From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 8 Mar 2010 08:07:51 +0000 (+0000)
Subject: Fixed acl handling in lists.n -Acls were not checked correctl. If we had permissions... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=843229261a2bd09115b0bff9bafab278098a1f1a;p=gosa.git

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/groups/class_filterGroupLDAP.inc dn and check if there is a -r- in the result.

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@16331 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/plugins/admin/groups/class_filterGroupLDAP.inc b/gosa-core/plugins/admin/groups/class_filterGroupLDAP.inc
index 2176ca9a1..04806cf88 100644
--- a/gosa-core/plugins/admin/groups/class_filterGroupLDAP.inc
+++ b/gosa-core/plugins/admin/groups/class_filterGroupLDAP.inc
@@ -2,7 +2,7 @@
 
 class filterGroupLDAP {
 
-  static function query($base, $scope, $filter, $attributes, $category, $objectStorage= "")
+  static function query($parent,$base, $scope, $filter, $attributes, $category, $objectStorage= "")
   {
     $result= array();
     $menu= array();
@@ -10,7 +10,7 @@ class filterGroupLDAP {
     $config= session::global_get('config');
     $ldap= $config->get_ldap_link(TRUE);
     $flag= ($scope == "sub")?GL_SUBSEARCH:0;
-    $tmp= filterGroupLDAP::get_list($base, $filter, $attributes, $category, $objectStorage, $flag | GL_SIZELIMIT);
+    $tmp= filterGroupLDAP::get_list($parent,$base, $filter, $attributes, $category, $objectStorage, $flag | GL_SIZELIMIT);
 
     // Sort out menu entries, but save info
     $index= 0;
@@ -42,7 +42,7 @@ class filterGroupLDAP {
   }
 
 
-  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)
   {
     $filter= "(|(|(objectClass=gotoMenuEntry)(objectClass=gotoSubmenuEntry))$filter)";
     return filterLDAP::get_list($base, $filter, $attributes, $category, $objectStorage, $flags);