From 1fb06cbda42851d006b96e17f6e08a590627575c Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 8 Mar 2010 08:07:53 +0000 Subject: [PATCH] Fixed acl handling in lists.n -Acls were not checked correctl. If we had permissions to view only phones, we got all systems listed, due to the fact that get_psermission can not differentiate between object types. We have to do this manually, not just iterate through all possible combinations of acl-categrory M /root/2.6/gosa-all/gosa/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc dn and check if there is a -r- in the result. git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@16332 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../objectSelect/class_filterLDAPDepartmentBlacklist.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc b/gosa-core/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc index ff6c467ea..3fac87377 100644 --- a/gosa-core/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc +++ b/gosa-core/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc @@ -2,9 +2,9 @@ class filterLDAPDepartmentBlacklist extends filterLDAPBlacklist{ - static function query($base, $scope, $filter, $attributes, $category, $objectStorage= "") + static function query($parent,$base, $scope, $filter, $attributes, $category, $objectStorage= "") { - $entries = filterLDAPBlacklist::query($base, $scope, $filter, $attributes, $category,array()); + $entries = filterLDAPBlacklist::query($parent,$base, $scope, $filter, $attributes, $category,array()); foreach($entries as $key => $entry){ $entries[$key]['cn'] = $entry['ou']; $entries[$key][ $entries[$key]['count'] ]= 'cn'; -- 2.30.2