From b8bd27009e2a8ad6ad773abe18a5f6c3b8a00199 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 28 Mar 2015 18:32:53 +0100 Subject: [PATCH] Simplify code --- htdocs/core/login/functions_dolibarr.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php index 8654c866969..74da1f97ff0 100644 --- a/htdocs/core/login/functions_dolibarr.php +++ b/htdocs/core/login/functions_dolibarr.php @@ -112,18 +112,16 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest= } // We must check entity - if ($passok) + if ($passok && ! empty($conf->multicompany->enabled)) // We must check entity { global $mc; - if (!isset($mc)) { - //Global not available, disable $conf->multicompany->enabled for safety - $conf->multicompany->enabled = false; - } - - if (! empty($conf->multicompany->enabled)) { + if (! isset($mc)) $conf->multicompany->enabled = false; // Global not available, disable $conf->multicompany->enabled for safety + else + { $ret = $mc->checkRight($obj->rowid, $entitytotest); - if ($ret < 0) { + if ($ret < 0) + { dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '" . $entitytotest . "' not allowed for user '" . $obj->rowid . "'"); $login = ''; // force authentication failure }