From feaf5266e97923bb105a7dde666fa71ee5af4765 Mon Sep 17 00:00:00 2001 From: Regis Houssin 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 9d482017f29..cac66e7c36b 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -102,6 +102,7 @@ if (empty($dolibarr_main_limit_users)) $dolibarr_main_limit_users=0; if (empty($dolibarr_mailing_limit_sendbyweb)) $dolibarr_mailing_limit_sendbyweb=0; if (empty($force_charset_do_notuse)) $force_charset_do_notuse='UTF-8'; 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 607b184ff85..f24c4e2ab7f 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -76,6 +76,8 @@ if (! empty($dolibarr_main_document_root_alt)) if (defined('TEST_DB_FORCE_TYPE')) $conf->db->type=constant('TEST_DB_FORCE_TYPE'); // 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 @@ -139,6 +141,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."'";