X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fautocomplete.php;h=e6bbdbde2b69c765d47a1bee636ccff4dee473d1;hb=5223915c299ab169dd23f0538fb9823b39853507;hp=b88b89bee011027d53cac61020d83b8594e47c62;hpb=bb54cf17425265c9f565d02829eeea9bcf62ff37;p=gosa.git

diff --git a/gosa-core/html/autocomplete.php b/gosa-core/html/autocomplete.php
index b88b89bee..e6bbdbde2 100644
--- 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());
 
@@ -34,21 +35,49 @@ if (!session::global_is_set('ui')){
   exit;
 }
 
-if(isset($_POST['NAME'])){
+/* Base completition or filter completition? */
+if (isset($_GET['type']) && $_GET['type'] == "base") {
 
-  /* Get configuration from session */
-  $config= $_SESSION['ui'];
-  $ldap= $config->get_ldap_link();
-  $ldap->cd($config->current['BASE']);
-  $n= normalizeLDAP($_POST['NAME']);
-  $res= $ldap->search ("(&(objectClass=gosaAccount)(cn=*$n*)(givenName=*$n*)(sn=*$n*)(uid=*$n*))", array("cn"));
+  // Find dn based on name and description
+  if (session::is_set("pathMapping") && count($_POST) == 1) {
+    $res= "";
+    $pathMapping= session::get("pathMapping");
+    $search= preg_replace('/"/', '"', current($_POST));
 
-  echo '<ul>';
-  foreach($res as $attrs){
-    echo '<li>'.$line['cn'][0].'</li>';
+    $config = session::global_get('config');
+    foreach ($config->department_info as $dn => $info) {
+      if (!isset($pathMapping[$dn])) {
+        continue;
+      }
+      if (mb_stristr($info['name'], $search) !== false) {
+        $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>".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>".mark($search, $pathMapping[$dn]).($info['description']==''?"":"<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
+        continue;
+      }
+    }
+
+    /* Return results */
+    if (!empty($res)) {
+      echo "<ul>$res</ul>";
+    }
   }
-  echo '</ul>';
-}
 
+} else {
+
+  $ui = session::global_get('ui');
+
+  /* Is there a filter object arround? */
+  if (session::is_set("autocomplete")){
+    $filter= session::get("autocomplete");
+    $filter->processAutocomplete();
+  }
+}
 
 ?>