diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-01-07 12:14:50 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-01-07 12:14:50 +0000 |
| commit | 80bb7715823673e62ba155e7a984c6fa1d8a443d (patch) | |
| tree | 449b0b0cbf9bdfcf59c8a859a5bc77c0657fc269 /actions | |
| parent | af7149183fb60bdaf73c679d40c4febb2415c0d7 (diff) | |
| download | elgg-80bb7715823673e62ba155e7a984c6fa1d8a443d.tar.gz elgg-80bb7715823673e62ba155e7a984c6fa1d8a443d.tar.bz2 | |
Closes #662: https on login.
git-svn-id: https://code.elgg.org/elgg/trunk@2535 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/admin/site/update_basic.php | 6 | ||||
| -rw-r--r-- | actions/systemsettings/install.php | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php index 5710e63b9..c29fdd044 100644 --- a/actions/admin/site/update_basic.php +++ b/actions/admin/site/update_basic.php @@ -45,6 +45,12 @@ else unset_config('debug', $site->getGUID()); + $https_login = get_input('https_login'); + if ($https_login) + set_config('https_login', 1, $site->getGUID()); + else + unset_config('https_login', $site->getGUID()); + $usage = get_input('usage'); if ($usage) unset_config('ping_home', $site->getGUID()); diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php index 25846d6f1..3ea4e117e 100644 --- a/actions/systemsettings/install.php +++ b/actions/systemsettings/install.php @@ -78,7 +78,12 @@ unset_config('disable_api', $site->getGUID()); else set_config('disable_api', 'disabled', $site->getGUID()); -
+ + $https_login = get_input('https_login'); + if ($https_login) + set_config('https_login', 1, $site->getGUID()); + else + unset_config('https_login', $site->getGUID());
// activate some plugins by default if (isset($CONFIG->default_plugins)) |