Imported Upstream version 0.3

[roundcube.git] / program / steps / mail / autocomplete.inc

diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index fe011de0a21028997581c20d153676058e4a33f7..46915672d47019678eb400f948f13e8ed1d7802f 100644 (file)
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/autocomplete.inc                                   |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008, RoundCube Dev Team                                |
+ | Copyright (C) 2008-2009, RoundCube Dev Team                           |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -19,31 +19,29 @@
 
 */
 
-$MAXNUM = 15;  // same limit as in app.js
+$MAXNUM = 15;
 $contacts = array();
+$book_types = (array) $RCMAIL->config->get('autocomplete_addressbooks', 'sql');
 
-if ($search = get_input_value('_search', RCUBE_INPUT_POST)) {
+if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_POST, true)) {
 
-  foreach ($RCMAIL->config->get('autocomplete_addressbooks', array('sql')) as $id) {
+  foreach ($book_types as $id) {
     $abook = $RCMAIL->get_address_book($id);
     $abook->set_pagesize($MAXNUM);
 
     if ($result = $abook->search(array('email','name'), $search)) {
       while ($sql_arr = $result->iterate()) {
-        if (stripos((string)$sql_arr['email'], $search) !== false || stripos((string)$sql_arr['name'], $search) !== false) {
           $contacts[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
-        }
+         if (count($contacts) >= $MAXNUM)
+            break 2;
       }
     }
-    
-    if (count($contacts) >= $MAXNUM)
-      break;
   }
   
   sort($contacts);
 }
 
-$OUTPUT->command('ksearch_query_results', $contacts);
+$OUTPUT->command('ksearch_query_results', $contacts, $search);
 $OUTPUT->send();
 
-?>
\ No newline at end of file
+?>