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

Merge pull request #5364 from tysauron/patch-7

Browse Source 
FIX Simplification + get real DN of user from setup of key (multi d…
This commit is contained in:
Laurent Destailleur 2016-07-20 19:15:41 +02:00 committed by GitHub
commit 548411a3fb
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/user/class/usergroup.class.php
View File

@ -784,11 +784,8 @@ class UserGroup extends CommonObject
{ {
$muser=new User($this->db); $muser=new User($this->db);
$muser->fetch($val->id); $muser->fetch($val->id);
if ($conf->global->LDAP_KEY_USERS == 'cn') $ldapuserid=$muser->getFullName($langs); $info2 = $muser->_load_ldap_info();
elseif ($conf->global->LDAP_KEY_USERS == 'sn') $ldapuserid=$muser->lastname; $valueofldapfield[] = $muser->_load_ldap_dn($info2);
elseif ($conf->global->LDAP_KEY_USERS == 'uid') $ldapuserid=$muser->login;
$valueofldapfield[] = $conf->global->LDAP_KEY_USERS.'='.$ldapuserid.','.$conf->global->LDAP_USER_DN;
} }
$info[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] = (!empty($valueofldapfield)?$valueofldapfield:''); $info[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] = (!empty($valueofldapfield)?$valueofldapfield:'');
} }