Code

Updated ACL filter.
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 28 Dec 2009 08:51:43 +0000 (08:51 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 28 Dec 2009 08:51:43 +0000 (08:51 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14950 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-core/plugins/admin/acl/class_filterACL.inc

index 1626da66b642c61bb6817bfb3c3459e27b44f17a..a74df2738f6fdf1d5f650bdc0c91d86a675501b3 100644 (file)
@@ -8,7 +8,7 @@ class filterACL {
     $ldap= $config->get_ldap_link(TRUE);
     $flag= ($scope == "sub")?GL_SUBSEARCH:0;
     $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, array(), $flag | GL_SIZELIMIT, "cat"));
     $result= array_merge($result,filterACL::get_list($base, $filter, $attributes, $category, $objectStorage, $flag | GL_SIZELIMIT, ""));
     return(filterACL::unifyResult($result));
   }
@@ -97,6 +97,8 @@ class filterACL {
       $ldap->cd($base);
       if ($method == "ls") {
         $ldap->ls("(&$filter$dnFilter)", $base, $attributes);
+      } elseif ($method == "cat") {
+        $ldap->cat($base, $attributes, "(&$filter$dnFilter)");
       } else {
         $ldap->search("(&$filter$dnFilter)", $attributes);
       }