From c812c32808b5a7362fce73ad54eaef23f7e26fa8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 1 Sep 2009 15:47:29 +0000
Subject: [PATCH] Fix: Bad init of conf->entity

---
 dev/skeletons/skeleton_script.php | 8 +++-----
 htdocs/master.inc.php             | 9 +++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dev/skeletons/skeleton_script.php b/dev/skeletons/skeleton_script.php
index de05e5b5a8f..c19ca088832 100644
--- a/dev/skeletons/skeleton_script.php
+++ b/dev/skeletons/skeleton_script.php
@@ -39,19 +39,17 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 
 // Include Dolibarr environment
 require_once($path."../../htdocs/master.inc.php");
-// After this $db is an opened handler to database. We close it at end of file.
+// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 require_once(DOL_DOCUMENT_ROOT."/cron/functions_cron.lib.php");
 
-
-// Load main language strings
-$langs->load("main");
-
 // Global variables
 $version='$Revision$';
 $error=0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
+//$langs->setDefaultLang('en_US'); 	// To change default language of $langs
+$langs->load("main");				// To load language file for default language
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") *****\n";
 
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 61891041020..3ec860dfb26 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -225,22 +225,23 @@ if (! defined('NOREQUIREUSER'))
  */
 if (! defined('NOREQUIREDB'))
 {
-	if (session_id() && isset($_SESSION["dol_entity"]))				// Entity inside an opened session
+	// By default conf->entity is 1, but we change this if we ask another value.
+	if (session_id() && ! empty($_SESSION["dol_entity"]))				// Entity inside an opened session
 	{
 		$conf->entity = $_SESSION["dol_entity"];
 	}
-	elseif (isset($_ENV["dol_entity"]))								// Entity inside a CLI script
+	elseif (! empty($_ENV["dol_entity"]))								// Entity inside a CLI script
 	{
 		$conf->entity = $_ENV["dol_entity"];
 	}
-	elseif (isset($_POST["loginfunction"]) && isset($_POST["entity"]))	// Just after a login page
+	elseif (isset($_POST["loginfunction"]) && ! empty($_POST["entity"]))	// Just after a login page
 	{
 		$conf->entity = $_POST["entity"];
 	}
 	else
 	{
 		$entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]);
-		if (isset($_COOKIE[$entityCookieName]) && ! empty($conf->file->cookie_cryptkey)) 						// Just for view specific login page
+		if (! empty($_COOKIE[$entityCookieName]) && ! empty($conf->file->cookie_cryptkey)) 						// Just for view specific login page
 		{
 			include_once(DOL_DOCUMENT_ROOT."/core/cookie.class.php");