Fixes: #1381 (re)start and stop buttons should not depend on some weird LDAP field

asterisk/admin/systems/services/asterisk/class_serviceAsterisk.inc

@@ -24,13 +24,10 @@ class serviceAsterisk extends simpleService {
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goFonServer");
-  var $StatusFlag       = "goFonServerStatus";
 
   /* This class can't be assigned twice so it conflicts with itsself */
   var $conflicts        = array();
 
-  var $goFonServerStatus  = "";
-
   static function getAttributesInfo ()
   {
     return array(

fax/admin/systems/services/fax/class_serviceFax.inc

@@ -22,28 +22,20 @@
 
 class goFaxServer extends simpleService {
 
-  var $cli_summary       = "This plugin is used within the ServerService Plugin \nand indicates that this server supports fax informations.";
-  var $cli_description   = "Some longer text\nfor help";
-  var $cli_parameters    = array("one" => "one is nice", "two" => "two is even better");
-  /* This plugin only writes its objectClass */
-
   var $objectclasses     =  array("goFaxServer");
-  var $StatusFlag        = "goFaxServerStatus";
-  var $goFaxServerStatus = "";
 
   /* Return plugin informations for acl handling */
   static function plInfo()
   {
-    return (array(
-          "plShortName"   => _("FAX service"),
-          "plDescription" => _("FAX service")." ("._("Services").")",
-          "plSelfModify"  => FALSE,
-          "plDepends"     => array(),
-          "plPriority"    => 99,
-          "plSection"     => array("administration"),
-          "plCategory"    => array("server"),
-          "plProvidedAcls"=> parent::generatePlProvidedAcls(self::getAttributesInfo())
-          ));
+    return array(
+      "plShortName"     => _("FAX service"),
+      "plDescription"   => _("FAX service")." ("._("Services").")",
+      "plSelfModify"    => FALSE,
+      "plDepends"       => array(),
+      "plSection"       => array("administration"),
+      "plCategory"      => array("server"),
+      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+    );
   }
 
     /*!

kolab/admin/systems/services/kolab/class_serviceKolab.inc

@@ -63,15 +63,14 @@ class serviceKolab extends simpleService
 
   static function plInfo()
   {
-    return (array(
+    return array(
       "plShortName"     => _("Kolab mail service"),
       "plDescription"   => _("Kolab mail service")." ("._("Services").")",
       "plSelfModify"    => FALSE,
-      "plPriority"      => 85,
       "plSection"       => array("administration"),
       "plCategory"      => array("server"),
       "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
-    ));
+    );
   }
 
 
@@ -241,11 +240,6 @@ class serviceKolab extends simpleService
 
   function remove_from_parent()
   {
-     /* Remove status flag, it is not a memeber of this->attributes, so ensure that it is deleted too */
-    if (!empty($this->StatusFlag)) {
-      $this->attrs[$this->StatusFlag] = array();
-    }
-
     /* Only walk through following code, if this host was a member of the kolab hosts, else skip this */
     if (!$this->initially_was_account) {
       return;

mail/admin/systems/services/imap/class_serviceIMAP.inc

@@ -24,8 +24,6 @@ class goImapServer extends simpleService {
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goImapServer");
-  /* This class can't be assigned twice so it conflicts with itsself */
-  var $StatusFlag       = "goImapServerStatus";
 
   /* Return plugin informations for acl handling */
   static function plInfo()

mail/admin/systems/services/mail/class_serviceMail.inc

 <?php
 
-class serviceMail extends simpleService{
+class serviceMail extends simpleService {
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goMailServer");
-  var $StatusFlag       = "goMailServerStatus";
-  var $goMailServerStatus = "";
 
   /* Return plugin informations for acl handling */
   static function plInfo()
   {
-    return (array(
-          "plShortName"    => _("Mail smtp (Postfix)"),
-          "plDescription"  => _("Mail smtp - Postfix")." ("._("Services").")",
-          "plSelfModify"   => FALSE,
-          "plDepends"      => array(),
-          "plPriority"     => 98,
-          "plSection"      => array("administration"),
-          "plCategory"     => array("server"),
-          "plProvidedAcls" => parent::generatePlProvidedAcls(self::getAttributesInfo())
-            ));
+    return array(
+      "plShortName"    => _("Mail smtp (Postfix)"),
+      "plDescription"  => _("Mail smtp - Postfix")." ("._("Services").")",
+      "plSelfModify"   => FALSE,
+      "plDepends"      => array(),
+      "plSection"      => array("administration"),
+      "plCategory"     => array("server"),
+      "plProvidedAcls" => parent::generatePlProvidedAcls(self::getAttributesInfo())
+    );
   }
 
 
@@ -165,6 +162,5 @@ class serviceMail extends simpleService{
     $this->prepare_save();
     $this->ldap_save();
   }
-
 }
 ?>

mail/admin/systems/services/spam/class_serviceSpamAssassin.inc

@@ -55,8 +55,6 @@ class gospamserver extends simpleService{
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goSpamServer");
   var $attributes       = array("saRewriteHeader","saTrustedNetworks","saRequiredScore","saFlags","saRule");
-  var $StatusFlag       = "saStatus";
-  var $saStatus         = "";
 
     /* Return plugin informations for acl handling  */
 

mail/admin/systems/services/virus/class_serviceAntiVirus.inc

@@ -49,23 +49,19 @@ class AvFlagsAttribute extends StringAttribute
 class govirusserver extends simpleService{
 
   var $objectclasses    = array("goVirusServer");
-  var $StatusFlag       = "avStatus";
-  var $avStatus         = "";
-  var $conflicts        = array("goVirusServer");
 
   /* Return plugin informations for acl handling */
   static function plInfo()
   {
-    return (array(
-          "plShortName"   => _("Antivirus service"),
-          "plDescription" => _("Antivirus service")." ("._("Services").")",
-          "plSelfModify"  => FALSE,
-          "plDepends"     => array(),
-          "plPriority"    => 96,
-          "plSection"     => array("administration"),
-          "plCategory"    => array("server"),
-          "plProvidedAcls"=> parent::generatePlProvidedAcls(self::getAttributesInfo())
-          ));
+    return array(
+      "plShortName"   => _("Antivirus service"),
+      "plDescription" => _("Antivirus service")." ("._("Services").")",
+      "plSelfModify"  => FALSE,
+      "plDepends"     => array(),
+      "plSection"     => array("administration"),
+      "plCategory"    => array("server"),
+      "plProvidedAcls"=> parent::generatePlProvidedAcls(self::getAttributesInfo())
+    );
   }
 
   /*!

systems/admin/systems/services/ntp/class_serviceNTP.inc

@@ -20,35 +20,25 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class goNtpServer extends simpleService{
+class goNtpServer extends simpleService {
 
-  var $cli_summary      = "This plugin is used within the ServerService Pluign \nand indicates that this server supports NTP service.";
-  var $cli_description  = "Some longer text\nfor help";
-  var $cli_parameters   = array("one" => "one is nice", "two" => "two is better");
-
-  /* This plugin only writes its objectClass */
   var $objectclasses    = array("goNtpServer");
-  var $StatusFlag       = "goNtpServerStatus";
-  var $goNtpServerStatus= "";
 
   /* Return plugin informations for acl handling */
   static function plInfo()
   {
-    return (array(
-          "plShortName"   => _("Time service"),
-          "plDescription" => _("Time service - NTP")." ("._("Services").")",
-          "plSelfModify"  => FALSE,
-          "plDepends"     => array(),
-          "plPriority"    => 91,
-          "plSection"     => array("administration"),
-          "plCategory"    => array("server"),
-          "plProvidedAcls"=> parent::generatePlProvidedAcls(self::getAttributesInfo())
-          ));
+    return array(
+      "plShortName"     => _("Time service"),
+      "plDescription"   => _("Time service - NTP")." ("._("Services").")",
+      "plSelfModify"    => FALSE,
+      "plDepends"       => array(),
+      "plSection"       => array("administration"),
+      "plCategory"      => array("server"),
+      "plProvidedAcls"  => parent::generatePlProvidedAcls(self::getAttributesInfo())
+    );
   }
 
- /*!
-  *  \brief The main function : information about attributes
-  */
+ /* The main function : information about attributes */
   static function getAttributesInfo ()
   {
       return array (

systems/admin/systems/services/terminal/class_serviceTerminal.inc

@@ -24,22 +24,18 @@ class goTerminalServer extends simpleService{
 
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goTerminalServer");
-  var $StatusFlag       = "goTerminalServerStatus";
-  var $conflicts        = array("goTerminalServer");
-  var $goTerminalServerStatus = "";
 
   /* Return plugin informations for acl handling */
   static function plInfo()
   {
-    return (array(
-          "plShortName"   => _("Terminal service"),
-          "plDescription" => _("Terminal service")." ("._("Services").")",
-          "plSelfModify"  => FALSE,
-          "plPriority"    => 87,
-          "plSection"     => array("administration"),
-          "plCategory"    => array("server"),
-          "plProvidedAcls"=> parent::generatePlProvidedAcls(self::getAttributesInfo())
-          ));
+    return array(
+      "plShortName"   => _("Terminal service"),
+      "plDescription" => _("Terminal service")." ("._("Services").")",
+      "plSelfModify"  => FALSE,
+      "plSection"     => array("administration"),
+      "plCategory"    => array("server"),
+      "plProvidedAcls"=> parent::generatePlProvidedAcls(self::getAttributesInfo())
+    );
   }
 
   /*!