From 9d67b040765868d99e1048399efac02b80fc46d8 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 5 Sep 2012 19:17:55 +0200
Subject: [PATCH] New: add possibility to force entity in login page

---
 htdocs/filefunc.inc.php | 1 +
 htdocs/master.inc.php   | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 4a28e5c0ae4..c93923fc12c 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -108,6 +108,7 @@ if (empty($dolibarr_mailing_limit_sendbyweb)) $dolibarr_mailing_limit_sendbyweb=
 if (empty($force_charset_do_notuse)) $force_charset_do_notuse='UTF-8';
 if (empty($dolibarr_strict_mode)) $dolibarr_strict_mode=0; // For debug in php strict mode
 if (empty($multicompany_transverse_mode)) $multicompany_transverse_mode=0;
+if (empty($multicompany_force_entity)) $multicompany_force_entity=0; // To force entity in login page
 
 // Security: CSRF protection
 // This test check if referrer ($_SERVER['HTTP_REFERER']) is same web site than Dolibarr ($_SERVER['HTTP_HOST'])
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 12f1e08dbd5..0e8b2b6502d 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -78,6 +78,8 @@ if (defined('TEST_DB_FORCE_TYPE')) $conf->db->type=constant('TEST_DB_FORCE_TYPE'
 $conf->file->strict_mode = empty($dolibarr_strict_mode)?'':$dolibarr_strict_mode;
 // Force Multi-Company transverse mode
 $conf->multicompany->transverse_mode = empty($multicompany_transverse_mode)?'':$multicompany_transverse_mode;
+// Force entity in login page
+$conf->multicompany->force_entity = empty($multicompany_force_entity)?'':(int) $multicompany_force_entity;
 
 // Chargement des includes principaux de librairies communes
 if (! defined('NOREQUIREUSER')) require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';		// Need 500ko memory
@@ -141,6 +143,10 @@ if (! defined('NOREQUIREDB'))
 	{
 		$conf->entity = DOLENTITY;
 	}
+	else if (! empty($conf->multicompany->force_entity) && is_int($conf->multicompany->force_entity)) // To force entity in login page
+	{
+		$conf->entity = $conf->multicompany->force_entity;
+	}
 
 	//print "Will work with data into entity instance number '".$conf->entity."'";