From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 4 Feb 2010 11:06:11 +0000 (+0000)
Subject: Updated autocompletion
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3b2528eff62e96878dffab7c46b177a84b47f7cb;p=gosa.git

Updated autocompletion


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15585 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/html/autocomplete.php b/gosa-core/html/autocomplete.php
index caaa3a0c1..74b46abd2 100644
--- a/gosa-core/html/autocomplete.php
+++ b/gosa-core/html/autocomplete.php
@@ -49,15 +49,15 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
         continue;
       }
       if (mb_stristr($info['name'], $search) !== false) {
-        $res.= "<li>".$pathMapping[$dn].($info['description']==''?"":"<span class='informal'> [".$info['description']."]</span>")."</li>";
+        $res.= "<li>".mark($search, $pathMapping[$dn]).($info['description']==''?"":"<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
         continue;
       }
       if (mb_stristr($info['description'], $search) !== false) {
-        $res.= "<li>".$pathMapping[$dn].($info['description']==''?"":"<span class='informal'> [".$info['description']."]</span>")."</li>";
+        $res.= "<li>".mark($search, $pathMapping[$dn]).($info['description']==''?"":"<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
         continue;
       }
       if (mb_stristr($pathMapping[$dn], $search) !== false) {
-        $res.= "<li>".$pathMapping[$dn].($info['description']==''?"":"<span class='informal'> [".$info['description']."]</span>")."</li>";
+        $res.= "<li>".mark($search, $pathMapping[$dn]).($info['description']==''?"":"<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
         continue;
       }
     }
diff --git a/gosa-core/html/themes/default/style.css b/gosa-core/html/themes/default/style.css
index 302d4f1fd..8bf92d7a9 100644
--- a/gosa-core/html/themes/default/style.css
+++ b/gosa-core/html/themes/default/style.css
@@ -2007,3 +2007,7 @@ font-style:italic;
 * html div.treeList {
 height: expression( this.scrollHeight > 500 ? "500px" : "auto" );
 }
+
+span.mark {
+color:#B22;
+}
diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index a8bb6fa3e..51ffec05e 100644
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -530,7 +530,7 @@ class filter {
 
         echo '<ul>';
         foreach ($result as $entry) {
-          echo '<li>'.$entry.'</li>';
+          echo '<li>'.mark($_POST[$tag], $entry).'</li>';
           if ($max-- == 0) {
             break;
           }
diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 34ab73482..8609fab62 100644
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -3504,5 +3504,18 @@ function get_next_id_traditional($attrib, $dn)
 }
 
 
+/* Mark the occurance of a string with a span */
+function mark($needle, $haystack, $ignorecase= true)
+{
+  $result= "";
+
+  while (preg_match('/^(.*)('.preg_quote($needle).')(.*)$/i', $haystack, $matches)) {
+    $result.= $matches[1]."<span class='mark'>".$matches[2]."</span>";
+    $haystack= $matches[3];
+  }
+
+  return $result.$haystack;
+}
+
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>