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

New: Add option dolibarr_main_force_https

Browse Source
This commit is contained in:
Laurent Destailleur 2008-04-06 20:17:11 +00:00
parent baa5f74fbd
commit 68c09f00ec
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/main.inc.php
View File

@ -90,6 +90,25 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
require_once("master.inc.php"); require_once("master.inc.php");
// Check if HTTPS
if ($conf->main_force_https)
{
if (eregi('^http:',$_SERVER["SCRIPT_URI"]) && ! eregi('^https:',$_SERVER["SCRIPT_URI"]))
{
if ($_SERVER["HTTPS"] != 'on')
{
dolibarr_syslog("dolibarr_main_force_https is on but https disabled on serveur",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"]);
header("Location: ".$newurl);
exit;
}
}
}
// Chargement des includes complementaire de presentation // Chargement des includes complementaire de presentation
if (! defined('NOREQUIREMENU')) require_once(DOL_DOCUMENT_ROOT ."/menu.class.php"); // Need 11ko memory if (! defined('NOREQUIREMENU')) require_once(DOL_DOCUMENT_ROOT ."/menu.class.php"); // Need 11ko memory

2
htdocs/master.inc.php
View File

@ -133,6 +133,8 @@ if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation='latin1_swed
$conf->db->dolibarr_main_db_collation=$dolibarr_main_db_collation; $conf->db->dolibarr_main_db_collation=$dolibarr_main_db_collation;
// Identifiant autres // Identifiant autres
$conf->main_authentication = $dolibarr_main_authentication; $conf->main_authentication = $dolibarr_main_authentication;
// Force https
$conf->main_force_https = $dolibarr_main_force_https;
// Identifiant propre au client // Identifiant propre au client
if (empty($character_set_client)) $character_set_client='ISO-8859-1'; if (empty($character_set_client)) $character_set_client='ISO-8859-1';
$conf->character_set_client=$character_set_client; $conf->character_set_client=$character_set_client;