diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index ab1a16c9883c196751ec0e78caa40a70c639b9ea..7c682756eddbc32c52b2951cf09675d14ceaf1bd 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -225,7 +225,8 @@ if (isset($_SERVER["HTTP_USER_AGENT"])) // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url) -if (! empty($conf->file->main_force_https)) +// $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off' +if (! empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on')) { $newurl=''; if (is_numeric($conf->file->main_force_https)) @@ -239,21 +240,13 @@ if (! empty($conf->file->main_force_https)) } else // Check HTTPS environment variable (Apache/mod_ssl only) { - // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off' - if (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on') // If link is http - { - $newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"]; - } + $newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"]; } } else { // Check HTTPS environment variable (Apache/mod_ssl only) - // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off' - if (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on') // If link is http - { - $newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"]; - } + $newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"]; } // Start redirect if ($newurl)