3 files changed, 26 insertions, 31 deletions

diff --git a/frontend/pages/configurations/manager.php b/frontend/pages/configurations/manager.php
index dfd8322..6396aaa 100644
--- a/frontend/pages/configurations/manager.php
+++ b/frontend/pages/configurations/manager.php
@@ -1,20 +1,18 @@
 <?php
-function init_configurations_manager() {
-	global $S;
+function init_configurations_manager(&$S) {
 	if (!isset($S['user'])) {
 		return 'login';
 	}
 	return array('title' => 'Manage Configurations');
 }
-function body_configurations_manager() {
-	global $S, $request, $conf;
+function body_configurations_manager(&$S) {
 	echo '<h3>Configurations Manager</h3>';
-	if (isset($request['build']) && isset($request['configuration'])) {
-		$c=new sql_configuration($request['configuration']);
+	if (isset($_REQUEST['build']) && isset($_REQUEST['configuration'])) {
+		$c=new sql_configuration($_REQUEST['configuration']);
 		if ($c->owner!=$S['user']->id) {
 			echo print_error('You do not have permission to build this configuration.');
 		} else {
-			$name=isset($request['name'])?$request['name']:null;
+			$name=isset($_REQUEST['name'])?$_REQUEST['name']:null;
 			$build=$c->build($name);
 			if (is_object($build))
 				echo print_success('Submitted for build - <a href="'.url("build/$build->id").'">Logs</a>');
@@ -22,12 +20,12 @@ function body_configurations_manager() {
 				echo print_error('Invalid configuration', 'Your configuration could not be submitted for build.  Please return to <a href="'.url("config/$c->id/$build").'">step '.$build.'</a> and continue configuration from there.');
 		}
 	}
-	$r=$S['pdo']->query('SELECT * FROM `configurations` WHERE `owner`='.$S['user']->id);
+	$r=query('SELECT * FROM `configurations` WHERE `owner`='.$S['user']->id);
 	if ($r->rowCount() == 0) {
 		echo print_warning('You have no configurations.').'<a href="'.url('create').'">Create a configuration</a>';
 		return;
 	}
-	echo '<form action="'.url('configurations').'" method="post"><table><tr><th>ID</th><th>Name</th>'.(count($conf['modules']) > 1?'<th>Module</th>':'').'<th>Status</th><th>Options</th><th>Builds</th></tr>'."\n";
+	echo '<form action="'.url('configurations').'" method="post"><table><tr><th>ID</th><th>Name</th>'.(count($S['conf']['modules']) > 1?'<th>Module</th>':'').'<th>Status</th><th>Options</th><th>Builds</th></tr>'."\n";
 	$ready=0;
 	while($c=$r->fetch(PDO::FETCH_ASSOC)) {
 		$c=new sql_configuration($c);
@@ -39,7 +37,7 @@ function body_configurations_manager() {
 			echo $c->id;
 		}
 		echo '</td><td>'.(isset($c->name) && strlen($c->name)?htmlentities($c->name):'<i>Unnamed</i>').'</td><td>';
-		if (count($conf['modules']) > 1) {
+		if (count($S['conf']['modules']) > 1) {
 			echo "$c->module</td><td>";
 		}
 		if ($c->status > 0) {
diff --git a/frontend/pages/configurations/status.php b/frontend/pages/configurations/status.php
index d27efd4..f0ba8d5 100644
--- a/frontend/pages/configurations/status.php
+++ b/frontend/pages/configurations/status.php
@@ -1,13 +1,12 @@
 <?php
-function init_configurations_status() {
-	global $S, $request;
+function init_configurations_status(&$S) {
 	if (!isset($S['user'])) {
 		return 'login';
 	}
-	if (!(isset($request['configuration']) && strlen($request['configuration']) == 6 && ctype_alnum($request['configuration']))) {
+	if (!(isset($_REQUEST['configuration']) && strlen($_REQUEST['configuration']) == 6 && ctype_alnum($_REQUEST['configuration']))) {
 		return '404';
 	}
-	$r=$S['pdo']->query('SELECT * FROM `configurations` WHERE `id`=\''.$request['configuration'].'\'');
+	$r=query('SELECT * FROM `configurations` WHERE `id`=\''.$_REQUEST['configuration'].'\'');
 	if ($r->rowCount() == 0) {
 		return '404';
 	}
@@ -17,8 +16,7 @@ function init_configurations_status() {
 	}
 	return array('title' => 'Status');
 }
-function body_configurations_status() {
-	global $S;
+function body_configurations_status(&$S) {
 	$c=&$S['status']['configuration'];
 	$module=new module($c->module);
 	$status=true;
diff --git a/frontend/pages/configurations/wizard.php b/frontend/pages/configurations/wizard.php
index 947e321..33b9949 100644
--- a/frontend/pages/configurations/wizard.php
+++ b/frontend/pages/configurations/wizard.php
@@ -1,17 +1,16 @@
 <?php
-function init_configurations_wizard() {
-	global $S, $request, $conf;
+function init_configurations_wizard(&$S) {
 	if (!isset($S['user'])) {
 		return 'login';
 	}
-	if (isset($request['configuration']) && strlen($request['configuration']) == 6 && ctype_alnum($request['configuration'])) {
-		$S['wizard']['configuration']=new sql_configuration($request['configuration']);
+	if (isset($_REQUEST['configuration']) && strlen($_REQUEST['configuration']) == 6 && ctype_alnum($_REQUEST['configuration'])) {
+		$S['wizard']['configuration']=new sql_configuration($_REQUEST['configuration']);
 		$configuration=&$S['wizard']['configuration'];
 		if ($configuration->owner != $S['user']->id) {
 			return '404';
 		}
-		if (isset($request['wizard_submit'])) {
-			$steps=array_keys($request['wizard_submit']);
+		if (isset($_REQUEST['wizard_submit'])) {
+			$steps=array_keys($_REQUEST['wizard_submit']);
 			$step=$steps[0];
 			wizard_load_step($step);
 			debug('wizard', "processing $configuration->module step $step");
@@ -28,16 +27,17 @@ function init_configurations_wizard() {
 				$configuration->write();
 				wizard_load_step($result);
 			}
-		} elseif (isset($request['step']) && ctype_alnum($request['step'])) {
-			wizard_load_step($request['step']);
+		} elseif (isset($_REQUEST['step']) && ctype_alnum($_REQUEST['step'])) {
+			wizard_load_step($_REQUEST['step']);
 		} elseif ($configuration->status > 0) {
 			wizard_load_step($configuration->status);
 		}
-	} elseif (isset($request['init'])) {
+	} elseif (isset($_REQUEST['init'])) {
 		$S['wizard']['configuration']=new sql_configuration();
 		$configuration=&$S['wizard']['configuration'];
-		$configuration->name=$request['name'];
-		$mod=isset($request['mod']) && isset($conf['modules'][$request['mod']])?$conf['modules'][$request['mod']]:$conf['modules'][0];
+		$configuration->name=$_REQUEST['name'];
+		$configuration->visibility='public';
+		$mod=isset($_REQUEST['mod']) && isset($S['conf']['modules'][$_REQUEST['mod']])?$S['conf']['modules'][$_REQUEST['mod']]:$S['conf']['modules'][0];
 		$configuration->module=$mod;
 		$configuration->init();
 		debug('wizard', "Module: $mod");
@@ -49,8 +49,7 @@ function init_configurations_wizard() {
 		return array('title' => 'Create');
 	}
 }
-function body_configurations_wizard() {
-	global $S, $conf;
+function body_configurations_wizard(&$S) {
 	if (isset($S['wizard']['configuration'])) {
 		$configuration=&$S['wizard']['configuration'];
 		if (isset($S['wizard']['step']))
@@ -59,10 +58,10 @@ function body_configurations_wizard() {
 			echo print_success('Config finished!', '<form action="'.url('configurations').'" method="post"><input type="hidden" name="configuration" value="'.$configuration->id.'" />Name (optional): <input name="name" value="'.($configuration->name?htmlentities($configuration->name):'').'" /> <input type="submit" name="build" value="Build" /></form>');
 	} else {
 		echo '<form action="'.url('create').'" method="post"><h3>Request an image built</h3>Name of your configuration (optional): <input name="name" /><br/>';
-		if (count($conf['modules']) > 1) {
+		if (count($S['conf']['modules']) > 1) {
 			echo 'Module: <select name="mod">';
 			$i=0;
-			foreach ($conf['modules'] as $mod) {
+			foreach ($S['conf']['modules'] as $mod) {
 				$mod=new module($mod);
 				echo '<option value="'.$i++.'">'.htmlentities($mod->name).'</option>';
 			}