3 files changed, 88 insertions, 63 deletions

diff --git a/views/default/forms/admin/site/regenerate_secret.php b/views/default/forms/admin/site/regenerate_secret.php
new file mode 100644
index 000000000..af269b801
--- /dev/null
+++ b/views/default/forms/admin/site/regenerate_secret.php
@@ -0,0 +1,24 @@
+<?php
+
+$strength = $vars['strength'];
+
+?>
+<p><?php echo elgg_echo('admin:site:secret:intro'); ?></p>
+
+<table class="elgg-table">
+	<tr>
+		<th><?php echo elgg_echo('site_secret:current_strength'); ?></th>
+		<td class="elgg-strength-<?php echo $strength; ?>">
+			<h4><?php echo elgg_echo("site_secret:strength:$strength"); ?></h4>
+			<div><?php echo elgg_echo("site_secret:strength_msg:$strength"); ?></div>
+		</td>
+	</tr>
+</table>
+
+<div class="elgg-foot">
+	<?php echo elgg_view('input/submit', array(
+			'value' => elgg_echo('admin:site:secret:regenerate'),
+			'class' => 'elgg-requires-confirmation elgg-button elgg-button-submit',
+		)); ?>
+	<p class="elgg-text-help mts"><?php echo elgg_echo('admin:site:secret:regenerate:help'); ?></p>
+</div>
diff --git a/views/default/forms/admin/site/update_advanced.php b/views/default/forms/admin/site/update_advanced.php
index 3085921d9..14b74e4f9 100644
--- a/views/default/forms/admin/site/update_advanced.php
+++ b/views/default/forms/admin/site/update_advanced.php
@@ -4,96 +4,98 @@
  */
 $form_body = "";
 
-foreach (array('wwwroot', 'path', 'dataroot', 'view') as $field) {
-	$form_body .= "<p>";
+foreach (array('wwwroot', 'path', 'dataroot') as $field) {
+	$form_body .= "<div>";
 	$form_body .= elgg_echo('installation:' . $field) . "<br />";
 	$warning = elgg_echo('installation:warning:' . $field);
 	if ($warning != 'installation:warning:' . $field) {
 		echo "<b>" . $warning . "</b><br />";
 	}
 	$value = elgg_get_config($field);
-	$form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value));
-	$form_body .= "</p>";
+	$form_body .= elgg_view("input/text",array('name' => $field, 'value' => $value));
+	$form_body .= "</div>";
 }
 
-$form_body .= "<p>" . elgg_echo('admin:site:access:warning') . "<br />";
-$form_body .= elgg_echo('installation:sitepermissions');
+$form_body .= "<div>" . elgg_echo('admin:site:access:warning') . "<br />";
+$form_body .= "<label>" . elgg_echo('installation:sitepermissions') . "</label>";
 $form_body .= elgg_view('input/access', array(
-	'internalname' => 'default_access',
+	'options_values' => array(
+		ACCESS_PRIVATE => elgg_echo("PRIVATE"),
+		ACCESS_FRIENDS => elgg_echo("access:friends:label"),
+		ACCESS_LOGGED_IN => elgg_echo("LOGGED_IN"),
+		ACCESS_PUBLIC => elgg_echo("PUBLIC")
+	),
+	'name' => 'default_access',
 	'value' => elgg_get_config('default_access'),
-)) . "</p>";
-$form_body .= "<p>" . elgg_echo('installation:allow_user_default_access:description') . "<br />";
+)) . "</div>";
+$form_body .= "<div>" . elgg_echo('installation:allow_user_default_access:description') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
-	'options' => array(elgg_echo('installation:allow_user_default_access:label')),
-	'internalname' => 'allow_user_default_access',
-	'value' => (elgg_get_config('allow_user_default_access') ? elgg_echo('installation:allow_user_default_access:label') : ""),
-)) . "</p>";
-$form_body .= "<p>" . elgg_echo('installation:simplecache:description') . "<br />";
+	'options' => array(elgg_echo('installation:allow_user_default_access:label') => 1),
+	'name' => 'allow_user_default_access',
+	'value' => (elgg_get_config('allow_user_default_access') ? 1 : 0),
+)) . "</div>";
+$form_body .= "<div>" . elgg_echo('installation:simplecache:description') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
-	'options' => array(elgg_echo('installation:simplecache:label')),
-	'internalname' => 'simplecache_enabled',
-	'value' => (elgg_get_config('simplecache_enabled') ? elgg_echo('installation:simplecache:label') : ""),
-)) . "</p>";
-$form_body .= "<p>" . elgg_echo('installation:viewpathcache:description') . "<br />";
+	'options' => array(elgg_echo('installation:simplecache:label') => 1),
+	'name' => 'simplecache_enabled',
+	'value' => (elgg_get_config('simplecache_enabled') ? 1 : 0),
+)) . "</div>";
+$form_body .= "<div>" . elgg_echo('installation:systemcache:description') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
-	'options' => array(elgg_echo('installation:viewpathcache:label')),
-	'internalname' => 'viewpath_cache_enabled',
-	'value' => (elgg_get_config('viewpath_cache_enabled') ? elgg_echo('installation:viewpathcache:label') : ""),
-)) . "</p>";
+	'options' => array(elgg_echo('installation:systemcache:label') => 1),
+	'name' => 'system_cache_enabled',
+	'value' => (elgg_get_config('system_cache_enabled') ? 1 : 0),
+)) . "</div>";
 
 $debug_options = array('0' => elgg_echo('installation:debug:none'), 'ERROR' => elgg_echo('installation:debug:error'), 'WARNING' => elgg_echo('installation:debug:warning'), 'NOTICE' => elgg_echo('installation:debug:notice'));
-$form_body .= "<p>" . elgg_echo('installation:debug');
+$form_body .= "<div>" . elgg_echo('installation:debug');
 $form_body .= elgg_view('input/dropdown', array(
 	'options_values' => $debug_options,
-	'internalname' => 'debug',
+	'name' => 'debug',
 	'value' => elgg_get_config('debug'),
 ));
-$form_body .= '</p>';
+$form_body .= '</div>';
 
 // control new user registration
 $options = array(
-	'options' => array(elgg_echo('installation:registration:label')),
-	'internalname' => 'allow_registration',
-	'value' => elgg_get_config('allow_registration') ? elgg_echo('installation:registration:label') : '',
+	'options' => array(elgg_echo('installation:registration:label') => 1),
+	'name' => 'allow_registration',
+	'value' => elgg_get_config('allow_registration') ? 1 : 0,
 );
-$form_body .= '<p>' . elgg_echo('installation:registration:description');
-$form_body .= '<br />' .elgg_view('input/checkboxes', $options) . '</p>';
+$form_body .= '<div>' . elgg_echo('installation:registration:description');
+$form_body .= '<br />' .elgg_view('input/checkboxes', $options) . '</div>';
 
 // control walled garden
 $walled_garden = elgg_get_config(walled_garden);
 $options = array(
-	'options' => array(elgg_echo('installation:walled_garden:label')),
-	'internalname' => 'walled_garden',
-	'value' => $walled_garden ? elgg_echo('installation:walled_garden:label') : '',
+	'options' => array(elgg_echo('installation:walled_garden:label') => 1),
+	'name' => 'walled_garden',
+	'value' => $walled_garden ? 1 : 0,
 );
-$form_body .= '<p>' . elgg_echo('installation:walled_garden:description');
-$form_body .= '<br />' . elgg_view('input/checkboxes', $options) . '</p>';
+$form_body .= '<div>' . elgg_echo('installation:walled_garden:description');
+$form_body .= '<br />' . elgg_view('input/checkboxes', $options) . '</div>';
 
-$form_body .= "<p>" . elgg_echo('installation:httpslogin') . "<br />";
+$form_body .= "<div>" . elgg_echo('installation:httpslogin') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
-	'options' => array(elgg_echo('installation:httpslogin:label')),
-	'internalname' => 'https_login',
-	'value' => (elgg_get_config('https_login') ? elgg_echo('installation:httpslogin:label') : "")
-)) . "</p>";
+	'options' => array(elgg_echo('installation:httpslogin:label') => 1),
+	'name' => 'https_login',
+	'value' => (elgg_get_config('https_login') ? 1 : 0)
+)) . "</div>";
 
-$form_body .= "<p>" . elgg_echo('installation:disableapi') . "<br />";
-$on = elgg_echo('installation:disableapi:label');
+$form_body .= "<div>" . elgg_echo('installation:disableapi') . "<br />";
 $disable_api = elgg_get_config('disable_api');
-if ($disable_api) {
-	$on = (disable_api ?  "" : elgg_echo('installation:disableapi:label'));
-}
+$on = $disable_api ?  0 : 1;
 $form_body .= elgg_view("input/checkboxes", array(
-	'options' => array(elgg_echo('installation:disableapi:label')),
-	'internalname' => 'api',
+	'options' => array(elgg_echo('installation:disableapi:label') => 1),
+	'name' => 'api',
 	'value' => $on,
 ));
-$form_body .= "</p>";
+$form_body .= "</div>";
 
-$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
+$form_body .= elgg_view('input/hidden', array('name' => 'settings', 'value' => 'go'));
 
-$form_body .= '<p class="bta">';
+$form_body .= '<div class="elgg-foot">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
-$form_body .= '</p>';
-$form_body = "<div class='admin_settings site_admin'>" . $form_body . "</div>";
+$form_body .= '</div>';
 
-echo $form_body;
\ No newline at end of file
+echo $form_body;
diff --git a/views/default/forms/admin/site/update_basic.php b/views/default/forms/admin/site/update_basic.php
index f8cefaa7c..88870bc60 100644
--- a/views/default/forms/admin/site/update_basic.php
+++ b/views/default/forms/admin/site/update_basic.php
@@ -5,28 +5,27 @@
 $form_body = "";
 
 foreach (array('sitename','sitedescription', 'siteemail') as $field) {
-	$form_body .= "<p>";
+	$form_body .= "<div>";
 	$form_body .= elgg_echo('installation:' . $field) . "<br />";
 	$warning = elgg_echo('installation:warning:' . $field);
 	if ($warning != 'installation:warning:' . $field) {
 		echo "<b>" . $warning . "</b><br />";
 	}
 	$value = elgg_get_config($field);
-	$form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value));
-	$form_body .= "</p>";
+	$form_body .= elgg_view("input/text",array('name' => $field, 'value' => $value));
+	$form_body .= "</div>";
 }
 
 $languages = get_installed_translations();
-$form_body .= "<p>" . elgg_echo('installation:language');
+$form_body .= "<div>" . elgg_echo('installation:language');
 $form_body .= elgg_view("input/dropdown", array(
-	'internalname' => 'language',
+	'name' => 'language',
 	'value' => elgg_get_config('language'),
 	'options_values' => $languages,
-)) . "</p>";
+)) . "</div>";
 
-$form_body .= '<p class="bta">';
+$form_body .= '<div class="elgg-foot">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
-$form_body .= '</p>';
-$form_body = "<div class='admin_settings site_admin'>".$form_body."</div>";
+$form_body .= '</div>';
 
 echo $form_body;
\ No newline at end of file