diff options
Diffstat (limited to 'views/default/core')
-rw-r--r-- | views/default/core/account/login_box.php | 2 | ||||
-rw-r--r-- | views/default/core/account/login_dropdown.php | 2 | ||||
-rw-r--r-- | views/default/core/account/login_walled_garden.php | 22 | ||||
-rw-r--r-- | views/default/core/settings/account/default_access.php | 6 | ||||
-rw-r--r-- | views/default/core/settings/account/language.php | 1 |
5 files changed, 7 insertions, 26 deletions
diff --git a/views/default/core/account/login_box.php b/views/default/core/account/login_box.php index 0dee72328..a371ab0c8 100644 --- a/views/default/core/account/login_box.php +++ b/views/default/core/account/login_box.php @@ -9,7 +9,7 @@ $form_body = elgg_view('forms/login'); $login_url = elgg_get_site_url(); -if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) { +if (elgg_get_config('https_login')) { $login_url = str_replace("http:", "https:", $login_url); } ?> diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php index 386a52a6c..356aa48de 100644 --- a/views/default/core/account/login_dropdown.php +++ b/views/default/core/account/login_dropdown.php @@ -12,7 +12,7 @@ $form_body = elgg_view('forms/login'); $form_body .= "<input type='hidden' name='returntoreferer' value='true' />"; $login_url = elgg_get_site_url(); -if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) { +if (elgg_get_config('https_login')) { $login_url = str_replace("http", "https", elgg_get_site_url()); } diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php index 8b801ed1d..9335c0dfd 100644 --- a/views/default/core/account/login_walled_garden.php +++ b/views/default/core/account/login_walled_garden.php @@ -2,30 +2,12 @@ /** * Walled Garden Login Form */ - -global $CONFIG; - -/* -$form_body = "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea username')) . "</label>"; -$form_body .= "<br />"; -$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')) . "</label><br />"; - -$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))); -$form_body .= "<div class='remember_me'><label><input type='checkbox' name='persistent' checked value='true' />".elgg_echo('user:persistent')."</label></div>"; - -$register = elgg_echo('register'); -$lost_password = elgg_echo('user:password:lost'); -$form_body .= '<p class="lost_password">'; -$form_body .= $CONFIG->allow_registration ? "<a class=\"registration_link\" href=\"".elgg_get_site_url()."pg/register/\">$register</a> | " : ''; -$form_body .= "<a class='forgotten_password_link' href=\"{$login_url}pages/account/forgotten_password.php\">$lost_password</a>"; -$form_body .= '</p>'; -*/ $form_body = elgg_view('forms/login'); $form_body .= elgg_view('input/hidden', array('internalname' => 'returntoreferer', 'value' => 'true')); $login_url = elgg_get_site_url(); -if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) { +if (elgg_get_config('https_login')) { $login_url = str_replace("http", "https", elgg_get_site_url()); } ?> @@ -36,7 +18,7 @@ if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) { ?> <?php -if ($CONFIG->allow_registration) { +if (elgg_get_config('allow_registration')) { $title = elgg_echo('register'); $body = elgg_view("account/forms/register", array( 'friend_guid' => (int) get_input('friend_guid', 0), diff --git a/views/default/core/settings/account/default_access.php b/views/default/core/settings/account/default_access.php index 678a68ba1..4c4e44757 100644 --- a/views/default/core/settings/account/default_access.php +++ b/views/default/core/settings/account/default_access.php @@ -5,12 +5,12 @@ * @package Elgg * @subpackage Core */ -if ($vars['config']->allow_user_default_access) { +if (elgg_get_config('allow_user_default_access')) { $user = elgg_get_page_owner_entity(); if ($user) { if (false === ($default_access = $user->getPrivateSetting('elgg_default_access'))) { - $default_access = $vars['config']->default_access; + $default_access = elgg_get_config('default_access'); } ?> <div class="elgg-module elgg-info-module"> @@ -22,7 +22,7 @@ if ($vars['config']->allow_user_default_access) { <?php echo elgg_echo('default_access:label'); ?>: <?php - echo elgg_view('input/access',array('internalname' => 'default_access', 'value' => $default_access)); + echo elgg_view('input/access', array('internalname' => 'default_access', 'value' => $default_access)); ?> </p> diff --git a/views/default/core/settings/account/language.php b/views/default/core/settings/account/language.php index bac22fe34..3391a3733 100644 --- a/views/default/core/settings/account/language.php +++ b/views/default/core/settings/account/language.php @@ -6,7 +6,6 @@ * @subpackage Core */ -global $CONFIG; $user = elgg_get_page_owner_entity(); if ($user) { |