Merge branch 'stable-3.1' of github.com:AlternC/AlternC into stable-3.1

This commit is contained in:
Benjamin Sonntag 2016-08-09 16:44:34 +02:00
commit 5ef516e0ba
1 changed files with 1 additions and 2 deletions

View File

@ -169,8 +169,7 @@ $hooks = new m_hooks();
// https: Redirection if not calling https://!fqdn or if https is forced
if ((variable_get('force_https', '0', "This variable is set to 0 (default) if users can access the management desktop through HTTP, otherwise we force HTTPS")&&(!isset($_SERVER["HTTPS"])|| ($_SERVER["HTTPS"] != "on")))
||(isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on" && $host != $L_FQDN)) {
if ((variable_get('force_https', '0', "This variable is set to 0 (default) if users can access the management desktop through HTTP, otherwise we force HTTPS")&&(!isset($_SERVER["HTTPS"])|| ($_SERVER["HTTPS"] != "on")))) {
// do not redirect if access is not by HTTP(s)
if (isset($_SERVER['REQUEST_URI'])) {
header("Location: https://".$_SERVER["HTTP_HOST"].$_SERVER['REQUEST_URI']);