Grouplisting changed

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

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 20d925f03f6c53a23415e528e12474aa8323aeab..fe9c5119cb4f63dc1a5724ef522fe641e6cc9bc1 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -547,10 +547,11 @@ class groupManagement extends plugin
         $filter= "(&(|(memberUID=" . $groupfilter['guser'] . ")(cn=" . $groupfilter['guser'] . "))$filter)";
       }
     }
-    if ($groupfilter['subsearch'] == "checked"){
-      $res= get_list($this->ui->subtreeACL, "$filter", TRUE, $base, array("cn", "description", "gidNumber"), TRUE);
+    if ($groupfilter['subsearch'] != "checked"){
+      $res= get_list($this->ui->subtreeACL, "$filter", FALSE, $base, array("cn", "description", "gidNumber"), TRUE);
     } else {
       $base= get_groups_ou().$base;
+     
       $res= get_list($this->ui->subtreeACL, "$filter", FALSE, $base, array("cn", "description", "gidNumber"), TRUE);
     }
     if (preg_match("/size limit/i", $error) || preg_match("/size limit/i", $error2)){
@@ -662,7 +663,7 @@ class groupManagement extends plugin
     $base2 = preg_replace("/ou=people,/i","",$base);
 
     $res3 =  get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
-                              TRUE, $base2, array("ou", "description"), TRUE);
+                              FALSE, $base2, array("ou", "description"), TRUE);
 
     $this->departments= array();
     $tmp = array();
@@ -686,15 +687,16 @@ class groupManagement extends plugin
       }
     }
     if ($groupfilter['subsearch'] == "checked"){
-      $res= get_list($this->ui->subtreeACL, "$filter", TRUE, $base, array("cn", "description", "gidNumber"), TRUE);
+      $res= get_list($this->ui->subtreeACL, "$filter", FALSE, $base, array("cn", "description", "gidNumber"), TRUE);
     } else {
-      $base= get_groups_ou().$base;
+     $base= get_groups_ou().$base;
       $res= get_list($this->ui->subtreeACL, "$filter", FALSE, $base, array("cn", "description", "gidNumber"), TRUE);
     }
     if (preg_match("/size limit/i", $error) || preg_match("/size limit/i", $error2)){
       $_SESSION['limit_exceeded']= TRUE;
     }
 
+    $this->grouplist = array();  
     foreach ($res as $value){
       $this->grouplist[$value['gidNumber'][0]]= $value;
     }

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index e79da9b1d152c9a0849411a6aa6730247d81e6fd..ecf653dd2358ee10572ec6dc14d1a7f0cbf292c9 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -830,9 +830,8 @@ class systems extends plugin
     /* Get all gotoTerminal's */
     $this->terminals= array();
 
-    $res= get_list($this->ui->subtreeACL, "(|$termfilter$workfilter$winfilter$printfilter$phonefilter$serverfilter$netfilter)", TRUE, $base, array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), TRUE);
+    $res= get_list($this->ui->subtreeACL, "(|$termfilter$workfilter$winfilter$printfilter$phonefilter$serverfilter$netfilter)", false, $base, array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE);
 
-      
     /* NEW LIST MANAGMENT
      * We also need to search for the departments
      * So we are able to navigate like in konquerer