From: hickert Date: Mon, 11 Oct 2010 13:29:51 +0000 (+0000) Subject: Added mail size limit option X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0ed2ad4019e683f391d809d1b10bfd588c5f4bb5;p=gosa.git Added mail size limit option git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19978 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/groupware/admin/ogroups/DistributionList/class_DistributionList.inc b/gosa-plugins/groupware/admin/ogroups/DistributionList/class_DistributionList.inc index 0b3e2aa1a..bbb081b7e 100644 --- a/gosa-plugins/groupware/admin/ogroups/DistributionList/class_DistributionList.inc +++ b/gosa-plugins/groupware/admin/ogroups/DistributionList/class_DistributionList.inc @@ -9,8 +9,12 @@ class DistributionList extends plugin public $view_logged = FALSE; - public $attributes = array('primaryMailAddress','alternateAddresses','memberList'); + public $attributes = array('primaryMailAddress','alternateAddresses','memberList','mailSizeLimit'); + public $mailSizeLimit = NULL; + public $primaryMailAddress = ""; + public $alternateAddresses = array(); + public $memberList = array(); function __construct($config, $dn, $attrs = NULL) { @@ -187,11 +191,12 @@ class DistributionList extends plugin $smarty = get_smarty(); $smarty->assign('rpcError' , $this->rpcError); - foreach(array("primaryMailAddress","alternateAddresses") as $attr){ + foreach(array("primaryMailAddress","alternateAddresses","mailSizeLimit") as $attr){ $smarty->assign("{$attr}ACL", $this->getacl($attr)); $smarty->assign($attr, set_post($this->$attr)); } + $smarty->assign("useMailSizeLimit", ($this->mailSizeLimit != NULL)); $smarty->assign("memberList", set_post($this->memberList)); $smarty->assign('rpcErrorMessage' , $this->rpcErrorMessage); return($display.$smarty->fetch(get_template_path('DistributionList/generic.tpl', TRUE))); @@ -213,6 +218,7 @@ class DistributionList extends plugin "plOptions" => array(), "plProvidedAcls" => array( "primaryMailAddress" => _("Mail address"), + "mailSizeLimit" => _("Mail size limit"), "alternateAddresses" => _("Alternate mail addresses")) )); } @@ -222,11 +228,13 @@ class DistributionList extends plugin function save_object() { - - if(isset($_POST['retryInit'])){ - $this->init(); + if(isset($_POST['DistributionList_posted'])){ + if(isset($_POST['retryInit'])){ + $this->init(); + } + if(!isset($_POST['useMailSizeLimit'])) $this->mailSizeLimit = NULL; + plugin::save_object(); } - plugin::save_object(); } diff --git a/gosa-plugins/groupware/admin/ogroups/DistributionList/generic.tpl b/gosa-plugins/groupware/admin/ogroups/DistributionList/generic.tpl index c06dacac3..1f4876835 100644 --- a/gosa-plugins/groupware/admin/ogroups/DistributionList/generic.tpl +++ b/gosa-plugins/groupware/admin/ogroups/DistributionList/generic.tpl @@ -3,10 +3,23 @@

{t}Groupware{/t}

+ {t}Mail address{/t}: {render acl=$primaryMailAddressACL} {/render} +
+ + {render acl=$mailSizeLimitACL} + + {/render} + {t}Use incoming mail size limitation{/t} + {render acl=$mailSizeLimitACL} + + {/render}

@@ -31,4 +44,4 @@ - +