Fix export of selected contacts from search result (#1488905)

Aleksander Machniak

2013-01-17 8e8f3b96b51fde1df953de7398b15e0f01e10777

 program/steps/mail/autocomplete.inc

@@ -18,9 +18,6 @@
 +-----------------------------------------------------------------------+
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 +-----------------------------------------------------------------------+

 $Id$

*/

if ($RCMAIL->action == 'group-expand') {
@@ -29,10 +26,10 @@
    $members = array();
    $abook->set_group($gid);
    $abook->set_pagesize(1000);  // TODO: limit number of group members by config
    $result = $abook->list_records(array('email','name'));
    $result = $abook->list_records($RCMAIL->config->get('contactlist_fields'));
    while ($result && ($sql_arr = $result->iterate())) {
      foreach ((array)$sql_arr['email'] as $email) {
        $members[] = format_email_recipient($email, $sql_arr['name']);
        $members[] = format_email_recipient($email, rcube_addressbook::compose_list_name($sql_arr));
        break;  // only expand one email per contact
      }
    }
@@ -67,7 +64,7 @@
    $abook = $RCMAIL->get_address_book($id);
    $abook->set_pagesize($MAXNUM);

    if ($result = $abook->search(array('email','name'), $search, $mode, true, true, 'email')) {
    if ($result = $abook->search($RCMAIL->config->get('contactlist_fields'), $search, $mode, true, true, 'email')) {
      while ($sql_arr = $result->iterate()) {
        // Contact can have more than one e-mail address
        $email_arr = (array)$abook->get_col_values('email', $sql_arr, true);
@@ -78,6 +75,7 @@
            continue;
          }

          $sql_arr['name'] = rcube_addressbook::compose_list_name($sql_arr);
          $contact = format_email_recipient($email, $sql_arr['name']);

          // skip entries that don't match