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

Add multicompany->enabled test

Browse Source
This commit is contained in:
Alexis Algoud 2013-12-16 09:45:38 +01:00
parent 4844aed67e
commit ba70794c1d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/login/functions_ldap.php
View File

@ -41,7 +41,6 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass; global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass;
global $dolibarr_main_auth_ldap_filter; global $dolibarr_main_auth_ldap_filter;
global $dolibarr_main_auth_ldap_debug; global $dolibarr_main_auth_ldap_debug;
global $mc;
if (! function_exists("ldap_connect")) if (! function_exists("ldap_connect"))
{ {
@ -169,8 +168,14 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
{ {
dol_syslog("functions_ldap::check_user_password_ldap Sync user found id=".$user->id); dol_syslog("functions_ldap::check_user_password_ldap Sync user found id=".$user->id);
// On verifie si le login a change et on met a jour les attributs dolibarr // On verifie si le login a change et on met a jour les attributs dolibarr
$ret=$mc->checkRight($user->id, $entitytotest);
if ($ret < 0) $login=false; // provoque l'echec de l'identification if ($conf->multicompany->enabled) {
global $mc;
$ret=$mc->checkRight($user->id, $entitytotest);
if ($ret < 0) $login=false; // provoque l'echec de l'identification
}
if ($user->login != $ldap->login && $ldap->login) if ($user->login != $ldap->login && $ldap->login)
{ {