From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 8 Jun 2006 03:57:52 +0000 (+0000)
Subject: Added empty option to serviceAdd
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0270e141edb56efa0517cab2db2a1e6bc5a449d5;p=gosa.git

Added empty option to serviceAdd



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

diff --git a/plugins/admin/systems/ServiceAddDialog.tpl b/plugins/admin/systems/ServiceAddDialog.tpl
index 6fc2ac68e..bdd0999ed 100755
--- a/plugins/admin/systems/ServiceAddDialog.tpl
+++ b/plugins/admin/systems/ServiceAddDialog.tpl
@@ -12,6 +12,7 @@
 <br>
 <br>{t}Service to add{/t} &nbsp;
 	<select name="ServiceName" >
+		<option value="" >&nbsp;</option>
 		{html_options options=$Services }
 	</select>
 {else}
diff --git a/plugins/admin/systems/class_ServiceAddDialog.inc b/plugins/admin/systems/class_ServiceAddDialog.inc
index a5a284e68..86ab833ac 100644
--- a/plugins/admin/systems/class_ServiceAddDialog.inc
+++ b/plugins/admin/systems/class_ServiceAddDialog.inc
@@ -19,7 +19,9 @@ class ServiceAddDialog extends plugin{
   function execute()
   {
     $smarty = get_smarty();
-    $smarty->assign("Services",$this->parent->getAllUnusedServices());
+    $services = $this->parent->getAllUnusedServices();
+    natcasesort($services);
+    $smarty->assign("Services",$services);
     return($smarty->fetch(get_template_path("ServiceAddDialog.tpl", TRUE,dirname(__FILE__))));
  }
 
diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc
index cae85ae9d..02b7bd67c 100644
--- a/plugins/admin/systems/class_goMailServer.inc
+++ b/plugins/admin/systems/class_goMailServer.inc
@@ -475,7 +475,7 @@ class goMailServer extends plugin{
   {
     $flag = $this->StatusFlag;
     $fields['Status']     = $this->$flag;
-    $fields['Message']    = _("Postfix"). " - ".$this->postfixMyhostname;
+    $fields['Message']    = _("Postfix")." ["._("configured for")." ".$this->postfixMyhostname."] ";
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
     $fields['AllowRestart'] = true;
diff --git a/plugins/admin/systems/class_serverService.inc b/plugins/admin/systems/class_serverService.inc
index 26c57163f..fab65db69 100644
--- a/plugins/admin/systems/class_serverService.inc
+++ b/plugins/admin/systems/class_serverService.inc
@@ -165,7 +165,7 @@ class ServerService extends plugin
 
 
     /* Abort dialog */
-    if(isset($_POST['SaveServiceAdd'])){
+    if((isset($_POST['SaveServiceAdd'])) && (!empty($_POST['ServiceName']))){
       $serv = $_POST['ServiceName'];    
       $this->plugins[$serv]->is_account = true;
       $this->dialog  = $this->plugins[$serv];