Added fix for regex session storage

[gosa.git] / include / class_MultiSelectWindow.inc

diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc
index f201660a64c7d8f98059b6bd2bec98d8d9f7760f..00d49d6d57c74d175f18172fc0a8df16cf8f8a19 100644 (file)
--- a/include/class_MultiSelectWindow.inc
+++ b/include/class_MultiSelectWindow.inc
@@ -35,8 +35,6 @@ class MultiSelectWindow{
 
   var $SaveAdditionalVars = array();  // Additional Post vars to store 
 
-  var $force_height       = false;
-
        function ClearElementsList()
        {
                $this->array_Elements = array();
@@ -47,18 +45,11 @@ class MultiSelectWindow{
     $this->HideFilterPart = $bool;
   }
 
-  function ForceMaximumDivHeight($height = "")
-  {
-    $this->DivHeight    = $height;
-    if(!empty($height)){
-      $this->force_height = true;
-    }else{
-      $this->force_height = false;
-    }
+  function SetHeight($height)
+  { 
+    $this->DivHeight=$height;
   }
 
-
-
        /* Adds a regex input field to the current dialog */
        function AddRegex($name,$string,$value,$conn,$image="images/search.png")
        {
@@ -88,12 +79,6 @@ class MultiSelectWindow{
                $this->CloseButtonString        = _("Close");
                $this->filterName                       = $filterName;
 
-               /* Set default base, to users base  */
-    $ui   = get_userinfo();
-    $base = get_base_from_people($ui->dn);
-               if(!isset($_SESSION['CurrentMainBase'])){
-                       $_SESSION['CurrentMainBase'] = $base;
-               }
                $this->selectedBase = $_SESSION['CurrentMainBase'];
 
     /* Check default values for SaveAdditionalVars */
@@ -356,8 +341,6 @@ class MultiSelectWindow{
                $smarty->assign("filterName"    ,       $this->filterName);
                $smarty->assign("is_headpage"   ,       $this->is_headpage);
 
-    $smarty->assign("force_height",$this->force_height);
-
                $display = $smarty->fetch(get_template_path("MultiSelectWindow.tpl"));
                return($display);
        }
@@ -493,6 +476,7 @@ class MultiSelectWindow{
                                        $val = preg_replace("/\*\**/","*",$val);
                                        $this->array_Regexes[$key]['value'] = $val;
                                        $this->$box['name'] = $val;
+          $_SESSION['MultiDialogFilters'][$this->filterName][$box['name']] =  $val;
                                }
                        }
                }