lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: force redirect to https could not work for some environments

Browse Source 
Conflicts:
	htdocs/main.inc.php
This commit is contained in:
Laurent Destailleur 2012-12-12 02:40:01 +01:00
parent f8f3b2dc39
commit 48eec88cba
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/conf/conf.php.example
View File

@ -205,11 +205,14 @@ $dolibarr_main_authentication='dolibarr';
//##################
// dolibarr_main_force_https
// This parameter allows to force the HTTPS mode.
// This parameter allows to force the HTTPS mode.
// 0 = No forced redirect
// 1 = Force redirect to https until SCRIPT_URI start with https
// 2 = Force redirect to https until SERVER["HTTPS"] is 'on'
// Warning: If you enable this parameter, your web server must be configured
// to respond URL with https protocol.
// Default value: 0
// Possible values: 0 or 1
// Possible values: 0, 1 or 2
// Examples:
// $dolibarr_main_force_https='0';
//
@ -292,4 +295,4 @@ $dolibarr_main_prod='0';
// Examples:
// $multicompany_transverse_mode='1';
?>
?>

11
htdocs/main.inc.php
View File

@ -195,9 +195,9 @@ if (isset($_SERVER["HTTP_USER_AGENT"]))
if (! empty($conf->file->main_force_https))
{
$newurl='';
if ($conf->file->main_force_https == '1')
if (is_numeric($conf->file->main_force_https))
{
if (! empty($_SERVER["SCRIPT_URI"])) // If SCRIPT_URI supported by server
if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"])) // If SCRIPT_URI supported by server
{
if (preg_match('/^http:/i',$_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i',$_SERVER["SCRIPT_URI"])) // If link is http
{
@ -215,7 +215,12 @@ if (! empty($conf->file->main_force_https))
}
else
{
$newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
// 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"];
}
}
// Start redirect
if ($newurl)