From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 26 Sep 2006 07:35:15 +0000 (+0000)
Subject: Fixed kolab service
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cfcde7f9223b4de8a80ba3f99e3189c231331112;p=gosa.git

Fixed kolab service


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4774 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index 7d8544a37..3365211b9 100644
--- a/plugins/admin/systems/class_servKolab.inc
+++ b/plugins/admin/systems/class_servKolab.inc
@@ -108,11 +108,13 @@ class servkolab extends goService {
       Assign informations to smarty 
      ***************/
 
-    /* Set relayhost and if we have MX lookup enabled*/
-    if($this->postfix_mxrelayenabled) {
-      $smarty->assign("RelayMxSupportCheck"," checked ");
-    } else {
-      $smarty->assign("RelayMxSupportCheck","");
+    /* Set relayhost and if we have MX lookup enabled*/ 
+    if($this->acl_is_writeable("postfixmxrelayenabled")){
+      if($this->postfix_mxrelayenabled) {
+        $smarty->assign("RelayMxSupportCheck"," checked ");
+      } else {
+        $smarty->assign("RelayMxSupportCheck","");
+      }
     }
 
     /* Set acls */
@@ -294,7 +296,7 @@ class servkolab extends goService {
 
     /* Adapt relayhost */
     $this->postfix_relayhost= preg_replace('/[\[\]]/', '', $this->postfix_relayhost);
-    if (!$this->postfix_mxrelayenabled && $this->postfix_relayhost != ""){
+    if ($this->postfix_mxrelayenabled && $this->postfix_relayhost != ""){
       $this->postfix_relayhost= "[".$this->postfix_relayhost."]";
     }
 
@@ -384,6 +386,7 @@ class servkolab extends goService {
             "postfixmynetworks"              => _("SMTP privileged networks") ,
             "postfixenablevirusscan"         => _("Enable virus scan") ,
             "postfixrelayhost"               => _("Relayhost") ,
+            "postfixmxrelayenabled"          => _("Enable MX lookup for relayhost"),
             "apachehttp"                     => _("HTTP FreeBusy service") ,
             "apacheallowunauthenticatedfb"   => _("Allow unauthenticated free busy"),
             "postfixallowunauthenticated"    => _("Accept Internet Mail") ,