From 6c27c3b55e7516ae1d2b99ecd1188203d022de78 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Fri, 25 Jan 2013 14:27:25 +0100 Subject: Add search box to compose address book widget (#1488381) --- program/steps/mail/list_contacts.inc | 153 ++++++++++++++++++++++------------- 1 file changed, 99 insertions(+), 54 deletions(-) (limited to 'program/steps/mail/list_contacts.inc') diff --git a/program/steps/mail/list_contacts.inc b/program/steps/mail/list_contacts.inc index 9347190da..7e3b349cd 100644 --- a/program/steps/mail/list_contacts.inc +++ b/program/steps/mail/list_contacts.inc @@ -5,7 +5,7 @@ | program/steps/mail/list_contacts.inc | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2012, The Roundcube Dev Team | + | Copyright (C) 2012-2013, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -19,72 +19,117 @@ +-----------------------------------------------------------------------+ */ -$jsenv = array(); -$source = get_input_value('_source', RCUBE_INPUT_GPC); -$CONTACTS = $RCMAIL->get_address_book($source); -$PAGE_SIZE = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50)); - -if ($CONTACTS && $CONTACTS->ready) { - // set list properties - $CONTACTS->set_pagesize($PAGE_SIZE); - $CONTACTS->set_page(max(1, intval($_GET['_page']))); - - // list groups of this source (on page one) - if ($CONTACTS->groups && $CONTACTS->list_page == 1) { - foreach ($CONTACTS->list_groups() as $group) { - $CONTACTS->reset(); - $CONTACTS->set_group($group['ID']); - $group_prop = $CONTACTS->get_group($group['ID']); - - // group (distribution list) with email address(es) - if ($group_prop['email']) { - foreach ((array)$group_prop['email'] as $email) { - $row_id = 'G'.$group['ID']; - $jsresult[$row_id] = format_email_recipient($email, $group['name']); +$afields = $RCMAIL->config->get('contactlist_fields'); +$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name'); +$page_size = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50)); +$page = max(1, intval($_GET['_page'])); + +// Use search result +if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) { + $search = (array)$_SESSION['search'][$_REQUEST['_search']]; + + // get records from all sources + foreach ($search as $s => $set) { + $CONTACTS = $RCMAIL->get_address_book($s); + + // reset page + $CONTACTS->set_page(1); + $CONTACTS->set_pagesize(9999); + $CONTACTS->set_search_set($set); + + // get records + $result = $CONTACTS->list_records($afields); + + while ($row = $result->next()) { + $row['sourceid'] = $s; + $key = rcube_addressbook::compose_contact_key($row, $sort_col); + $records[$key] = $row; + } + unset($result); + } + + // sort the records + ksort($records, SORT_LOCALE_STRING); + + // create resultset object + $count = count($records); + $first = ($page-1) * $page_size; + $result = new rcube_result_set($count, $first); + + // we need only records for current page + if ($page_size < $count) { + $records = array_slice($records, $first, $page_size); + } + + $result->records = array_values($records); +} +// list contacts from selected source +else { + $source = get_input_value('_source', RCUBE_INPUT_GPC); + $CONTACTS = $RCMAIL->get_address_book($source); + + if ($CONTACTS && $CONTACTS->ready) { + // set list properties + $CONTACTS->set_pagesize($page_size); + $CONTACTS->set_page($page); + + // list groups of this source (on page one) + if ($CONTACTS->groups && $CONTACTS->list_page == 1) { + foreach ($CONTACTS->list_groups() as $group) { + $CONTACTS->reset(); + $CONTACTS->set_group($group['ID']); + $group_prop = $CONTACTS->get_group($group['ID']); + + // group (distribution list) with email address(es) + if ($group_prop['email']) { + foreach ((array)$group_prop['email'] as $email) { + $row_id = 'G'.$group['ID']; + $jsresult[$row_id] = format_email_recipient($email, $group['name']); + $OUTPUT->command('add_contact_row', $row_id, array( + 'contactgroup' => html::span(array('title' => $email), Q($group['name']))), 'group'); + } + } + // show group with count + else if (($result = $CONTACTS->count()) && $result->count) { + $row_id = 'E'.$group['ID']; + $jsresult[$row_id] = $group['name']; $OUTPUT->command('add_contact_row', $row_id, array( - 'contactgroup' => html::span(array('title' => $email), Q($group['name']))), 'group'); + 'contactgroup' => Q($group['name'] . ' (' . intval($result->count) . ')')), 'group'); } } - // show group with count - else if (($result = $CONTACTS->count()) && $result->count) { - $row_id = 'E'.$group['ID']; - $jsresult[$row_id] = $group['name']; - $OUTPUT->command('add_contact_row', $row_id, array( - 'contactgroup' => Q($group['name'] . ' (' . intval($result->count) . ')')), 'group'); - } } + + // get contacts for this user + $CONTACTS->set_group(0); + $result = $CONTACTS->list_records($afields); } +} - // get contacts for this user - $CONTACTS->set_group(0); - $afields = $RCMAIL->config->get('contactlist_fields'); - $result = $CONTACTS->list_records($afields); +if (!empty($result) && !$result->count && $result->searchonly) { + $OUTPUT->show_message('contactsearchonly', 'notice'); +} +else if (!empty($result) && $result->count > 0) { + // create javascript list + while ($row = $result->next()) { + $name = rcube_addressbook::compose_list_name($row); - if (!$result->count && $result->searchonly) { - $OUTPUT->show_message('contactsearchonly', 'notice'); - } - else if (!empty($result) && $result->count > 0) { - // create javascript list - while ($row = $result->next()) { - $name = rcube_addressbook::compose_list_name($row); - - // add record for every email address of the contact - $emails = $CONTACTS->get_col_values('email', $row, true); - foreach ($emails as $i => $email) { - $row_id = $row['ID'].$i; - $jsresult[$row_id] = format_email_recipient($email, $name); - $OUTPUT->command('add_contact_row', $row_id, array( - 'contact' => html::span(array('title' => $email), Q($name ? $name : $email) . - ($name && count($emails) > 1 ? ' ' . html::span('email', Q($email)) : '') - )), 'person'); - } + // add record for every email address of the contact + $emails = $CONTACTS->get_col_values('email', $row, true); + foreach ($emails as $i => $email) { + $row_id = $row['ID'].$i; + $jsresult[$row_id] = format_email_recipient($email, $name); + $OUTPUT->command('add_contact_row', $row_id, array( + 'contact' => html::span(array('title' => $email), Q($name ? $name : $email) . + ($name && count($emails) > 1 ? ' ' . html::span('email', Q($email)) : '') + )), 'person'); } } } + // update env $OUTPUT->set_env('contactdata', $jsresult); -$OUTPUT->set_env('pagecount', ceil($result->count / $PAGE_SIZE)); +$OUTPUT->set_env('pagecount', ceil($result->count / $page_size)); $OUTPUT->command('set_page_buttons'); // send response -- cgit v1.2.3