Updated setup migrate step

[gosa.git] / gosa-core / include / class_userinfo.inc

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 08e232de746e1c7f0b263c45eac5c3995d2d5d5f..c410e70db7b47e410a67239eabdbcacc5f2fd813 100644 (file)
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -80,7 +80,7 @@ class userinfo
   public function reset_acl_cache()
   {
     /* Initialize ACL_CACHE */
-    session::set('ACL_CACHE',array());
+    session::global_set('ACL_CACHE',array());
   }
 
   function loadACL()
@@ -328,7 +328,7 @@ class userinfo
     }
 
     /* Push cache answer? */
-    $ACL_CACHE = &session::get('ACL_CACHE');
+    $ACL_CACHE = &session::global_get('ACL_CACHE');
     if (isset($ACL_CACHE["$dn+$object+$attribute"])){
       $ret = $ACL_CACHE["$dn+$object+$attribute"];
       if($skip_write){
@@ -422,7 +422,7 @@ class userinfo
 
           /* Self ACLs? 
            */
-          if($dn != $this->dn && isset($subacl['acl'][$object][0]) && strpos($subacl['acl'][$object][0],"s")){
+          if($dn != $this->dn && isset($subacl['acl'][$object][0]) && (strpos($subacl['acl'][$object][0],"s") !== FALSE)){
             continue;
           }
 
@@ -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]);
                 }
               }
@@ -522,7 +526,7 @@ class userinfo
     }
 
     /* Use cached results if possilbe */
-    $ACL_CACHE = &session::get('ACL_CACHE');
+    $ACL_CACHE = &session::global_get('ACL_CACHE');
 
     if(!is_array($module)){
       $module = array($module);
@@ -545,7 +549,7 @@ class userinfo
           foreach($info['acl'] as $cat => $data){
 
             /* Skip self acls? */
-            if($skip_self_acls && isset($data['0']) && strpos($data['0'], "s")) continue;
+            if($skip_self_acls && isset($data['0']) && (strpos($data['0'], "s") !== FALSE)) continue;
             if(preg_match("/^".preg_quote($mod, '/')."/",$cat)){
               $found =TRUE;
               break;
@@ -598,6 +602,11 @@ class userinfo
 
     foreach(str_split($newACL) as $char){
 
+      /* Skip "self" ACLs without combination of rwcdm, they have no effect.
+         -self flag without read/write/create/...
+       */
+      if(empty($char)) continue;
+
       /* Skip permanent and subtree entries */
       if (preg_match('/[sp]/', $acl[$char])){
         continue;