From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 8 Jun 2006 03:45:47 +0000 (+0000)
Subject: Changed 'reset' to 'restart'
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b7ff5a9b6deb733c5ce1dfb2e2dfd39d33efdaad;p=gosa.git

Changed 'reset' to 'restart'


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

diff --git a/plugins/admin/systems/class_divListSystemService.inc b/plugins/admin/systems/class_divListSystemService.inc
index 2835d741b..426b97b15 100644
--- a/plugins/admin/systems/class_divListSystemService.inc
+++ b/plugins/admin/systems/class_divListSystemService.inc
@@ -55,7 +55,7 @@ class divListSystemService extends MultiSelectWindow
     " <input class='center' type='image' align='middle' src='images/status_stop_all.png'  class='center'   
         name='stopServices' alt='"._("Stop service")."' title='"._("Stop all services")."'>&nbsp;".
     " <input class='center' type='image' align='middle' src='images/status_restart_all.png'    class='center'
-        name='resetServices' alt='"._("Reset service")."' title='"._("Reset all services")."'>&nbsp;".
+        name='restartServices' alt='"._("Restart service")."' title='"._("Restart all services")."'>&nbsp;".
     "</div>";
     $this->SetListHeader($listhead);
   }
@@ -74,7 +74,7 @@ class divListSystemService extends MultiSelectWindow
         case ''      : $str ="";break;
         case SERVICE_STOPPED  : $str ="<img src='images/status_stopped.png' title='"._("Stopped")."'>"; break;
         case SERVICE_STARTED  : $str ="<img src='images/status_running.png' title='"._("Started")."'>"; break;
-        case SERVICE_RESETTED : $str ="<img src='images/status_restarting.png' title='"._("Restarting")."' alt='R'>"; break;
+        case SERVICE_RESTARTED : $str ="<img src='images/status_restarting.png' title='"._("Restarting")."' alt='R'>"; break;
         default: $str= "<img src='images/select_user.png' alt='".$entry['Status']."' title='"._("User status")." : ".$entry['Status']."'>";
       }
 
@@ -93,7 +93,7 @@ class divListSystemService extends MultiSelectWindow
         $actions .= "&nbsp;<img src='images/empty' width='16' alt=''>";
       }
       if($entry['AllowStart']){
-        $actions .= "&nbsp;<input type='image' name='ResetSingleService_".$name."' src='images/status_restart.png'>";
+        $actions .= "&nbsp;<input type='image' name='RestartSingleService_".$name."' src='images/status_restart.png'>";
       }else{
         $actions .= "&nbsp;<img src='images/empty' width='16' alt=''>";
       }
diff --git a/plugins/admin/systems/class_goCupsServer.inc b/plugins/admin/systems/class_goCupsServer.inc
index 82fc0528f..c926db6e1 100644
--- a/plugins/admin/systems/class_goCupsServer.inc
+++ b/plugins/admin/systems/class_goCupsServer.inc
@@ -45,7 +45,7 @@ class goCupsServer extends plugin{
     $fields['Message']    = _("Print service");
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
-    $fields['AllowReset'] = true;
+    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
diff --git a/plugins/admin/systems/class_goFaxServer.inc b/plugins/admin/systems/class_goFaxServer.inc
index 066711c77..ff8805b10 100644
--- a/plugins/admin/systems/class_goFaxServer.inc
+++ b/plugins/admin/systems/class_goFaxServer.inc
@@ -47,7 +47,7 @@ class goFaxServer extends plugin{
     $fields['Message']    = _("FAX database configuration");
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
-    $fields['AllowReset'] = true;
+    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc
index 750940fe6..adb0d55f8 100644
--- a/plugins/admin/systems/class_goFonServer.inc
+++ b/plugins/admin/systems/class_goFonServer.inc
@@ -50,7 +50,7 @@ class goFonServer extends plugin{
     $fields['Message']    = _("Asterisk management");
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
-    $fields['AllowReset'] = true;
+    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
diff --git a/plugins/admin/systems/class_goGlpiServer.inc b/plugins/admin/systems/class_goGlpiServer.inc
index 36bc52c5c..36caf5c92 100644
--- a/plugins/admin/systems/class_goGlpiServer.inc
+++ b/plugins/admin/systems/class_goGlpiServer.inc
@@ -49,7 +49,7 @@ class goGlpiServer extends plugin{
     $fields['Message']    = _("Glpi management");
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
-    $fields['AllowReset'] = true;
+    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc
index a10c71505..301a2dd87 100644
--- a/plugins/admin/systems/class_goImapServer.inc
+++ b/plugins/admin/systems/class_goImapServer.inc
@@ -50,7 +50,7 @@ class goImapServer extends plugin{
 
     $this->Actions = array( SERVICE_STOPPED=>SERVICE_STOPPED,
                             SERVICE_STARTED => SERVICE_STARTED,
-                            SERVICE_RESETTED=>SERVICE_RESETTED,
+                            SERVICE_RESTARTED=>SERVICE_RESTARTED,
                             "repair_database"=>_("Repair database"));
     
   }
@@ -82,7 +82,7 @@ class goImapServer extends plugin{
     $fields['Message']    = _("Cyrus service");
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
-    $fields['AllowReset'] = true;
+    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
diff --git a/plugins/admin/systems/class_goKrbServer.inc b/plugins/admin/systems/class_goKrbServer.inc
index 544568728..ca2bc66f5 100644
--- a/plugins/admin/systems/class_goKrbServer.inc
+++ b/plugins/admin/systems/class_goKrbServer.inc
@@ -48,7 +48,7 @@ class goKrbServer extends plugin{
     $fields['Message']    = _("Kerberos kadmin access informations");
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
-    $fields['AllowReset'] = true;
+    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
diff --git a/plugins/admin/systems/class_goLdapServer.inc b/plugins/admin/systems/class_goLdapServer.inc
index 21f5866a2..f5a284882 100644
--- a/plugins/admin/systems/class_goLdapServer.inc
+++ b/plugins/admin/systems/class_goLdapServer.inc
@@ -46,7 +46,7 @@ class goLdapServer extends plugin{
     $fields['Message']    = _("LDAP Service");
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
-    $fields['AllowReset'] = true;
+    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
diff --git a/plugins/admin/systems/class_goLogDBServer.inc b/plugins/admin/systems/class_goLogDBServer.inc
index 20785cd7c..a85705009 100644
--- a/plugins/admin/systems/class_goLogDBServer.inc
+++ b/plugins/admin/systems/class_goLogDBServer.inc
@@ -48,7 +48,7 @@ class goLogDBServer extends plugin{
     $fields['Message']    = _("Asterisk management");
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
-    $fields['AllowReset'] = true;
+    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc
index 6a596d97e..cae85ae9d 100644
--- a/plugins/admin/systems/class_goMailServer.inc
+++ b/plugins/admin/systems/class_goMailServer.inc
@@ -46,7 +46,7 @@ class goMailServer extends plugin{
 
     $this->Actions = array( SERVICE_STOPPED=>SERVICE_STOPPED,
                             SERVICE_STARTED => SERVICE_STARTED,
-                            SERVICE_RESETTED=>SERVICE_RESETTED, 
+                            SERVICE_RESTARTED=>SERVICE_RESTARTED, 
                             "mailqueue"=>"mailqueue");
 
     /* Fill  RestrictionFilters   TransportProtocols  from external hooks */
@@ -478,7 +478,7 @@ class goMailServer extends plugin{
     $fields['Message']    = _("Postfix"). " - ".$this->postfixMyhostname;
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
-    $fields['AllowReset'] = true;
+    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
diff --git a/plugins/admin/systems/class_goNtpServer.inc b/plugins/admin/systems/class_goNtpServer.inc
index 264d56b62..9188acf3f 100644
--- a/plugins/admin/systems/class_goNtpServer.inc
+++ b/plugins/admin/systems/class_goNtpServer.inc
@@ -69,7 +69,7 @@ class goNtpServer extends plugin{
     $fields['Message']    = _("NTP service");
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
-    $fields['AllowReset'] = true;
+    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
diff --git a/plugins/admin/systems/class_goShareServer.inc b/plugins/admin/systems/class_goShareServer.inc
index b3156643f..7911dcb0e 100644
--- a/plugins/admin/systems/class_goShareServer.inc
+++ b/plugins/admin/systems/class_goShareServer.inc
@@ -147,7 +147,7 @@ class goShareServer extends plugin{
     $fields['Message']    = _("Shares");
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
-    $fields['AllowReset'] = true;
+    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
diff --git a/plugins/admin/systems/class_goSyslogServer.inc b/plugins/admin/systems/class_goSyslogServer.inc
index 5cffb0f0e..f3481a47c 100644
--- a/plugins/admin/systems/class_goSyslogServer.inc
+++ b/plugins/admin/systems/class_goSyslogServer.inc
@@ -45,7 +45,7 @@ class goSyslogServer extends plugin{
     $fields['Message']    = _("Syslog service");
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
-    $fields['AllowReset'] = true;
+    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
diff --git a/plugins/admin/systems/class_goTerminalServer.inc b/plugins/admin/systems/class_goTerminalServer.inc
index 9c8a2af2e..a9d2d5963 100644
--- a/plugins/admin/systems/class_goTerminalServer.inc
+++ b/plugins/admin/systems/class_goTerminalServer.inc
@@ -48,7 +48,7 @@ class goTerminalServer extends plugin{
     $fields['Message']    = _("Terminal service");
     $fields['AllowStart'] = true;
     $fields['AllowStop']  = true;
-    $fields['AllowReset'] = true;
+    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
diff --git a/plugins/admin/systems/class_serverService.inc b/plugins/admin/systems/class_serverService.inc
index bfdb7373c..26c57163f 100644
--- a/plugins/admin/systems/class_serverService.inc
+++ b/plugins/admin/systems/class_serverService.inc
@@ -2,11 +2,11 @@
 
 define("START_SERVICE",1);
 define("STOP_SERVICE",2);
-define("RESET_SERVICE",3);
+define("RESTART_SERVICE",3);
 
 define("SERVICE_STOPPED",_("Stop"));
 define("SERVICE_STARTED",_("Start"));
-define("SERVICE_RESETTED",_("Restart"));
+define("SERVICE_RESTARTED",_("Restart"));
 
 define("ALL_SERVICES",100);
 
@@ -60,12 +60,12 @@ class ServerService extends plugin
     $PossiblePosts = array("addNewService"  => "", 
                            "startServices"  => "",
                            "stopServices"   => "",
-                           "resetServices"  => "",
+                           "restartServices"  => "",
                            "removeServices" => "",
 
                            "StartSingleService"  => "/^StartSingleService_(.*)_[xy]$/",
                            "StopSingleService"   => "/^StopSingleService_(.*)_[xy]$/",
-                           "ResetSingleService"  => "/^ResetSingleService_(.*)_[xy]$/",
+                           "RestartSingleService"  => "/^RestartSingleService_(.*)_[xy]$/",
                            "RemoveSingleService" => "/^RemoveSingleService_(.*)_[xy]$/",
                            "EditSingleService"   => "/^EditSingleService_(.*)_[xy]$/");
 
@@ -88,10 +88,9 @@ class ServerService extends plugin
     /* Handle state changes for services */
     $map =  array( "startServices"          => array("type" => START_SERVICE , "service" => ALL_SERVICES),
                       "stopServices"          => array("type" => STOP_SERVICE  , "service" => ALL_SERVICES),
-                      "resetServices"         => array("type" => RESET_SERVICE , "service" => ALL_SERVICES),
-                      "StartSingleService"    => array("type" => START_SERVICE , "service" => $s_entry),
+                      "restartServices"         => array("type" => RESTART_SERVICE , "service" => ALL_SERVICES),                      "StartSingleService"    => array("type" => START_SERVICE , "service" => $s_entry),
                       "StopSingleService"     => array("type" => STOP_SERVICE , "service" => $s_entry),
-                      "ResetSingleService"    => array("type" => RESET_SERVICE , "service" => $s_entry));
+                      "RestartSingleService"    => array("type" => RESTART_SERVICE , "service" => $s_entry));
     if(isset($map[$s_action])){
       $type     = $map[$s_action]['type'];
       $service  = $map[$s_action]['service'];
@@ -263,8 +262,8 @@ class ServerService extends plugin
       $action = SERVICE_STARTED;
     }elseif($method== STOP_SERVICE){
       $action = SERVICE_STOPPED;
-    }elseif($method == RESET_SERVICE){
-      $action = SERVICE_RESETTED;
+    }elseif($method == RESTART_SERVICE){
+      $action = SERVICE_RESTARTED;
     }else{
       print_red(sprintf(_("The specified method '%s' can't executed for services."),$action));
       return;