From 9c63350831d63495428cf553e960ee69083a90ed Mon Sep 17 00:00:00 2001 From: tysauron Date: Thu, 16 Jun 2016 23:39:59 +0200 Subject: [PATCH] Simplification + reprise du vrai DN de l'utilisateur (gestion multi domaine par exemple) --- htdocs/user/class/usergroup.class.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 50237b0ef61..575fdadebe2 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -784,11 +784,8 @@ class UserGroup extends CommonObject { $muser=new User($this->db); $muser->fetch($val->id); - if ($conf->global->LDAP_KEY_USERS == 'cn') $ldapuserid=$muser->getFullName($langs); - elseif ($conf->global->LDAP_KEY_USERS == 'sn') $ldapuserid=$muser->lastname; - elseif ($conf->global->LDAP_KEY_USERS == 'uid') $ldapuserid=$muser->login; - - $valueofldapfield[] = $conf->global->LDAP_KEY_USERS.'='.$ldapuserid.','.$conf->global->LDAP_USER_DN; + $info2 = $muser->_load_ldap_info(); + $valueofldapfield[] = $muser->_load_ldap_dn($info2); } $info[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] = (!empty($valueofldapfield)?$valueofldapfield:''); }