From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 23 Dec 2009 14:24:08 +0000 (+0000)
Subject: Updated ACL Filter
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=800d69cc3a65d84fa86b551810411c9a3e404a7b;p=gosa.git

Updated ACL Filter


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

diff --git a/gosa-core/plugins/admin/acl/class_filterACL.inc b/gosa-core/plugins/admin/acl/class_filterACL.inc
index a9d7cb9b2..1626da66b 100644
--- a/gosa-core/plugins/admin/acl/class_filterACL.inc
+++ b/gosa-core/plugins/admin/acl/class_filterACL.inc
@@ -7,8 +7,8 @@ class filterACL {
     $config= session::global_get('config');
     $ldap= $config->get_ldap_link(TRUE);
     $flag= ($scope == "sub")?GL_SUBSEARCH:0;
-    $result= filterACL::get_list($base, $filter, $attributes, $category, array(), $flag | GL_SIZELIMIT, "cat");
-    $result= array_merge($result,filterACL::get_list($base, $filter, $attributes, $category, array(), $flag | GL_SIZELIMIT, ""));
+    $result=array();
+    $result= array_merge($result,filterACL::get_list($base, $filter, $attributes, $category, array(), $flag | GL_SIZELIMIT, "search"));
     $result= array_merge($result,filterACL::get_list($base, $filter, $attributes, $category, $objectStorage, $flag | GL_SIZELIMIT, ""));
     return(filterACL::unifyResult($result));
   }
@@ -97,8 +97,6 @@ class filterACL {
       $ldap->cd($base);
       if ($method == "ls") {
         $ldap->ls("(&$filter$dnFilter)", $base, $attributes);
-      } elseif($method == "cat") {
-        $ldap->cat($base, $attributes);
       } else {
         $ldap->search("(&$filter$dnFilter)", $attributes);
       }