Merge pull request #133 from cwickert/release-0.9-canned-responses

Thomas B.

2013-10-07 a3b85d7b8560cdc1057fcaffa3acbd247b4b5b7a

 program/steps/addressbook/list.inc

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

 $Id$

*/

$afields = $RCMAIL->config->get('contactlist_fields');

// Use search result
if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
@@ -34,7 +33,7 @@
        $page = isset($_SESSION['page']) ? $_SESSION['page'] : 1;

    $_SESSION['page'] = $page;
    $sort_col = $this->config->get('addressbook_sort_col', 'name');
    $sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');

    // Get records from all sources
    foreach ($search as $s => $set) {
@@ -46,11 +45,11 @@
        $source->set_search_set($set);

        // get records
        $result = $source->list_records(array('name', 'email'));
        $result = $source->list_records($afields);

        while ($row = $result->next()) {
            $row['sourceid'] = $s;
            $key = $row[$sort_col] . ':' . $row['sourceid'];
            $key = rcube_addressbook::compose_contact_key($row, $sort_col);
            $records[$key] = $row;
        }
        unset($result);
@@ -76,7 +75,7 @@
    $CONTACTS = rcmail_contact_source(null, true);

    // get contacts for this user
    $result = $CONTACTS->list_records(array('name'));
    $result = $CONTACTS->list_records($afields);

    if (!$result->count && $result->searchonly) {
        $OUTPUT->show_message('contactsearchonly', 'notice');