From: cajus Date: Mon, 18 Sep 2006 11:24:26 +0000 (+0000) Subject: More speed optimizations X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4f507bf6c24fd9a5c50928b3a0c334ba5529c42d;p=gosa.git More speed optimizations git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@4712 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/include/class_plugin.inc b/include/class_plugin.inc index d1af40e85..8be727a5b 100644 --- a/include/class_plugin.inc +++ b/include/class_plugin.inc @@ -114,7 +114,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; @@ -130,8 +130,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 5c3204571..caadc2c57 100644 --- a/include/class_tabs.inc +++ b/include/class_tabs.inc @@ -32,18 +32,20 @@ class tabs var $by_object= array(); var $SubDialog = false; - function tabs($config, $data, $dn, $gui= true) + function tabs($config, $data, $dn) { /* Save dn */ $this->dn= $dn; $this->config= $config; + $baseobject= NULL; foreach ($data as $tab){ $this->by_name[$tab['CLASS']]= $tab['NAME']; - if ($gui){ - $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, false); + $this->by_object[$tab['CLASS']]= new $tab['CLASS']($this->config, $this->dn, $baseobject); } $this->by_object[$tab['CLASS']]->parent= &$this; diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc index 42626b91e..a2f7acccf 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 426bbf190..07bb051e1 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_groupAcl.inc b/plugins/admin/groups/class_groupAcl.inc index 01e05a0de..233e59b69 100644 --- a/plugins/admin/groups/class_groupAcl.inc +++ b/plugins/admin/groups/class_groupAcl.inc @@ -26,9 +26,9 @@ class acl extends plugin var $attributes= array("gosaSubtreeACL"); var $objectclasses= array("gosaObject"); - function acl ($config, $dn= NULL) + function acl ($config, $dn= NULL, $parent= NULL) { - plugin::plugin($config, $dn); + plugin::plugin($config, $dn, $parent); /* WorkAround */ include "acl_definition.inc"; diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index 80839ce16..4a4fde162 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/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc index e1a3ca488..f25a036f1 100644 --- a/plugins/admin/groups/class_groupGeneric.inc +++ b/plugins/admin/groups/class_groupGeneric.inc @@ -45,9 +45,9 @@ class group extends plugin var $attributes= array("cn", "description", "gidNumber","memberUid","sambaGroupType","sambaSID"); var $objectclasses= array("top", "posixGroup"); - function group ($config, $dn= NULL) + function group ($config, $dn= NULL, $parent= NULL) { - plugin::plugin ($config, $dn); + plugin::plugin ($config, $dn, $parent); /* Load attributes depending on the samba version */ $this->samba3= ($config->current['SAMBAVERSION'] == 3); diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc index d42c233e8..31557a6c4 100644 --- a/plugins/admin/groups/class_groupMail.inc +++ b/plugins/admin/groups/class_groupMail.inc @@ -55,11 +55,11 @@ class mailgroup extends plugin var $objectclasses= array("gosaMailAccount"); - function mailgroup ($config, $dn= NULL, $ui= NULL) + function mailgroup ($config, $dn= NULL, $parent= NULL) { /* Initialise all available attributes ... if possible */ - plugin::plugin($config, $dn); + plugin::plugin($config, $dn, $parent); /* Set mailMethod to the one defined in gosa.conf */ diff --git a/plugins/admin/groups/tabs_group.inc b/plugins/admin/groups/tabs_group.inc index 8357a0e42..a4d0279db 100644 --- a/plugins/admin/groups/tabs_group.inc +++ b/plugins/admin/groups/tabs_group.inc @@ -3,9 +3,9 @@ class grouptabs extends tabs { - function grouptabs($config, $data, $dn, $gui= true) + function grouptabs($config, $data, $dn) { - tabs::tabs($config, $data, $dn, $gui); + tabs::tabs($config, $data, $dn); $baseobject= $this->by_object['group']; foreach ($this->by_object as $name => $obj){ if(isset($obj->parent)){ diff --git a/plugins/admin/ogroups/class_mailogroup.inc b/plugins/admin/ogroups/class_mailogroup.inc index b13799aae..ed9d9ed6d 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 0a173556e..eb0db5799 100644 --- a/plugins/admin/ogroups/class_termgroup.inc +++ b/plugins/admin/ogroups/class_termgroup.inc @@ -28,13 +28,13 @@ class termgroup extends plugin "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 7d1e3fe86..46821aa95 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 2c909c690..9ff501913 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 ea5a02ef6..e44e000bd 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 be90e46e1..f3f1b3f46 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 24566d9f2..76718175b 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_servDB.inc b/plugins/admin/systems/class_servDB.inc index cd716eaf1..127558005 100644 --- a/plugins/admin/systems/class_servDB.inc +++ b/plugins/admin/systems/class_servDB.inc @@ -51,9 +51,9 @@ class servdb extends plugin "goFonServer" => array("goFonAdmin", "goFonPassword", "goFonAreaCode", "goFonCountryCode")); - function servdb ($config, $dn= NULL) + function servdb ($config, $dn= NULL, $parent= NULL) { - plugin::plugin ($config, $dn); + plugin::plugin ($config, $dn, $parent); /* Make dynamic list of objectClasses */ foreach ($this->additionaloc as $oc => $dummy){ diff --git a/plugins/admin/systems/class_servDHCP.inc b/plugins/admin/systems/class_servDHCP.inc index 8d468f948..f9d6fe1d6 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 9bc83feef..c109d44a6 100644 --- a/plugins/admin/systems/class_servDNS.inc +++ b/plugins/admin/systems/class_servDNS.inc @@ -21,9 +21,9 @@ class servdns extends plugin var $DNSinitially_was_account; - function servdns ($config, $dn= NULL) + function servdns ($config, $dn= NULL, $parent= NULL) { - plugin::plugin ($config, $dn); + plugin::plugin ($config, $dn, $parent); $this->orig_dn = $dn; diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc index 9c0f48cd1..d9e946a14 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 9d0d752c1..086bbd583 100644 --- a/plugins/admin/systems/class_servKolab.inc +++ b/plugins/admin/systems/class_servKolab.inc @@ -35,14 +35,14 @@ class servkolab extends plugin { "cyrus_quotawarn"); var $objectclasses = array("top", "kolab"); - 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 9a3114e80..98c8bcb92 100644 --- a/plugins/admin/systems/class_servRepository.inc +++ b/plugins/admin/systems/class_servRepository.inc @@ -22,9 +22,9 @@ class servrepository extends plugin var $repositories = array(); var $FAIrepository = array(); - function servrepository ($config, $dn= NULL) + function servrepository ($config, $dn= NULL, $parent= NULL) { - plugin::plugin ($config, $dn); + plugin::plugin ($config, $dn, $parent); $this->repositories = array(); if(isset($this->attrs['FAIrepository'])){ diff --git a/plugins/admin/systems/class_servService.inc b/plugins/admin/systems/class_servService.inc index c624e5e0b..091e98717 100644 --- a/plugins/admin/systems/class_servService.inc +++ b/plugins/admin/systems/class_servService.inc @@ -41,10 +41,10 @@ class servservice extends plugin var $mounts_to_remove = array(); var $oldone = NULL; //temp dave for old mount entry - function servservice ($config, $dn= NULL) + function servservice ($config, $dn= NULL, $parent= NULL) { - plugin::plugin ($config, $dn); + plugin::plugin ($config, $dn, $parent); $ldap = $this->config->get_ldap_link(); $avl_objectclasses = $ldap->get_objectclasses(); diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc index b3b38ac5f..f87becda7 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 c84058364..bd3ee4652 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 77e45245d..596cf2baf 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); /* Get arrays */ foreach (array("gotoModules") as $val){ diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc index ffd87eb9c..fc0191a72 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 6f0828838..9620d0592 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 7ba6be5e1..b8dbddd00 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 1b5be31a7..812a48982 100644 --- a/plugins/admin/systems/class_workstationStartup.inc +++ b/plugins/admin/systems/class_workstationStartup.inc @@ -51,9 +51,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/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc index c4cdf2a23..5232ca844 100644 --- a/plugins/gofax/faxaccount/class_gofaxAccount.inc +++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc @@ -45,10 +45,10 @@ class gofaxAccount extends plugin var $uid= ""; - function gofaxAccount ($config, $dn= NULL) + function gofaxAccount ($config, $dn= NULL, $parent) { /* General initialization */ - plugin::plugin ($config, $dn); + plugin::plugin ($config, $dn, $parent); /* Get user id */ if(isset($this->attrs['uid'])){ diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc index 49f08c236..cd62cf5c5 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 cabcb9a8b..bb2f3f2c0 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 d9d91bef6..803784026 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 44029b490..b5a5e22b3 100644 --- a/plugins/gofon/phoneaccount/class_phoneAccount.inc +++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc @@ -41,9 +41,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 phone hardware */ if (!isset($this->attrs['goFonHardware'])){ diff --git a/plugins/personal/connectivity/class_connectivity.inc b/plugins/personal/connectivity/class_connectivity.inc index bb705259c..74154e65f 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; @@ -36,7 +36,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); $this->plugin[$name]->acl= get_module_permission($acl, "$name", $ui->dn); } } diff --git a/plugins/personal/connectivity/class_intranetAccount.inc b/plugins/personal/connectivity/class_intranetAccount.inc index 325894392..1f475bf25 100644 --- a/plugins/personal/connectivity/class_intranetAccount.inc +++ b/plugins/personal/connectivity/class_intranetAccount.inc @@ -37,9 +37,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 34a8fd56c..080a498b2 100644 --- a/plugins/personal/connectivity/class_kolabAccount.inc +++ b/plugins/personal/connectivity/class_kolabAccount.inc @@ -26,9 +26,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_opengwAccount.inc b/plugins/personal/connectivity/class_opengwAccount.inc index a4b817d19..e33682c3e 100644 --- a/plugins/personal/connectivity/class_opengwAccount.inc +++ b/plugins/personal/connectivity/class_opengwAccount.inc @@ -38,9 +38,9 @@ class opengwAccount extends plugin var $OGWPassword = ""; var $uid =""; - function opengwAccount ($config, $dn= NULL) + function opengwAccount ($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_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc index 482a28c5d..d88b3801d 100644 --- a/plugins/personal/connectivity/class_oxchangeAccount.inc +++ b/plugins/personal/connectivity/class_oxchangeAccount.inc @@ -584,9 +584,9 @@ class oxchangeAccount extends plugin var $dnmode= ""; - function oxchangeAccount ($config, $dn= NULL) + function oxchangeAccount ($config, $dn= NULL, $parent= NULL) { - plugin::plugin ($config, $dn); + plugin::plugin ($config, $dn, $parent); for ($i=0;$iconfig->data['TABS']['CONNECTIVITY']);$i++){ if($this->config->data['TABS']['CONNECTIVITY'][$i]['CLASS']=='oxchangeAccount') { $this->oxconf=$this->config->data['TABS']['CONNECTIVITY'][$i]; diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc index d9d52b388..6dd83674c 100644 --- a/plugins/personal/connectivity/class_phpgwAccount.inc +++ b/plugins/personal/connectivity/class_phpgwAccount.inc @@ -21,9 +21,9 @@ class phpgwAccount extends plugin var $uid = ""; - function phpgwAccount ($config, $dn= NULL) + function phpgwAccount ($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_phpscheduleitAccount.inc b/plugins/personal/connectivity/class_phpscheduleitAccount.inc index 8a3868a85..073da05ca 100644 --- a/plugins/personal/connectivity/class_phpscheduleitAccount.inc +++ b/plugins/personal/connectivity/class_phpscheduleitAccount.inc @@ -36,9 +36,9 @@ class phpscheduleitAccount extends plugin var $attributes= array(); var $objectclasses= array("phpscheduleitAccount"); - function phpscheduleitAccount ($config, $dn= NULL) + function phpscheduleitAccount ($config, $dn= NULL, $parent= NULL) { - plugin::plugin ($config, $dn); + plugin::plugin ($config, $dn, $parent); } function execute() diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc index 85b1e6f6c..ba416e37c 100644 --- a/plugins/personal/connectivity/class_pptpAccount.inc +++ b/plugins/personal/connectivity/class_pptpAccount.inc @@ -37,9 +37,9 @@ class pptpAccount extends plugin var $uid =""; - function pptpAccount ($config, $dn= NULL) + function pptpAccount ($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_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc index 1f6fefff7..bf40e92e8 100644 --- a/plugins/personal/connectivity/class_proxyAccount.inc +++ b/plugins/personal/connectivity/class_proxyAccount.inc @@ -25,9 +25,9 @@ class proxyAccount extends plugin var $uid = ""; - function proxyAccount ($config, $dn= NULL) + function proxyAccount ($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 549bbf56c..ecb2e4125 100644 --- a/plugins/personal/connectivity/class_pureftpdAccount.inc +++ b/plugins/personal/connectivity/class_pureftpdAccount.inc @@ -29,9 +29,9 @@ class pureftpdAccount extends plugin "FTPUploadBandwidth","FTPDownloadBandwidth","FTPStatus","FTPuid","FTPgid"); var $objectclasses= array("PureFTPdUser"); - 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])){ diff --git a/plugins/personal/connectivity/class_webdavAccount.inc b/plugins/personal/connectivity/class_webdavAccount.inc index c87b4d9de..0edecd3bd 100644 --- a/plugins/personal/connectivity/class_webdavAccount.inc +++ b/plugins/personal/connectivity/class_webdavAccount.inc @@ -17,9 +17,9 @@ class webdavAccount extends plugin var $uid =""; - function webdavAccount ($config, $dn= NULL) + function webdavAccount ($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/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc index 6bc6cbd6e..8b06f7af1 100644 --- a/plugins/personal/environment/class_environment.inc +++ b/plugins/personal/environment/class_environment.inc @@ -74,9 +74,9 @@ class environment extends plugin var $cn; var $OrigCn; - function environment ($config, $dn= NULL) + function environment ($config, $dn= NULL, $parent= NULL) { - plugin::plugin ($config, $dn); + plugin::plugin ($config, $dn, $parent); /* Check : Are we currently editing a group or user dialog */ if((isset($this->attrs['cn'][0]))&&(!isset($this->attrs['uid'][0]))){ diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc index 77c7b489b..9f89c679e 100644 --- a/plugins/personal/mail/class_mailAccount.inc +++ b/plugins/personal/mail/class_mailAccount.inc @@ -65,10 +65,10 @@ class mailAccount extends plugin /* constructor, if 'dn' is set, the node loads the given 'dn' from LDAP */ - function mailAccount ($config, $dn= NULL) + function mailAccount ($config, $dn= NULL, $parent= NULL) { /* Load bases attributes */ - plugin::plugin($config, $dn); + plugin::plugin($config, $dn, $parent); if(isset($this->attrs['uid'])){ $this->uid = $this->attrs['uid'][0]; diff --git a/plugins/personal/nagios/class_nagiosAccount.inc b/plugins/personal/nagios/class_nagiosAccount.inc index a95f64aaf..ac489538a 100644 --- a/plugins/personal/nagios/class_nagiosAccount.inc +++ b/plugins/personal/nagios/class_nagiosAccount.inc @@ -63,12 +63,12 @@ class nagiosAccount extends plugin /* constructor, if 'dn' is set, the node loads the given 'dn' from LDAP */ - function nagiosAccount ($config, $dn= NULL) + function nagiosAccount ($config, $dn= NULL, $parent= NULL) { /* Configuration is fine, allways */ $this->config= $config; - plugin::plugin ($config, $dn); + plugin::plugin ($config, $dn, $parent); /* Set uid */ if(isset($this->attrs['uid'])){ diff --git a/plugins/personal/netatalk/class_netatalk.inc b/plugins/personal/netatalk/class_netatalk.inc index 73343859a..9af5e13f1 100644 --- a/plugins/personal/netatalk/class_netatalk.inc +++ b/plugins/personal/netatalk/class_netatalk.inc @@ -71,11 +71,11 @@ class netatalk extends plugin { var $uid =""; /* The constructor just saves a copy of the config. You may add what ever you need. */ - function netatalk($config, $dn = NULL) { + function netatalk($config, $dn = NULL, $parent= NULL) { /* Include config object */ $this->config = $config; - plugin :: plugin($config, $dn); + plugin::plugin($config, $dn, $parent); /* set user id */ if(isset($this->attrs['uid'])){ diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc index a79ba689c..ff4cef179 100644 --- a/plugins/personal/posix/class_posixAccount.inc +++ b/plugins/personal/posix/class_posixAccount.inc @@ -77,13 +77,13 @@ class posixAccount extends plugin /* constructor, if 'dn' is set, the node loads the given 'dn' from LDAP */ - function posixAccount ($config, $dn= NULL) + function posixAccount ($config, $dn= NULL, $parent= NULL) { /* Configuration is fine, allways */ $this->config= $config; /* Load bases attributes */ - plugin::plugin($config, $dn); + plugin::plugin($config, $dn, $parent); /* set user id */ if(isset($this->attrs['uid'])){ diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc index 883005925..8a7f5ab88 100644 --- a/plugins/personal/samba/class_sambaAccount.inc +++ b/plugins/personal/samba/class_sambaAccount.inc @@ -91,7 +91,7 @@ class sambaAccount extends plugin var $CopyPasteVars = array("kickoff_time_set","logoff_time_set","logon_time_set","mungedObject","orig_sambaDomainName"); - function sambaAccount ($config, $dn= NULL) + function sambaAccount ($config, $dn= NULL, $parent= NULL) { /* Load attributes depending on the samba version */ $this->samba3= ($config->current['SAMBAVERSION'] == 3); @@ -115,7 +115,7 @@ class sambaAccount extends plugin $this->objectclasses= array ("sambaAccount"); } - plugin::plugin ($config, $dn); + plugin::plugin ($config, $dn, $parent); /* set user id */ if(isset($this->attrs['uid'])){