From 1f88995f4ce4b09cef66647ab34c2990bb5f86fe Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 4 Aug 2006 09:27:23 +0000 Subject: [PATCH] Some acl changes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4392 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/personal/mail/class_mailAccount.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc index 6b9ae99fa..1d9c3131a 100644 --- a/plugins/personal/mail/class_mailAccount.inc +++ b/plugins/personal/mail/class_mailAccount.inc @@ -484,10 +484,11 @@ class mailAccount extends plugin /* Display mail account tab */ $smarty->assign("mailServers", $mailserver); + $SkipWrite = (!isset($this->parent) || !$this->parent) && !isset($_SESSION['edit']); $tmp = $this->plInfo(); foreach($tmp['plProvidedAcls'] as $name => $transl){ - $smarty->assign("$name"."ACL", $this->getacl($name)); + $smarty->assign("$name"."ACL", $this->getacl($name,$SkipWrite)); } foreach(array("gosaMailServer", "gosaMailQuota", "perms", "mail", @@ -507,7 +508,7 @@ class mailAccount extends plugin /* Disable mail field if needed */ $method= new $this->method($this->config); if ($method->uattrib == "mail" && $this->initially_was_account){ - $smarty->assign("mailACL", "disabled"); + $smarty->assign("mailACL", preg_replace("/w/","",$this->getacl("mail",$SkipWrite))); } -- 2.30.2