From 36639c4f31b4c85369696735f8858d4551726545 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 28 Dec 2009 08:51:43 +0000 Subject: [PATCH] Updated ACL filter. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14950 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/plugins/admin/acl/class_filterACL.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gosa-core/plugins/admin/acl/class_filterACL.inc b/gosa-core/plugins/admin/acl/class_filterACL.inc index 1626da66b..a74df2738 100644 --- a/gosa-core/plugins/admin/acl/class_filterACL.inc +++ b/gosa-core/plugins/admin/acl/class_filterACL.inc @@ -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); } -- 2.30.2