Updated Group list

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2538 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 6319ee80f1ca3cd47fde9bcfae8f45141a071876..d83e1b7a6bccb7ffe4ba12db376763b0e6b84524 100644 (file)
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -144,14 +144,14 @@ class LDAP{
     }
   }
 
-  function ls($filter = "(objectclass=*)", $basedn = "")
+  function ls($filter = "(objectclass=*)", $basedn = "",$attrs = array("*"))
   {
     if($this->hascon){
       if ($this->reconnect) $this->connect();
       $this->clearResult();
       if ($basedn == "")
         $basedn = $this->basedn;
-      $this->sr = @ldap_list($this->cid, $basedn, $filter);
+      $this->sr = @ldap_list($this->cid, $basedn, $filter,$attrs);
       $this->error = @ldap_error($this->cid);
       $this->resetResult();
       $this->hasres=true;

diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc
index 64a49bf18b315aad591092e7f9e8419c1a34ebef..3557ccf66055daef16c57f07564e53bbd4bcaab3 100644 (file)
--- a/plugins/admin/groups/class_groupGeneric.inc
+++ b/plugins/admin/groups/class_groupGeneric.inc
@@ -374,7 +374,7 @@ class group extends plugin
     $gufilter= get_global("gufilter");
 
     $ldap->cd ($gufilter['dselect']);
-    $ldap->search ("(&(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate))(!(uid=*$)))", array("uid", "sn", "givenName"));
+    $ldap->ls ("(&(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate))(!(uid=*$)))",get_people_ou().$gufilter['dselect'],array("uid", "sn", "givenName"));
     $this->allusers= array();
     while ($attrs= $ldap->fetch()){
       if (isset($attrs["givenName"][0]) && isset($attrs["sn"][0])){