From 80bb7715823673e62ba155e7a984c6fa1d8a443d Mon Sep 17 00:00:00 2001
From: marcus
Date: Wed, 7 Jan 2009 12:14:50 +0000
Subject: Closes #662: https on login.
git-svn-id: https://code.elgg.org/elgg/trunk@2535 36083f99-b078-4883-b0ff-0f9b5a30f544
---
views/default/account/forms/login.php | 10 ++++++++--
views/default/settings/system.php | 5 ++++-
2 files changed, 12 insertions(+), 3 deletions(-)
(limited to 'views/default')
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)) ? "" . elgg_echo('register') . " | " : "";
$form_body .= "" . elgg_echo('user:password:lost') . "
";
- //
+ //
+
+ $login_url = $vars['url'];
+ if ((isset($CONFIG->https_login)) && ($CONFIG->https_login))
+ $login_url = str_replace("http", "https", $vars['url']);
?>
- $form_body, 'action' => "{$vars['url']}action/login")); ?>
+ $form_body, 'action' => "{$login_url}action/login"));
+ ?>
\ 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 .= "" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "
";
- $form_body .= "" . elgg_echo('installation:debug') . "
" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('installation:debug:label') : "") )) . "
";
+ $form_body .= "" . elgg_echo('installation:debug') . "
" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('installation:debug:label') : "") )) . "
";
+
+ $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:disableapi') . "
";
$on = elgg_echo('installation:disableapi:label');
--
cgit v1.2.3