Replaced config->search with get_cfg_value

[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 42048258fbf8cd34d15e0bbb72c14743d2da032d..04de2dae2c5cb13fce48ef21f3638fe6ce823937 100644 (file)
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -155,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";
@@ -223,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>";
 
@@ -419,10 +419,11 @@ class filter {
 
     // Build in filters
     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='\$(\"act\").value= \"filter-$tag\";\$(\"exec_act\").click();'>".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>";
       }
     }
 
@@ -451,7 +452,7 @@ class filter {
 
     $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";
   }