[tokkee]

tokkee.org

Code

projects / gosa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d6cf813)
Changed 'reset' to 'restart'
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 8 Jun 2006 03:45:47 +0000 (03:45 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 8 Jun 2006 03:45:47 +0000 (03:45 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3680 594d385d-05f5-0310-b6e9-bd551577e9d8

15 files changed:
plugins/admin/systems/class_divListSystemService.inc patch | blob | history
plugins/admin/systems/class_goCupsServer.inc patch | blob | history
plugins/admin/systems/class_goFaxServer.inc patch | blob | history
plugins/admin/systems/class_goFonServer.inc patch | blob | history
plugins/admin/systems/class_goGlpiServer.inc patch | blob | history
plugins/admin/systems/class_goImapServer.inc patch | blob | history
plugins/admin/systems/class_goKrbServer.inc patch | blob | history
plugins/admin/systems/class_goLdapServer.inc patch | blob | history
plugins/admin/systems/class_goLogDBServer.inc patch | blob | history
plugins/admin/systems/class_goMailServer.inc patch | blob | history
plugins/admin/systems/class_goNtpServer.inc patch | blob | history
plugins/admin/systems/class_goShareServer.inc patch | blob | history
plugins/admin/systems/class_goSyslogServer.inc patch | blob | history
plugins/admin/systems/class_goTerminalServer.inc patch | blob | history
plugins/admin/systems/class_serverService.inc patch | blob | history

diff --git a/plugins/admin/systems/class_divListSystemService.inc b/plugins/admin/systems/class_divListSystemService.inc
index 2835d741b7d9acadb632117a75a73edef9224929..426b97b15f7e5f65f6b4736b46c4757009076058 100644 (file)
--- 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 82fc0528f2f782c29cb17afe6c664204bc447428..c926db6e1f1d7a0bf160eae14f30c5b9f6be5a67 100644 (file)
--- 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 066711c7753fb239859eb18485d38096997f6c22..ff8805b10f9bd6eb36e3adbbd28131fbf70324d3 100644 (file)
--- 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 750940fe651f62acc62ff9f545e1f8ce1d4e3204..adb0d55f8b45efa950366a006c785b9346b82e30 100644 (file)
--- 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 36bc52c5cd171cb6d9278ac5ebd4a70984d0c4cb..36caf5c92820010fe00f4f6a2c6307bf3a63f5e5 100644 (file)
--- 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 a10c7150523839eb6196bf84dc950df2cc3a5719..301a2dd8721b49258e180e4344cafde733554c1a 100644 (file)
--- 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 54456872894f67ad808143ef59d8a2eca8a10ec1..ca2bc66f58465cb56bce350bc2122af5d64e370b 100644 (file)
--- 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 21f5866a24b5a37ace2c74af7c2af66d0606e569..f5a28488279f392a2ba41abfb1267ebc6ca3c4d4 100644 (file)
--- 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 20785cd7c9f6ef4d176c0ad304e55bb0f1fe5d6a..a857050092163844dcccf2fa15dbf223fefa4c0d 100644 (file)
--- 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 6a596d97ec8f31328b8e53f3e01fc78311d627b4..cae85ae9d2607dc5d2a740c413198d885c583ef4 100644 (file)
--- 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 264d56b62a7feea43aac97dd9f93304a7567f3ea..9188acf3fa6e5e4487f6eecadc49d737029875cd 100644 (file)
--- 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 b3156643f231edb92ac337106e007778fc30f4ba..7911dcb0e4687ae4fe5c2f71f257617e8b94fece 100644 (file)
--- 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 5cffb0f0e180f94fb36c830df7d588cb41bd7b72..f3481a47c0f55c5e9a65b0b54aefe841d2abd9e1 100644 (file)
--- 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 9c8a2af2e59ba07e17127fb3e5ab6bca6a0c3ffc..a9d2d59637e8c68c3c8a81cb4ec6e3b3e5e562e3 100644 (file)
--- 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 bfdb7373c2f2b8ad04b7d008e95f577241e6bd8a..26c57163f8fe5d41848f6bd4a3a2949413902bf9 100644 (file)
--- 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;
GONICUS system administrator (SVN clone)