Fixed base generation

[gosa.git] / include / class_MultiSelectWindow.inc

diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc
index 898aad6eee628c9859e265f42718aece1b16cafc..00d49d6d57c74d175f18172fc0a8df16cf8f8a19 100644 (file)
--- a/include/class_MultiSelectWindow.inc
+++ b/include/class_MultiSelectWindow.inc
@@ -29,14 +29,26 @@ class MultiSelectWindow{
        var $DepartmentsAdded           = false;
        var $selectedBase       = "";
 
-  var $SaveAdditionalVars = array();  // Additional Post vars to store 
+  var $DivHeight          = "";
+
+  var $HideFilterPart     = false;
 
+  var $SaveAdditionalVars = array();  // Additional Post vars to store 
 
        function ClearElementsList()
        {
                $this->array_Elements = array();
        }
 
+  function HideFilterPart($bool = true)
+  {
+    $this->HideFilterPart = $bool;
+  }
+
+  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")
@@ -67,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 */
@@ -229,6 +235,10 @@ class MultiSelectWindow{
                $divlist = new divlist($this->string_Title);
                $divlist->SetSummary($this->string_Summary);
                $divlist->SetEntriesPerPage(0); // 0 for scrollable list 
+  
+    if($this->DivHeight != ""){
+      $divlist->SetHeight($this->DivHeight);
+    }
 
                /* set Header informations 
                 */
@@ -288,6 +298,13 @@ class MultiSelectWindow{
                }
                $smarty->assign("regexes"                       , $regexes );
 
+    /* Hide Filter Part if Requested or empty */
+    if((empty($boxes)) && (empty($regexes)) || ($this->HideFilterPart)){
+                 $smarty->assign("Skip_Filter_Part",   true);
+    }else{ 
+                 $smarty->assign("Skip_Filter_Part",   false);
+    }
+
                /* Assign alphabet and display it 
                 */     
                $smarty->assign("Display_alphabet",     $this->bool_DisplayAlpahabet);
@@ -363,9 +380,9 @@ class MultiSelectWindow{
 
                        /* Homebutton is posted */
                        if($s_action=="home"){
-                               $ui= get_userinfo();
-                               $this->selectedBase=(preg_replace("/^[^,]+,/","",$ui->dn));
-                               $this->selectedBase=(preg_replace("/^[^,]+,/","",$this->selectedBase));
+        $ui= get_userinfo();
+        $base = get_base_from_people($ui->dn);
+                               $this->selectedBase= $base;
                        }
 
                        /* Open selected department
@@ -459,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;
                                }
                        }
                }