Updated a couple of values

[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 65cdfdfd9ff0c606b93412305d910ce55f3b4350..423694c8a7df021ab160120ec0dcd4ff85b21b9e 100644 (file)
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -284,6 +284,9 @@ class userinfo
         then return all permissions.
      */
     if($this->ignore_acl_for_current_user()){
+      if($skip_write){
+        return("rcdm");
+      }
       return("rwcdm");
     }
 
@@ -475,9 +478,8 @@ class userinfo
         $found = FALSE;
         foreach($info['acl'] as $cat => $data){
 
-          /* Skip self acls?
-           */
-          if($skip_self_acls && preg_match("//s",$data['0'])) continue;
+          /* Skip self acls? */
+          if($skip_self_acls && isset($data['0']) && preg_match("//s",$data['0'])) continue;
 
           if(is_array($module)){
             foreach($module as $mod){
@@ -642,7 +644,7 @@ class userinfo
    */ 
   function ignore_acl_for_current_user()
   {
-    return(isset($this->config->current['IGNORE_ACL']) && $this->config->current['IGNORE_ACL'] == $this->dn);
+    return($this->config->get_cfg_value("ignore_acl") == $this->dn);
   }
 
 }