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 26acc88c2dcf44972c06ef11b6ec2c1fe6aaab33..46915672d47019678eb400f948f13e8ed1d7802f 100644 (file)
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -19,11 +19,11 @@
 
 */
 
-$MAXNUM = 15;  // same limit as in app.js
+$MAXNUM = 15;
 $contacts = array();
 $book_types = (array) $RCMAIL->config->get('autocomplete_addressbooks', 'sql');
 
-if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_POST)) {
+if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_POST, true)) {
 
   foreach ($book_types as $id) {
     $abook = $RCMAIL->get_address_book($id);
@@ -31,14 +31,11 @@ if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_POST)) {
 
     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);
@@ -47,4 +44,4 @@ if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_POST)) {
 $OUTPUT->command('ksearch_query_results', $contacts, $search);
 $OUTPUT->send();
 
-?>
\ No newline at end of file
+?>