Dont throw away the hidden inputs..

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

diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index f4f1daad718af1893101c38c774baf2aadff0807..42048258fbf8cd34d15e0bbb72c14743d2da032d 100644 (file)
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -67,14 +67,14 @@ class filter {
     if (isset($xmlData['search'])) {
 
       // Array conversion
-      if (!is_array($xmlData['search'])) {
+      if (!isset($xmlData['search'][0])) {
         $searches= array($xmlData['search']);
       } else {
         $searches= $xmlData['search'];
       }
 
       /* Store available searches */
-      foreach ($xmlData['search'] as $search) {
+      foreach ($searches as $search) {
 
         /* Do multi conversation */ 
         if (!isset($search['query'][0])){
@@ -117,8 +117,8 @@ class filter {
     }
 
     // Initialize searches and default search mode
-    $this->reloadFilters();
     $this->defaultSearch= $xmlData['definition']['default'];
+    $this->reloadFilters();
     $this->setSearch($this->defaultSearch);
 
     return true;  
@@ -260,7 +260,11 @@ class filter {
       // Handle converters if present
       if ($this->converter) {
         preg_match('/([^:]+)::(.*)$/', $this->converter, $m);
-        $filter= call_user_func(array($m[1], $m[2]), preg_replace('/\$/', $this->value, $filter));
+        if ($this->value == "") {
+          $filter= call_user_func(array($m[1], $m[2]), preg_replace('/\$/', "*", $filter));
+        } else {
+          $filter= call_user_func(array($m[1], $m[2]), preg_replace('/\$/', $this->value, $filter));
+        }
       }
 
       // Do not replace escaped \$ - This is required to be able to search for e.g. windows machines.
@@ -407,8 +411,7 @@ class filter {
   function renderFilterMenu()
   {
     // Load shortcut
-    $result= "<input type='hidden' name='act' id='filter' value=''><div style='display:none'><input type='submit' name='exec_filter' id='exec_filter' value=''></div>".
-      "<ul class='level1' id='filter-root'><li><a href='#'>".image("images/filter.png").image("images/lists/sort-down.png")."</a>";
+    $result= "<ul class='level1' id='filter-root'><li><a href='#'>".image("images/filter.png").image("images/lists/sort-down.png")."</a>";
 
     // Build ul/li list
     $separator= " style='border-top:1px solid #AAA' ";
@@ -419,7 +422,7 @@ class filter {
       if ($tag == $this->search) {
         $result.= "<li><a href='#'>".image("images/checked.png")."&nbsp;"._($config['label'])."</a></li>";
       } else {
-        $result.= "<li><a href='#' onClick='document.getElementById(\"filter\").value= \"filter-$tag\";mainform.submit();'>".image("images/empty.png")."&nbsp;"._($config['label'])."</a></li>";
+        $result.= "<li><a href='#' onClick='\$(\"act\").value= \"filter-$tag\";\$(\"exec_act\").click();'>".image("images/empty.png")."&nbsp;"._($config['label'])."</a></li>";
       }
     }
 
@@ -429,7 +432,7 @@ class filter {
       if ($tag == $this->search) {
         $result.= "<li".($first?$separator:"")."><a href='#'>".image("images/checked.png")."&nbsp;"._($config['description'])."</a></li>";
       } else {
-        $result.= "<li".($first?$separator:"")."><a href='#' onClick='document.getElementById(\"filter\").value= \"filter-$tag\";mainform.submit();'>".image("images/empty.png")."&nbsp;"._($config['description'])."</a></li>";
+        $result.= "<li".($first?$separator:"")."><a href='#' onClick='\$(\"act\").value= \"filter-$tag\";\$(\"exec_act\").click();'>".image("images/empty.png")."&nbsp;"._($config['description'])."</a></li>";
       }
 
       $first= false;
@@ -437,12 +440,12 @@ class filter {
 
     // Render scope if set to auto
     if ($this->scopeMode == "auto") {
-      $result.= "<li$separator><a href='#' onClick='document.getElementById(\"filter\").value= \"toggle-subtree\";mainform.submit();'>".($this->scope=="one"?image("images/empty.png"):image("images/checked.png"))."&nbsp;"._("Search in subtrees")."</a></li>";
+      $result.= "<li$separator><a href='#' onClick='\$(\"act\").value= \"toggle-subtree\";\$(\"exec_act\").click();'>".($this->scope=="one"?image("images/empty.png"):image("images/checked.png"))."&nbsp;"._("Search in subtrees")."</a></li>";
     }
 
 
     // Edit filter menu
-    $result.= "<li$separator><a href='#' onClick='document.getElementById(\"filter\").value= \"config-filter\";mainform.submit();'>".image("images/configure.png")."&nbsp;"._("Edit filters")."...</a></li>";
+    $result.= "<li$separator><a href='#' onClick='\$(\"act\").value= \"config-filter\";\$(\"exec_act\").click();'>".image("images/configure.png")."&nbsp;"._("Edit filters")."...</a></li>";
 
     $result.= "</ul>";