From 4503c58bc954671503650223bbcabe7a2951d415 Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 3 Feb 2011 02:55:41 +0000 Subject: Refs #2428 removed some uses of CONFIG in the views git-svn-id: http://code.elgg.org/elgg/trunk@7996 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/admin/site/advanced.php | 67 +++++++++++++++++++++++++++-------- views/default/admin/site/basic.php | 18 +++++++--- 2 files changed, 65 insertions(+), 20 deletions(-) (limited to 'views/default/admin') 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 .= "

"; $form_body .= elgg_echo('installation:' . $field) . "
"; $warning = elgg_echo('installation:warning:' . $field); - if ($warning != 'installation:warning:' . $field) echo "" . $warning . "
"; - $value = $vars['config']->$field; + if ($warning != 'installation:warning:' . $field) { + echo "" . $warning . "
"; + } + $value = elgg_get_config($field); $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value)); $form_body .= "

"; } $form_body .= "

" . elgg_echo('admin:site:access:warning') . "
"; -$form_body .= elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => $vars['config']->default_access)) . "

"; -$form_body .= "

" . elgg_echo('installation:allow_user_default_access:description') . "
" .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') : "") )) . "

"; -$form_body .= "

" . elgg_echo('installation:simplecache:description') . "
" .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') : "") )) . "

"; -$form_body .= "

" . elgg_echo('installation:viewpathcache:description') . "
" .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') : "") )) . "

"; +$form_body .= elgg_echo('installation:sitepermissions'); +$form_body .= elgg_view('input/access', array( + 'internalname' => 'default_access', + 'value' => elgg_get_config('default_access'), +)) . "

"; +$form_body .= "

" . elgg_echo('installation:allow_user_default_access:description') . "
"; +$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') : ""), +)) . "

"; +$form_body .= "

" . elgg_echo('installation:simplecache:description') . "
"; +$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') : ""), +)) . "

"; +$form_body .= "

" . elgg_echo('installation:viewpathcache:description') . "
"; +$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') : ""), +)) . "

"; $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 .= "

" . 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 .= '

'; // 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 .= '

' . elgg_echo('installation:registration:description'); $form_body .= '
' .elgg_view('input/checkboxes', $options) . '

'; // 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 .= '

' . elgg_echo('installation:walled_garden:description'); $form_body .= '
' . elgg_view('input/checkboxes', $options) . '

'; -$form_body .= "

" . elgg_echo('installation:httpslogin') . "
" .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') : "") )) . "

"; +$form_body .= "

" . elgg_echo('installation:httpslogin') . "
"; +$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') : "") +)) . "

"; $form_body .= "

" . elgg_echo('installation:disableapi') . "
"; $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 .= "

"; $form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go')); $form_body .= "
".elgg_view('input/submit', array('value' => elgg_echo("save"))); -$form_body = "
".$form_body."
"; +$form_body = "
" . $form_body . "
"; + 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 .= "

"; $form_body .= elgg_echo('installation:' . $field) . "
"; $warning = elgg_echo('installation:warning:' . $field); - if ($warning != 'installation:warning:' . $field) echo "" . $warning . "
"; - $value = $vars['config']->$field; + if ($warning != 'installation:warning:' . $field) { + echo "" . $warning . "
"; + } + $value = elgg_get_config($field); $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value)); $form_body .= "

"; } $languages = get_installed_translations(); -$form_body .= "

" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "

"; +$form_body .= "

" . elgg_echo('installation:language'); +$form_body .= elgg_view("input/pulldown", array( + 'internalname' => 'language', + 'value' => elgg_get_config('language'), + 'options_values' => $languages, +)) . "

"; $form_body .= "
".elgg_view('input/submit', array('value' => elgg_echo("save"))); -$form_body = "
".$form_body."
"; +$form_body = "
".$form_body."
"; + echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); -- cgit v1.2.3