From f621bf6a9170ea3aacbf5ed1380350ee0ef74fb8 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 29 Jun 2006 03:26:11 +0000 Subject: [PATCH] Fixed baseSelectDialog parameters git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3966 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../admin/applications/class_applicationGeneric.inc | 2 +- plugins/admin/departments/class_departmentGeneric.inc | 2 +- plugins/admin/groups/class_groupGeneric.inc | 2 +- plugins/admin/ogroups/class_ogroup.inc | 2 +- plugins/admin/systems/class_baseSelectDialog.inc | 10 +++++----- plugins/admin/systems/class_componentGeneric.inc | 2 +- plugins/admin/systems/class_phoneGeneric.inc | 2 +- plugins/admin/systems/class_printGeneric.inc | 2 +- plugins/admin/systems/class_servGeneric.inc | 2 +- plugins/admin/systems/class_terminalGeneric.inc | 2 +- plugins/admin/systems/class_winGeneric.inc | 2 +- plugins/admin/systems/class_workstationGeneric.inc | 2 +- plugins/gofax/blocklists/class_blocklistManagement.inc | 2 +- .../gofon/conference/class_phoneConferenceGeneric.inc | 2 +- plugins/gofon/macro/class_gofonMacro.inc | 2 +- plugins/personal/generic/class_user.inc | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc index bf90cea8c..a469fb26e 100644 --- a/plugins/admin/applications/class_applicationGeneric.inc +++ b/plugins/admin/applications/class_applicationGeneric.inc @@ -141,7 +141,7 @@ class application extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config); + $this->dialog = new baseSelectDialog($this->config,$this); $this->dialog->setCurrentBase($this->base); } } diff --git a/plugins/admin/departments/class_departmentGeneric.inc b/plugins/admin/departments/class_departmentGeneric.inc index 5205da944..d687ea112 100644 --- a/plugins/admin/departments/class_departmentGeneric.inc +++ b/plugins/admin/departments/class_departmentGeneric.inc @@ -97,7 +97,7 @@ class department extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config); + $this->dialog = new baseSelectDialog($this->config,$this); $this->dialog->setCurrentBase($this->base); } } diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc index 449ee54de..e2f6bd0a1 100644 --- a/plugins/admin/groups/class_groupGeneric.inc +++ b/plugins/admin/groups/class_groupGeneric.inc @@ -214,7 +214,7 @@ class group extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config); + $this->dialog = new baseSelectDialog($this->config,$this); $this->dialog->setCurrentBase($this->base); } } diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc index 461002c82..2e2faa8bc 100644 --- a/plugins/admin/ogroups/class_ogroup.inc +++ b/plugins/admin/ogroups/class_ogroup.inc @@ -181,7 +181,7 @@ class ogroup extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config); + $this->dialog = new baseSelectDialog($this->config,$this); $this->dialog->setCurrentBase($this->base); } } diff --git a/plugins/admin/systems/class_baseSelectDialog.inc b/plugins/admin/systems/class_baseSelectDialog.inc index 6739c1848..50fb1204d 100644 --- a/plugins/admin/systems/class_baseSelectDialog.inc +++ b/plugins/admin/systems/class_baseSelectDialog.inc @@ -4,19 +4,19 @@ class baseSelectDialog extends MultiSelectWindow { var $selectedBase = ""; // Used for navigation var $base_selection_regex = "*"; // Used regex ... -// var $Doesnothing = ""; // Checkbox which does nothing - var $BaseToUse = false; // used to specify the selected base, // false if none is selected var $allowedBases = array(); + var $parent = NULL; - function baseSelectDialog ($config,$onlyAllowThisBases = array()) + function baseSelectDialog ($config,$parent,$onlyAllowThisBases = array()) { MultiSelectWindow::MultiSelectWindow($config,"BASEselectWindow"); - + + $this->parent = $parent; + $this->selectedBase = $config->current['BASE']; - $this->allowedBases = $onlyAllowThisBases; $this->SetTitle("Base"); diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc index 7d1e3fe86..1d61176a1 100644 --- a/plugins/admin/systems/class_componentGeneric.inc +++ b/plugins/admin/systems/class_componentGeneric.inc @@ -56,7 +56,7 @@ class componentGeneric extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config); + $this->dialog = new baseSelectDialog($this->config,$this); $this->dialog->setCurrentBase($this->base); } } diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc index 24566d9f2..09949d694 100644 --- a/plugins/admin/systems/class_phoneGeneric.inc +++ b/plugins/admin/systems/class_phoneGeneric.inc @@ -111,7 +111,7 @@ class phoneGeneric extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config); + $this->dialog = new baseSelectDialog($this->config,$this); $this->dialog->setCurrentBase($this->base); } } diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc index 156dfd477..af71cf675 100644 --- a/plugins/admin/systems/class_printGeneric.inc +++ b/plugins/admin/systems/class_printGeneric.inc @@ -312,7 +312,7 @@ class printgeneric extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config); + $this->dialog = new baseSelectDialog($this->config,$this); $this->dialog->setCurrentBase($this->base); $this->baseSelection = true; } diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc index 9c0f48cd1..1ab22f202 100644 --- a/plugins/admin/systems/class_servGeneric.inc +++ b/plugins/admin/systems/class_servGeneric.inc @@ -118,7 +118,7 @@ class servgeneric extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config); + $this->dialog = new baseSelectDialog($this->config,$this); $this->dialog->setCurrentBase($this->base); } } diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc index 164c7db8f..98d7e0db9 100644 --- a/plugins/admin/systems/class_terminalGeneric.inc +++ b/plugins/admin/systems/class_terminalGeneric.inc @@ -204,7 +204,7 @@ class termgeneric extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config); + $this->dialog = new baseSelectDialog($this->config,$this); $this->dialog->setCurrentBase($this->base); } } diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc index ffd87eb9c..d1fb73268 100644 --- a/plugins/admin/systems/class_winGeneric.inc +++ b/plugins/admin/systems/class_winGeneric.inc @@ -79,7 +79,7 @@ class wingeneric extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config); + $this->dialog = new baseSelectDialog($this->config,$this); $this->dialog->setCurrentBase($this->base); } } diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc index c40c6f125..56912e078 100644 --- a/plugins/admin/systems/class_workstationGeneric.inc +++ b/plugins/admin/systems/class_workstationGeneric.inc @@ -190,7 +190,7 @@ class workgeneric extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config); + $this->dialog = new baseSelectDialog($this->config,$this); $this->dialog->setCurrentBase($this->base); } } diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc index d5898fd27..93d8010e3 100644 --- a/plugins/gofax/blocklists/class_blocklistManagement.inc +++ b/plugins/gofax/blocklists/class_blocklistManagement.inc @@ -259,7 +259,7 @@ class blocklist extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config); + $this->dialog = new baseSelectDialog($this->config,$this); $this->dialog->setCurrentBase($this->base); } } diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc index 49f08c236..37d2c6483 100644 --- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc +++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc @@ -125,7 +125,7 @@ class conference extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config); + $this->dialog = new baseSelectDialog($this->config,$this); $this->dialog->setCurrentBase($this->base); } } diff --git a/plugins/gofon/macro/class_gofonMacro.inc b/plugins/gofon/macro/class_gofonMacro.inc index cabcb9a8b..5e0f5faf0 100755 --- a/plugins/gofon/macro/class_gofonMacro.inc +++ b/plugins/gofon/macro/class_gofonMacro.inc @@ -109,7 +109,7 @@ class macro extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config,$this->allowedBasesToMoveTo()); + $this->dialog = new baseSelectDialog($this->config, $this); $this->dialog->setCurrentBase($this->base); } } diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc index 720114707..ec56ed885 100644 --- a/plugins/personal/generic/class_user.inc +++ b/plugins/personal/generic/class_user.inc @@ -278,7 +278,7 @@ class user extends plugin foreach($_POST as $name => $value){ if(preg_match("/^chooseBase/",$name) && $once){ $once = false; - $this->dialog = new baseSelectDialog($this->config,$this->allowedBasesToMoveTo()); + $this->dialog = new baseSelectDialog($this->config,$this,$this->allowedBasesToMoveTo()); $this->dialog->setCurrentBase($this->base); } } -- 2.30.2