Save to conitnue for service add

Fixed hooks for gomailserver
renamed basic actions

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

diff --git a/plugins/admin/systems/ServiceAddDialog.tpl b/plugins/admin/systems/ServiceAddDialog.tpl
index 386e1ee08b9362825bb0cfb3a80c33cd5e32405f..6046c328be20a5a16fbceeccce2e9cc721ba221d 100755 (executable)
--- a/plugins/admin/systems/ServiceAddDialog.tpl
+++ b/plugins/admin/systems/ServiceAddDialog.tpl
@@ -30,7 +30,7 @@
 <p class="seperator">
 <p>
 <div style="width:100%; text-align:right;">
-    <input type='submit' name='SaveServiceAdd' value='{t}Save{/t}' {if !$Services} disabled {/if}>
+    <input type='submit' name='SaveServiceAdd' value='{t}Continue{/t}' {if !$Services} disabled {/if}>
     &nbsp;
     <input type='submit' name='CancelServiceAdd' value='{t}Cancel{/t}'>
 </div>

diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc
index d6ae1a90327e62e2f04e4aebae6bbd890a217556..cdab67ce1b1e651d019d5ab147693405cec7f894 100644 (file)
--- a/plugins/admin/systems/class_goMailServer.inc
+++ b/plugins/admin/systems/class_goMailServer.inc
@@ -54,22 +54,24 @@ class goMailServer extends plugin{
     $this->TransportProtocols =array("smtp"=>"SMTP");
     $this->RestrictionFilters = array("FILTER"=>"FILTER"); 
     foreach(array("ADDITIONALRESTRICTIONFILTERS"=>"RestrictionFilters",
-            "ADDITIONALPROTOCOLLS"        =>"TransportProtocols") as $file => $var){
-      $file = $this->config->data['MAIN'][$file];
-      if((isset($file)) && is_readable($file)){
-        $tmp = file_get_contents($file);
-        $tmp2= split("\n",$tmp);
-        foreach($tmp2 as $entry){
-          if(empty($entry)) continue;
-          if(preg_match("/:/",$entry)){
-            $tmp3 = split(":",$entry);
-            $r = $this->$var;
-            $r[$tmp3[0]]=$tmp3[1];
-            $this->$var = $r;
-          }else{
-            $r = $this->$var;
-            $r[$entry] =$entry;
-            $this->$var = $r;
+          "ADDITIONALPROTOCOLLS"        =>"TransportProtocols") as $file => $var){
+      if(isset($this->config->data['MAIN'][$file])){
+        $file = $this->config->data['MAIN'][$file];
+        if((isset($file)) && is_readable($file)){
+          $tmp = file_get_contents($file);
+          $tmp2= split("\n",$tmp);
+          foreach($tmp2 as $entry){
+            if(empty($entry)) continue;
+            if(preg_match("/:/",$entry)){
+              $tmp3 = split(":",$entry);
+              $r = $this->$var;
+              $r[$tmp3[0]]=$tmp3[1];
+              $this->$var = $r;
+            }else{
+              $r = $this->$var;
+              $r[$entry] =$entry;
+              $this->$var = $r;
+            }
           }
         }
       }

diff --git a/plugins/admin/systems/class_serverService.inc b/plugins/admin/systems/class_serverService.inc
index f0360e9a16cb95800abd23fee6b0faf2925330a6..bfdb7373c2f2b8ad04b7d008e95f577241e6bd8a 100644 (file)
--- a/plugins/admin/systems/class_serverService.inc
+++ b/plugins/admin/systems/class_serverService.inc
@@ -4,9 +4,9 @@ define("START_SERVICE",1);
 define("STOP_SERVICE",2);
 define("RESET_SERVICE",3);
 
-define("SERVICE_STOPPED","stopped");
-define("SERVICE_STARTED","started");
-define("SERVICE_RESETTED","resetted");
+define("SERVICE_STOPPED",_("Stop"));
+define("SERVICE_STARTED",_("Start"));
+define("SERVICE_RESETTED",_("Restart"));
 
 define("ALL_SERVICES",100);