From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 8 Mar 2010 08:07:25 +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=ec37d7bb890e002844453bebe96c80da1e5756e8;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/include/class_filter.inc dn and check if there is a -r- in the result.

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

diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index f44e39dcb..cd9aa8dd7 100644
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -37,6 +37,7 @@ class filter {
   var $alphabet= null;
   var $converter= array();
   var $pid;
+  var $headpage;
 
 
   function filter($filename)
@@ -419,7 +420,9 @@ class filter {
         }
       }
 
-      $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes, $this->category, $this->objectStorage));
+      // Now call filter method and merge resulting entries. 
+      $result= array_merge($result, call_user_func(array($backend, 'query'),
+            $this, $this->base, $this->scope, $filter, $attributes, $this->category, $this->objectStorage));
     }
     
     return ($result);