X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_userinfo.inc;h=423694c8a7df021ab160120ec0dcd4ff85b21b9e;hb=06cc53394cf695b3bc663073e526d7d94e4bb2d6;hp=65cdfdfd9ff0c606b93412305d910ce55f3b4350;hpb=7135b3fda8b7ab49b1f69010202f240ec5f3737c;p=gosa.git diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc index 65cdfdfd9..423694c8a 100644 --- 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); } }