X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_filter.inc;h=04de2dae2c5cb13fce48ef21f3638fe6ce823937;hb=c9bd6c4d92532063a9dd8df3cfd20740d43e5841;hp=cce1bae49185f90c5eb22d4c6bb1b6231db6f8d4;hpb=68bd96121508977bdc21064df3cfeaf17a92fe14;p=gosa.git

diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index cce1bae49..04de2dae2 100644
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -22,9 +22,11 @@
 
 class filter {
 
-  var $xmlData;
   var $searches= array();
+  var $xmlSearches= array();
+  var $attributes= array();
   var $search;
+  var $defaultSearch;
   var $category= "";
   var $objectStorage= array();
   var $base= "";
@@ -53,34 +55,34 @@ class filter {
   function load($filename)
   {
     $contents = file_get_contents($filename);
-    $this->xmlData= xml::xml2array($contents, 1);
+    $xmlData= xml::xml2array($contents, 1);
 
-    if (!isset($this->xmlData['filterdef'])) {
+    if (!isset($xmlData['filterdef'])) {
       return false;
     }
 
-    $this->xmlData= $this->xmlData["filterdef"];
+    $xmlData= $xmlData["filterdef"];
 
     // Load filter
-    if (isset($this->xmlData['search'])) {
+    if (isset($xmlData['search'])) {
 
       // Array conversion
-      if (!is_array($this->xmlData['search'])) {
-        $searches= array($this->xmlData['search']);
+      if (!isset($xmlData['search'][0])) {
+        $searches= array($xmlData['search']);
       } else {
-        $searches= $this->xmlData['search'];
+        $searches= $xmlData['search'];
       }
 
       /* Store available searches */
-      foreach ($this->xmlData['search'] as $search) {
+      foreach ($searches as $search) {
 
         /* Do multi conversation */ 
-        if (!is_array($search['query'])){
+        if (!isset($search['query'][0])){
           $search['query']= array($search['query']);
         }
 
         /* Store search */
-        $this->searches[$search['tag']]= $search;
+        $this->xmlSearches[$search['tag']]= $search;
 
       }
     } else {
@@ -88,60 +90,60 @@ class filter {
     }
 
     // Transfer scope
-    $this->scopeMode= $this->xmlData['definition']['scope'];
+    $this->scopeMode= $xmlData['definition']['scope'];
     if ($this->scopeMode == "auto") {
       $this->scope= "one";
     } else {
       $this->scope= $this->scopeMode;
     }
 
+    // Transfer attributes
+    $this->attributes= $xmlData['definition']['attribute'];
+    if (!is_array($this->attributes)) {
+      $this->attributes= array($this->attributes);
+    }
+
     // Transfer initial value
-    if (isset($this->xmlData['definition']['initial']) && $this->xmlData['definition']['initial'] == "true"){
+    if (isset($xmlData['definition']['initial']) && $xmlData['definition']['initial'] == "true"){
       $this->initial= true;
     }
 
     // Transfer category
-    if (isset($this->xmlData['definition']['category'])){
-      $this->category= $this->xmlData['definition']['category'];
+    if (isset($xmlData['definition']['category'])){
+      $this->category= $xmlData['definition']['category'];
+    }
+    if (!is_array($this->category)) {
+      $this->category= array($this->category);
     }
 
-    // Set default search mode
-    $this->setSearch($this->xmlData['definition']['default']);
+    // Initialize searches and default search mode
+    $this->defaultSearch= $xmlData['definition']['default'];
+    $this->reloadFilters();
+    $this->setSearch($this->defaultSearch);
 
     return true;  
   }
 
 
-  function setSearch($method)
+  function reloadFilters()
+  {
+    $this->searches= array_merge($this->xmlSearches, userFilter::getFilter($this->category));
+    $this->setSearch($this->search);
+  }
+
+
+  function setSearch($method= null)
   {
     $patch= null;
-    if (is_array($this->category)) {
-      $categories= $this->category;
-    } else {
-      $categories= array($this->category);
-    }
-    $userfilters= userFilter::getFilter($categories);
 
-    // User filter selected?
-    if (isset($userfilters[$method])){
-      $usermethod= $method;
-      $patch= $userfilters[$method]['filter'];
-      $method= $userfilters[$method]['parent'];
+    // Maybe our search method has gone?
+    if (!isset($this->searches[$method])) {
+      $method= $this->defaultSearch;
     }
 
-    // Move information
+    // Try to use it, but bail out if there's no help...
     if (isset($this->searches[$method])) {
-      $this->query= array_merge($this->searches[$method]['query']);
-      if (!isset($this->query[0])) {
-        $this->query= array($this->query);
-      }
- 
-      // Patch first filter?
-      if ($patch) {
-        $this->query[0]['filter']= $patch;
-        $method= $usermethod;
-      }
-
+      $this->query= $this->searches[$method]['query'];
       $this->search= $method;
     } else {
       die ("Invalid search module!");
@@ -153,7 +155,7 @@ class filter {
   {
     $size= 30;
     $maxlength= 30;
-    $result= "<input class='filter_textfield' id='$tag' name='$tag' type='text' size='$size' maxlength='{$maxlength}' value='".$value."'>";
+    $result= "<input class='filter_textfield' placeholder='"._("Search")."...' id='$tag' name='$tag' type='text' size='$size' maxlength='{$maxlength}' value='".$value."'>";
     if ($element && isset($element['autocomplete'])) {
       $frequency= "0.5";
       $characters= "1";
@@ -221,7 +223,7 @@ class filter {
 
   function render()
   {
-    $content= "<table class='filter-wrapper'><tr><td>".$this->renderFilterMenu()."</td><td>";
+    $content= "<table class='filter-wrapper' summary='"._("Search filter")."'><tr><td>".$this->renderFilterMenu()."</td><td>";
     $content.= "<div class='search-filter'>".$this->getTextfield('search_filter', $this->value, $this->searches[$this->search])."</div>".
       "&nbsp;<button class='search-filter' type='submit' title='"._("Search")."'>".image("images/find.png")."</button></td></tr></table>";
 
@@ -240,10 +242,9 @@ class filter {
       $this->initial= true;
       return $result;
     }
-
     // Go thru all queries and merge results
     foreach ($this->query as $query) {
-      if (!isset($query['backend']) || !isset($query['filter']) || !isset($query['attribute'])) {
+      if (!isset($query['backend']) || !isset($query['filter'])) {
         die("No backend specified in search config.");
       }
 
@@ -255,12 +256,15 @@ class filter {
 
       // Load filter and attributes
       $filter= $query['filter'];
-      $attributes= $query['attribute'];
 
       // 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.
@@ -270,7 +274,7 @@ class filter {
         $filter= preg_replace("/\\$/", "*".normalizeLdap($this->value)."*", $filter);
       }
 
-      $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes, $this->category, $this->objectStorage));
+      $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $this->attributes, $this->category, $this->objectStorage));
     }
 
     return ($result);
@@ -280,7 +284,6 @@ class filter {
   function update()
   {
     if (isset($_POST['FILTER_PID']) && $_POST['FILTER_PID'] == $this->pid) {
-
       // Save input field
       if (isset($_POST['search_filter'])) {
         $this->value= validate($_POST['search_filter']);
@@ -292,14 +295,8 @@ class filter {
       }
 
       // Switch filter?
-      if (is_array($this->category)) {
-        $categories= $this->category;
-      } else {
-        $categories= array($this->category);
-      }
-
       if (isset($_POST['act'])) {
-        foreach (array_merge($this->searches, userFilter::getFilter($categories)) as $tag => $cfg) {
+        foreach ($this->searches as $tag => $cfg) {
           if ($_POST['act'] == "filter-$tag") {
             $this->setSearch($tag);
             break;
@@ -326,6 +323,7 @@ class filter {
     $result= array();
 
     // Is backend available?
+    # FIXME
     $queries= $config['query'];
     if (!isset($queries[0])){
       $queries= array($queries);
@@ -413,34 +411,29 @@ 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' ";
     $result.= "<ul class='level2'>";
 
     // Build in filters
-    foreach ($this->searches as $tag => $config) {
+    foreach ($this->xmlSearches as $tag => $config) {
+      $label = htmlentities(_($config['label']),ENT_COMPAT,'UTF-8');
       if ($tag == $this->search) {
-        $result.= "<li><a href='#'>".image("images/checked.png")."&nbsp;"._($config['label'])."</a></li>";
+        $result.= "<li><a href='#'>".image("images/checked.png")."&nbsp;".$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;".$label."</a></li>";
       }
     }
 
     // User defined filters
     $first= true;
-    if (is_array($this->category)) {
-      $categories= $this->category;
-    } else {
-      $categories= array($this->category);
-    }
-    foreach (userFilter::getFilter($categories) as $tag => $config) {
+    foreach (userFilter::getFilter($this->category) as $tag => $config) {
       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;
@@ -448,18 +441,18 @@ 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>";
 
     $script= '<script type="text/javascript" language="JavaScript">var menu2; menu2= new Menu("filter-root", "menu2", configMenu)</script>';
 
-    return "<div id='filtermenu'>".$result."</li></ul><div>$script";
+    return "<div id='filtermenu'>".$result."</li></ul></div>$script";
   }