aboutsummaryrefslogtreecommitdiff
path: root/views/default/admin/site
diff options
context:
space:
mode:
Diffstat (limited to 'views/default/admin/site')
-rw-r--r--views/default/admin/site/advanced.php67
-rw-r--r--views/default/admin/site/basic.php18
2 files changed, 65 insertions, 20 deletions
diff --git a/views/default/admin/site/advanced.php b/views/default/admin/site/advanced.php
index 65c796fbd..49c5de6ac 100644
--- a/views/default/admin/site/advanced.php
+++ b/views/default/admin/site/advanced.php
@@ -10,57 +10,94 @@ $action = elgg_get_site_url() . "action/admin/site/update_advanced";
$form_body = "";
-foreach(array('wwwroot', 'path', 'dataroot', 'view') as $field) {
+foreach (array('wwwroot', 'path', 'dataroot', 'view') as $field) {
$form_body .= "<p>";
$form_body .= elgg_echo('installation:' . $field) . "<br />";
$warning = elgg_echo('installation:warning:' . $field);
- if ($warning != 'installation:warning:' . $field) echo "<b>" . $warning . "</b><br />";
- $value = $vars['config']->$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 .= "<p>" . elgg_echo('admin:site:access:warning') . "<br />";
-$form_body .= elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => $vars['config']->default_access)) . "</p>";
-$form_body .= "<p>" . elgg_echo('installation:allow_user_default_access:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:allow_user_default_access:label')), 'internalname' => 'allow_user_default_access', 'value' => ($vars['config']->allow_user_default_access ? elgg_echo('installation:allow_user_default_access:label') : "") )) . "</p>";
-$form_body .= "<p>" . elgg_echo('installation:simplecache:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:simplecache:label')), 'internalname' => 'simplecache_enabled', 'value' => ($vars['config']->simplecache_enabled ? elgg_echo('installation:simplecache:label') : "") )) . "</p>";
-$form_body .= "<p>" . elgg_echo('installation:viewpathcache:description') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:viewpathcache:label')), 'internalname' => 'viewpath_cache_enabled', 'value' => (($vars['config']->viewpath_cache_enabled) ? elgg_echo('installation:viewpathcache:label') : "") )) . "</p>";
+$form_body .= elgg_echo('installation:sitepermissions');
+$form_body .= elgg_view('input/access', array(
+ 'internalname' => 'default_access',
+ 'value' => elgg_get_config('default_access'),
+)) . "</p>";
+$form_body .= "<p>" . 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 />";
+$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 />";
+$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>";
$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 .= elgg_view('input/pulldown', array('options_values' => $debug_options, 'internalname' => 'debug', 'value' => $vars['config']->debug));
+$form_body .= elgg_view('input/pulldown', array(
+ 'options_values' => $debug_options,
+ 'internalname' => 'debug',
+ 'value' => elgg_get_config('debug'),
+));
$form_body .= '</p>';
// control new user registration
$options = array(
'options' => array(elgg_echo('installation:registration:label')),
'internalname' => 'allow_registration',
- 'value' => $vars['config']->allow_registration ? elgg_echo('installation:registration:label') : '',
+ 'value' => elgg_get_config('allow_registration') ? elgg_echo('installation:registration:label') : '',
);
$form_body .= '<p>' . elgg_echo('installation:registration:description');
$form_body .= '<br />' .elgg_view('input/checkboxes', $options) . '</p>';
// control walled garden
+$walled_garden = elgg_get_config(walled_garden);
$options = array(
'options' => array(elgg_echo('installation:walled_garden:label')),
'internalname' => 'walled_garden',
- 'value' => $vars['config']->walled_garden ? elgg_echo('installation:walled_garden:label') : '',
+ 'value' => $walled_garden ? elgg_echo('installation:walled_garden:label') : '',
);
$form_body .= '<p>' . elgg_echo('installation:walled_garden:description');
$form_body .= '<br />' . elgg_view('input/checkboxes', $options) . '</p>';
-$form_body .= "<p>" . elgg_echo('installation:httpslogin') . "<br />" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:httpslogin:label')), 'internalname' => 'https_login', 'value' => ($vars['config']->https_login ? elgg_echo('installation:httpslogin:label') : "") )) . "</p>";
+$form_body .= "<p>" . 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>";
$form_body .= "<p>" . 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'));
+$disable_api = elgg_get_config('disable_api');
+if ($disable_api) {
+ $on = (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 .= elgg_view("input/checkboxes", array(
+ 'options' => array(elgg_echo('installation:disableapi:label')),
+ 'internalname' => 'api',
+ 'value' => $on,
+));
$form_body .= "</p>";
$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
$form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo("save")));
-$form_body = "<div class='admin_settings site_admin margin-top'>".$form_body."</div>";
+$form_body = "<div class='admin_settings site_admin'>" . $form_body . "</div>";
+
echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
diff --git a/views/default/admin/site/basic.php b/views/default/admin/site/basic.php
index d7d36f25b..2c50cf89f 100644
--- a/views/default/admin/site/basic.php
+++ b/views/default/admin/site/basic.php
@@ -10,19 +10,27 @@ $action = elgg_get_site_url() . "action/admin/site/update_basic";
$form_body = "";
-foreach(array('sitename','sitedescription', 'siteemail') as $field) {
+foreach (array('sitename','sitedescription', 'siteemail') as $field) {
$form_body .= "<p>";
$form_body .= elgg_echo('installation:' . $field) . "<br />";
$warning = elgg_echo('installation:warning:' . $field);
- if ($warning != 'installation:warning:' . $field) echo "<b>" . $warning . "</b><br />";
- $value = $vars['config']->$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>";
}
$languages = get_installed_translations();
-$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>" . elgg_echo('installation:language');
+$form_body .= elgg_view("input/pulldown", array(
+ 'internalname' => 'language',
+ 'value' => elgg_get_config('language'),
+ 'options_values' => $languages,
+)) . "</p>";
$form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo("save")));
-$form_body = "<div class='admin_settings site_admin margin-top'>".$form_body."</div>";
+$form_body = "<div class='admin_settings site_admin'>".$form_body."</div>";
+
echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));