From 0d824354c94d69b08345cdf8bf322aa07b4958c3 Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 11 Aug 2008 12:52:17 +0000
Subject: Refs #210 & #211 : Some more core settings / admin pages moved to use
 admin_gatekeeper. Install script action now also refuses to be run if the
 site has already been installed.

git-svn-id: https://code.elgg.org/elgg/trunk@1824 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/admin/site/update_basic.php |  1 +
 actions/systemsettings/install.php  |  4 +-
 actions/usersettings/save.php       |  3 +-
 views/default/settings/system.php   | 84 +++++++++++++------------------------
 views/default/usersettings/form.php | 22 ++++------
 5 files changed, 42 insertions(+), 72 deletions(-)

diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php
index 4a3fd775c..12d74a535 100644
--- a/actions/admin/site/update_basic.php
+++ b/actions/admin/site/update_basic.php
@@ -17,6 +17,7 @@
 	
 	// block non-admin users
 	admin_gatekeeper();
+	action_gatekeeper();
 	
 	if (get_input('settings') == 'go') {
 		
diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php
index 061a2404e..4629d010d 100644
--- a/actions/systemsettings/install.php
+++ b/actions/systemsettings/install.php
@@ -11,7 +11,9 @@
 	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
-	 */
+	 */
+
+	if (is_installed()) gatekeeper();
 
 	if (get_input('settings') == 'go') {
 		
diff --git a/actions/usersettings/save.php b/actions/usersettings/save.php
index 6322369bc..5b1b9f736 100644
--- a/actions/usersettings/save.php
+++ b/actions/usersettings/save.php
@@ -12,7 +12,8 @@
 	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 	global $CONFIG;
 
-	gatekeeper();
+	gatekeeper();
+	action_gatekeeper();
 	
 	trigger_plugin_hook('usersettings:save','user');
 	
diff --git a/views/default/settings/system.php b/views/default/settings/system.php
index 13e730029..857c64d03 100644
--- a/views/default/settings/system.php
+++ b/views/default/settings/system.php
@@ -19,59 +19,33 @@
 			$action = $vars['url'] . "action/systemsettings/save";
 		} else {
 			$action = $vars['action'];
-		}
-
-?>
-
-	<form action="<?php echo $action; ?>" method="post">
-		
-<?php
-
-		foreach(array('sitename','sitedescription', 'wwwroot','path','dataroot', 'view') as $field) {
-
-?>
-		<p>
-			<?php echo elgg_echo($field); ?><br />
-			<?php 
-				echo elgg_view("input/text",array('internalname' => $field, 'value' => $vars['config']->$field)); 
-			?>
-		</p>
-	
-<?php
-
-		}
-
-?>
-		<p>
-			<?php echo elgg_echo('language'); ?>
-			<?php
-				$languages = get_installed_translations();
-				
-				echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages));
-			?>
-		</p>
-
-		<p>
-			<?php echo elgg_echo('debug'); ?><br />
-			<?php 
-				echo elgg_view("input/checkboxes", array('options' => array(elgg_echo('debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('debug:label') : "") )); 
-			?>
-		</p>
-		
-		<p>
-			<?php echo elgg_echo('usage'); ?><br />
-			<?php
-				$on = elgg_echo('usage:label');
-				
-				if (isset($CONFIG->ping_home))
-					$on = ($vars['config']->ping_home!='disabled' ? elgg_echo('usage:label') : "");
-				echo elgg_view("input/checkboxes", array('options' => array(elgg_echo('usage:label')), 'internalname' => 'usage', 'value' => $on )); 
-			?>
-		</p>
+		}
+		
+		$form_body = "";
+		foreach(array('sitename','sitedescription', 'wwwroot','path','dataroot', 'view') as $field) {
+			$form_body .= "<p>";
+			$form_body .= elgg_echo($field) . "<br />";
+			$form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $vars['config']->$field));
+			$form_body .= "</p>";
+		}
+		
+		$languages = get_installed_translations();
+		$form_body .= "<p>" . elgg_echo('language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "</p>";
+		
+		$form_body .= "<p>" . elgg_echo('debug') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('debug:label') : "") )) . "</p>";
+		
+		$form_body .= "<p>" . elgg_echo('usage') . "<br />";
+		$on = elgg_echo('usage:label');
+
+		if (isset($CONFIG->ping_home))
+			$on = ($vars['config']->ping_home!='disabled' ? elgg_echo('usage:label') : "");
+		$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('usage:label')), 'internalname' => 'usage', 'value' => $on )); 
+		$form_body .= "</p>";
+		
+		$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
+		
+		$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
+		
+		echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
 		
-		<p>
-			<input type="hidden" name="settings" value="go" />
-			<input type="submit" value="<?php echo elgg_echo("save"); ?>" />
-		</p>
-	
-	</form>
+?>
\ No newline at end of file
diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php
index e245a0da1..509146162 100644
--- a/views/default/usersettings/form.php
+++ b/views/default/usersettings/form.php
@@ -1,15 +1,7 @@
-<form action="<?php echo $vars['url']; ?>action/usersettings/save" method="post" >
-
-	<div class="settings_form">
-<?php
-
-	echo elgg_view("usersettings/user");
-
-?>
-	</div>
-
-	<p>
-		<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
-	</p>
-
-</form>
\ No newline at end of file
+<?php
+
+	$form_body = "<div class=\"settings_form\">" . elgg_view("usersettings/user") . "</div>";
+	$form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "</p>";
+
+	echo elgg_view('input/form', array('action' => "{$vars['url']}action/usersettings/save", 'body' => $form_body));
+?>
\ No newline at end of file
-- 
cgit v1.2.3