From a19b1adcc856c72f83cc60b607d0f66d7c57f52f Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 27 Sep 2006 04:22:20 +0000 Subject: [PATCH] Added priorities, fixed service names. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4788 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/fai/class_faiSummaryTab.inc | 2 +- plugins/admin/systems/class_glpiAccount.inc | 2 +- plugins/admin/systems/class_goFonServer.inc | 8 +++---- plugins/admin/systems/class_goGlpiServer.inc | 6 ++--- plugins/admin/systems/class_goImapServer.inc | 6 ++--- plugins/admin/systems/class_goKrbServer.inc | 6 ++--- plugins/admin/systems/class_goLdapServer.inc | 4 ++-- plugins/admin/systems/class_goLogDBServer.inc | 6 ++--- plugins/admin/systems/class_goMailServer.inc | 10 ++++---- plugins/admin/systems/class_goNtpServer.inc | 10 ++++---- plugins/admin/systems/class_goShareServer.inc | 6 ++--- plugins/admin/systems/class_goSpamServer.inc | 4 ++-- .../admin/systems/class_goSyslogServer.inc | 8 +++---- .../admin/systems/class_goTerminalServer.inc | 6 ++--- plugins/admin/systems/class_goVirusServer.inc | 4 ++-- plugins/admin/systems/class_servDNS.inc | 24 +++++++------------ plugins/admin/systems/class_servGeneric.inc | 2 +- plugins/admin/systems/class_servKolab.inc | 4 ++-- .../admin/systems/class_servRepository.inc | 4 ++-- plugins/admin/systems/class_termDNS.inc | 2 +- .../systems/class_workstationStartup.inc | 2 +- 21 files changed, 59 insertions(+), 67 deletions(-) diff --git a/plugins/admin/fai/class_faiSummaryTab.inc b/plugins/admin/fai/class_faiSummaryTab.inc index 0f5f5fcc2..eba31ee2a 100644 --- 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 ffc5a4605..4c43d5c4e 100644 --- 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 7a0920bcc..e8d5e3b25 100644 --- 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 634a4e302..5851b8f01 100644 --- 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 43a2a5834..8a95ed7ad 100644 --- 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 fb9c9d41b..d753d15e2 100644 --- 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 8229c32a6..5bce18539 100644 --- 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 75b31b140..31ad8e8dc 100644 --- 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 e7fde7450..58f9f5062 100644 --- 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 eaa885a7b..f51f9b211 100644 --- 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 0eab8bf07..f5061b1e3 100644 --- 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 77b7d0d9a..a5ac7fa56 100644 --- 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 65bad054e..da96ea330 100644 --- 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 017c7476d..fea6e77db 100644 --- 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 442ebb6ea..2cc0a1b1a 100644 --- 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 997a8ad00..8bd6f6d14 100644 --- a/plugins/admin/systems/class_servDNS.inc +++ b/plugins/admin/systems/class_servDNS.inc @@ -1,6 +1,8 @@ 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 beb041887..c11ae498d 100644 --- 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 feb471c50..7ca2e1d70 100644 --- 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 d6006348d..7d7cedd6f 100644 --- 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 5850acf5a..1fb01de68 100644 --- 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 abc7ca682..e2b198c20 100644 --- 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"), -- 2.30.2