From eaddae88046f037405757679a1c24461ec0d8dbe Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 29 Sep 2008 12:03:13 +0000
Subject: Closes #383 & #384

git-svn-id: https://code.elgg.org/elgg/trunk@2144 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/settings/system.php  | 17 +++++++++++++----
 views/failsafe/settings/system.php | 13 ++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

(limited to 'views')

diff --git a/views/default/settings/system.php b/views/default/settings/system.php
index 24f76be6c..2ddd8ac7b 100644
--- a/views/default/settings/system.php
+++ b/views/default/settings/system.php
@@ -22,7 +22,7 @@
 		}
 		
 		$form_body = "";
-		foreach(array('sitename','sitedescription', 'wwwroot','path','dataroot', 'view') as $field) {
+		foreach(array('sitename','sitedescription', 'siteemail', 'wwwroot','path','dataroot', 'view') as $field) {
 			$form_body .= "<p>";
 			$form_body .= elgg_echo('installation:' . $field) . "<br />";
 			$warning = elgg_echo('installation:warning:' . $field);
@@ -36,14 +36,23 @@
 		$form_body .= "<p>" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "</p>";
 		
 		$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:debug') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('installation:debug:label') : "") )) . "</p>";
+		
+		$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:disableapi') . "<br />";
+		$on = elgg_echo('installation:disableapi:label');
+		if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true))
+			$on = ($vars['config']->disable_api ?  "" : elgg_echo('installation:disableapi:label'));
+		$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', 'value' => $on ));
+		$form_body .= "</p>";
 		
 		$form_body .= "<p class=\"admin_usage\">" . elgg_echo('installation:usage') . "<br />";
-		$on = elgg_echo('installation:usage:label');
-
+		$on = elgg_echo('installation:usage:label');
+		
 		if (isset($CONFIG->ping_home))
 			$on = ($vars['config']->ping_home!='disabled' ? elgg_echo('installation:usage:label') : "");
 		$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:usage:label')), 'internalname' => 'usage', 'value' => $on )); 
-		$form_body .= "</p>";
+		$form_body .= "</p>";
+		
+		
 		
 		$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
 		
diff --git a/views/failsafe/settings/system.php b/views/failsafe/settings/system.php
index 6e7c68999..475ffc870 100644
--- a/views/failsafe/settings/system.php
+++ b/views/failsafe/settings/system.php
@@ -22,7 +22,7 @@
 		}
 		
 		$form_body = "";
-		foreach(array('sitename','sitedescription', 'wwwroot','path','dataroot', 'view') as $field) {
+		foreach(array('sitename','sitedescription', 'siteemail', 'wwwroot','path','dataroot', 'view') as $field) {
 			$form_body .= "<p>";
 			$form_body .= elgg_echo('installation:' . $field) . "<br />";
 			$warning = elgg_echo('installation:warning:' . $field);
@@ -37,14 +37,21 @@
 		$form_body .= "<p>" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "</p>";
 		
 		$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:debug') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('installation:debug:label') : "") )) . "</p>";
+		
+		$form_body .= "<p class=\"admin_debug\">" . elgg_echo('installation:disableapi') . "<br />";
+		$on = elgg_echo('installation:disableapi:label');
+		if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true))
+			$on = ($vars['config']->disable_api ?  "" : elgg_echo('installation:disableapi:label'));
+		$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', 'value' => $on ));
+		$form_body .= "</p>";
 		
 		$form_body .= "<p class=\"admin_usage\">" . elgg_echo('installation:usage') . "<br />";
 		$on = elgg_echo('installation:usage:label');
 
 		if (isset($CONFIG->ping_home))
 			$on = ($vars['config']->ping_home!='disabled' ? elgg_echo('installation:usage:label') : "");
-		$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:usage:label')), 'internalname' => 'usage', 'value' => $on )); 
-		$form_body .= "</p>";
+		$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:usage:label')), 'internalname' => 'usage', 'value' => $on ));	
+		$form_body .= "</p>";
 		
 		$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
 		
-- 
cgit v1.2.3