Reverted last commit

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

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index fbcc9b1dd7d8811ae990ae08d5b410125fe89841..10c05d9652012ebf1b6fcb3bc843858a37747f95 100644 (file)
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -450,7 +450,7 @@ class listing {
 
     // Save base
     if (isset($_POST['BASE']) && $this->baseMode) {
-      $base= validate($_POST['BASE']);
+      $base= get_post('BASE');
       if (isset($this->bases[$base])) {
         $this->base= $base;
         session::global_set("CurrentMainBase", $this->base);
@@ -644,8 +644,10 @@ class listing {
         $selected= " selected";
         $found= true;
       }
-      $result.= "<option value='".$key."'$selected>".$value."</option>";
+      $key = htmlentities($key,ENT_QUOTES);
+      $result.= "\n<option value=\"".$key."\"$selected>".$value."</option>";
     }
+
     $result.= "</select>";
 
     // Reset the currently used base to the first DN we found if there
@@ -1091,6 +1093,12 @@ class listing {
         if (isset($action['label'])){
           $result.= "<li$separator><a href='#'>$img"._($action['label'])."&nbsp;<img border='0' src='images/forward-arrow.png'></a>";
         }
+
+        // Ensure we've an array of actions, this enables sub menus with only one action.
+        if(isset($action['action']['type'])){
+          $action['action'] = array($action['action']);
+        }
+
         $result.= $this->recurseActions($action['action'])."</li>";
         $level--;
         $separator= "";