Fixed a couple of static/non-static error messages

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

diff --git a/include/class_acl.inc b/include/class_acl.inc
index 9bf8e623825c0b6f49257a732a9d599cff2689ca..f5b26e32f21effdef7c567bee067226cc8355290 100644 (file)
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -41,7 +41,7 @@ class acl extends plugin
     if (isset($this->attrs['gosaAclEntry'])){
       for ($i= 0; $i<$this->attrs['gosaAclEntry']['count']; $i++){
         $acl= $this->attrs['gosaAclEntry'][$i];
-        $this->gosaAclEntry= array_merge($this->gosaAclEntry, $this->explodeACL($acl));
+        $this->gosaAclEntry= array_merge($this->gosaAclEntry, acl::explodeACL($acl));
       }
     }
     ksort($this->gosaAclEntry);
@@ -103,7 +103,7 @@ class acl extends plugin
       $this->roles[$role_id]['acls'] =array();
       for ($i= 0; $i < $attrs['gosaAclTemplate']['count']; $i++){
         $acl= $attrs['gosaAclTemplate'][$i];
-        $this->roles[$role_id]['acls'] = array_merge($this->roles[$role_id]['acls'],$this->explodeACL($acl));
+        $this->roles[$role_id]['acls'] = array_merge($this->roles[$role_id]['acls'],acl::explodeACL($acl));
       }
       $this->roles[$role_id]['description'] = $dsc;
       $this->roles[$role_id]['cn'] = $attrs['cn'][0];
@@ -774,7 +774,7 @@ class acl extends plugin
   }
 
 
-  function explodeACL($acl)
+  static function explodeACL($acl)
   {
     list($index, $type)= split(':', $acl);
     $a= array( $index => array("type" => $type,
@@ -805,7 +805,7 @@ class acl extends plugin
   }
 
 
-  function extractMembers($acl,$role = FALSE)
+  static function extractMembers($acl,$role = FALSE)
   {
     global $config;
     $a= array();
@@ -849,7 +849,7 @@ class acl extends plugin
   }
 
 
-  function extractACL($acl)
+  static function extractACL($acl)
   {
     /* Rip acl off the string, seperate by ',' and place it in an array */
     $as= preg_replace('/^[^:]+:[^:]+:[^:]*:(.*)$/', '\1', $acl);
@@ -1081,7 +1081,7 @@ class acl extends plugin
 
   
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("ACL"),

diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 17ae13ff4071b267c4f606dbe63bf5e69bfc1197..bcd2ccfb121f586613b9491b2dfc94e6117a7153 100644 (file)
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -37,7 +37,7 @@ class LDAP{
     global $config;
     $this->follow_referral= $follow_referral;
     $this->tls=$tls;
-    $this->binddn=$this->convert($binddn);
+    $this->binddn=LDAP::convert($binddn);
 
     $this->bindpw=$bindpw;
     $this->hostname=$hostname;
@@ -62,7 +62,7 @@ class LDAP{
       (   => OB
       )   => CB
       /   => SL                                                                  */
-  function convert($dn)
+  static function convert($dn)
   {
     if (SPECIALS_OVERRIDE == TRUE){
       $tmp= preg_replace(array("/\\\\,/", "/\\\\2C/", "/\(/", "/\)/", "/\//"),
@@ -79,7 +79,7 @@ class LDAP{
      codes to their original values. See "convert" for mor information. 
      ',' characters are always expanded to \, (not \2C), since all tested LDAP
      servers seem to take it the correct way.                                  */
-  function fix($dn)
+  static function fix($dn)
   {
     if (SPECIALS_OVERRIDE == TRUE){
       return (preg_replace(array("/\001CO/", "/\001OB/", "/\001CB/", "/\001SL/"),
@@ -106,7 +106,7 @@ class LDAP{
       }
 
       $this->error = "No Error";
-      if ($bid = @ldap_bind($this->cid, $this->fix($this->binddn), $this->bindpw)) {
+      if ($bid = @ldap_bind($this->cid, LDAP::fix($this->binddn), $this->bindpw)) {
         $this->error = "Success";
         $this->hascon=true;
       } else {
@@ -126,7 +126,7 @@ class LDAP{
   function rebind($ldap, $referral)
   {
     $credentials= $this->get_credentials($referral);
-    if (@ldap_bind($ldap, $this->fix($credentials['ADMIN']), $credentials['PASSWORD'])) {
+    if (@ldap_bind($ldap, LDAP::fix($credentials['ADMIN']), $credentials['PASSWORD'])) {
       $this->error = "Success";
       $this->hascon=true;
       $this->reconnect= true;
@@ -164,7 +164,7 @@ class LDAP{
     if ($dir == "..")
       $this->basedn = $this->getParentDir();
     else
-      $this->basedn = $this->convert($dir);
+      $this->basedn = LDAP::convert($dir);
   }
 
   function getParentDir($basedn = "")
@@ -172,7 +172,7 @@ class LDAP{
     if ($basedn=="")
       $basedn = $this->basedn;
     else
-      $basedn = $this->convert($this->basedn);
+      $basedn = LDAP::convert($this->basedn);
     return(ereg_replace("[^,]*[,]*[ ]*(.*)", "\\1", $basedn));
   }
 
@@ -184,7 +184,7 @@ class LDAP{
       $start = microtime();
    
       $this->clearResult();
-      $this->sr = @ldap_search($this->cid, $this->fix($this->basedn), $filter, $attrs);
+      $this->sr = @ldap_search($this->cid, LDAP::fix($this->basedn), $filter, $attrs);
       $this->error = @ldap_error($this->cid);
       $this->resetResult();
       $this->hasres=true;
@@ -197,7 +197,7 @@ class LDAP{
         }
       }
 
-      $this->log("LDAP operation: time=".get_MicroTimeDiff($start,microtime())." operation=search('".$this->fix($this->basedn)."', '$filter')");
+      $this->log("LDAP operation: time=".get_MicroTimeDiff($start,microtime())." operation=search('".LDAP::fix($this->basedn)."', '$filter')");
       return($this->sr);
     }else{
       $this->error = "Could not connect to LDAP server";
@@ -213,11 +213,11 @@ class LDAP{
       if ($basedn == "")
         $basedn = $this->basedn;
       else
-        $basedn= $this->convert($basedn);
+        $basedn= LDAP::convert($basedn);
   
       $start = microtime();
 
-      $this->sr = @ldap_list($this->cid, $this->fix($basedn), $filter,$attrs);
+      $this->sr = @ldap_list($this->cid, LDAP::fix($basedn), $filter,$attrs);
       $this->error = @ldap_error($this->cid);
       $this->resetResult();
       $this->hasres=true;
@@ -230,7 +230,7 @@ class LDAP{
         }
       }
 
-      $this->log("LDAP operation: time=".get_MicroTimeDiff($start,microtime())." operation=ls('".$this->fix($basedn)."', '$filter')");
+      $this->log("LDAP operation: time=".get_MicroTimeDiff($start,microtime())." operation=ls('".LDAP::fix($basedn)."', '$filter')");
 
       return($this->sr);
     }else{
@@ -245,7 +245,7 @@ class LDAP{
       if ($this->reconnect) $this->connect();
       $this->clearResult();
       $filter = "(objectclass=*)";
-      $this->sr = @ldap_read($this->cid, $this->fix($dn), $filter,$attrs);
+      $this->sr = @ldap_read($this->cid, LDAP::fix($dn), $filter,$attrs);
       $this->error = @ldap_error($this->cid);
       $this->resetResult();
       $this->hasres=true;
@@ -284,7 +284,7 @@ class LDAP{
         if ($this->re)
         {
           $att= @ldap_get_attributes($this->cid, $this->re);
-          $att['dn']= trim($this->convert(@ldap_get_dn($this->cid, $this->re)));
+          $att['dn']= trim(LDAP::convert(@ldap_get_dn($this->cid, $this->re)));
         }
         $this->error = @ldap_error($this->cid);
         if (!isset($att)){
@@ -328,7 +328,7 @@ class LDAP{
           $rv = @ldap_get_dn($this->cid, $this->re);
         
           $this->error = @ldap_error($this->cid);
-          return(trim($this->convert($rv)));
+          return(trim(LDAP::convert($rv)));
            }
       }else{
         $this->error = "Perform a Fetch with no Search";
@@ -364,7 +364,7 @@ class LDAP{
       if ($dn == "")
         $dn = $this->basedn;
 
-      $r = @ldap_mod_del($this->cid, $this->fix($dn), $attrs);
+      $r = @ldap_mod_del($this->cid, LDAP::fix($dn), $attrs);
       $this->error = @ldap_error($this->cid);
       return($r);
     }else{
@@ -380,7 +380,7 @@ class LDAP{
       if ($dn == "")
         $dn = $this->basedn;
 
-      $r = @ldap_mod_replace($this->cid, $this->fix($dn), $attrs);
+      $r = @ldap_mod_replace($this->cid, LDAP::fix($dn), $attrs);
       $this->error = @ldap_error($this->cid);
       return($r);
     }else{
@@ -393,7 +393,7 @@ class LDAP{
   {
     if($this->hascon){
       if ($this->reconnect) $this->connect();
-      $r = @ldap_delete($this->cid, $this->fix($deletedn));
+      $r = @ldap_delete($this->cid, LDAP::fix($deletedn));
       $this->error = @ldap_error($this->cid);
       return($r ? $r : 0);
     }else{
@@ -432,7 +432,7 @@ class LDAP{
       }
       
       /* Finally Delete own Node */
-      $r = @ldap_delete($this->cid, $this->fix($deletedn));
+      $r = @ldap_delete($this->cid, LDAP::fix($deletedn));
       $this->error = @ldap_error($this->cid);
       return($r ? $r : 0);
     }else{
@@ -448,16 +448,16 @@ class LDAP{
     error_reporting(E_ALL | E_STRICT);
     
     if($is_first){
-      echo "<h2>".sprintf(_("Creating copy of %s"),"<i>".@LDAP::fix($sourcedn)."</i>")."</h2>";
+      echo "<h2>".sprintf(_("Creating copy of %s"),"<i>".LDAP::fix($sourcedn)."</i>")."</h2>";
     }else{
       if(preg_match("/^ou=/",$sourcedn)){
-        echo "<h3>"._("Processing")." <i>".@LDAP::fix($destinationdn)."</i></h3>";
+        echo "<h3>"._("Processing")." <i>".LDAP::fix($destinationdn)."</i></h3>";
       }else{
         $tmp = split(",",$sourcedn);
         
         echo "&nbsp;<b>"._("Object").":</b> ";
 
-        $deststr = @LDAP::fix($destinationdn);
+        $deststr = LDAP::fix($destinationdn);
         if(strlen($deststr) > 96){
           $deststr = substr($deststr,0,96)."...";
         }
@@ -497,7 +497,7 @@ class LDAP{
   
         /* check if this is a department */
         if(in_array("organizationalUnit",$attr['objectClass'])){
-          $attr['dn'] = $this->convert($destinationdn);
+          $attr['dn'] = LDAP::convert($destinationdn);
           $this->cd($basedn);
           $this->create_missing_trees($destinationdn);
           $this->cd($destinationdn);
@@ -531,7 +531,7 @@ class LDAP{
           /* If this is no department */
           foreach($attr as $key => $value){
             if(in_array($key ,array("FAItemplateFile","FAIscript", "gotoLogonScript", "gosaApplicationIcon","gotoMimeIcon"))){
-              $sr= ldap_read($this->cid, $this->fix($sourcedn), "$key=*", array($key));
+              $sr= ldap_read($this->cid, LDAP::fix($sourcedn), "$key=*", array($key));
               $ei= ldap_first_entry($this->cid, $sr);
               if ($tmp= @ldap_get_values_len($this->cid, $ei,$key)){
                 $attr[$key] = $tmp;
@@ -618,7 +618,7 @@ class LDAP{
     }
     if($this->hascon){
       if ($this->reconnect) $this->connect();
-      $r = @ldap_modify($this->cid, $this->fix($this->basedn), $attrs);
+      $r = @ldap_modify($this->cid, LDAP::fix($this->basedn), $attrs);
       $this->error = @ldap_error($this->cid);
       return($r ? $r : 0);
     }else{
@@ -631,7 +631,7 @@ class LDAP{
   {
     if($this->hascon){
       if ($this->reconnect) $this->connect();
-      $r = @ldap_add($this->cid, $this->fix($this->basedn), $attrs);
+      $r = @ldap_add($this->cid, LDAP::fix($this->basedn), $attrs);
       $this->error = @ldap_error($this->cid);
       return($r ? $r : 0);
     }else{
@@ -807,7 +807,7 @@ class LDAP{
   {
     $data= "";
     if ($this->reconnect) $this->connect();
-    $sr= @ldap_read($this->cid, $this->fix($dn), "objectClass=*", array("$name"));
+    $sr= @ldap_read($this->cid, LDAP::fix($dn), "objectClass=*", array("$name"));
 
     /* fill data from LDAP */
     if ($sr) {
@@ -864,7 +864,7 @@ class LDAP{
     if (isset($referrals[$server])){
       return ($referrals[$server]);
     } else {
-      $ret['ADMIN']= $this->fix($this->binddn);
+      $ret['ADMIN']= LDAP::fix($this->binddn);
       $ret['PASSWORD']= $this->bindpw;
     }
 
@@ -928,7 +928,7 @@ class LDAP{
     }
 
     /* Searching Ldap Tree */
-    $sr= @ldap_read($this->cid, $this->fix($dn), $filter, $name);
+    $sr= @ldap_read($this->cid, LDAP::fix($dn), $filter, $name);
 
     /* Get the first entry */   
     $entry= @ldap_first_entry($this->cid, $sr);
@@ -972,7 +972,7 @@ class LDAP{
 
   function dn_exists($dn)
   {
-    return @ldap_list($this->cid, $this->fix($dn), "(objectClass=*)", array("objectClass"));
+    return @ldap_list($this->cid, LDAP::fix($dn), "(objectClass=*)", array("objectClass"));
   }
   
 

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index f2d01c51bd79a09346dc5c0193146dad032ae7da..4440ab7626ead2106a0fb992fa7ef64960921db9 100644 (file)
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -1435,7 +1435,7 @@ class plugin
   }
 
 
-  function plInfo()
+  static function plInfo()
   {
     return array();
   }

diff --git a/plugins/addons/addressbook/class_addressbook.inc b/plugins/addons/addressbook/class_addressbook.inc
index 91d1e042c66393ba416f76ac746ef4c6d70e748f..67bb3455e734bb5dbffcef79222cf54d618f0daa 100644 (file)
--- a/plugins/addons/addressbook/class_addressbook.inc
+++ b/plugins/addons/addressbook/class_addressbook.inc
@@ -797,7 +797,7 @@ class addressbook extends plugin
 
 
   /* Return plugin informations for acl handling  */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName" => _("Addressbook"),

diff --git a/plugins/addons/gotomasses/class_gotomasses.inc b/plugins/addons/gotomasses/class_gotomasses.inc
index 0785eaccfd8f5a21db71d411a0c41565538fc7a9..5638ba624d9c9d8f5b7fc2a498c358593b0366b6 100644 (file)
--- a/plugins/addons/gotomasses/class_gotomasses.inc
+++ b/plugins/addons/gotomasses/class_gotomasses.inc
@@ -406,7 +406,7 @@ class gotomasses extends plugin
   }
 
 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
         "plShortName"   => _("System mass deployment"),

diff --git a/plugins/addons/ldapmanager/class_ldif.inc b/plugins/addons/ldapmanager/class_ldif.inc
index 2b914c552e52bccf2f60fa87f2d3c691c8b1a884..3451f8179d92351d370482b1e632881075fa3f4a 100644 (file)
--- a/plugins/addons/ldapmanager/class_ldif.inc
+++ b/plugins/addons/ldapmanager/class_ldif.inc
@@ -28,7 +28,7 @@ class ldif extends plugin
 
   /* Return plugin informations for acl handling
      #FIXME You can only read attributes within this report plugin */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
         "plShortName"   => _("Ldap manager"),

diff --git a/plugins/addons/logview/class_gosa_logview.inc b/plugins/addons/logview/class_gosa_logview.inc
index b71b05c88f9171a6713cb63eabc3467730146dab..9d4a4aab22864fe7114b9ab5a3e38c968a204bec 100644 (file)
--- a/plugins/addons/logview/class_gosa_logview.inc
+++ b/plugins/addons/logview/class_gosa_logview.inc
@@ -349,7 +349,7 @@ class gosa_logview extends plugin
 
   /* Return plugin informations for acl handling
      #FIXME You can only read attributes within this report plugin 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
         "plShortName"   => _("Log view"),

diff --git a/plugins/addons/logview/class_logview.inc b/plugins/addons/logview/class_logview.inc
index 3c436b7fb848430a5753f2e45dbb017fad95783f..8716ee7e9bb749d0f72f46c6c3f69b8dfa72a434 100644 (file)
--- a/plugins/addons/logview/class_logview.inc
+++ b/plugins/addons/logview/class_logview.inc
@@ -396,7 +396,7 @@ class logview extends plugin
 
   /* Return plugin informations for acl handling
      #FIXME You can only read attributes within this report plugin */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
         "plShortName"   => _("Log view"),

diff --git a/plugins/addons/mailqueue/class_mailqueue.inc b/plugins/addons/mailqueue/class_mailqueue.inc
index 3e34bfc79299e55d51bb3af2f45791d55b261da8..6b1e6e46e5ee8925b48dd0f2cd1c7e89b6dd9e4f 100644 (file)
--- a/plugins/addons/mailqueue/class_mailqueue.inc
+++ b/plugins/addons/mailqueue/class_mailqueue.inc
@@ -385,7 +385,7 @@ class mailqueue extends plugin
 
   /* Return plugin informations for acl handling
      #FIXME You can only read attributes within this report plugin */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
         "plShortName"   => _("Mailqueue"),

diff --git a/plugins/addons/notifications/class_msgplug.inc b/plugins/addons/notifications/class_msgplug.inc
index 84debeff8cd35d9c0575d6617b4eb30b30b0e6ea..edbab55eef09a5c17ad3a596bc12b8fa68b4481a 100644 (file)
--- a/plugins/addons/notifications/class_msgplug.inc
+++ b/plugins/addons/notifications/class_msgplug.inc
@@ -234,7 +234,7 @@ class msgplug extends plugin
 
   
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
         "plShortName"   => _("Notification"),

diff --git a/plugins/admin/acl/class_aclRole.inc b/plugins/admin/acl/class_aclRole.inc
index a03ee5b0f15c7a676a01428425dc9fc2dce951d0..18bf440dc06395e02229391fde536fc0653c2370 100644 (file)
--- a/plugins/admin/acl/class_aclRole.inc
+++ b/plugins/admin/acl/class_aclRole.inc
@@ -662,7 +662,7 @@ class aclrole extends acl
   
 
   /* Return plugin informations for acl handling  */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName" => _("Role"),

diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc
index 88f199974e261ae8c5f87125076ce35196c02b4b..22fcf10be69a57a8ae2ebc16086bff996f62c453 100644 (file)
--- a/plugins/admin/applications/class_applicationGeneric.inc
+++ b/plugins/admin/applications/class_applicationGeneric.inc
@@ -536,7 +536,7 @@ class application extends plugin
 
   /* Return plugin informations for acl handling
       #FIXME FAIscript seams to ununsed within this class... */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Generic"),

diff --git a/plugins/admin/applications/class_applicationParameters.inc b/plugins/admin/applications/class_applicationParameters.inc
index c9f5d4241e3684c724312777c22e790ef58405b5..9f11eb6b94a78f05aaeb9f6850a631bb73cfcc61 100644 (file)
--- a/plugins/admin/applications/class_applicationParameters.inc
+++ b/plugins/admin/applications/class_applicationParameters.inc
@@ -226,7 +226,7 @@ class applicationParameters extends plugin
 
   /* Return plugin informations for acl handling
 #FIXME FAIscript seams to ununsed within this class... */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Parameter"),

diff --git a/plugins/admin/departments/class_departmentGeneric.inc b/plugins/admin/departments/class_departmentGeneric.inc
index ba32c90e7254cb217c7177ab270f1973d8dfd8c2..668da2f7aacda29f0e332e904a66c08a239161a4 100644 (file)
--- a/plugins/admin/departments/class_departmentGeneric.inc
+++ b/plugins/admin/departments/class_departmentGeneric.inc
@@ -581,7 +581,7 @@ class department extends plugin
 
 
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array("plShortName"   => _("Generic"),
                   "plDescription" => _("Departments"),

diff --git a/plugins/admin/devices/class_deviceGeneric.inc b/plugins/admin/devices/class_deviceGeneric.inc
index 46d5821459058351143c7bcd84a02f403ed83e2c..095adf7f34a073e32c3cd6d22a4f0b7f3c11bee4 100644 (file)
--- a/plugins/admin/devices/class_deviceGeneric.inc
+++ b/plugins/admin/devices/class_deviceGeneric.inc
@@ -219,7 +219,7 @@ class deviceGeneric extends plugin
 
 
   /* Return plugin informations for acl handling  */
-  public function plInfo()
+  public static function plInfo()
   {
     return (array(
           "plShortName"   => _("Generic"),

diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc
index 32bdf685de39a9b00d42902e71dae9ad96c0f493..a4fdd56402579a52ca1b31cf497f9bb965eb258e 100644 (file)
--- a/plugins/admin/fai/class_faiHook.inc
+++ b/plugins/admin/fai/class_faiHook.inc
@@ -552,7 +552,7 @@ class faiHook extends plugin
   }
 
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array( 
           "plShortName" => _("Hook"),

diff --git a/plugins/admin/fai/class_faiHookEntry.inc b/plugins/admin/fai/class_faiHookEntry.inc
index 5a23ea4979aecc181caf441685565ed654044bd0..84b326e718bb223bde39cc7f481f50d57219ee11 100644 (file)
--- a/plugins/admin/fai/class_faiHookEntry.inc
+++ b/plugins/admin/fai/class_faiHookEntry.inc
@@ -183,7 +183,7 @@ class faiHookEntry extends plugin
   }
 
     /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName" => _("Hook entry"),

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index f11e22407e982e394f35748a9cc37a1aa073d834..1396a0a3dff331ebd16cb7fe735f020963b811d1 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -1019,7 +1019,7 @@ class faiManagement extends plugin
 
 
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array( 
           "plShortName"   => _("FAI releases"),

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index 605df4b526413a412a99ac4d1e24856ba973911d..840a5ae9262015d2e6db104ac3e8cc5eb9cb3ffc 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -530,7 +530,7 @@ class faiPackage extends plugin
   }
 
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array( 
           "plShortName" => _("Package"),

diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc
index a16ac272b21088f004a679ac29af101e03f806d4..031c5a4d4f0c4a7667f04eb2702144614a5c34a4 100644 (file)
--- a/plugins/admin/fai/class_faiPartitionTable.inc
+++ b/plugins/admin/fai/class_faiPartitionTable.inc
@@ -532,7 +532,7 @@ class faiPartitionTable extends plugin
 
 
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array( 
           "plShortName" => _("Partition table"),

diff --git a/plugins/admin/fai/class_faiPartitionTableEntry.inc b/plugins/admin/fai/class_faiPartitionTableEntry.inc
index e8ded4e3a24d7de3defca9177e833ccffedf435a..038e54e473f65b7046b25e44f2993555169e4a08 100644 (file)
--- a/plugins/admin/fai/class_faiPartitionTableEntry.inc
+++ b/plugins/admin/fai/class_faiPartitionTableEntry.inc
@@ -452,7 +452,7 @@ class faiPartitionTableEntry extends plugin
   
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName" => _("Partition table entry"),

diff --git a/plugins/admin/fai/class_faiProfile.inc b/plugins/admin/fai/class_faiProfile.inc
index 0f429041e2cca10a5c2d20df58e2a48aa211af13..0e5cacffd3384db95f95179360b4bb9fa063b810 100644 (file)
--- a/plugins/admin/fai/class_faiProfile.inc
+++ b/plugins/admin/fai/class_faiProfile.inc
@@ -450,7 +450,7 @@ class faiProfile extends plugin
 
 
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array( 
           "plShortName" => _("Profile"),

diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc
index 43741e45c9b277e37b83a84ebb8d27781f2f7f23..8a985da959605fbfd15b378f3d88c3b8a3af207a 100644 (file)
--- a/plugins/admin/fai/class_faiScript.inc
+++ b/plugins/admin/fai/class_faiScript.inc
@@ -603,7 +603,7 @@ class faiScript extends plugin
   
 
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array( 
           "plShortName" => _("Script"),

diff --git a/plugins/admin/fai/class_faiScriptEntry.inc b/plugins/admin/fai/class_faiScriptEntry.inc
index 5e162f05dd18bde29a9505682aedbdda4617052e..0321329209825ddaac037fff565a47c70348d085 100644 (file)
--- a/plugins/admin/fai/class_faiScriptEntry.inc
+++ b/plugins/admin/fai/class_faiScriptEntry.inc
@@ -174,7 +174,7 @@ class faiScriptEntry extends plugin
 
   
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName" => _("Script entry"),

diff --git a/plugins/admin/fai/class_faiSummaryTab.inc b/plugins/admin/fai/class_faiSummaryTab.inc
index 540d5111571741d2df05db7681cad281cbed5748..a9bfbb840a39c40b631d85913d6d2c4b7650eb82 100644 (file)
--- a/plugins/admin/fai/class_faiSummaryTab.inc
+++ b/plugins/admin/fai/class_faiSummaryTab.inc
@@ -563,7 +563,7 @@ class faiSummaryTab extends plugin{
   }
 
   /* Return plugin informations for acl handling * /
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Summary"),

diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc
index 42923af354aeab28433c649ec6498574c18a5d02..7d8e5ed7353a1296469dee89e796322facc098c2 100644 (file)
--- a/plugins/admin/fai/class_faiTemplate.inc
+++ b/plugins/admin/fai/class_faiTemplate.inc
@@ -524,7 +524,7 @@ class faiTemplate extends plugin
   
 
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array( 
           "plShortName" => _("Template"),

diff --git a/plugins/admin/fai/class_faiTemplateEntry.inc b/plugins/admin/fai/class_faiTemplateEntry.inc
index d661c81550f0d12e13ffd171957226ebe2ed15f6..f2278b65e7c5e706973d87481dbe12e5a865a200 100644 (file)
--- a/plugins/admin/fai/class_faiTemplateEntry.inc
+++ b/plugins/admin/fai/class_faiTemplateEntry.inc
@@ -237,7 +237,7 @@ class faiTemplateEntry extends plugin
 
   
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName" => _("Template entry"),

diff --git a/plugins/admin/fai/class_faiVariable.inc b/plugins/admin/fai/class_faiVariable.inc
index 9dea39748b2eb016879d796274c0f7cd486cbcf3..c2eba3e0072773dba346cbf96ee43865b63780a2 100644 (file)
--- a/plugins/admin/fai/class_faiVariable.inc
+++ b/plugins/admin/fai/class_faiVariable.inc
@@ -417,7 +417,7 @@ class faiVariable extends plugin
 
   
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array( 
           "plShortName" => _("Variable"),

diff --git a/plugins/admin/fai/class_faiVariableEntry.inc b/plugins/admin/fai/class_faiVariableEntry.inc
index 2bcb8548e1a8b343d61e22b9e397fedee1a47a4e..5fc6ef01e3cf977400b5d8f7739fc4ac4908dc9f 100644 (file)
--- a/plugins/admin/fai/class_faiVariableEntry.inc
+++ b/plugins/admin/fai/class_faiVariableEntry.inc
@@ -132,7 +132,7 @@ class faiVariableEntry extends plugin
   }
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName" => _("Variable entry"),

diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc
index 0a7574be7e4da27920d74faab6e81b5b6e6b0e39..12b80fab21da955b609519b1be3058b5c17b5132 100644 (file)
--- a/plugins/admin/groups/class_groupApplication.inc
+++ b/plugins/admin/groups/class_groupApplication.inc
@@ -1209,7 +1209,7 @@ class appgroup extends plugin
 
 
   /* Return plugin informations for acl handling  */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Applications"),

diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc
index 1ef173718c30fd9f63719617679e53a834f358ea..095d3be2792d98f9657cc055b7fbf52dbed301b7 100644 (file)
--- a/plugins/admin/groups/class_groupGeneric.inc
+++ b/plugins/admin/groups/class_groupGeneric.inc
@@ -946,7 +946,7 @@ class group extends plugin
 
   
   /* Return plugin informations for acl handling  */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array(  
           "plShortName" => _("Generic"),

diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc
index 952aab3e5f5cd7eb152614c8620e751e052e1894..be6f7b3fef6fd9406e70aa0d047fa76b237c840d 100644 (file)
--- a/plugins/admin/groups/class_groupMail.inc
+++ b/plugins/admin/groups/class_groupMail.inc
@@ -1126,7 +1126,7 @@ I: Only insider delivery */
 
 
   /* Return plugin informations for acl handling  */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Mail"),

diff --git a/plugins/admin/mimetypes/class_mimetypeGeneric.inc b/plugins/admin/mimetypes/class_mimetypeGeneric.inc
index 2e21c24f92291fd56c5c088f05e03cab6d22346a..c96097586c3b02f91de534db714414e85294c85c 100644 (file)
--- a/plugins/admin/mimetypes/class_mimetypeGeneric.inc
+++ b/plugins/admin/mimetypes/class_mimetypeGeneric.inc
@@ -675,7 +675,7 @@ class mimetype extends plugin
   }
 
   /* Return plugin informations for acl handling  */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Generic"),

diff --git a/plugins/admin/ogroups/class_mailogroup.inc b/plugins/admin/ogroups/class_mailogroup.inc
index 7074f25a5bd74cd58e9f2f52299c80bcdfb5d313..ebf569729927c3df9acd88916b14c7946afe5913 100644 (file)
--- a/plugins/admin/ogroups/class_mailogroup.inc
+++ b/plugins/admin/ogroups/class_mailogroup.inc
@@ -175,7 +175,7 @@ class mailogroup extends plugin
   }
 
 
-   function plInfo()
+   static function plInfo()
   {
     return (array(
           "plShortName"   => _("Mail"),

diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc
index 22699c89306d4f6695d67420cf5fc6c5cef1a984..e74b3985a637ee31a57b1afe903e4d3f4d062ea0 100644 (file)
--- a/plugins/admin/ogroups/class_ogroup.inc
+++ b/plugins/admin/ogroups/class_ogroup.inc
@@ -741,7 +741,7 @@ class ogroup extends plugin
   }
 
 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Generic"),

diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc
index be7d69a117af57cf89f69926a369f3960a1a23c2..f67ee78d8a566eb73423ddef8721ecacc3468ead 100644 (file)
--- a/plugins/admin/ogroups/class_phonequeue.inc
+++ b/plugins/admin/ogroups/class_phonequeue.inc
@@ -914,7 +914,7 @@ class phonequeue extends plugin
   }
 
 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Phone"),

diff --git a/plugins/admin/ogroups/class_termgroup.inc b/plugins/admin/ogroups/class_termgroup.inc
index 1abaa0b031a052a9dd02cb3c1716564343434d22..53c59ecc85b237d544dcdf03d90266fbb65adbc2 100644 (file)
--- a/plugins/admin/ogroups/class_termgroup.inc
+++ b/plugins/admin/ogroups/class_termgroup.inc
@@ -381,7 +381,7 @@ class termgroup extends plugin
 
   }
   
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("System"),

diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc
index 1a0d15caa7c0bdcae410f0738085411e3ada26de..8a65bdd8a826160ee7ec1c21920777a53986529a 100644 (file)
--- a/plugins/admin/systems/class_componentGeneric.inc
+++ b/plugins/admin/systems/class_componentGeneric.inc
@@ -274,7 +274,7 @@ class componentGeneric extends plugin
   }
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Generic"),

diff --git a/plugins/admin/systems/class_glpiAccount.inc b/plugins/admin/systems/class_glpiAccount.inc
index ece8186694cfdf35cf3f353dcf5a43841857133b..e6411087ae7ba6c1587268f66b9b3ae6bea158a6 100644 (file)
--- a/plugins/admin/systems/class_glpiAccount.inc
+++ b/plugins/admin/systems/class_glpiAccount.inc
@@ -774,7 +774,7 @@ class glpiAccount extends plugin
   }
 
    /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Glpi"),

diff --git a/plugins/admin/systems/class_glpiPrinterAccount.inc b/plugins/admin/systems/class_glpiPrinterAccount.inc
index 6447d62ca47496fbeb3403e10e3ff28f2211d642..049249cd5aaba106cd2b8d8abc872c3e44967888 100644 (file)
--- a/plugins/admin/systems/class_glpiPrinterAccount.inc
+++ b/plugins/admin/systems/class_glpiPrinterAccount.inc
@@ -775,7 +775,7 @@ class glpiPrinterAccount extends plugin
   }  
 
      /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Glpi"),

diff --git a/plugins/admin/systems/class_goCupsServer.inc b/plugins/admin/systems/class_goCupsServer.inc
index 94f6d7fa43e69be336514eb0c370f8252c3d85be..6fa572b9d6b8f09750e2fc475bce20e215f81cf3 100644 (file)
--- a/plugins/admin/systems/class_goCupsServer.inc
+++ b/plugins/admin/systems/class_goCupsServer.inc
@@ -62,7 +62,7 @@ class goCupsServer extends goService{
   }  
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Cups"),

diff --git a/plugins/admin/systems/class_goFaxServer.inc b/plugins/admin/systems/class_goFaxServer.inc
index de98a645f3b00535e9bcbc1441c38f6151fa1676..1e5e04976ea4b87560afc9d2f448bfb402e805a2 100644 (file)
--- a/plugins/admin/systems/class_goFaxServer.inc
+++ b/plugins/admin/systems/class_goFaxServer.inc
@@ -82,7 +82,7 @@ class goFaxServer extends goService {
   } 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Fax database"),

diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc
index 21a2659cb59031f55f8f7c7a92128245377d1c26..2e69a849deaebabb0beebbb5bfdae8a7ca79b353 100644 (file)
--- a/plugins/admin/systems/class_goFonServer.inc
+++ b/plugins/admin/systems/class_goFonServer.inc
@@ -155,7 +155,7 @@ class goFonServer extends goService{
 
  
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("VoIP service"),

diff --git a/plugins/admin/systems/class_goGlpiServer.inc b/plugins/admin/systems/class_goGlpiServer.inc
index 3ab952904f96b368458cb829d39cd8c843d52145..07c07d427cccf039b5cd8c3b6040e1660fbd5c73 100644 (file)
--- a/plugins/admin/systems/class_goGlpiServer.inc
+++ b/plugins/admin/systems/class_goGlpiServer.inc
@@ -81,7 +81,7 @@ class goGlpiServer extends goService {
   } 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Inventory database"),

diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc
index f8d9f7c26f9ea5850a522e14139d4d34a2aa79bb..e5681b9426912ee02911577be9dccab624fd46ae 100644 (file)
--- a/plugins/admin/systems/class_goImapServer.inc
+++ b/plugins/admin/systems/class_goImapServer.inc
@@ -152,7 +152,7 @@ class goImapServer extends goService {
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("IMAP/POP3"),

diff --git a/plugins/admin/systems/class_goKioskService.inc b/plugins/admin/systems/class_goKioskService.inc
index cee4aa17989d21b8b61831a7142df308931e340e..5b87b4e830282c2f7a7cfd62cef5d5fc0f5d34e7 100644 (file)
--- a/plugins/admin/systems/class_goKioskService.inc
+++ b/plugins/admin/systems/class_goKioskService.inc
@@ -212,7 +212,7 @@ class goKioskService extends goService{
   }
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Kiosk"),

diff --git a/plugins/admin/systems/class_goKrbServer.inc b/plugins/admin/systems/class_goKrbServer.inc
index 62bd889bea2de00411b179a8f64adb560e86e3b8..3eef127f4cbdd73f8a51607f1189660b15b9fb78 100644 (file)
--- a/plugins/admin/systems/class_goKrbServer.inc
+++ b/plugins/admin/systems/class_goKrbServer.inc
@@ -85,7 +85,7 @@ class goKrbServer extends goService{
   } 
 
     /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Kerberos"),

diff --git a/plugins/admin/systems/class_goLdapServer.inc b/plugins/admin/systems/class_goLdapServer.inc
index 4629410d45bbaca5e15321ce73321d475c0e1dba..c16df038783d3f3dbc0a471892dfc3a8ce553b2e 100644 (file)
--- a/plugins/admin/systems/class_goLdapServer.inc
+++ b/plugins/admin/systems/class_goLdapServer.inc
@@ -77,7 +77,7 @@ class goLdapServer extends goService{
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Ldap"),

diff --git a/plugins/admin/systems/class_goLogDBServer.inc b/plugins/admin/systems/class_goLogDBServer.inc
index 464573297895badcd36fd087d30e9a8a2285ccaf..3a193dbf2ef3edf2ae5791a24466c6f079d37cb7 100644 (file)
--- a/plugins/admin/systems/class_goLogDBServer.inc
+++ b/plugins/admin/systems/class_goLogDBServer.inc
@@ -82,7 +82,7 @@ class goLogDBServer extends goService{
   } 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Logging database"),

diff --git a/plugins/admin/systems/class_goMailServer.inc b/plugins/admin/systems/class_goMailServer.inc
index 99ee887fe91b7ee7e8dae2f074b5744383a4552c..742249ef717c404495f051d6d5ae136840e6f031 100644 (file)
--- a/plugins/admin/systems/class_goMailServer.inc
+++ b/plugins/admin/systems/class_goMailServer.inc
@@ -695,7 +695,7 @@ class goMailServer extends goService{
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Mail smtp (Postfix)"),

diff --git a/plugins/admin/systems/class_goNtpServer.inc b/plugins/admin/systems/class_goNtpServer.inc
index 5a4f40f8240d39131c15534c873e6e37114f40ca..b179ae95b6830c1dfb991fcece65b060a547ecf4 100644 (file)
--- a/plugins/admin/systems/class_goNtpServer.inc
+++ b/plugins/admin/systems/class_goNtpServer.inc
@@ -106,7 +106,7 @@ class goNtpServer extends goService{
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Time service"),

diff --git a/plugins/admin/systems/class_goShareServer.inc b/plugins/admin/systems/class_goShareServer.inc
index 6a9f8424c60cd9cce51d3c57b9ec6661616e4776..354d780373ab007fd7d79ad65b7b25e2eb04143d 100644 (file)
--- a/plugins/admin/systems/class_goShareServer.inc
+++ b/plugins/admin/systems/class_goShareServer.inc
@@ -379,7 +379,7 @@ class goShareServer extends goService{
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("File service (Shares)"),

diff --git a/plugins/admin/systems/class_goSpamServer.inc b/plugins/admin/systems/class_goSpamServer.inc
index e62bb401be229d9575c75890ed13e2342fb01ca9..82ff0fbaf84809b7c95f5887010139e86307f258 100644 (file)
--- a/plugins/admin/systems/class_goSpamServer.inc
+++ b/plugins/admin/systems/class_goSpamServer.inc
@@ -318,7 +318,7 @@ class gospamserver extends goService{
 
   
   /* Return plugin informations for acl handling  */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Spamassassin"),

diff --git a/plugins/admin/systems/class_goSyslogServer.inc b/plugins/admin/systems/class_goSyslogServer.inc
index abeb947feb465bbca5ec3c7731d960cc76757ce8..9461977e2152f43878775edf1a298e48be9ab1fc 100644 (file)
--- a/plugins/admin/systems/class_goSyslogServer.inc
+++ b/plugins/admin/systems/class_goSyslogServer.inc
@@ -62,7 +62,7 @@ class goSyslogServer extends goService{
   } 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Logging service"),

diff --git a/plugins/admin/systems/class_goTerminalServer.inc b/plugins/admin/systems/class_goTerminalServer.inc
index a6dbcd5e6a6afa6fac1c84cbf1dafddea03a9bc2..e832de04cc36ff4603bcc9f2962ee5ce657617c2 100644 (file)
--- a/plugins/admin/systems/class_goTerminalServer.inc
+++ b/plugins/admin/systems/class_goTerminalServer.inc
@@ -118,7 +118,7 @@ class goTerminalServer extends goService{
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Terminal service"),

diff --git a/plugins/admin/systems/class_goVirusServer.inc b/plugins/admin/systems/class_goVirusServer.inc
index 0d7cd71592009a3ba93853ef95f56b7c562132cd..f91c5f5ae92272aaa9f3113803ae480c0bdccd96 100644 (file)
--- a/plugins/admin/systems/class_goVirusServer.inc
+++ b/plugins/admin/systems/class_goVirusServer.inc
@@ -211,7 +211,7 @@ class govirusserver extends goService{
 
 
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Anti virus"),

diff --git a/plugins/admin/systems/class_gosaLogServer.inc b/plugins/admin/systems/class_gosaLogServer.inc
index 2e7c052b405ed047009c421d44b73ad47860855a..cade0e243414c54056980334198b8f069b4cdeaa 100644 (file)
--- a/plugins/admin/systems/class_gosaLogServer.inc
+++ b/plugins/admin/systems/class_gosaLogServer.inc
@@ -85,7 +85,7 @@ class gosaLogServer extends goService{
   } 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("GOsa logging service"),

diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc
index f3269eeb3c499509159cce76069b153b001f9fa1..f169c0ec7928c4e589c4b0b58315622bcd1613fb 100644 (file)
--- a/plugins/admin/systems/class_phoneGeneric.inc
+++ b/plugins/admin/systems/class_phoneGeneric.inc
@@ -484,7 +484,7 @@ class phoneGeneric extends plugin
 
   /* Return plugin informations for acl handling
       #FIXME FAIscript seams to ununsed within this class... */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Generic"),

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index ec922b9fe332a9e3c7f4ef0df6cb4ea07ef79c11..54092c670e23f287bf71cefb8b45fc6b53d18ccd 100644 (file)
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -893,7 +893,7 @@ class printgeneric extends plugin
 
   /* Return plugin informations for acl handling
       #FIXME FAIscript seams to ununsed within this class... */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Generic"),

diff --git a/plugins/admin/systems/class_servDHCP.inc b/plugins/admin/systems/class_servDHCP.inc
index 9f6f93f9074f14acaed5daac38bc848e9950f881..c804ec2bc17a013aa45265ac27f7c736ff4608be 100644 (file)
--- a/plugins/admin/systems/class_servDHCP.inc
+++ b/plugins/admin/systems/class_servDHCP.inc
@@ -679,7 +679,7 @@ class servdhcp extends goService
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("DHCP service"),

diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc
index fed9c92f71120d54fd01530aac9e7d3fe50f5c8c..13e7a93170a042cbac0f84194f37d564e615c0fd 100644 (file)
--- a/plugins/admin/systems/class_servDNS.inc
+++ b/plugins/admin/systems/class_servDNS.inc
@@ -568,7 +568,7 @@ class servdns extends goService
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("DNS service"),

diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc
index b46e85b29ceb61d2f4b63dd497a77d7c9dbf97de..9d29f5e59f05b4f41f1bfff56e8c3217f3aa49a9 100644 (file)
--- a/plugins/admin/systems/class_servGeneric.inc
+++ b/plugins/admin/systems/class_servGeneric.inc
@@ -419,7 +419,7 @@ class servgeneric extends plugin
 
 
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array( 
           "plShortName"   => _("Generic"),

diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index 7768f2563998017301e02eb4e41fc2663ae54574..7d31ff58d59401b212e4a50ef541403176f1f753 100644 (file)
--- a/plugins/admin/systems/class_servKolab.inc
+++ b/plugins/admin/systems/class_servKolab.inc
@@ -377,7 +377,7 @@ class servkolab extends goService {
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Kolab"),

diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/class_servRepository.inc
index c95860729cf54c183c1d698d635f0b1c9e15f205..e1c9a2e05de0b2308a657c4c362c50048c2d26aa 100644 (file)
--- a/plugins/admin/systems/class_servRepository.inc
+++ b/plugins/admin/systems/class_servRepository.inc
@@ -367,7 +367,7 @@ class servrepository extends goService
   }
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Repository"),

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 0ee9980ead1fb4007447685096b4ef96917b0779..52b1534213c6521ce0915a4c35965ec3a3083664 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -1368,7 +1368,7 @@ class systems extends plugin
 
   /* !! Incoming dummy acls, required to defined acls for incoming objects
    */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Incoming objects"),

diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc
index bcaaf8b872263fa0f6b592004de1b3ebf9fcbf1c..34f55366000146f0536eb4469e768ec3b670975a 100644 (file)
--- a/plugins/admin/systems/class_termDNS.inc
+++ b/plugins/admin/systems/class_termDNS.inc
@@ -828,7 +828,7 @@ class termDNS extends plugin
 
 
   /* Return plugin informations for acl handling  */ 
-  function plInfo()
+  static function plInfo()
   {
     $tmp =  array(
         "plShortName"   => _("DNS"),

diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index f129061de5e9610d6aa45e04810c3a156d14c82c..be12d590e30845225be7171cf292e06d4d00338f 100644 (file)
--- a/plugins/admin/systems/class_terminalGeneric.inc
+++ b/plugins/admin/systems/class_terminalGeneric.inc
@@ -630,7 +630,7 @@ class termgeneric extends plugin
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Terminal"),

diff --git a/plugins/admin/systems/class_terminalService.inc b/plugins/admin/systems/class_terminalService.inc
index ea2c8d7fe049ebe90180beb5ea89c7d21e0891eb..49f8046923480576d73a2bbacd290877d99aca3b 100644 (file)
--- a/plugins/admin/systems/class_terminalService.inc
+++ b/plugins/admin/systems/class_terminalService.inc
@@ -487,7 +487,7 @@ class termservice extends plugin
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Service"),

diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 9185810d38a65fcafb6770e4e95d4660bed26c5e..0174459e3515ababdc4565ea6221c2a85219b9e0 100644 (file)
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -555,7 +555,7 @@ class termstartup extends plugin
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Startup"),

diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc
index ef279f3ab20351aa809392b7a04f8e4c51a9bdad..8a15e930ce0c34b7e4e2d8ecf04257237ac60dd3 100644 (file)
--- a/plugins/admin/systems/class_winGeneric.inc
+++ b/plugins/admin/systems/class_winGeneric.inc
@@ -282,7 +282,7 @@ class wingeneric extends plugin
 
   /* Return plugin informations for acl handling
   #FIXME FAIscript seams to ununsed within this class... */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Win generic"),

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index eb389834517f25e228f58c0b8f29d779a7d329c6..14641c0b7617a239781a3e90249338d17245ec3b 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -615,7 +615,7 @@ class workgeneric extends plugin
 
   /* Return plugin informations for acl handling 
       #FIXME FAIscript seams to ununsed within this class... */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array(  
           "plShortName"   => _("Generic"),

diff --git a/plugins/admin/systems/class_workstationService.inc b/plugins/admin/systems/class_workstationService.inc
index 8bb55fb52dc1c3d36bf1e0b68979e55ffd355444..23698cf61a870110bb751d866d9595e1f26b1f1c 100644 (file)
--- a/plugins/admin/systems/class_workstationService.inc
+++ b/plugins/admin/systems/class_workstationService.inc
@@ -471,7 +471,7 @@ class workservice extends plugin
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Service"),

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 76ba599a58bdafac976b06850b74c051c3c70182..ef10f4abb94e902ecf537c7496f2c44f216963e0 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -1310,7 +1310,7 @@ class workstartup extends plugin
 
 
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array( 
           "plShortName"   => _("Startup"),

diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc
index 8c7df503314b40986a6a055610f6bd732255cd75..d054e3b6a8d496749976c4d46eed0cb90255d899 100644 (file)
--- a/plugins/gofax/blocklists/class_blocklistManagement.inc
+++ b/plugins/gofax/blocklists/class_blocklistManagement.inc
@@ -705,7 +705,7 @@ class blocklist extends plugin
   }
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(  
           "plShortName"       => _("Fax"),

diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc
index 1376d088e2075bda5603cacfbc6811576497e3d1..eca2228577a9cc7591826a1803e03327489faafd 100644 (file)
--- a/plugins/gofax/faxaccount/class_gofaxAccount.inc
+++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc
@@ -827,7 +827,7 @@ class gofaxAccount extends plugin
 
   /* Return plugin informations for acl handling 
       #FIXME some attributes are still missing in this plugin acls */
-  function plInfo()
+  static function plInfo()
   {
     return (array(  
           "plShortName"     => _("Fax"),

diff --git a/plugins/gofax/faxreports/class_faxreport.inc b/plugins/gofax/faxreports/class_faxreport.inc
index b3628ad7a3c7d6b5e309a19df16d4e8b5446a018..41e0fc47160179a046cf8865be4222448fb46e5b 100644 (file)
--- a/plugins/gofax/faxreports/class_faxreport.inc
+++ b/plugins/gofax/faxreports/class_faxreport.inc
@@ -473,7 +473,7 @@ class faxreport extends plugin
 
   /* Return plugin informations for acl handling
     #FIXME You can only read attributes within this report plugin */
-  function plInfo()
+  static function plInfo()
   {
   
     return (array(

diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index 9d580039f0bcd76314870e81680fb6a6b8edbf66..bae719aaecb07dda6b51351cfffa757ffbf9fe5e 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
@@ -731,7 +731,7 @@ class conference extends plugin
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Conference"),

diff --git a/plugins/gofon/fonreports/class_fonreport.inc b/plugins/gofon/fonreports/class_fonreport.inc
index 5bd788c3610c2be2953d4aca09718e1f48be43f9..a63a78f3e8ef23aa1f9dfe88d31a094978a4a57e 100644 (file)
--- a/plugins/gofon/fonreports/class_fonreport.inc
+++ b/plugins/gofon/fonreports/class_fonreport.inc
@@ -389,7 +389,7 @@ class fonreport extends plugin
 
   /* Return plugin informations for acl handling 
      #FIXME You can only read attributes within this report plugin */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
         "plShortName"   => _("Phone reports"),

diff --git a/plugins/gofon/macro/class_gofonMacro.inc b/plugins/gofon/macro/class_gofonMacro.inc
index 660f40f788d2e15fd8b873030de193c8c5fe44c5..dba57adb728ae285fbf687d3d70ada42643fa44c 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacro.inc
+++ b/plugins/gofon/macro/class_gofonMacro.inc
@@ -564,7 +564,7 @@ class macro extends plugin
   }
 
 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"   => _("Generic"),

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index 01abe960e7ba95efdc439762127a07f30c3ac5a8..35b134d4f092012269186d7ba73f5e7e7c2f5b5e 100644 (file)
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -1468,7 +1468,7 @@ class phoneAccount extends plugin
   }
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"     => _("Phone"),

diff --git a/plugins/personal/connectivity/class_intranetAccount.inc b/plugins/personal/connectivity/class_intranetAccount.inc
index 95781eadf57b1becb5466b9fa27556c1fdc6b092..c2b9573d32e5387063491a70b98a55a178851e08 100644 (file)
--- a/plugins/personal/connectivity/class_intranetAccount.inc
+++ b/plugins/personal/connectivity/class_intranetAccount.inc
@@ -191,7 +191,7 @@ class intranetAccount extends plugin
 
 
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array(     
           "plShortName"     => _("Intranet"),

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 413a2007135482723c712ab982757f73a20e650c..c72977de810d583ad0568e4784bc8cb750aaee92 100644 (file)
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -460,7 +460,7 @@ class kolabAccount extends plugin
 
 
   /* Return plugin informations for acl handling  */
-  function plInfo()
+  static function plInfo()
   {
     return (array(     
           "plShortName"     => _("Kolab"),

diff --git a/plugins/personal/connectivity/class_opengwAccount.inc b/plugins/personal/connectivity/class_opengwAccount.inc
index 4c7dee76b0c87b4968b41fe72643879723fd7d85..ff96e458e7532c2c81bead43c9fd4090da69d4c3 100644 (file)
--- a/plugins/personal/connectivity/class_opengwAccount.inc
+++ b/plugins/personal/connectivity/class_opengwAccount.inc
@@ -332,7 +332,7 @@ class opengwAccount extends plugin
 
  /* Return plugin informations for acl handling 
       #FIXME This is only an enable/disable checkbox for this account, there is possibly a better solution available later */  
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"     => _("Opengroupware"),

diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index f21e1e4eb42f0aae8397fa5993f7aedf8b9987bf..ce4288fbb43b5fc384b0c7bdd4ddbf8aa151cf4d 100644 (file)
--- a/plugins/personal/connectivity/class_oxchangeAccount.inc
+++ b/plugins/personal/connectivity/class_oxchangeAccount.inc
@@ -958,7 +958,7 @@ class oxchangeAccount extends plugin
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"     => _("Open xchange"),

diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc
index 9a9457071abae427520dadbfc85a8464e5bd3777..7c5cf6e2c879a59af2bf835153c17505ddcd3cd7 100644 (file)
--- a/plugins/personal/connectivity/class_phpgwAccount.inc
+++ b/plugins/personal/connectivity/class_phpgwAccount.inc
@@ -151,7 +151,7 @@ class phpgwAccount extends plugin
 
 
   /* Return plugin informations for acl handling */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"     => _("PHP GW"),

diff --git a/plugins/personal/connectivity/class_phpscheduleitAccount.inc b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
index 825df3d9b1f1df68719f79f3ebc68ef7223154ce..41454ea7c78af2064dd966d698420824955fea39 100644 (file)
--- a/plugins/personal/connectivity/class_phpscheduleitAccount.inc
+++ b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
@@ -153,7 +153,7 @@ class phpscheduleitAccount extends plugin
 
   /* Return plugin informations for acl handling 
       #FIXME This is only an enable/disable checkbox for this account, there is possibly a better solution available later */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"     => _("PHP Schedule it"),

diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc
index 4fe717c810fc3ab81cf57ce35bcb247a05880403..0c8c659cf019109b2cb417a748f669faa01571ad 100644 (file)
--- a/plugins/personal/connectivity/class_pptpAccount.inc
+++ b/plugins/personal/connectivity/class_pptpAccount.inc
@@ -167,7 +167,7 @@ class pptpAccount extends plugin
 
 
   /* Return plugin informations for acl handling */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"     => _("PPTP"),

diff --git a/plugins/personal/connectivity/class_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc
index e286cd66c622da6c8384817ec28ac1dd524bfc52..455bb53e58bed88edf4bf85a170981a7c460ca52 100644 (file)
--- a/plugins/personal/connectivity/class_proxyAccount.inc
+++ b/plugins/personal/connectivity/class_proxyAccount.inc
@@ -301,7 +301,7 @@ class proxyAccount extends plugin
 
   /* Return plugin informations for acl handling 
       #FIME There possibly some attributes that can be combined to one acl. */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"     => _("Proxy"),

diff --git a/plugins/personal/connectivity/class_pureftpdAccount.inc b/plugins/personal/connectivity/class_pureftpdAccount.inc
index 669b818b966f2144bdb017e07631531f412658f0..68de2e881ddc885b734204660a79472a92888c7e 100644 (file)
--- a/plugins/personal/connectivity/class_pureftpdAccount.inc
+++ b/plugins/personal/connectivity/class_pureftpdAccount.inc
@@ -228,7 +228,7 @@ class pureftpdAccount extends plugin
 
   /* Return plugin informations for acl handling
   #FIME There possibly some attributes that can be combined to one acl. */
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"     => _("Ftp"),

diff --git a/plugins/personal/connectivity/class_webdavAccount.inc b/plugins/personal/connectivity/class_webdavAccount.inc
index 401648a9f41982f04dc2ce533e894a8ffc80a7c7..59fdb60ef8ce24000dbdc102a315a9ae81be5242 100644 (file)
--- a/plugins/personal/connectivity/class_webdavAccount.inc
+++ b/plugins/personal/connectivity/class_webdavAccount.inc
@@ -150,7 +150,7 @@ class webdavAccount extends plugin
 
   /* Return plugin informations for acl handling
       #FIXME This is only an enable/disable checkbox for this account, there is possibly a better solution available later */
-  function plInfo()
+  static function plInfo()
   {
     return (array(  
           "plShortName"     => _("WebDAV"),

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 8830c41919467fb43d9b3da84f5ed5dabf4e2082..0fa8a76daeeadd8f5d35688ff57e0d6a4fcffa69 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -1321,7 +1321,7 @@ class environment extends plugin
 
   /* Return plugin informations for acl handling 
 #FIXME these ACLs should work for groups too */ 
-  function plInfo()
+  static function plInfo()
   {
     return (array("plShortName"     => _("Environment"),
           "plDescription"   => _("Environment settings"),         // Description

diff --git a/plugins/personal/environment/environment.tpl b/plugins/personal/environment/environment.tpl
index 4a24b3571b80d8b5998e5744611fb4c93e924a8b..952f722543060bf0d7599291d9f402eca73c7cb3 100644 (file)
--- a/plugins/personal/environment/environment.tpl
+++ b/plugins/personal/environment/environment.tpl
@@ -110,7 +110,7 @@
      <td colspan=2>
       <br>
 {render acl=$gotoProfileFlagLACL}
-      <input type="checkbox" name="gotoProfileFlagL" id="gotoProfileFlagL" value="L"  {$gotoProfileFlagLCHK}>
+      <input type="checkbox" name="gotoProfileFlagL" id="gotoProfileFlagL" value="L" {$gotoProfileFlagLCHK}>
 {/render}
       <label for="gotoProfileFlagL">{t}Resolution changeable during session{/t}</label>
      </td>

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index ea0c806374e587d0bb29568f255d55c0f99cec04..6437f1dd9452694874bc0cd197cce1aed39b6d9e 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -1350,7 +1350,7 @@ class user extends plugin
   }
 
 
-  function plInfo()
+  static function plInfo()
   {
   
     $govattrs= array(

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index cf0db85918cabde7edeeca1faa07a374f4dc199d..c696b7f02a0e4993e71ae4b6a536d4e5171de5e0 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -1134,7 +1134,7 @@ class mailAccount extends plugin
    }
 
 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"     => _("Mail"),

diff --git a/plugins/personal/nagios/class_nagiosAccount.inc b/plugins/personal/nagios/class_nagiosAccount.inc
index 804ba2ba05def039c5ea5e673ba4a754f11b5301..41b2de34c6a638b1c889ea7d12b1b5c92c1c6da7 100644 (file)
--- a/plugins/personal/nagios/class_nagiosAccount.inc
+++ b/plugins/personal/nagios/class_nagiosAccount.inc
@@ -269,7 +269,7 @@ class nagiosAccount extends plugin
 
 
 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"     => _("Nagios"),

diff --git a/plugins/personal/netatalk/class_netatalk.inc b/plugins/personal/netatalk/class_netatalk.inc
index 23af26f20ca4c29ebb6b77c36d2680791a3e3325..3693fda79f3ed68652febad185966cee8b28eac7 100644 (file)
--- a/plugins/personal/netatalk/class_netatalk.inc
+++ b/plugins/personal/netatalk/class_netatalk.inc
@@ -364,7 +364,7 @@ class netatalk extends plugin {
 
 
   /* Return plugin informations for acl handling*/
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plDescription"     => _("Netatalk"),

diff --git a/plugins/personal/password/class_password.inc b/plugins/personal/password/class_password.inc
index 330301a4d6ae48a992aab3208f64d09d6fbffeca..f9d5ac44a4b2cc2ef8944c17955dc2fe47f72e7c 100644 (file)
--- a/plugins/personal/password/class_password.inc
+++ b/plugins/personal/password/class_password.inc
@@ -134,7 +134,7 @@ class password extends plugin
   {
   }
 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plDescription"     => _("User password"),

diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index 427b4a433313ca43e972f3ee8fe051b7f21d85a5..1453f4570c3ad2020f87db02d831035a89af9f79 100644 (file)
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -1345,7 +1345,7 @@ class posixAccount extends plugin
   }
 
 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plDescription"     => _("POSIX account"),

diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index da4680a471203f0822ea8ff0d82772820bd0d462..bd71c8f7ae27eccddaee0e3891d5c1519dfc7e6e 100644 (file)
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -1100,7 +1100,7 @@ class sambaAccount extends plugin
   }
 
   
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plShortName"     => _("Samba"),

diff --git a/plugins/personal/scalix/class_scalixAccount.inc b/plugins/personal/scalix/class_scalixAccount.inc
index a69972fc93da3b416dce3a58fbddcc68cd76bdd3..2d85f0d889116ea31f3f3ece160904cdf6668d91 100644 (file)
--- a/plugins/personal/scalix/class_scalixAccount.inc
+++ b/plugins/personal/scalix/class_scalixAccount.inc
@@ -391,7 +391,7 @@ class scalixAccount extends plugin
   }
 
 
-  function plInfo()
+  static function plInfo()
   {
     return (array(
           "plDescription"     => _("Scalix account"),