Updated list handling

[gosa.git] / gosa-core / include / class_MultiSelectWindow.inc

diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index 5fe22de80c01dc4fd6e5ee417fd48c7c6ea68c67..9c9bd5071763836acd638b6201d0f0a983b95fd5 100644 (file)
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -529,9 +529,12 @@ class MultiSelectWindow{
       }
     }
 
-    /* Save base selection from headpage selectbox*/
+    /* Save base selection from headpage selectbox */
     if(isset($_POST['CurrentMainBase'])){
-      $this->selectedBase = $_POST['CurrentMainBase'];
+      $this->selectedBase = get_post('CurrentMainBase');
+      session::global_set("CurrentMainBase", $this->selectedBase);
+    } else {
+      $this->selectedBase= session::global_get("CurrentMainBase");
     }
 
     /* Homebutton is posted */
@@ -645,7 +648,7 @@ class MultiSelectWindow{
                }
 
     /* Save currenlty selected base in session */
-    session::set("CurrentMainBase",$this->selectedBase);
+    session::global_set("CurrentMainBase",$this->selectedBase);
        }
 
 
@@ -684,7 +687,7 @@ class MultiSelectWindow{
       $s_attrs[]= $data['ATTR']; 
     }
 
-    $tmp = get_list("(|".$s_filter.")",$s_acls,$this->selectedBase,$s_attrs,GL_NONE | GL_SIZELIMIT);
+    $tmp = get_list("(|".$s_filter.")",$s_acls,$this->selectedBase,$s_attrs,GL_NONE);
     foreach($tmp as $attrs){
       foreach($types as $name => $data){
         if(in_array($data['OC'],$attrs['objectClass']) && isset($attrs[$data['ATTR']][0])){
@@ -772,11 +775,13 @@ class MultiSelectWindow{
         $first = $value;
       }
 
+
+      $v_value = htmlentities($value,ENT_QUOTES);
       if ($this->selectedBase == $value){
         $found = TRUE;
-        $options.= "<option selected='selected' value='".$value."'>$name</option>";
+        $options.= "<option selected='selected' value=\"".$v_value."\">$name</option>";
       } else {
-        $options.= "<option value='".$value."'>$name</option>";
+        $options.= "<option value=\"".$v_value."\">$name</option>";
       }
     }