From: hickert Date: Tue, 9 Dec 2008 08:00:38 +0000 (+0000) Subject: Updated mailAccount, prevent user from changing their mail server or address settings X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=48b44b4b524d5cf5430eea73791b8c9f19da41dd;p=gosa.git Updated mailAccount, prevent user from changing their mail server or address settings git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13195 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc index b0d992cdd..2f5ad1052 100644 --- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc +++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc @@ -361,6 +361,10 @@ class mailAccount extends plugin SMARTY- Assign smarty variables ****************/ $smarty = get_smarty(); + $smarty->assign("initially_was_account", $this->initially_was_account); + $smarty->assign("isModifyableMail", $this->mailMethod->isModifyableMail()); + $smarty->assign("mailEqualsCN", $this->mailMethod->mailEqualsCN()); + $SkipWrite = (!isset($this->parent) || !$this->parent) && !session::is_set('edit'); $tmp = $this->plInfo(); foreach($tmp['plProvidedAcls'] as $name => $transl){ diff --git a/gosa-plugins/mail/personal/mail/generic.tpl b/gosa-plugins/mail/personal/mail/generic.tpl index bb67e4cb5..928909ecf 100644 --- a/gosa-plugins/mail/personal/mail/generic.tpl +++ b/gosa-plugins/mail/personal/mail/generic.tpl @@ -8,6 +8,9 @@ {$must} + {if !$isModifyableMail && $initially_was_account} + + {else} {if $domainSelectionEnabled} {render acl=$mailACL} @@ -20,17 +23,23 @@ {/render} {/if} + {/if} + {if !$isModifyableMail && $initially_was_account} + + {else} + {render acl=$gosaMailServerACL} {/render} + {/if} {/if}