Added priorities, fixed service names.

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

diff --git a/plugins/admin/fai/class_faiSummaryTab.inc b/plugins/admin/fai/class_faiSummaryTab.inc
index 0f5f5fcc28571a4e7c56777b746b71ed2d882d99..eba31ee2a38c82469a6ac3a0957e0d6c111fff91 100644 (file)
--- a/plugins/admin/fai/class_faiSummaryTab.inc
+++ b/plugins/admin/fai/class_faiSummaryTab.inc
@@ -546,7 +546,7 @@ class faiSummaryTab extends plugin{
           "plDescription" => _("FAI summary"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 15,
           "plSection"     => array("administration"),
           "plCategory"    => array("workstation","server","fai") ,
           "plProvidedAcls"=> array(

diff --git a/plugins/admin/systems/class_glpiAccount.inc b/plugins/admin/systems/class_glpiAccount.inc
index ffc5a46052c07e3eb38ad3fe07b0368ce57f7bef..4c43d5c4e51646ca9c23aa648df2ecaed2daca6d 100644 (file)
--- a/plugins/admin/systems/class_glpiAccount.inc
+++ b/plugins/admin/systems/class_glpiAccount.inc
@@ -762,7 +762,7 @@ class glpiAccount extends plugin
           "plDescription" => _("Inventory extension"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 20,
           "plSection"     => array("administration"),
           "plCategory"    => array("workstation","terminal","component","server","phone") ,
           "plProvidedAcls"=> array(

diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc
index 7a0920bcce7cfdeb694fe2900903acc9f3b2cbb2..e8d5e3b25925ca4da9c59f978daf6f250709c863 100644 (file)
--- a/plugins/admin/systems/class_goFonServer.inc
+++ b/plugins/admin/systems/class_goFonServer.inc
@@ -55,7 +55,7 @@ class goFonServer extends goService{
   function getListEntry()
   {
     $fields = goService::getListEntry();
-    $fields['Message']    = _("Asterisk management");
+    $fields['Message']    = _("VoIP service - Asterisk management");
     $fields['AllowEdit']  = true;
     return($fields);
   }
@@ -90,11 +90,11 @@ class goFonServer extends goService{
   function plInfo()
   {
     return (array(
-          "plShortName"   => _("GoFon server"),
-          "plDescription" => _("GoFon server service"),
+          "plShortName"   => _("VoIP service"),
+          "plDescription" => _("VoIP - asterisk management")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 92,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_goGlpiServer.inc b/plugins/admin/systems/class_goGlpiServer.inc
index 634a4e302db17ced0bd50f8d43c45bf0fb367299..5851b8f015bcf69fd0c21892ed27f68769a28bf3 100644 (file)
--- a/plugins/admin/systems/class_goGlpiServer.inc
+++ b/plugins/admin/systems/class_goGlpiServer.inc
@@ -80,11 +80,11 @@ class goGlpiServer extends goService {
   function plInfo()
   {
     return (array(
-          "plShortName"   => _("Glpi server"),
-          "plDescription" => _("Glpi server service"),
+          "plShortName"   => _("Inventory database"),
+          "plDescription" => _("Inventory database")." ("._("Services").")" ,
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 93,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc
index 43a2a583445c1b6096d82f408676d12cba40603e..8a95ed7ad854c541aa75ac12c36700dc3f7d904c 100644 (file)
--- a/plugins/admin/systems/class_goImapServer.inc
+++ b/plugins/admin/systems/class_goImapServer.inc
@@ -151,11 +151,11 @@ class goImapServer extends goService {
   function plInfo()
   {
     return (array(
-          "plShortName"   => _("Imap"),
-          "plDescription" => _("Imap service"),
+          "plShortName"   => _("IMAP/POP3"),
+          "plDescription" => _("IMAP/POP3")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 94,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_goKrbServer.inc b/plugins/admin/systems/class_goKrbServer.inc
index fb9c9d41be0c433d3776cb83a6c2693214276ae6..d753d15e26526c1b15b5fdb93a99a3fea7cfa7ee 100644 (file)
--- a/plugins/admin/systems/class_goKrbServer.inc
+++ b/plugins/admin/systems/class_goKrbServer.inc
@@ -50,7 +50,7 @@ class goKrbServer extends goService{
   function getListEntry()
   {
     $fields               = goService::getListEntry();
-    $fields['Message']    = _("Kerberos kadmin access informations");
+    $fields['Message']    = _("Kerberos service (kadmin access informations)");
     $fields['AllowEdit']  = true;
     return($fields);
   }
@@ -85,10 +85,10 @@ class goKrbServer extends goService{
   {
     return (array(
           "plShortName"   => _("Kerberos"),
-          "plDescription" => _("Kerberos service"),
+          "plDescription" => _("Kerberos access information")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 95,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_goLdapServer.inc b/plugins/admin/systems/class_goLdapServer.inc
index 8229c32a689b7c4de20e19c52fdc5414f41ff1d1..5bce185394f7f5c518af2a69f6660057d06b33bc 100644 (file)
--- a/plugins/admin/systems/class_goLdapServer.inc
+++ b/plugins/admin/systems/class_goLdapServer.inc
@@ -76,10 +76,10 @@ class goLdapServer extends goService{
   {
     return (array(
           "plShortName"   => _("Ldap"),
-          "plDescription" => _("Ldap service"),
+          "plDescription" => _("Ldap")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 96,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_goLogDBServer.inc b/plugins/admin/systems/class_goLogDBServer.inc
index 75b31b140766bb8b85bc3cd3e71e8967d7a6b59e..31ad8e8dc5f4246fe1f47eb21dff888a5c25995c 100644 (file)
--- a/plugins/admin/systems/class_goLogDBServer.inc
+++ b/plugins/admin/systems/class_goLogDBServer.inc
@@ -80,11 +80,11 @@ class goLogDBServer extends goService{
   function plInfo()
   {
     return (array(
-          "plShortName"   => _("Log"),
-          "plDescription" => _("Log service"),
+          "plShortName"   => _("Logging database"),
+          "plDescription" => _("Logging database")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 97,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc
index e7fde74503fdf5fea51a986b08e243976a494cc4..58f9f5062ac7ff78d2a91e44fdf3c8b4af76c461 100644 (file)
--- a/plugins/admin/systems/class_goMailServer.inc
+++ b/plugins/admin/systems/class_goMailServer.inc
@@ -43,7 +43,7 @@ class goMailServer extends goService{
   function goMailServer($config,$dn)
   {
     plugin::plugin($config,$dn);
-    $this->DisplayName = _("Mail service (SMTP)");
+    $this->DisplayName = _("Mail smtp service (Postfix)");
 
     $this->Actions = array( SERVICE_STOPPED=>SERVICE_STOPPED,
                             SERVICE_STARTED => SERVICE_STARTED,
@@ -505,7 +505,7 @@ class goMailServer extends goService{
   function getListEntry()
   {
     $fields               = goService::getListEntry();
-    $fields['Message']    = _("Mail service (SMTP)");
+    $fields['Message']    = _("Mail smtp service (Postfix)");
     $fields['AllowEdit']  = true;
     return($fields);
   }
@@ -682,11 +682,11 @@ class goMailServer extends goService{
   function plInfo()
   {
     return (array(
-          "plShortName"   => _("Postfix mail"),
-          "plDescription" => _("Postfix mail service"),
+          "plShortName"   => _("Mail smtp (Postfix)"),
+          "plDescription" => _("Mail smtp - Postfix")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 98,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_goNtpServer.inc b/plugins/admin/systems/class_goNtpServer.inc
index eaa885a7b6a0de6534d477c4e01f4bf239b727d9..f51f9b2118d4bde5140ed9b4cf21879eb35b1d56 100644 (file)
--- a/plugins/admin/systems/class_goNtpServer.inc
+++ b/plugins/admin/systems/class_goNtpServer.inc
@@ -26,7 +26,7 @@ class goNtpServer extends goService{
   function goNtpServer($config,$dn)
   {
     plugin::plugin($config,$dn);
-    $this->DisplayName = _("Time service");
+    $this->DisplayName = _("Time service (NTP)");
 
     /* Load arrays */
     $tmp = array();
@@ -67,7 +67,7 @@ class goNtpServer extends goService{
   function getListEntry()
   {
     $fields               = goService::getListEntry();
-    $fields['Message']    = _("NTP service");
+    $fields['Message']    = _("Time service (NTP)");
     $fields['AllowEdit']  = true;
     return($fields);
   }
@@ -103,11 +103,11 @@ class goNtpServer extends goService{
   function plInfo()
   {
     return (array(
-          "plShortName"   => _("NTP"),
-          "plDescription" => _("NTP service"),
+          "plShortName"   => _("Time service"),
+          "plDescription" => _("Time service - NTP")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 91,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_goShareServer.inc b/plugins/admin/systems/class_goShareServer.inc
index 0eab8bf07f1bbd5504b65091f6b0af6f9d4dc710..f5061b1e3ee475404de49d22060f02bd9986b48e 100644 (file)
--- a/plugins/admin/systems/class_goShareServer.inc
+++ b/plugins/admin/systems/class_goShareServer.inc
@@ -340,11 +340,11 @@ class goShareServer extends goService{
   function plInfo()
   {
     return (array(
-          "plShortName"   => _("Shares"),
-          "plDescription" => _("Share service"),
+          "plShortName"   => _("File servive (Shares)"),
+          "plDescription" => _("File service - Shares")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 90,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_goSpamServer.inc b/plugins/admin/systems/class_goSpamServer.inc
index 77b7d0d9a1090a9b6d166f66ec923642dd94d007..a5ac7fa563e126e843ca440089339dafbc39005f 100644 (file)
--- a/plugins/admin/systems/class_goSpamServer.inc
+++ b/plugins/admin/systems/class_goSpamServer.inc
@@ -317,10 +317,10 @@ class gospamserver extends goService{
   {
     return (array(
           "plShortName"   => _("Spamassassin"),
-          "plDescription" => _("Spamassassin service"),
+          "plDescription" => _("Spamassassin")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 89,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
           "plProvidedAcls"=> array(

diff --git a/plugins/admin/systems/class_goSyslogServer.inc b/plugins/admin/systems/class_goSyslogServer.inc
index 65bad054ec8964bf5e1c9945cf50e021a909217a..da96ea33085a730f92d14292ccc4847762c19182 100644 (file)
--- a/plugins/admin/systems/class_goSyslogServer.inc
+++ b/plugins/admin/systems/class_goSyslogServer.inc
@@ -39,7 +39,7 @@ class goSyslogServer extends goService{
   function getListEntry()
   {
     $fields               = goService::getListEntry();
-    $fields['Message']    = _("Syslog service");
+    $fields['Message']    = _("Logging service");
     $fields['AllowEdit']  = false;
     return($fields);
   }
@@ -60,11 +60,11 @@ class goSyslogServer extends goService{
   function plInfo()
   {
     return (array(
-          "plShortName"   => _("Syslog"),
-          "plDescription" => _("Syslog service"),
+          "plShortName"   => _("Logging service"),
+          "plDescription" => _("Logging service")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 88,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_goTerminalServer.inc b/plugins/admin/systems/class_goTerminalServer.inc
index 017c7476ddb2337aff3e94caa922392ea5953822..fea6e77db18627047048d76b96df7fdc8c63fea4 100644 (file)
--- a/plugins/admin/systems/class_goTerminalServer.inc
+++ b/plugins/admin/systems/class_goTerminalServer.inc
@@ -114,11 +114,11 @@ class goTerminalServer extends goService{
   function plInfo()
   {
     return (array(
-          "plShortName"   => _("Terminal"),
-          "plDescription" => _("Terminal service"),
+          "plShortName"   => _("Terminal service"),
+          "plDescription" => _("Terminal service")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 87,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_goVirusServer.inc b/plugins/admin/systems/class_goVirusServer.inc
index 442ebb6eadcef93cec2525b4ff1e87ab0d69eb50..2cc0a1b1a83de33e6686ffa7f35d9aa827bc56b7 100644 (file)
--- a/plugins/admin/systems/class_goVirusServer.inc
+++ b/plugins/admin/systems/class_goVirusServer.inc
@@ -209,10 +209,10 @@ class govirusserver extends goService{
   {
     return (array(
           "plShortName"   => _("Anti virus"),
-          "plDescription" => _("Anti virus service"),
+          "plDescription" => _("Anti virus")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 96,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
           "plProvidedAcls"=> array(

diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc
index 997a8ad00fc0efbb481707c4cc0c3e86d76b1c71..8bd6f6d147693b557e36745a554eca42d1a16caf 100644 (file)
--- a/plugins/admin/systems/class_servDNS.inc
+++ b/plugins/admin/systems/class_servDNS.inc
@@ -1,6 +1,8 @@
 <?php
 
-class servdns extends plugin
+require_once("class_goService.inc");
+
+class servdns extends goService
 {
   /* CLI vars */
   var $cli_summary= "Manage server basic objects";
@@ -29,7 +31,7 @@ class servdns extends plugin
   {
     plugin::plugin ($config, $dn, $parent);
 
-    $this->DisplayName = _("Domain name system service");
+    $this->DisplayName = _("DNS service");
 
     $this->orig_dn = $dn;
 
@@ -347,18 +349,8 @@ class servdns extends plugin
 
   function getListEntry()
   {
-    $this->updateStatusState();
-    $flag = $this->StatusFlag;
-    if(empty($flag)){
-      $fields['Status']      = "";
-    }else{
-      $fields['Status']      = $this->$flag;
-    }
+    $fields               = goService::getListEntry(); 
     $fields['Message']    = _("DNS service");
-    $fields['AllowStart'] = true;
-    $fields['AllowStop']  = true;
-    $fields['AllowRestart'] = true;
-    $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
   }
@@ -387,11 +379,11 @@ class servdns extends plugin
   function plInfo()
   {
     return (array(
-          "plShortName"   => _("DNS"),
-          "plDescription" => _("DNS service"),
+          "plShortName"   => _("DNS service"),
+          "plDescription" => _("DNS service")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 83,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc
index beb041887b4a97d1abf407145784a195dabc16d3..c11ae498d5c617b66268d14c28c7787db83a0465 100644 (file)
--- a/plugins/admin/systems/class_servGeneric.inc
+++ b/plugins/admin/systems/class_servGeneric.inc
@@ -334,7 +334,7 @@ class servgeneric extends plugin
           "plDescription" => _("Server generic"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 1,
           "plSection"     => array("administration"),           
           "plCategory"    => array("server" => array("description"  => _("Server"),
                                                      "objectClass"  => "gotoWorkstation")),

diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index feb471c50e63c950b40b4f0ca66d5174f3a6e9e2..7ca2e1d700a49d6914bee9125b0570f68e24c76c 100644 (file)
--- a/plugins/admin/systems/class_servKolab.inc
+++ b/plugins/admin/systems/class_servKolab.inc
@@ -372,10 +372,10 @@ class servkolab extends goService {
   {
     return (array(
           "plShortName"   => _("Kolab"),
-          "plDescription" => _("Kolab service"),
+          "plDescription" => _("Kolab mail service")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 85,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/class_servRepository.inc
index d6006348d893d099b6ff429bbe3be5fee1287fb6..7d7cedd6ff2b4a8943369059577884643851127d 100644 (file)
--- a/plugins/admin/systems/class_servRepository.inc
+++ b/plugins/admin/systems/class_servRepository.inc
@@ -347,10 +347,10 @@ class servrepository extends goService
   {
     return (array(
           "plShortName"   => _("Repository"),
-          "plDescription" => _("Repository service"),
+          "plDescription" => _("Repository service")." ("._("Services").")",
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 84,
           "plSection"     => array("administration"),
           "plCategory"    => array("server"),
 

diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc
index 5850acf5a6d80ce9f797197b8902c3850acf324b..1fb01de68033af692405e511454b8e7c7598ef63 100644 (file)
--- a/plugins/admin/systems/class_termDNS.inc
+++ b/plugins/admin/systems/class_termDNS.inc
@@ -511,7 +511,7 @@ class termDNS extends plugin
           "plDescription" => _("DNS settings"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 5,
           "plSection"     => array("administration"),
           "plCategory"    => array("workstation","terminal","phone","server","component","printer"),
 

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index abc7ca682b5328764ebb7f5f22b0984f745ea2c0..e2b198c205d0c84dceed1169ef60dc6b209c0701 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -1101,7 +1101,7 @@ class workstartup extends plugin
           "plDescription" => _("System startup"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 9,
           "plSection"     => array("administration"),           
           "plCategory"    => array("workstation","server","ogroups"),