Fixed acls for fax account / addons

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

diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 42f729db8992deab90bdb9f049bb8ab3fb9a4fc0..2c816bd2e56ffe1f9bac809affb0892918aafc05 100644 (file)
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -70,9 +70,9 @@ class pluglist {
                foreach($this->ui->subtreeACL as $arr){
                        foreach($arr as $value){
                                if ($value == ':all' || preg_match("/[,:]$modname#/", $value)){
-                                       if (!preg_match('/^!/', $value)){
+                       //              if (!preg_match('/^!/', $value)){
                                                return (TRUE);
-                                       }
+                       //              }
                                }
                        }
                }

diff --git a/plugins/gofax/faxreports/class_faxreport.inc b/plugins/gofax/faxreports/class_faxreport.inc
index 8846a396ffb1d9cba60863bcaf4f956ea1633866..f6b05cc304488df56d693c387d26638fad18b5ea 100644 (file)
--- a/plugins/gofax/faxreports/class_faxreport.inc
+++ b/plugins/gofax/faxreports/class_faxreport.inc
@@ -211,8 +211,11 @@ class faxreport extends plugin
 
       $fax_users= array();
       while ($attrs= $ldap->fetch()){
-
-        if (chkacl ($this->acl, "faxreport") == ""){
+        $ui = get_userinfo();
+        $acl= get_permissions ($ui->dn, $ui->subtreeACL);
+        $acl2= get_module_permission($acl, "faxreport", $attrs['dn']);
+        
+        if (chkacl ($acl2, "faxreport") == ""){
           $fax_users[]= $attrs["uid"][0];
         }
       }