From 2d3e2bc56108fc014edfaa154237b551daea4cc0 Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Wed, 21 Sep 2011 07:17:46 -0400 Subject: [PATCH] Add option 'searchonly' for address books; currently used by LDAP directories --- program/steps/addressbook/list.inc | 65 ++++++++++++++++++++++++++++++-- 1 files changed, 60 insertions(+), 5 deletions(-) diff --git a/program/steps/addressbook/list.inc b/program/steps/addressbook/list.inc index 0eb4b80..313b52e 100644 --- a/program/steps/addressbook/list.inc +++ b/program/steps/addressbook/list.inc @@ -19,16 +19,71 @@ */ -// get contacts for this user -$result = $CONTACTS->list_records(array('name')); +// Use search result +if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) +{ + $search = (array)$_SESSION['search'][$_REQUEST['_search']]; + $records = array(); + + if (!empty($_GET['_page'])) + $page = intval($_GET['_page']); + else + $page = isset($_SESSION['page']) ? $_SESSION['page'] : 1; + + $_SESSION['page'] = $page; + + // Get records from all sources + foreach ($search as $s => $set) { + $source = $RCMAIL->get_address_book($s); + + // reset page + $source->set_page(1); + $source->set_pagesize(9999); + $source->set_search_set($set); + + // get records + $result = $source->list_records(array('name', 'email')); + + while ($row = $result->next()) { + $row['sourceid'] = $s; + $key = $row['name'] . ':' . $row['sourceid']; + $records[$key] = $row; + } + unset($result); + } + + // sort the records + ksort($records, SORT_LOCALE_STRING); + + // create resultset object + $count = count($records); + $first = ($page-1) * $CONFIG['pagesize']; + $result = new rcube_result_set($count, $first); + + // we need only records for current page + if ($CONFIG['pagesize'] < $count) { + $records = array_slice($records, $first, $CONFIG['pagesize']); + } + + $result->records = array_values($records); +} +// List selected directory +else { + $CONTACTS = rcmail_contact_source(null, true); + + // get contacts for this user + $result = $CONTACTS->list_records(array('name')); + + if (!$result->count && $result->searchonly) + $OUTPUT->show_message('contactsearchonly', 'notice'); +} // update message count display -$OUTPUT->set_env('pagecount', ceil($result->count / $CONTACTS->page_size)); -$OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($rowcount)); +$OUTPUT->set_env('pagecount', ceil($result->count / $CONFIG['pagesize'])); +$OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($result)); // create javascript list rcmail_js_contacts_list($result); // send response $OUTPUT->send(); - -- Gitblit v1.9.1