Updated userinfo

-Implemented self-acls in get_category_permissions.

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

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 699c7151f4fcb505b9fbdb9a6c50001f9cf85fad..4564beda636538f426378333b8065fb0b547ad09 100644 (file)
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -466,6 +466,9 @@ class userinfo
               if($attribute == ""){    
                 foreach($this->ocMapping[$ocs] as $oc){
                   if (isset($subacl['acl'][$ocs.'/'.$oc])){
+
+                    if($dn != $this->dn && strpos($subacl['acl'][$ocs.'/'.$oc][0],"s") !== FALSE) continue;
+
                     foreach($subacl['acl'][$ocs.'/'.$oc] as $attr => $dummy){
                       $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl'][$ocs.'/'.$oc][$attr]);
                     }
@@ -474,6 +477,7 @@ class userinfo
                 }
               }else{
                 if(isset($subacl['acl'][$ocs.'/'.$oc][0])){
+                  if($dn != $this->dn && strpos($subacl['acl'][$ocs.'/'.$oc][0],"s") !== FALSE) continue;
                   $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl'][$ocs.'/'.$oc][0]);
                 }
               }