From: hickert Date: Fri, 20 May 2005 08:32:46 +0000 (+0000) Subject: ACLs added to the kolab Plugin X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d992bdf1b97ec2ec81accebe127f67e7bd1c8378;p=gosa.git ACLs added to the kolab Plugin git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@269 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc index 7d4cc10a6..fa46d5a03 100644 --- a/plugins/admin/systems/class_servKolab.inc +++ b/plugins/admin/systems/class_servKolab.inc @@ -128,10 +128,6 @@ class servkolab extends plugin { } /* Check Relayhost and if we have MX lookup enabled*/ - if((isset($_POST['NewHost'])) || (isset($_POST['DelHost']))) - { - $this->postfix_mxrelayenabled = $_POST['RelayMxSupport'] ; - } if($this->postfix_relayhost[0]=="[") { $this->postfix_mxrelayenabled=false; @@ -156,18 +152,7 @@ class servkolab extends plugin { /* Initialize all attributes, that were submitted */ foreach($this->attributes as $val) { - /* If theres a button pressed, we need to check all attributes */ - if ((isset($_POST['NewHost'])) || (isset($_POST['DelHost']))) - { - /* Set var to value or to zero */ - if (isset($_POST[$val])) - { - - $this->$val = $_POST[$val]; - } else { - $this->$val = 0; - } - } + $smarty->assign($val."ACL",$this->acl,str_replace("_","-",$val)); /* Tell smarty which variables we are useing */ $smarty->assign($val, $this->$val); if (($this->$val != "FALSE") && (!empty($this->$val))) diff --git a/plugins/admin/systems/servkolab.tpl b/plugins/admin/systems/servkolab.tpl index c0ba21491..3a68fda17 100644 --- a/plugins/admin/systems/servkolab.tpl +++ b/plugins/admin/systems/servkolab.tpl @@ -8,7 +8,7 @@ - + {t}POP3 service{/t} @@ -16,7 +16,7 @@ - + {t}POP3/SSL service{/t} @@ -24,7 +24,7 @@ - + {t}IMAP service{/t} @@ -32,7 +32,7 @@ - + {t}IMAP/SSL service{/t} @@ -40,7 +40,7 @@ - + {t}Sieve service{/t} @@ -48,7 +48,7 @@ - + {t}FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy){/t} @@ -56,7 +56,7 @@ - + {t}HTTP FreeBusy service (legacy){/t} @@ -64,7 +64,7 @@ - + {t}Amavis email scanning (virus/spam){/t} @@ -83,7 +83,8 @@ - % + % + Percentage to warn users @@ -102,12 +103,12 @@ - {t}Allow unauthenticated downloading of Free/Busy information{/t} + {t}Allow unauthenticated downloading of Free/Busy information{/t} - + When creating free/busy lists, include data from x days in the past @@ -124,7 +125,7 @@ {t}Hosts/networks allowed to relay{/t}  - + @@ -142,14 +143,14 @@ - + {t}Enable MX lookup for relayhost{/t} {t}Host used to relay mails{/t}  - + @@ -167,7 +168,7 @@ - + {t}Accept mail from other domains over non-authenticated SMTP{/t}