Heimdal stuff not needed. It's too insecure to read m-keys by php.

[gosa.git] / include / class_MultiSelectWindow.inc

diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc
index 7961247b8019770ab07ca0250434670f61165cb3..b7d4bb9166f0147f76dd2962075f9132019acf70 100644 (file)
--- a/include/class_MultiSelectWindow.inc
+++ b/include/class_MultiSelectWindow.inc
@@ -74,14 +74,14 @@ class MultiSelectWindow{
        }
 
        /* Contrucktion */
-       function MultiSelectWindow($config, $filterName, $module)
+       function MultiSelectWindow(&$config, $filterName, $module)
        {
-               $this->config = $config;
+               $this->config = &$config;
                $this->module = $module;
                $this->SaveButtonString         = _("Save");
                $this->CloseButtonString        = _("Close");
                $this->filterName                       = $filterName;
-
+    $this->ui = get_userinfo();
                $this->selectedBase = $_SESSION['CurrentMainBase'];
 
     /* Check default values for SaveAdditionalVars */
@@ -470,7 +470,9 @@ class MultiSelectWindow{
     if($s_action=="root"){
       $this->selectedBase=($this->config->current['BASE']);
       $dep_id = $this->ui->get_module_departments($this->module);
-      $this->selectedBase = $dep_id[key($dep_id)];
+      if(isset($dep_id[key($dep_id)])){
+        $this->selectedBase = $dep_id[key($dep_id)];
+      }
     }
 
 
@@ -659,7 +661,7 @@ class MultiSelectWindow{
                        $non_empty="";
                        $nkey= normalizePreg($key);
                        foreach($this->config->departments as $keyd=>$vald ){
-                               if(preg_match("/$nkey\/.*/",$keyd)){
+                               if(preg_match('/$nkey\/.*/',$keyd)){
                                        $non_empty="full";
                                }
                        }