Fixed baseSelectDialog parameters

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

diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc
index bf90cea8cb900abbbd1f2e2d5c103a005224abef..a469fb26e7a93267c36e875fbd07a31eefe7a99e 100644 (file)
--- 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 5205da94447f99145248934c108fc8bb617b3a91..d687ea1127b66e44c3b199a89befd428c1c25d03 100644 (file)
--- 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 449ee54debe405e7316b45e77b282b80a9c0778c..e2f6bd0a133e168edab95b192e3a64bfdbd9e8c1 100644 (file)
--- 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 461002c82cd79a89235f773d4072ecc51575f282..2e2faa8bc535f5355d0336a02df43056b1d3e737 100644 (file)
--- 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 6739c1848b042a10bc6555d86a9d28296841f45b..50fb1204dd116f776ccc13f9ae8d3f5c5f1d072a 100644 (file)
--- 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 7d1e3fe86572a3603b9c44076cf66c70a631bfc3..1d61176a11d3d396e088c4ee76f14f3df037f795 100644 (file)
--- 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 24566d9f2ed296f5eb2ff12a1084b616e493bd68..09949d694c586c7b01ae7e54ae8cef0fa5fec28e 100644 (file)
--- 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 156dfd4770992fb9a6fd9b26706689398e87b52a..af71cf6756744a3ca952bbf087c295abd07578e7 100644 (file)
--- 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 9c0f48cd1f442c63d0434f2fffc556b7810f816f..1ab22f202ae774fc902bd8ec04cf6d3d1df66d86 100644 (file)
--- 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 164c7db8f58aad0ee5b81765944d7af2e4aef383..98d7e0db980344c88e4cb22a83eeedb93bd35923 100644 (file)
--- 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 ffd87eb9c02448ecf32d5be4a65bd7f2bd62ba3b..d1fb732689223ba74f6e8ee24eb295c9f231ed59 100644 (file)
--- 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 c40c6f1254198c671d33787bc77ab3d0b25452c1..56912e07816110dec029811869ca5c5fece4f49e 100644 (file)
--- 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 d5898fd27d45c81651e4f8200f23ef4ca6e31ac1..93d8010e3d9d14fc6793f96dcc87decfe686ad5e 100644 (file)
--- 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 49f08c236214318632b87065bb6395b4d9d94704..37d2c6483f4ac5bca46e2d7fcb96e3f6b441d967 100644 (file)
--- 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 cabcb9a8b03b787d559f1cadefa28ecf7bf06a84..5e0f5faf0651b7b8ab1c24705e2e602e27874ad7 100755 (executable)
--- 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 7201147077e70747ea45bff7b8408ef18c40b33d..ec56ed885bf14dc326de4d57bcc74ce677f5445f 100644 (file)
--- 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);
       }
     }