X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_filter.inc;h=e8b65ac78b4810013f8d70ef4973834fe57d57ac;hb=8ae8745c45a91ec8d98216398721ccadab3ac65a;hp=6a6a4216efff52f5c61a9a59d8c889acb8339bca;hpb=2c7257e5e02afafdfd3a6c4457c6b87467f26eae;p=gosa.git

diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index 6a6a4216e..e8b65ac78 100644
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -23,19 +23,17 @@
 class filter {
 
   var $xmlData;
-  var $elements= array();
-  var $elementValues= array();
-  var $alphabetElements= array();
-  var $autocompleter= array();
+  var $searches= array();
+  var $search;
   var $category= "";
   var $objectStorage= array();
   var $base= "";
   var $scope= "";
   var $query;
+  var $value= "";
   var $initial= false;
   var $scopeMode= "auto";
-  var $alphabet= null;
-  var $converter= array();
+  var $converter= null;
   var $pid;
 
 
@@ -65,23 +63,38 @@ class filter {
 
     // Load filter
     if (isset($this->xmlData['search'])) {
-      if (!isset($this->xmlData['search']['query'][0])){
-        $this->xmlData['search']['query']= array($this->xmlData['search']['query']);
-      }
 
-      // Move information
-      $entry= $this->xmlData['search'];
-      $this->scopeMode= $entry['scope'];
-      if ($entry['scope'] == "auto") {
-        $this->scope= "one";
+      // Array conversion
+      if (!is_array($this->xmlData['search'])) {
+        $searches= array($this->xmlData['search']);
       } else {
-        $this->scope= $entry['scope'];
+        $searches= $this->xmlData['search'];
+      }
+
+      /* Store available searches */
+      foreach ($this->xmlData['search'] as $search) {
+
+        /* Do multi conversation */ 
+        if (!is_array($search['query'])){
+          $search['query']= array($search['query']);
+        }
+
+        /* Store search */
+        $this->searches[$search['label']]= $search;
+
       }
-      $this->query= $entry['query'];
     } else {
       return false;
     }
 
+    // Transfer scope
+    $this->scopeMode= $this->xmlData['definition']['scope'];
+    if ($this->scopeMode == "auto") {
+      $this->scope= "one";
+    } else {
+      $this->scope= $this->scopeMode;
+    }
+
     // Transfer initial value
     if (isset($this->xmlData['definition']['initial']) && $this->xmlData['definition']['initial'] == "true"){
       $this->initial= true;
@@ -92,47 +105,25 @@ class filter {
       $this->category= $this->xmlData['definition']['category'];
     }
 
-    // Generate formular data
-    if (isset($this->xmlData['element'])) {
-      if (!isset($this->xmlData['element'][0])){
-        $this->xmlData['element']= array($this->xmlData['element']);
-      }
-      foreach ($this->xmlData['element'] as $element) {
-
-        // Ignore elements without type
-        if (!isset($element['type']) || !isset($element['tag'])) {
-          next;
-        }
-
-        $tag= $element['tag'];
-
-        // Fix arrays
-        if (isset($element['value']) && !isset($element['value'][0])) {
-          $element['value']= array($element['value']);
-        }
+    // Set default search mode
+    $this->setSearch($this->xmlData['definition']['default']);
 
-        // Store element for quick access
-        $this->elements[$tag] = $element;
+    return true;  
+  }
 
-        // Preset elementValues with default values if exist
-        if (isset($element['default']) && !is_array($element['default'])) {
-          $this->elementValues[$tag] = $element['default'];
-        } else {
-          $this->elementValues[$tag] = "";
-        }
 
-        // Does this element react on alphabet links?
-        if (isset($element['alphabet']) && $element['alphabet'] == "true") {
-          $this->alphabetElements[]= $tag;
-        }
+  function setSearch($method)
+  {
+    // Move information
+    if (isset($this->searches[$method])) {
+      $this->query= $this->searches[$method]['query'];
+      if (!isset($this->query[0])) {
+        $this->query= array($this->query);
       }
-
-      uasort($this->elements, 'strlenSort');
-      $this->elements= array_reverse($this->elements);
-
+      $this->search= $method;
+    } else {
+      die ("Invalid search module!");
     }
-
-    return true;  
   }
 
 
@@ -147,7 +138,7 @@ class filter {
     if (isset($element['maxlength'])){
       $maxlength= $element['maxlength'];
     }
-    $result= "<input class='filter_textfield' id='$tag' name='$tag' type='text' size='$size' maxlength='maxlength' value='".$this->elementValues[$tag]."'>";
+    $result= "<input class='filter_textfield' id='$tag' name='$tag' type='text' size='$size' maxlength='{$maxlength}' value='".$this->elementValues[$tag]."'>";
     if (isset($element['autocomplete'])) {
       $frequency= "0.5";
       $characters= "1";
@@ -168,64 +159,6 @@ class filter {
   }
 
 
-  function getCheckbox($element)
-  {
-    $tag= $element['tag'];
-    $checked= "";
-    if ($this->elementValues[$tag] == "true") {
-      $checked= " checked";
-    }
-
-    $result= "<input class='filter_checkbox' id='$tag' name='$tag' type='checkbox' onClick='document.mainform.submit();' value='true'$checked>";
-    return $result;
-  }
-
-
-  function getCombobox($element)
-  {
-    $result= "<select name='".$element['tag']."' size='1' onChange='document.mainform.submit();'>";
-
-    // Fill with presets
-    foreach ($element['value'] as $value) {
-      $selected= "";
-      if ($this->elementValues[$element['tag']] == $value['key']) {
-        $selected= " selected";
-      }
-
-      // Handle translations
-      $result.= "<option value='".$value['key']."'$selected>"._($value['label'])."</option>";
-    }
-
-    // Use autocompleter for additional data
-    if (isset($element['autocomplete'])) {
-      $list= $this->getCompletitionList($element['autocomplete'], $element['tag']);
-      foreach ($list as $value) {
-        $selected= "";
-        if ($this->elementValues[$element['tag']] == $value) {
-          $selected= " selected";
-        }
-        $result.= "<option value='$value'$selected>$value</option>";
-      }
-    }
-
-    $result.= "</select>";
-
-    return $result;
-  }
-
-
-  function setComboBoxOptions($tag, $options)
-  {
-    if (isset($this->elements[$tag]) && $this->elements[$tag]['type'] == "combobox") {
-      
-      $this->elements[$tag]['value']= array();
-      foreach ($options as $key => $label) {
-        $this->elements[$tag]['value'][]= array('label' => $label, 'key' => $key);
-      }
-    }
-  }
-
-
   function getCurrentBase()
   {
     if (isset($this->search->base) && (string)$this->search->scope != "auto") {
@@ -246,9 +179,9 @@ class filter {
   }
 
 
-  function setConverter($field, $hook)
+  function setConverter($hook)
   {
-    $this->converter[$field]= $hook;
+    $this->converter= $hook;
   }
 
 
@@ -270,45 +203,6 @@ class filter {
   }
 
 
-  function renderAlphabet($columns= 10)
-  {
-    // Return pre-rendered alphabet if available
-    if ($this->alphabet) {
-      return ($this->alphabet);
-    }
-
-    $characters= _("*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
-    $alphabet= "";
-    $c= 0;
-
-    /* Fill cells with charaters */
-    for ($i= 0, $l= mb_strlen($characters, 'UTF8'); $i<$l; $i++){
-      if ($c == 0){
-        $alphabet.= "<tr>";
-      }
-
-      $ch = mb_substr($characters, $i, 1, "UTF8");
-      $alphabet.= "<td><a class=\"alphaselect\" href=\"main.php?plug=".
-        validate($_GET['plug'])."&amp;filter=".$ch."\">&nbsp;".$ch."&nbsp;</a></td>";
-
-      if ($c++ == $columns){
-        $alphabet.= "</tr>";
-        $c= 0;
-      }
-    }
-
-    /* Fill remaining cells */
-    while ($c++ <= $columns){
-      $alphabet.= "<td>&nbsp;</td>";
-    }
-
-    /* Save alphabet */
-    $this->alphabet= "<table width='100%'>$alphabet</table>";
-
-    return ($this->alphabet);
-  }
-
-
   function renderApply()
   {
     return ("<input type='submit' name='apply' value='"._("Apply filter")."'>");
@@ -324,35 +218,12 @@ class filter {
 
   function render()
   {
-    $smarty= get_smarty();
-    $smarty->assign("ALPHABET", $this->renderAlphabet());
-    $smarty->assign("APPLY", $this->renderApply());
-    $smarty->assign("SCOPE", $this->renderScope());
-
-    // Load template and replace elementsHtml[]
-    foreach ($this->elements as $tag => $element) {
-      $htmlCode= "";
-      switch ($element['type']) {
-        case "textfield":
-          $htmlCode = $this->getTextfield($element);
-          break;
+    $content= "<table class='filter-wrapper'><tr><td>".$this->renderFilterMenu()."</td><td>";
+    $content.= "<div class='search-filter'><input type='text' name='search_filter' value='".$this->value."'></div>".
+              "&nbsp;<button class='search-filter' type='submit' title='"._("Search")."'>".image("images/find.png")."</button></td></tr></table>";
 
-        case "checkbox":
-          $htmlCode = $this->getCheckbox($element);
-          break;
-
-        case "combobox":
-          $htmlCode = $this->getCombobox($element);
-          break;
-
-        default:
-          die ("Unknown element type specified!");
-      }
-      $smarty->assign("$tag", $htmlCode);
-    }
-
-    // Load template
-    return ("<input type='hidden' name='FILTER_PID' value='".$this->pid."'>".$smarty->fetch(get_template_path($this->xmlData['definition']['template'], true)));
+    // Return meta data
+    return ("<input type='hidden' name='FILTER_PID' value='".$this->pid."'>".$content);
   }
 
 
@@ -383,31 +254,17 @@ class filter {
       $filter= $query['filter'];
       $attributes= $query['attribute'];
 
-      // Generate final filter
-      foreach ($this->elements as $tag => $element) {
-        if (!isset($element['set']) || !isset($element['unset'])) {
-          continue;
-        }
-
-        // Handle converters if present
-        if (isset($this->converter[$tag])) {
-          preg_match('/([^:]+)::(.*)$/', $this->converter[$tag], $m);
-          $e_set= call_user_func(array($m[1], $m[2]), preg_replace('/\$/', $this->elementValues[$tag], is_array($element['set'])?"":$element['set']));
-          $e_unset= call_user_func(array($m[1], $m[2]), preg_replace('/\$/', $this->elementValues[$tag], is_array($element['unset'])?"":$element['unset']));
-        } else {
-          $e_set= is_array($element['set'])?"":$element['set'];
-          $e_unset= is_array($element['unset'])?"":$element['unset'];
-        }
+      // 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->elementValues[$tag] == "") {
-          $e_unset= preg_replace('/[^\\\\]\$/', normalizeLdap($this->elementValues[$tag]), $e_unset);
-          $e_unset= preg_replace('/\\\\\$/','$', $e_unset);
-          $filter= preg_replace("/\\$$tag/", $e_unset, $filter);
-        } else {
-          $e_set= preg_replace('/[^\\\\]\$/', normalizeLdap($this->elementValues[$tag]), $e_set);
-          $e_set= preg_replace('/\\\\\$/','$', $e_set);
-          $filter= preg_replace("/\\$$tag/", $e_set, $filter);
-        }
+      // Do not replace escaped \$ - This is required to be able to search for e.g. windows machines.
+      if ($this->value == "") {
+        $filter= preg_replace("/\\$/", '*', $filter);
+      } else {
+        $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));
@@ -417,38 +274,13 @@ class filter {
   }
 
 
-  function isValid()
-  {
-    foreach ($this->elements as $tag => $element) {
-      if (isset($element->regex)){
-        if (!preg_match('/'.(string)$element->regex.'/', $this->elementValues[$tag])){
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-
-
   function update()
   {
-    /* React on alphabet links if needed */
-    if (isset($_GET['filter'])){
-      $s= mb_substr(validate($_GET['filter']), 0, 1, "UTF8");
-      foreach ($this->alphabetElements as $tag) {
-        $this->elementValues[$tag]= $s;
-      }
-    }
-
     if (isset($_POST['FILTER_PID']) && $_POST['FILTER_PID'] == $this->pid) {
-      // Load post values and adapt filter, base and scope accordingly - but
-      // only if we didn't get a _GET
-      foreach ($this->elements as $tag => $element) {
-        if (isset($_POST[$tag])){
-          $this->elementValues[$tag]= validate($_POST[$tag]);
-        } else {
-          $this->elementValues[$tag]= "";
-        }
+
+      // Save input field
+      if (isset($_POST['search_filter'])) {
+        $this->value= validate($_POST['search_filter']);
       }
 
       // Save scope if needed
@@ -460,7 +292,7 @@ class filter {
   }
 
 
-  function getCompletitionList($config, $tag, $value="*")
+  function getCompletitionList($config, $value="*")
   {
     global $class_mapping;
     $res= array();
@@ -479,7 +311,7 @@ class filter {
     }
 
     // Make filter
-    $filter= preg_replace("/\\$$tag/", normalizeLdap($value), $filter);
+    $filter= preg_replace("/\\$/", normalizeLdap($value), $filter);
     if (isset($config['base']) && isset($config['scope']) && isset($config['category'])) {
       $result= call_user_func(array($backend, 'query'), $config['base'], $config['scope'], $filter, $attributes,
                            $config["category"], $config["objectStorage"]);
@@ -514,22 +346,20 @@ class filter {
     // Introduce maximum number of entries
     $max= 25;
 
-    foreach ($this->autocompleters as $tag => $config) {
-      if(isset($_POST[$tag])){
-        $result= $this->getCompletitionList($config, $tag, $_POST[$tag]);
-        $result= array_unique($result);
-        asort($result);
-
-        echo '<ul>';
-        foreach ($result as $entry) {
-          echo '<li>'.$entry.'</li>';
-          if ($max-- == 0) {
-            break;
-          }
-        }
+    if(isset($this->searches[$this->search]['autocomplete'])){
+      $result= $this->getCompletitionList($this->searches[$this->search]['autocomplete'], $_POST['search_filter']);
+      $result= array_unique($result);
+      asort($result);
 
-        echo '</ul>';
+      echo '<ul>';
+      foreach ($result as $entry) {
+        echo '<li>'.mark($_POST['search_filter'], $entry).'</li>';
+        if ($max-- == 0) {
+          break;
+        }
       }
+
+      echo '</ul>';
     }
   }
 
@@ -558,14 +388,28 @@ class filter {
   }
 
 
-}
 
-// Sort elements for element length to allow proper replacing later on
-function strlenSort($a, $b) {
-  if (strlen($a['tag']) == strlen($b['tag'])) {
-    return 0;
+  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")._("...")."&nbsp;".image("images/lists/sort-down.png")."</a>";
+
+    // Build ul/li list
+    $result.= "<ul class='level2'>";
+    $result.= "<li><a href='#'>Dummy placeholder</a></li>";
+    #$result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"".$action['name']."\";mainform.submit();'>$img"._($action['label'])."</a></li>";
+
+    # AUTOCOMPLETER and getTextbox
+
+    $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 (strlen($a['tag']) < strlen($b['tag']) ? -1 : 1);
-} 
+
+}
+
 
 ?>