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

Fix: Better support of option dolibarr_main_force_https

Browse Source
This commit is contained in:
Laurent Destailleur 2008-12-23 20:36:13 +00:00
parent 0821015e1b
commit fa9aee5de4
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/main.inc.php
View File

@ -112,20 +112,33 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
// Set and init common variables // Set and init common variables
require_once("master.inc.php"); require_once("master.inc.php");
// Check if HTTPS // Check if HTTPS
if ($conf->main_force_https) if ($conf->main_force_https)
{ {
if (eregi('^http:',$_SERVER["SCRIPT_URI"]) && ! eregi('^https:',$_SERVER["SCRIPT_URI"])) if (! empty($_SERVER["SCRIPT_URI"])) // If SCRIPT_URI supported by server
{ {
if ($_SERVER["HTTPS"] != 'on') if (eregi('^http:',$_SERVER["SCRIPT_URI"]) && ! eregi('^https:',$_SERVER["SCRIPT_URI"])) // If link is http
{ {
dolibarr_syslog("dolibarr_main_force_https is on but https disabled on serveur. We ignore option.",LOG_ERR);
}
else
{
dolibarr_syslog("dolibarr_main_force_https is on, we make a redirect",LOG_DEBUG);
$newurl=eregi_replace('^http:','https:',$_SERVER["SCRIPT_URI"]); $newurl=eregi_replace('^http:','https:',$_SERVER["SCRIPT_URI"]);
dolibarr_syslog("dolibarr_main_force_https is on, we make a redirect to ".$newurl,LOG_DEBUG);
header("Location: ".$newurl);
exit;
}
}
else // Check on 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
{
$uri=eregi_replace('^http(s?)://','',$dolibarr_main_url_root);
$val=split('/',$uri);
$domaineport=$val[0]; // $domaineport contient nom domaine et port
$newurl='https://'.$domaineport.$_SERVER["REQUEST_URI"];
//print 'eee'.$newurl; exit;
dolibarr_syslog("dolibarr_main_force_https is on, we make a redirect to ".$newurl,LOG_DEBUG);
header("Location: ".$newurl); header("Location: ".$newurl);
exit; exit;
} }