From 4c7367ec2b5eb647a9563edd89753f52877a57e8 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 8 Mar 2010 08:08:00 +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/systems/class_filterSYSTEMS.inc dn and check if there is a -r- in the result. git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@16335 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc index 83e126b9c..178dee31c 100644 --- a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc +++ b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc @@ -2,7 +2,7 @@ class filterSYSTEMS { - static function query($base, $scope, $filter, $attributes, $category, $objectStorage= "") + static function query($parent,$base, $scope, $filter, $attributes, $category, $objectStorage= "") { $ui = get_userinfo(); global $config; @@ -10,7 +10,7 @@ class filterSYSTEMS { // Check whether the arp handling active or not $arp_handling_active = ($config->search("ArpNewDevice","CLASS",array('tabs')) != ""); - $entries = filterLDAP::query($base, $scope, $filter, $attributes, $category, $objectStorage); + $entries = filterLDAP::query($parent,$base, $scope, $filter, $attributes, $category, $objectStorage); foreach($entries as $key => $entry){ if(preg_match("/".preg_quote(get_ou('systemIncomingRDN'),'/')."/i", $entry['dn'])){ -- 2.30.2