From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 22 Nov 2007 15:36:39 +0000 (+0000)
Subject: Fixed a couple of static/non-static error messages
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=42b5b026ed7a219361e2813ed9b745848917a2ce;p=gosa.git

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 9bf8e6238..f5b26e32f 100644
--- 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 17ae13ff4..bcd2ccfb1 100644
--- 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 f2d01c51b..4440ab762 100644
--- 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 91d1e042c..67bb3455e 100644
--- 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 0785eaccf..5638ba624 100644
--- 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 2b914c552..3451f8179 100644
--- 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 b71b05c88..9d4a4aab2 100644
--- 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 3c436b7fb..8716ee7e9 100644
--- 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 3e34bfc79..6b1e6e46e 100644
--- 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 84debeff8..edbab55ee 100644
--- 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 a03ee5b0f..18bf440dc 100644
--- 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 88f199974..22fcf10be 100644
--- 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 c9f5d4241..9f11eb6b9 100644
--- 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 ba32c90e7..668da2f7a 100644
--- 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 46d582145..095adf7f3 100644
--- 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 32bdf685d..a4fdd5640 100644
--- 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 5a23ea497..84b326e71 100644
--- 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 f11e22407..1396a0a3d 100644
--- 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 605df4b52..840a5ae92 100644
--- 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 a16ac272b..031c5a4d4 100644
--- 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 e8ded4e3a..038e54e47 100644
--- 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 0f429041e..0e5cacffd 100644
--- 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 43741e45c..8a985da95 100644
--- 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 5e162f05d..032132920 100644
--- 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 540d51115..a9bfbb840 100644
--- 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 42923af35..7d8e5ed73 100644
--- 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 d661c8155..f2278b65e 100644
--- 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 9dea39748..c2eba3e00 100644
--- 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 2bcb8548e..5fc6ef01e 100644
--- 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 0a7574be7..12b80fab2 100644
--- 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 1ef173718..095d3be27 100644
--- 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 952aab3e5..be6f7b3fe 100644
--- 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 2e21c24f9..c96097586 100644
--- 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 7074f25a5..ebf569729 100644
--- 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 22699c893..e74b3985a 100644
--- 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 be7d69a11..f67ee78d8 100644
--- 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 1abaa0b03..53c59ecc8 100644
--- 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 1a0d15caa..8a65bdd8a 100644
--- 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 ece818669..e6411087a 100644
--- 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 6447d62ca..049249cd5 100644
--- 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 94f6d7fa4..6fa572b9d 100644
--- 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 de98a645f..1e5e04976 100644
--- 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 21a2659cb..2e69a849d 100644
--- 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 3ab952904..07c07d427 100644
--- 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 f8d9f7c26..e5681b942 100644
--- 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 cee4aa179..5b87b4e83 100644
--- 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 62bd889be..3eef127f4 100644
--- 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 4629410d4..c16df0387 100644
--- 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 464573297..3a193dbf2 100644
--- 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 99ee887fe..742249ef7 100644
--- 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 5a4f40f82..b179ae95b 100644
--- 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 6a9f8424c..354d78037 100644
--- 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 e62bb401b..82ff0fbaf 100644
--- 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 abeb947fe..9461977e2 100644
--- 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 a6dbcd5e6..e832de04c 100644
--- 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 0d7cd7159..f91c5f5ae 100644
--- 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 2e7c052b4..cade0e243 100644
--- 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 f3269eeb3..f169c0ec7 100644
--- 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 ec922b9fe..54092c670 100644
--- 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 9f6f93f90..c804ec2bc 100644
--- 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 fed9c92f7..13e7a9317 100644
--- 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 b46e85b29..9d29f5e59 100644
--- 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 7768f2563..7d31ff58d 100644
--- 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 c95860729..e1c9a2e05 100644
--- 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 0ee9980ea..52b153421 100644
--- 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 bcaaf8b87..34f553660 100644
--- 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 f129061de..be12d590e 100644
--- 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 ea2c8d7fe..49f804692 100644
--- 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 9185810d3..0174459e3 100644
--- 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 ef279f3ab..8a15e930c 100644
--- 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 eb3898345..14641c0b7 100644
--- 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 8bb55fb52..23698cf61 100644
--- 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 76ba599a5..ef10f4abb 100644
--- 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 8c7df5033..d054e3b6a 100644
--- 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 1376d088e..eca222857 100644
--- 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 b3628ad7a..41e0fc471 100644
--- 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 9d580039f..bae719aae 100644
--- 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 5bd788c36..a63a78f3e 100644
--- 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 660f40f78..dba57adb7 100755
--- 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 01abe960e..35b134d4f 100644
--- 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 95781eadf..c2b9573d3 100644
--- 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 413a20071..c72977de8 100644
--- 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 4c7dee76b..ff96e458e 100644
--- 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 f21e1e4eb..ce4288fbb 100644
--- 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 9a9457071..7c5cf6e2c 100644
--- 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 825df3d9b..41454ea7c 100644
--- 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 4fe717c81..0c8c659cf 100644
--- 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 e286cd66c..455bb53e5 100644
--- 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 669b818b9..68de2e881 100644
--- 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 401648a9f..59fdb60ef 100644
--- 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 8830c4191..0fa8a76da 100644
--- 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 4a24b3571..952f72254 100644
--- 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 ea0c80637..6437f1dd9 100644
--- 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 cf0db8591..c696b7f02 100644
--- 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 804ba2ba0..41b2de34c 100644
--- 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 23af26f20..3693fda79 100644
--- 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 330301a4d..f9d5ac44a 100644
--- 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 427b4a433..1453f4570 100644
--- 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 da4680a47..bd71c8f7a 100644
--- 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 a69972fc9..2d85f0d88 100644
--- 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"),