From b994093dad3114914923c9e0c5a97dd946ecee55 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 25 Nov 2008 14:32:27 +0000 Subject: [PATCH] Updated groupMail -Added checkbox to toggle local delivery, Updated template && added ACLs git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@13032 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/groups/acl_definition.inc | 1 + plugins/admin/groups/class_groupMail.inc | 9 ++++++++- plugins/admin/groups/mail.tpl | 12 ++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc index 3fcc5d63d..05674901e 100644 --- a/plugins/admin/groups/acl_definition.inc +++ b/plugins/admin/groups/acl_definition.inc @@ -72,6 +72,7 @@ $ACLD['mailgroup']= array( "mail", "gosaMailAlternateAddress", "gosaMailForwardingAddress", + "gosaMailDeliveryModeI", "gosaMailQuota", "gosaMailServer"); $ACLD['terminal']= array("gotoAdaptPath", diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc index ab86f0fb3..089369eca 100644 --- a/plugins/admin/groups/class_groupMail.inc +++ b/plugins/admin/groups/class_groupMail.inc @@ -39,6 +39,7 @@ class mailgroup extends plugin var $gosaMailMaxSize = ""; // var $remove_folder_from_imap = true; + var $only_local =""; // Dummy var used to assign ACLs. /* Helper */ var $indexed_acl= array(); @@ -543,6 +544,7 @@ class mailgroup extends plugin $smarty->assign("$type", $gmailfilter[$type]); } $smarty->assign("hint", print_sizelimit_warning()); + $display.= $smarty->fetch (get_template_path('mail_locals.tpl', TRUE)); return ($display); } @@ -595,7 +597,7 @@ class mailgroup extends plugin $mailserver[]= $key; } $smarty->assign("mailServers", $mailserver); - foreach(array("gosaMailServer", "gosaMailQuota", "perms", "mail", + foreach(array("gosaMailServer", "gosaMailQuota", "perms", "mail","only_local", "gosaMailAlternateAddress", "gosaMailForwardingAddress") as $val){ $smarty->assign("$val", $this->$val); $smarty->assign("$val"."ACL", chkacl($this->acl, "$val")); @@ -629,6 +631,11 @@ class mailgroup extends plugin $smarty->assign("kolab", FALSE); } + if (preg_match("/I/", $this->gosaMailDeliveryMode)) { + $smarty->assign("only_local", "checked"); + }else{ + $smarty->assign("only_local", ""); + } $display.= $smarty->fetch (get_template_path('mail.tpl', TRUE)); return ($display); diff --git a/plugins/admin/groups/mail.tpl b/plugins/admin/groups/mail.tpl index ffbcc3e22..eb400a9c5 100644 --- a/plugins/admin/groups/mail.tpl +++ b/plugins/admin/groups/mail.tpl @@ -100,6 +100,18 @@ {$plusattributes} +

 

+ +

 {t}Advanced mail options{/t}

+ + + + +
+ + {t}User is only allowed to send and receive local mails{/t} +
-- 2.30.2