From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 19 Sep 2006 03:30:28 +0000 (+0000)
Subject: Added speed optimizations
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1a1cd62339c5c255de11b0d5b78649e067e7bc34;p=gosa.git

Added speed optimizations


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

diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index a81041c7d..02cb696f9 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -197,6 +197,7 @@ class LDAP{
         }
       }
 
+      $this->log("LDAP operation: time=".get_MicroTimeDiff($start,microtime())." operation=search('".$this->fix($this->basedn)."', '$filter')");
       return($this->sr);
     }else{
       $this->error = "Could not connect to LDAP server";
@@ -229,6 +230,8 @@ class LDAP{
         }
       }
 
+      $this->log("LDAP operation: time=".get_MicroTimeDiff($start,microtime())." operation=ls('".$this->fix($basedn)."', '$filter')");
+
       return($this->sr);
     }else{
       $this->error = "Could not connect to LDAP server";
@@ -1205,6 +1208,15 @@ class LDAP{
 	  return $objectclasses;
   }
 
+  function log($string)
+  {
+    if (isset($_SESSION['config'])){
+      $cfg= $_SESSION['config'];
+      if (isset($cfg->current['LDAPSTATS']) && preg_match('/true/i', $cfg->current['LDAPSTATS'])){
+        syslog (LOG_INFO, $string);
+      }
+    }
+  }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 24863ac16..239e89fc5 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -122,7 +122,7 @@ class plugin
     \param dn Distinguished name to initialize plugin from
     \sa plugin()
    */
-  function plugin ($config, $dn= NULL)
+  function plugin ($config, $dn= NULL, $parent= NULL)
   {
     /* Configuration is fine, allways */
     $this->config= $config;	
@@ -141,8 +141,12 @@ class plugin
     if ($dn != NULL){
 
       /* Load data to 'attrs' and save 'dn' */
-      $ldap->cat ($dn);
-      $this->attrs= $ldap->fetch();
+      if ($parent != NULL){
+        $this->attrs= $parent->attrs;
+      } else {
+        $ldap->cat ($dn);
+        $this->attrs= $ldap->fetch();
+      }
 
       /* Copy needed attributes */
       foreach ($this->attributes as $val){
diff --git a/include/class_tabs.inc b/include/class_tabs.inc
index 0b422970e..c71fa9492 100644
--- a/include/class_tabs.inc
+++ b/include/class_tabs.inc
@@ -38,10 +38,19 @@ class tabs
 	/* Save dn */
 	$this->dn= $dn;
 	$this->config= $config;
+	
+	$baseobject= NULL;
 
 	foreach ($data as $tab){
 		$this->by_name[$tab['CLASS']]= $tab['NAME'];
-		$this->by_object[$tab['CLASS']]= new $tab['CLASS']($this->config, $this->dn);
+
+		if ($baseobject == NULL){
+			$baseobject= new $tab['CLASS']($this->config, $this->dn);
+			$this->by_object[$tab['CLASS']]= $baseobject;
+		} else {
+			$this->by_object[$tab['CLASS']]= new $tab['CLASS']($this->config, $this->dn, $baseobject);
+		}
+
 		$this->by_object[$tab['CLASS']]->parent= &$this;
 		$this->by_object[$tab['CLASS']]->set_acl_category($acl_category);
 
diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc
index c483bb97d..21c7de461 100644
--- a/plugins/admin/applications/class_applicationGeneric.inc
+++ b/plugins/admin/applications/class_applicationGeneric.inc
@@ -28,9 +28,9 @@ class application extends plugin
 
   var $isReleaseApplikation = false;
 
-  function application ($config, $dn= NULL)
+  function application ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     $tmp = search_config($this->config->data,"faiManagement","CLASS");
     if(!empty($tmp)) {
diff --git a/plugins/admin/applications/class_applicationParameters.inc b/plugins/admin/applications/class_applicationParameters.inc
index d65636b2e..5543b486c 100644
--- a/plugins/admin/applications/class_applicationParameters.inc
+++ b/plugins/admin/applications/class_applicationParameters.inc
@@ -14,9 +14,9 @@ class applicationParameters extends plugin
   var $attributes= array("gosaApplicationParameter");
   var $objectclasses= array();
 
-  function applicationParameters ($config, $dn= NULL)
+  function applicationParameters ($config, $dn= NULL, $parent= NULL)
   {
-	plugin::plugin ($config, $dn);
+	plugin::plugin ($config, $dn, $parent);
 
 	$this->gosaApplicationParameter = array();
 
diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc
index b1f0ddadc..8166af28c 100644
--- a/plugins/admin/groups/class_groupApplication.inc
+++ b/plugins/admin/groups/class_groupApplication.inc
@@ -39,7 +39,7 @@ class appgroup extends plugin
   var $gosaApplicationParameter ;
 
 
-  function appgroup ($config, $dn= NULL)
+  function appgroup ($config, $dn= NULL, $parent= NULL)
   {
    
     /* prepare group app for release management */ 
@@ -50,7 +50,7 @@ class appgroup extends plugin
       $this->attributes[] =  "FAIrelease";
     }
 
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     /* In some case of old applikations with old release tag saving, we 
         must reassign is_account state.
diff --git a/plugins/admin/ogroups/class_mailogroup.inc b/plugins/admin/ogroups/class_mailogroup.inc
index aeed8a0c3..cddc5b07d 100644
--- a/plugins/admin/ogroups/class_mailogroup.inc
+++ b/plugins/admin/ogroups/class_mailogroup.inc
@@ -12,9 +12,9 @@ class mailogroup extends plugin
   var $members= array();
 
 
-  function mailogroup ($config, $dn= NULL)
+  function mailogroup ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin($config, $dn);
+    plugin::plugin($config, $dn, $parent);
 
     /* Include config object */
     $this->config= $config;
diff --git a/plugins/admin/ogroups/class_termgroup.inc b/plugins/admin/ogroups/class_termgroup.inc
index 7e3137389..b60800884 100644
--- a/plugins/admin/ogroups/class_termgroup.inc
+++ b/plugins/admin/ogroups/class_termgroup.inc
@@ -25,13 +25,13 @@ class termgroup extends plugin
                             "memcheck"        => "memcheck",
                             "sysinfo"         => "sysinfo");
 
-  function termgroup ($config, $dn= NULL)
+  function termgroup ($config, $dn= NULL, $parent= NULL)
   {
     /***************
       Some  initialisations
      ***************/
 
-    plugin::plugin($config, $dn);
+    plugin::plugin($config, $dn, $parent);
 
     $ldap= $config->get_ldap_link();
 
diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc
index a6d93bb19..c11888fe8 100644
--- a/plugins/admin/systems/class_componentGeneric.inc
+++ b/plugins/admin/systems/class_componentGeneric.inc
@@ -22,9 +22,9 @@ class componentGeneric extends plugin
   var $objectclasses= array("top", "device", "ipHost", "ieee802Device");
   var $netConfigDNS;
 
-  function componentgeneric ($config, $dn= NULL)
+  function componentgeneric ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     /* Set base */
     if ($this->dn == "new"){
diff --git a/plugins/admin/systems/class_glpiAccount.inc b/plugins/admin/systems/class_glpiAccount.inc
index ead5893ff..b5837b86c 100644
--- a/plugins/admin/systems/class_glpiAccount.inc
+++ b/plugins/admin/systems/class_glpiAccount.inc
@@ -64,9 +64,9 @@ class glpiAccount extends plugin
   /* Contructor 
      Sets default values and checks if we already have an existing glpi account
    */
-  function glpiAccount ($config, $dn= NULL)
+  function glpiAccount ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
     $this->ui= get_userinfo();
 
     /* Abort class construction, if no db is defined */
diff --git a/plugins/admin/systems/class_glpiManufacturer.inc b/plugins/admin/systems/class_glpiManufacturer.inc
index 120818a5d..9ae1ea800 100644
--- a/plugins/admin/systems/class_glpiManufacturer.inc
+++ b/plugins/admin/systems/class_glpiManufacturer.inc
@@ -28,9 +28,9 @@ class glpiManufacturer extends plugin
   var $email      ="";
   var $ID         =-1;
 
-  function glpiManufacturer($config, $dn= NULL)
+  function glpiManufacturer($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
     $this->ui = get_userinfo();  
   }
 
diff --git a/plugins/admin/systems/class_glpiPrinterAccount.inc b/plugins/admin/systems/class_glpiPrinterAccount.inc
index 5af98b686..b9a009d04 100644
--- a/plugins/admin/systems/class_glpiPrinterAccount.inc
+++ b/plugins/admin/systems/class_glpiPrinterAccount.inc
@@ -69,9 +69,9 @@ class glpiPrinterAccount extends plugin
   /* Contructor 
      Sets default values and checks if we already have an existing glpi account
    */
-  function glpiPrinterAccount ($config, $dn= NULL)
+  function glpiPrinterAccount ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
     $this->ui= get_userinfo();
 
     $this->is_account = false;
diff --git a/plugins/admin/systems/class_goSpamServer.inc b/plugins/admin/systems/class_goSpamServer.inc
index a9762a5b7..1d4771220 100644
--- a/plugins/admin/systems/class_goSpamServer.inc
+++ b/plugins/admin/systems/class_goSpamServer.inc
@@ -40,10 +40,10 @@ class gospamserver extends plugin{
   var $ui               = NULL;
   var $acl              = NULL;
 
-  function gospamserver($config,$dn)
+  function gospamserver($config,$dn, $parent= NULL)
   {
     /* Init class */
-    plugin::plugin($config,$dn);
+    plugin::plugin($config,$dn, $parent);
     $this->DisplayName = _("Spamassassin");
 
     /* Get userinfo & acls */
diff --git a/plugins/admin/systems/class_goVirusServer.inc b/plugins/admin/systems/class_goVirusServer.inc
index ad549c62f..6335956b7 100644
--- a/plugins/admin/systems/class_goVirusServer.inc
+++ b/plugins/admin/systems/class_goVirusServer.inc
@@ -39,10 +39,10 @@ class govirusserver extends plugin{
   var $avHttpProxyURL               = "";
   var $avDatabaseMirror             = "";
 
-  function govirusserver($config,$dn)
+  function govirusserver($config,$dn, $parent= NULL)
   {
     /* Init class */
-    plugin::plugin($config,$dn);
+    plugin::plugin($config,$dn, $parent);
     $this->DisplayName = _("Anti virus");
 
     /* Get userinfo & acls */
diff --git a/plugins/admin/systems/class_inventory.inc b/plugins/admin/systems/class_inventory.inc
index e23eeddd2..c0ec0e685 100644
--- a/plugins/admin/systems/class_inventory.inc
+++ b/plugins/admin/systems/class_inventory.inc
@@ -12,9 +12,9 @@ class inventory extends plugin
   var $attributes= array();
   var $objectclasses= array("whatever");
 
-  function inventory ($config, $dn= NULL)
+  function inventory ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
   }
 
   function execute()
diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc
index 88e931528..2a98149b2 100644
--- a/plugins/admin/systems/class_phoneGeneric.inc
+++ b/plugins/admin/systems/class_phoneGeneric.inc
@@ -53,9 +53,9 @@ class phoneGeneric extends plugin
 
   var $objectclasses= array("top", "goFonHardware");
 
-  function phonegeneric ($config, $dn= NULL)
+  function phonegeneric ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
     $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses, true);
 
     /* Set base */
diff --git a/plugins/admin/systems/class_servDHCP.inc b/plugins/admin/systems/class_servDHCP.inc
index 8b4e9a878..f841affd6 100644
--- a/plugins/admin/systems/class_servDHCP.inc
+++ b/plugins/admin/systems/class_servDHCP.inc
@@ -12,9 +12,9 @@ class servdhcp extends plugin
   var $attributes= array();
   var $objectclasses= array("whatever");
 
-  function servdhcp ($config, $dn= NULL)
+  function servdhcp ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
   }
 
   function execute()
diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc
index f44efc030..997a8ad00 100644
--- a/plugins/admin/systems/class_servDNS.inc
+++ b/plugins/admin/systems/class_servDNS.inc
@@ -25,9 +25,9 @@ class servdns extends plugin
   var $DisplayName      = "";
   var $StatusFlag       = "";
 
-  function servdns ($config, $dn= NULL)
+  function servdns ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     $this->DisplayName = _("Domain name system service");
 
diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc
index 38bcccb65..3e616ebec 100644
--- a/plugins/admin/systems/class_servGeneric.inc
+++ b/plugins/admin/systems/class_servGeneric.inc
@@ -36,9 +36,9 @@ class servgeneric extends plugin
                             "memcheck"        => "memcheck",
                             "sysinfo"         => "sysinfo");
 
-  function servgeneric ($config, $dn= NULL)
+  function servgeneric ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     $this->modes["active"]= _("Activated");
     $this->modes["locked"]= _("Locked");
diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index a2c9ffef7..e7b78bf03 100644
--- a/plugins/admin/systems/class_servKolab.inc
+++ b/plugins/admin/systems/class_servKolab.inc
@@ -40,14 +40,14 @@ class servkolab extends plugin {
   var $DisplayName  = "Kolab mail service";
   var $StatusFlag   = "";
 
-  function servkolab($config, $dn = NULL) 
+  function servkolab($config, $dn = NULL, $parent= NULL) 
   {
     /* Setting the hostname and tell this Plugin that we are the kolab extension*/
     $this->hostname = preg_replace('/^cn=([^,]+),.*$/', '\1', $dn);
     $this->dn       = "k=kolab,".$config->current['BASE'];
 
     /* Load variables, if given*/
-    plugin::plugin($config, $this->dn);
+    plugin::plugin($config, $this->dn, $parent);
 
     /* Copy needed attributes */
     foreach($this->attributes as $val) {
diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/class_servRepository.inc
index 961c49a59..b49778d17 100644
--- a/plugins/admin/systems/class_servRepository.inc
+++ b/plugins/admin/systems/class_servRepository.inc
@@ -28,9 +28,9 @@ class servrepository extends plugin
   var $StatusFlag            = "";
 
 
-  function servrepository ($config, $dn= NULL)
+  function servrepository ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     $this->DisplayName = _("Repository service");
 
diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 6fbf1bd85..69a5872fd 100644
--- a/plugins/admin/systems/class_terminalGeneric.inc
+++ b/plugins/admin/systems/class_terminalGeneric.inc
@@ -56,9 +56,9 @@ class termgeneric extends plugin
                             "sysinfo"         => "sysinfo");
 
 
-  function termgeneric ($config, $dn= NULL)
+  function termgeneric ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
     $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
     /* Read arrays */
     foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
diff --git a/plugins/admin/systems/class_terminalInfo.inc b/plugins/admin/systems/class_terminalInfo.inc
index 97a3ef362..c51b7846f 100644
--- a/plugins/admin/systems/class_terminalInfo.inc
+++ b/plugins/admin/systems/class_terminalInfo.inc
@@ -35,9 +35,9 @@ class terminfo extends plugin
       "ghGfxAdapter", "ghSoundAdapter", "gotoLastUser");
   var $objectclasses= array("GOhard");
 
-  function terminfo ($config, $dn= NULL)
+  function terminfo ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     /* Read arrays */
     foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
diff --git a/plugins/admin/systems/class_terminalService.inc b/plugins/admin/systems/class_terminalService.inc
index 43cf9b1a7..7ffe10bce 100644
--- a/plugins/admin/systems/class_terminalService.inc
+++ b/plugins/admin/systems/class_terminalService.inc
@@ -62,9 +62,9 @@ class termservice extends plugin
   var $objectclasses= array("GOhard");
 
 
-  function termservice ($config, $dn= NULL)
+  function termservice ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
     
     array_unshift($this->XDrivers, "["._("unknown")."]");
     
diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index ccfaa3828..3fce2c28e 100644
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -32,9 +32,9 @@ class termstartup extends plugin
   var $orig_dn= "";
   var $ignore_account= TRUE;
 
-  function termstartup ($config, $dn= NULL)
+  function termstartup ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     $this->gotoBootKernels = array("default-inherit"=>"["._("inherited")."]");
 
diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc
index 01fbbef1a..30a0939dc 100644
--- a/plugins/admin/systems/class_winGeneric.inc
+++ b/plugins/admin/systems/class_winGeneric.inc
@@ -45,9 +45,9 @@ class wingeneric extends plugin
   var $objectclasses= array("posixAccount","person","organizationalPerson","inetOrgPerson","gosaAccount","shadowAccount","sambaSamAccount","top");
 
 
-  function wingeneric ($config, $dn= NULL)
+  function wingeneric ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
     $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
     /* Set base */
     if ($this->dn == "new"){
diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index 86e394bb8..0cd3d3191 100644
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -60,9 +60,9 @@ class workgeneric extends plugin
 
 
 
-  function workgeneric ($config, $dn= NULL)
+  function workgeneric ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
     $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
 
     /* Read arrays */
diff --git a/plugins/admin/systems/class_workstationService.inc b/plugins/admin/systems/class_workstationService.inc
index 5684cbad9..16b903999 100644
--- a/plugins/admin/systems/class_workstationService.inc
+++ b/plugins/admin/systems/class_workstationService.inc
@@ -58,9 +58,9 @@ class workservice extends plugin
   var $XKbLayouts       =array();
   var $XKbVariants      =array();
 
-  function workservice ($config, $dn= NULL)
+  function workservice ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     $this->XResolutions= array( 
         "640x480"   =>  "640x480",
diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 6554f70c4..abc7ca682 100644
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -50,9 +50,9 @@ class workstartup extends plugin
   /* Contains all possible server/release/class settings */
   var $FAIServRepConfig   = array();
 
-  function workstartup ($config, $dn= NULL)
+  function workstartup ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     /* Creating a list of valid Mirrors 
      * none will not be saved to ldap.
diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index 5b4716402..1e9340b23 100644
--- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
@@ -63,9 +63,9 @@ class conference extends plugin
 
   var $objectclasses= array("top", "goFonConference");
 
-  function conference ($config, $dn)
+  function conference ($config, $dn, $plugin= NULL)
   {
-    plugin::plugin($config, $dn);
+    plugin::plugin($config, $dn, $plugin);
     $this->is_account	= TRUE;
     $this->ui			= get_userinfo();
     $this->dn			= $dn;
diff --git a/plugins/gofon/macro/class_gofonMacro.inc b/plugins/gofon/macro/class_gofonMacro.inc
index 22c179f16..60d0f5284 100755
--- a/plugins/gofon/macro/class_gofonMacro.inc
+++ b/plugins/gofon/macro/class_gofonMacro.inc
@@ -50,9 +50,9 @@ class macro extends plugin
 
   //! The Konstructor   
   /*!  Konstructor, load class with  attributes of the given dn*/
-  function macro ($config, $dn= NULL)
+  function macro ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     $ldap= $config->get_ldap_link();
 
diff --git a/plugins/gofon/macro/class_gofonMacroParameters.inc b/plugins/gofon/macro/class_gofonMacroParameters.inc
index 4463afd70..cafc1da01 100755
--- a/plugins/gofon/macro/class_gofonMacroParameters.inc
+++ b/plugins/gofon/macro/class_gofonMacroParameters.inc
@@ -42,9 +42,9 @@ class macroParameter extends plugin
      - Set attributes from openldap (edit)
      - Set attributes from default (new)
   */
-  function macroParameter ($config, $dn= NULL)
+  function macroParameter ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     $tmp = array();  // temporary Var 
     $tmp2 = array(); // temporary Var ...
diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index ee0aefa6e..ace7564f7 100644
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -42,9 +42,9 @@ class phoneAccount extends plugin
 
   var $uid ="";
 
-  function phoneAccount ($config, $dn= NULL)
+  function phoneAccount ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     /* Set uid, it is used in handle_post_events */    
     if(isset($this->attrs['uid'])){
diff --git a/plugins/personal/connectivity/class_connectivity.inc b/plugins/personal/connectivity/class_connectivity.inc
index 036209a90..22427cb52 100644
--- a/plugins/personal/connectivity/class_connectivity.inc
+++ b/plugins/personal/connectivity/class_connectivity.inc
@@ -25,7 +25,7 @@ class connectivity extends plugin
   var $CopyPasteVars = array("plugin","plugin_name");
 
 
-  function connectivity ($config, $dn= NULL)
+  function connectivity ($config, $dn= NULL,$parent =NULL)
   {
     /* Preseed permissions */
     $this->dn= $dn;
@@ -35,7 +35,7 @@ class connectivity extends plugin
     foreach ($config->data['TABS']['CONNECTIVITY'] as $plug){
       $name= $plug['CLASS'];
       $this->plugin_name[]= $name;
-      $this->plugin[$name]= new $name($config, $dn);
+      $this->plugin[$name]= new $name($config, $dn,$parent);
 
       /* Acl base && category configuration, 
           these settings will be overloaded in main.inc, 
diff --git a/plugins/personal/connectivity/class_intranetAccount.inc b/plugins/personal/connectivity/class_intranetAccount.inc
index 3e16448bc..c7555eb86 100644
--- a/plugins/personal/connectivity/class_intranetAccount.inc
+++ b/plugins/personal/connectivity/class_intranetAccount.inc
@@ -31,9 +31,9 @@ class intranetAccount extends plugin
     \version 1.00
     \date    1.07.2005
    */
-  function intranetAccount ($config, $dn= NULL)
+  function intranetAccount ($config, $dn= NULL, $parent=NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn,$parent);
 
      /* Setting uid to default */
      if(isset($this->attrs['uid'][0])){
diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 55fd229c9..2874156a4 100644
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -23,9 +23,9 @@ class kolabAccount extends plugin
 
   var $uid = "";
 
-  function kolabAccount ($config, $dn= NULL)
+  function kolabAccount ($config, $dn= NULL,$parent = NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     /* Setting uid to default */
     if(isset($this->attrs['uid'][0])){
diff --git a/plugins/personal/connectivity/class_pureftpdAccount.inc b/plugins/personal/connectivity/class_pureftpdAccount.inc
index 854797e06..a1c3f59fe 100644
--- a/plugins/personal/connectivity/class_pureftpdAccount.inc
+++ b/plugins/personal/connectivity/class_pureftpdAccount.inc
@@ -25,9 +25,9 @@ class pureftpdAccount extends plugin
   var $objectclasses= array("PureFTPdUser");
   var $ReadOnly;
 
-  function pureftpdAccount ($config, $dn= NULL)
+  function pureftpdAccount ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
     
     /* Setting uid to default */
     if(isset($this->attrs['uid'][0])){