diff options
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/account/forms/login.php | 10 | ||||
| -rw-r--r-- | views/default/settings/system.php | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php index 17b44cc78..95eef7790 100644 --- a/views/default/account/forms/login.php +++ b/views/default/account/forms/login.php @@ -21,11 +21,17 @@ $form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "<a href=\"{$vars['url']}account/register.php\">" . elgg_echo('register') . "</a> | " : "";
$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
- //<input name=\"username\" type=\"text\" class="general-textarea" /></label>
+ //<input name=\"username\" type=\"text\" class="general-textarea" /></label> + + $login_url = $vars['url']; + if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) + $login_url = str_replace("http", "https", $vars['url']);
?>
<div id="login-box">
<h2><?php echo elgg_echo('login'); ?></h2>
- <?php echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/login")); ?>
+ <?php + echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login")); + ?>
</div>
\ No newline at end of file diff --git a/views/default/settings/system.php b/views/default/settings/system.php index 2ddd8ac7b..be9b00dee 100644 --- a/views/default/settings/system.php +++ b/views/default/settings/system.php @@ -35,7 +35,10 @@ $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 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: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: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 class=\"admin_debug\">" . elgg_echo('installation:disableapi') . "<br />"; $on = elgg_echo('installation:disableapi:label'); |