From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 11 May 2010 07:10:09 +0000 (+0000)
Subject: Added mailServer Properties
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ec20d8897f2881d9e2a5bf5701f5b8989e4dce10;p=gosa.git

Added mailServer Properties
- postfixProtocols postfixRestrictionFilters are now valid properties


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

diff --git a/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc b/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc
index 3f88d894d..4e221de2d 100644
--- a/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc
+++ b/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc
@@ -52,12 +52,15 @@ class goMailServer extends goService{
     $str = $this->config->data['TABS']['SERVERSERVICE'];
     $this->TransportProtocols =array("smtp"=>"SMTP");
     $this->RestrictionFilters = array("FILTER"=>"FILTER"); 
-    foreach(array("POSTFIXRESTRICTIONFILTERS"=>"RestrictionFilters",
-          "POSTFIXPROTOCOLS"        =>"TransportProtocols") as $file => $var){
-      if($this->config->get_cfg_value("core",$file) != ""){
-        $file = $this->config->get_cfg_value("core",$file);
-        if((isset($file)) && is_readable($file)){
-          $tmp = file_get_contents($file);
+    foreach(
+            array(
+                "postfixRestrictionFilters"=>"RestrictionFilters",
+                "postfixProtocols"        =>"TransportProtocols")
+            as $file => $var){
+        if($this->config->get_cfg_value("goMailServer",$file) != ""){
+            $file = $this->config->get_cfg_value("goMailServer",$file);
+            if((isset($file)) && is_readable($file)){
+                $tmp = file_get_contents($file);
           $tmp2= preg_split("/\n/",$tmp);
           foreach($tmp2 as $entry){
             if(empty($entry)) continue;
@@ -578,6 +581,36 @@ class goMailServer extends goService{
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 
+          "plProperties"  => array(
+              array(
+                  "name"          => "postfixProtocols",
+                  "type"          => "file",
+                  "default"       => "",
+                  "description"   => _("The 'postfixProtocols' statement defines a file to include for the postfix module in order to display user defined protocols.")."
+
+File syntax:
+    name1:Description1
+    name2:Description2",
+
+                  "check"         => "gosaProperty::isReadableFile",
+                  "migrate"       => "",
+                  "group"         => "mail",
+                  "mandatory"     => FALSE),
+              array(
+                  "name"          => "postfixRestrictionFilters",
+                  "type"          => "file",
+                  "default"       => "",
+                  "description"   => _("The 'postfixRestrictionFilters' statement defines a file to include for the postfix module in order to display user defined restriction filters.")."
+
+File syntax:
+    name1:Description1
+    name2:Description2",
+                  "check"         => "gosaProperty::isReadableFile",
+                  "migrate"       => "",
+                  "group"         => "mail",
+                  "mandatory"     => FALSE),
+              ),
+
           "plProvidedAcls"=> array(
 
             "start"           => _("Start"),