diff --git a/htdocs/lib/ldap.class.php b/htdocs/lib/ldap.class.php index 61a668d139a..0ddeeecb9bb 100644 --- a/htdocs/lib/ldap.class.php +++ b/htdocs/lib/ldap.class.php @@ -855,9 +855,7 @@ class Ldap * Returns an array containing attributes and values for first record */ function getAttribute($dn,$filter) - { - print $dn.'
'; - + { // Check parameters if (! $this->connection) { diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index 62cbf5c66d8..23563b40599 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -32,6 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); $langs->load("companies"); $langs->load("ldap"); +$langs->load("users"); // Protection quand utilisateur externe $contactid = isset($_GET["id"])?$_GET["id"]:''; @@ -173,9 +174,9 @@ if ($result > 0) $info=$fgroup->_load_ldap_info(); $dn=$fgroup->_load_ldap_dn($info,1); $search = "(".$fgroup->_load_ldap_dn($info,2).")"; - $records=$ldap->search($dn,$search); + $records = $ldap->getAttribute($dn,$search); - //print_r($records); + //var_dump($records); // Affichage arbre if (sizeof($records) && (! isset($records['count']) || $records['count'] > 0)) @@ -186,7 +187,7 @@ if ($result > 0) } else { - $result=show_ldap_content($records,0,0,true); + $result=show_ldap_content($records,0,$records['count'],true); } } else diff --git a/htdocs/usergroup.class.php b/htdocs/usergroup.class.php index 4fdf49be53a..2f89b24b710 100644 --- a/htdocs/usergroup.class.php +++ b/htdocs/usergroup.class.php @@ -45,7 +45,7 @@ class UserGroup extends CommonObject var $note; // Note on group var $datec; // Creation date of group var $datem; // Modification date of group - var $members=array(); // Array of users + var $members=array(1,2,18); // Array of users var $oldcopy; // To contains a clone of this when we need to save old properties of object @@ -564,7 +564,7 @@ class UserGroup extends CommonObject if ($this->note && $conf->global->LDAP_GROUP_FIELD_DESCRIPTION) $info[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION] = $this->note; if ($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS) { - $valueofldapfield=''; + $valueofldapfield=array(); foreach($this->members as $key=>$val) { $muser=new User($this->db); @@ -573,9 +573,8 @@ class UserGroup extends CommonObject $ldapuserid=$muser->login; // TODO ldapuserid should depends on value $conf->global->LDAP_KEY_USERS; - - if ($valueofldapfield) $valueofldapfield.=' '; - $valueofldapfield.=$conf->global->LDAP_KEY_USERS.'='.$ldapuserid.','.$conf->global->LDAP_USER_DN; + + $valueofldapfield[] = $conf->global->LDAP_KEY_USERS.'='.$ldapuserid.','.$conf->global->LDAP_USER_DN; } $info[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] = $valueofldapfield; }