Browse Source

Merge pull request #5364 from tysauron/patch-7

FIX Simplification + get real DN of user from setup of key (multi d…
Laurent Destailleur 9 years ago
parent
commit
548411a3fb
1 changed files with 2 additions and 5 deletions
  1. 2 5
      htdocs/user/class/usergroup.class.php

+ 2 - 5
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:'');
 		}