From 8e56706985ce20487f397a48432b4e49b3772257 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 8 Mar 2010 08:07:55 +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/opsiLicenses/class_filterOpsiLicense.inc dn and check if there is a -r- in the result. git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@16333 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../opsi/admin/opsiLicenses/class_filterOpsiLicense.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_filterOpsiLicense.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_filterOpsiLicense.inc index 10d0e1958..70f96a937 100644 --- a/gosa-plugins/opsi/admin/opsiLicenses/class_filterOpsiLicense.inc +++ b/gosa-plugins/opsi/admin/opsiLicenses/class_filterOpsiLicense.inc @@ -2,7 +2,7 @@ class filterOpsiLicense { - static function query($base, $scope, $filter, $attributes, $category, $objectStorage= "") + static function query($parent,$base, $scope, $filter, $attributes, $category, $objectStorage= "") { if(!class_available('opsi')) return(array()); @@ -10,7 +10,7 @@ class filterOpsiLicense { $config= session::global_get('config'); $ldap= $config->get_ldap_link(TRUE); $flag= ($scope == "sub")?GL_SUBSEARCH:0; - $result= filterOpsiLicense::get_list($base, $filter, $attributes, $category, $objectStorage, $flag); + $result= filterOpsiLicense::get_list($parent,$base, $filter, $attributes, $category, $objectStorage, $flag); // Simple filtering if(!empty($filter)){ @@ -24,7 +24,7 @@ class filterOpsiLicense { return(filterACL::unifyResult($result)); } - static function get_list($base, $filter, $attributes, $category, $objectStorage, $flags= GL_SUBSEARCH) + static function get_list($parent,$base, $filter, $attributes, $category, $objectStorage, $flags= GL_SUBSEARCH) { $config= session::global_get('config'); $si = new opsiLicenceHandler($config); -- 2.30.2