Updated image

[gosa.git] / gosa-core / html / autocomplete.php

diff --git a/gosa-core/html/autocomplete.php b/gosa-core/html/autocomplete.php
index caaa3a0c137d2be62b6ad30767a358f232e6a62a..8804363913ee6de1514d5a9bac14f7c4623d5d0d 100644 (file)
--- a/gosa-core/html/autocomplete.php
+++ b/gosa-core/html/autocomplete.php
@@ -24,6 +24,7 @@
 @require_once ("../include/php_setup.inc");
 @require_once ("functions.inc");
 
+session_cache_limiter("private");
 session::start();
 session::global_set('errorsAlreadyPosted',array());
 
@@ -41,23 +42,23 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
   if (session::is_set("pathMapping") && count($_POST) == 1) {
     $res= "";
     $pathMapping= session::get("pathMapping");
-    $search= preg_replace('/"/', '"', current($_POST));
+    $department_info= session::get("department_info");
 
-    $config = session::global_get('config');
-    foreach ($config->department_info as $dn => $info) {
+    $search= preg_replace('/"/', '"', current($_POST));
+    foreach ($department_info as $dn => $info) {
       if (!isset($pathMapping[$dn])) {
         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;
       }
     }
@@ -71,6 +72,7 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
 } else {
 
   $ui = session::global_get('ui');
+  $config = session::global_get('config');
 
   /* Is there a filter object arround? */
   if (session::is_set("autocomplete")){