Minimize chance of race condition in session handling (#1485659, #1484678)

svncommit

2009-05-12 617b4f699f2e47991c50e05528b1f9ecbc3c3d9c

 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,18 +19,22 @@

*/

$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)) {

  foreach ($RCMAIL->config->get('autocomplete_addressbooks', array('sql')) as $id) {
  foreach ($book_types as $id) {
    $abook = $RCMAIL->get_address_book($id);
    $abook->set_pagesize(20);
    $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;
        }
      }
    }
@@ -39,7 +43,7 @@
  sort($contacts);
}

$OUTPUT->command('ksearch_query_results', $contacts);
$OUTPUT->command('ksearch_query_results', $contacts, $search);
$OUTPUT->send();

?>