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

Todo: il faut qu'on trouve une autre solution, il n'y a que comme ca que la multicompany a un fonctionnement correct...

Browse Source
This commit is contained in:
Regis Houssin 2009-05-07 16:11:57 +00:00
parent 7891ea1cb1
commit 81a5393e70
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/conf.class.php
View File

@ -180,10 +180,10 @@ class Conf
foreach($this->modules as $module) foreach($this->modules as $module)
{ {
if (empty($this->$module->dir_output)) $this->$module->dir_output=$rootfordata."/".$module; if (empty($this->$module->dir_output)) $this->$module->dir_output=$rootfordata."/".$module;
//else $this->$module->dir_output=$rootfordata.$this->$module->dir_output; else $this->$module->dir_output=$rootfordata.$this->$module->dir_output;
//print 'this->'.$module.'->dir_output='.$this->$module->dir_output.'<br>'; //print 'this->'.$module.'->dir_output='.$this->$module->dir_output.'<br>';
if (empty($this->$module->dir_temp)) $this->$module->dir_temp=$rootfordata."/".$module."/temp"; if (empty($this->$module->dir_temp)) $this->$module->dir_temp=$rootfordata."/".$module."/temp";
//else $this->$module->dir_temp=$rootfordata.$this->$module->dir_temp; else $this->$module->dir_temp=$rootfordata.$this->$module->dir_temp;
//print 'this->'.$module.'->dir_temp='.$this->$module->dir_temp.'<br>'; //print 'this->'.$module.'->dir_temp='.$this->$module->dir_temp.'<br>';
} }

9
htdocs/main.inc.php
View File

@ -112,6 +112,11 @@ analyse_sql_injection($_POST);
// This is to make Dolibarr working with Plesk // This is to make Dolibarr working with Plesk
set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
// Retrieve the entity in login form, and after in the cookie
$entityCookieName = "DOLENTITYID_dolibarr";
if (isset($_POST["entity"])) $_SESSION["dol_entity"] = $_POST["entity"];
if (isset($_COOKIE[$entityCookieName])) $_SESSION["dol_entity"] = $_COOKIE[$entityCookieName];
// Set and init common variables // Set and init common variables
// This include will set $conf, $langs and $mysoc objects // This include will set $conf, $langs and $mysoc objects
require_once("master.inc.php"); require_once("master.inc.php");
@ -161,7 +166,7 @@ if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) ini_set('session.gc_maxlifetim
session_name($sessionname); session_name($sessionname);
session_start(); session_start();
dol_syslog("Start session name=".$sessionname." Session id()=".session_id().", _SESSION['dol_login']=".(isset($_SESSION["dol_login"])?$_SESSION["dol_login"]:'').", ".ini_get("session.gc_maxlifetime")); dol_syslog("Start session name=".$sessionname." Session id()=".session_id().", _SESSION['dol_login']=".(isset($_SESSION["dol_login"])?$_SESSION["dol_login"]:'').", ".ini_get("session.gc_maxlifetime"));
/*
// Retrieve the entity in login form and in the cookie. // Retrieve the entity in login form and in the cookie.
// This must be after the init of session (session_start) or this create serious pb of corrupted session. // This must be after the init of session (session_start) or this create serious pb of corrupted session.
$entityCookieName = "DOLENTITYID_dolibarr"; $entityCookieName = "DOLENTITYID_dolibarr";
@ -181,7 +186,7 @@ elseif (isset($_COOKIE[$entityCookieName]))
// Now we need to reload the conf with the choosed entity // Now we need to reload the conf with the choosed entity
$conf->setValues($db); $conf->setValues($db);
} }
*/
// Disable modules (this must be after session_start and after conf has been reloaded) // Disable modules (this must be after session_start and after conf has been reloaded)
if (! empty($_REQUEST["disablemodules"])) $_SESSION["disablemodules"]=$_REQUEST["disablemodules"]; if (! empty($_REQUEST["disablemodules"])) $_SESSION["disablemodules"]=$_REQUEST["disablemodules"];
if (! empty($_SESSION["disablemodules"])) if (! empty($_SESSION["disablemodules"]))

4
htdocs/master.inc.php
View File

@ -114,6 +114,10 @@ require_once(DOL_DOCUMENT_ROOT."/core/conf.class.php");
$conf = new Conf(); $conf = new Conf();
// Retrieve the entity
// Removed: The session has not been initialized yet so using SESSION is forbidden here
if (isset($_SESSION["dol_entity"])) $conf->entity = $_SESSION["dol_entity"];
// Identifiant propres au serveur base de donnee // Identifiant propres au serveur base de donnee
$conf->db->host = $dolibarr_main_db_host; $conf->db->host = $dolibarr_main_db_host;
if (empty($dolibarr_main_db_port)) $dolibarr_main_db_port=0; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql' if (empty($dolibarr_main_db_port)) $dolibarr_main_db_port=0; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql'