Separated configurations from builds of those configurations, added configurations manager to frontend

3 files changed, 7 insertions, 7 deletions

diff --git a/frontend/modules/gentoo/step1.php b/frontend/modules/gentoo/step1.php
index 16f04d9..aeb0a9e 100644
--- a/frontend/modules/gentoo/step1.php
+++ b/frontend/modules/gentoo/step1.php
@@ -4,8 +4,8 @@ function gentoo_init_step1() {
 }
 function gentoo_body_step1() {
 	global $S;
-	$build=&$S['wizard.build'];
-	//$opts=$build->get_buildopts(); // TODO use this to set selected="selected" on the current profile
+	$configuration=&$S['wizard.configuration'];
+	//$opts=$configuration->get_configopts(); // TODO use this to set selected="selected" on the current profile
 	echo 'Profile: <select name="pkgdir">';
 	$r=$S['pdo']->query('SELECT * FROM `profiles` WHERE `flags` NOT LIKE "%d%"'); // d for disabled
 	while ($profile=$r->fetch(PDO::FETCH_ASSOC)) {
@@ -18,7 +18,7 @@ function gentoo_body_step1() {
 function gentoo_process_step1() {
 	global $S, $request;
 	$profile=new sql_profile($request['pkgdir']);
-	$profileopt=new sql_buildopt($S['wizard.build']->id, 'profile', $profile->id);
+	$profileopt=new sql_configopt($S['wizard.configuration']->id, 'profile', $profile->id);
 	$profileopt->write();
 }
 ?>
diff --git a/frontend/modules/gentoo/step2.php b/frontend/modules/gentoo/step2.php
index 4e2907c..564dd4d 100644
--- a/frontend/modules/gentoo/step2.php
+++ b/frontend/modules/gentoo/step2.php
@@ -4,8 +4,8 @@ function gentoo_init_step2() {
 }
 function gentoo_body_step2() {
 	global $S;
-	$build=&$S['wizard.build'];
-	$opts=$build->get_buildopts();
+	$configuration=&$S['wizard.configuration'];
+	$opts=$configuration->get_configopts();
 	$profile=new sql_profile($opts['profile']);
 	$categories=$profile->get_packages();
 	echo '<ul>';
@@ -30,7 +30,7 @@ function gentoo_process_step2() {
 			$packages[]=$name;
 		}
 		$packages=implode(' ', $packages);
-		$opt=new sql_buildopt($S['wizard.build']->id, 'install_packages', $packages);
+		$opt=new sql_configopt($S['wizard.configuration']->id, 'install_packages', $packages);
 		$opt->write();
 	}
 }
diff --git a/frontend/modules/gentoo/step3.php b/frontend/modules/gentoo/step3.php
index d1d152d..2f66325 100644
--- a/frontend/modules/gentoo/step3.php
+++ b/frontend/modules/gentoo/step3.php
@@ -9,7 +9,7 @@ function gentoo_process_step3() {
 	global $S, $request;
 	if (isset($request['image_type'])) {
 		debug('wizard', 'step3: image type='.$request['image_type']);
-		$opt=new sql_buildopt($S['wizard.build']->id, 'image_type', $request['image_type']);
+		$opt=new sql_configopt($S['wizard.configuration']->id, 'image_type', $request['image_type']);
 		$opt->write();
 	} else {
 		debug('wizard', 'step3: no image_type variable');