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 a81041c7dbe570671515b3affca9c36860c14c06..02cb696f9ad6a50966b94f2d22478350952a89ed 100644 (file)
--- 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 24863ac16eb744738e38fdaea9bd1db22f7c90e1..239e89fc5eea63d5f47a4ce629088f543e2da9d2 100644 (file)
--- 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 0b422970e096bb4337ba4bf2e8bb2b7928a421d2..c71fa94920e3988584c1371a0642647d7e7d1145 100644 (file)
--- 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 c483bb97d3e71f8fb6338caed3e79767b3e5e848..21c7de4619e8b865518b9028eb6a6724a3f2be06 100644 (file)
--- 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 d65636b2e15f142cbe12a7087a9333f67634572d..5543b486c9173235496e40095cd35e3f8dbc3a57 100644 (file)
--- 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 b1f0ddadc6768ac354acb60fc84bed6a59b0a512..8166af28ccfba2cefc2b37966d609bde1f31baa3 100644 (file)
--- 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 aeed8a0c35a3b872e61f3bb0138a81c844a34aac..cddc5b07d2c13cc15a6a1e237cf45c467c1f53c7 100644 (file)
--- 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 7e3137389690d1e548b797ca2859d406941b2374..b60800884be2fc3e6b6d709d629502c085e25860 100644 (file)
--- 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 a6d93bb19da55c382f71a951f75871186f52e5c4..c11888fe8ec289a6ff0f87c6f46ffaee17d8f8bd 100644 (file)
--- 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 ead5893ff0ddff27311e1940b62fa900aa6f6a93..b5837b86cccf35c13ba41cb0cb6a0350c5e2da5d 100644 (file)
--- 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 120818a5ddc7839b1b52c753c21d7da1ec59d8de..9ae1ea8003b2c5214d303c747443f7c15d41a05b 100644 (file)
--- 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 5af98b686c62eef30c23c5fa26c8530a1e4aba1a..b9a009d04f10f93887eff813c3efb73818541f0f 100644 (file)
--- 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 a9762a5b7f8c71e0eea51998942bb4916bb5f411..1d47712203a724b0c2a3380daa0d805a23dc0923 100644 (file)
--- 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 ad549c62f2714b05ccc04dc951d9d745817160eb..6335956b77b66de5c1cf303d6658c38a8f3b28e2 100644 (file)
--- 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 e23eeddd288a3b4a6ee360a489e03587ed08f6d2..c0ec0e685226b1e74e493e3d2f6467b168996cc8 100644 (file)
--- 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 88e931528fb9b98d3171bd0d2b2e45c2d7f88d02..2a98149b2c37c476b98104ca4a20dc6d2f196861 100644 (file)
--- 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 8b4e9a878f59c41dd2a5f7f8937c2206a35308f1..f841affd653cd372ca09f8967b4944c43d0de81d 100644 (file)
--- 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 f44efc0301f8bff96ea7e2d29dbfcb86587ad76c..997a8ad00fc0efbb481707c4cc0c3e86d76b1c71 100644 (file)
--- 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 38bcccb65473bf55e68656c26b026aa0bf8edef6..3e616ebece1d22b97ac215a65103e6a319b103ae 100644 (file)
--- 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 a2c9ffef71e4fad997bed7878304d7396d16268a..e7b78bf035d34de914ed4fa688f374d36604e4cd 100644 (file)
--- 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 961c49a59b204dd0bd7813c9e0feb612bcf4af7b..b49778d17393c24028ecd8c98d45729196157267 100644 (file)
--- 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 6fbf1bd8518c0803bd27ea9cb646a0f443e7631f..69a5872fd5e2b2ab5a6222322f157d5f4e920c20 100644 (file)
--- 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 97a3ef362ed2f3ee9ff2fda54e92750d2baafb0b..c51b7846fb5d29864952169debd246e815cf2175 100644 (file)
--- 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 43cf9b1a79e6997e22f7516340ca1d31f85b3b66..7ffe10bce62b4bc5a08b6b1e693473e8f357a3dd 100644 (file)
--- 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 ccfaa3828c57eefd01e4a17e4418c8d2ed241c8d..3fce2c28eb823e94cb807751173986d660039fbe 100644 (file)
--- 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 01fbbef1a136f6034b291ba8d4e77496b3dbbb4a..30a0939dc5a5274bda51f6d6ee18ce4dde18ee7f 100644 (file)
--- 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 86e394bb88bef34fb4f58ab3b4d038b88b370646..0cd3d31912a2d4e32ffbc4c9d7d5c01fa903ac34 100644 (file)
--- 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 5684cbad93ce65567540527864e17b7bc4451261..16b9039996f2610cb59f58eaabae255803b618e3 100644 (file)
--- 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 6554f70c4851eb8bf5b508a5c524e93d41d90b3c..abc7ca682b5328764ebb7f5f22b0984f745ea2c0 100644 (file)
--- 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 5b4716402cf0021e60091f0a83f99abe78697db8..1e9340b23ecff51557c265f922877ceb9f6d22b5 100644 (file)
--- 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 22c179f161bb535a14c30ecf7200f5287118ebcf..60d0f52847769772f54c617b9f21ce5d131e7dea 100755 (executable)
--- 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 4463afd706b59e6fb20edd7be894f60ab10021d7..cafc1da0133b10c0d9d6ee0b904cd589c49f1f96 100755 (executable)
--- 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 ee0aefa6ef0571d9423fd4d388e57a927df87ebc..ace7564f796571c56284555e3b30d727acd8b493 100644 (file)
--- 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 036209a90b31e104c189fb0864d21f35b8a9d0ff..22427cb5218e254a9b6bea01a25f03ca5ba7aa38 100644 (file)
--- 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 3e16448bcb7cbfd1f65d5ad59797b097960b9518..c7555eb86e93f0a15bbf6a7519e2e88efee6c0f3 100644 (file)
--- 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 55fd229c96de828b4a95ce53b69fd4b67687aeaa..2874156a4d905817879f9652d94027a67a4dad9c 100644 (file)
--- 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 854797e0629c1b710939fd6f035456d6b937bbfc..a1c3f59fe5322388dcfc4604ee2131447bb4181d 100644 (file)
--- 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])){