From ecfaed571b2c38f4bcc2b6a0fa39fba15a5126ce Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 11 Nov 2011 10:04:45 -0500
Subject: [PATCH] - Apply fixes fom trunk up to r5414
---
program/steps/mail/autocomplete.inc | 107 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 84 insertions(+), 23 deletions(-)
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 1e56fb2..e40bb76 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -4,8 +4,9 @@
+-----------------------------------------------------------------------+
| program/steps/mail/autocomplete.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2008-2010, RoundCube Dev Team |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2008-2011, Roundcube Dev Team |
+ | Copyright (C) 2011, Kolab Systems AG |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -19,47 +20,108 @@
*/
-$MAXNUM = 15;
-$contacts = array();
-$book_types = (array) $RCMAIL->config->get('autocomplete_addressbooks', 'sql');
+if ($RCMAIL->action == 'group-expand') {
+ $abook = $RCMAIL->get_address_book(get_input_value('_source', RCUBE_INPUT_GPC));
+ if ($gid = get_input_value('_gid', RCUBE_INPUT_GPC)) {
+ $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'));
+ while ($result && ($sql_arr = $result->iterate())) {
+ foreach ((array)$sql_arr['email'] as $email)
+ $members[] = format_email_recipient($email, $sql_arr['name']);
+ }
-if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_GPC, true)) {
+ $separator = trim($RCMAIL->config->get('recipients_separator', ',')) . ' ';
+ $OUTPUT->command('replace_group_recipients', $gid, join($separator, array_unique($members)));
+ }
+
+ $OUTPUT->send();
+}
+
+
+$MAXNUM = (int) $RCMAIL->config->get('autocomplete_max', 15);
+$mode = (int) $RCMAIL->config->get('addressbook_search_mode');
+$single = (bool) $RCMAIL->config->get('autocomplete_single');
+$search = get_input_value('_search', RCUBE_INPUT_GPC, true);
+$source = get_input_value('_source', RCUBE_INPUT_GPC);
+$sid = get_input_value('_id', RCUBE_INPUT_GPC);
+
+if (strlen($source))
+ $book_types = array($source);
+else
+ $book_types = (array) $RCMAIL->config->get('autocomplete_addressbooks', 'sql');
+
+if (!empty($book_types) && strlen($search)) {
+ $contacts = array();
+ $books_num = count($book_types);
+ $search_lc = mb_strtolower($search);
foreach ($book_types as $id) {
$abook = $RCMAIL->get_address_book($id);
$abook->set_pagesize($MAXNUM);
- if ($result = $abook->search(array('email','name'), $search)) {
+ if ($result = $abook->search(array('email','name'), $search, $mode, true, true, 'email')) {
while ($sql_arr = $result->iterate()) {
- $contacts[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
- if (count($contacts) >= $MAXNUM)
- break 2;
+ // Contact can have more than one e-mail address
+ $email_arr = (array)$abook->get_col_values('email', $sql_arr, true);
+ $email_cnt = count($email_arr);
+ foreach ($email_arr as $email) {
+ if (empty($email)) {
+ continue;
+ }
+
+ $contact = format_email_recipient($email, $sql_arr['name']);
+
+ // skip entries that don't match
+ if ($email_cnt > 1 && strpos(mb_strtolower($contact), $search_lc) === false) {
+ continue;
+ }
+
+ // skip duplicates
+ if (!in_array($contact, $contacts)) {
+ $contacts[] = $contact;
+ if (count($contacts) >= $MAXNUM)
+ break 2;
+ }
+
+ // skip redundant entries (show only first email address)
+ if ($single) {
+ break;
+ }
+ }
}
}
-
+
// also list matching contact groups
- if ($abook->groups) {
+ if ($abook->groups && count($contacts) < $MAXNUM) {
foreach ($abook->list_groups($search) as $group) {
- $members = array();
$abook->reset();
$abook->set_group($group['ID']);
- $result = $abook->list_records(array('email','name'));
- while ($result && ($sql_arr = $result->iterate()))
- $members[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
-
- if (count($members)) {
- $contacts[] = array('name' => $group['name'] . ' (' . rcube_label('group') . ')', 'members' => $members);
+ $group_prop = $abook->get_group($group['ID']);
+
+ // group (distribution list) with email address(es)
+ if ($group_prop['email']) {
+ foreach ((array)$group_prop['email'] as $email) {
+ $contacts[] = format_email_recipient($email, $group['name']);
+ if (count($contacts) >= $MAXNUM)
+ break 2;
+ }
+ }
+ // show group with count
+ else if (($result = $abook->count()) && $result->count) {
+ $contacts[] = array('name' => $group['name'] . ' (' . intval($result->count) . ')', 'id' => $group['ID'], 'source' => $id);
if (count($contacts) >= $MAXNUM)
break;
}
}
}
}
-
+
usort($contacts, 'contact_results_sort');
}
-$OUTPUT->command('ksearch_query_results', $contacts, $search);
+$OUTPUT->command('ksearch_query_results', $contacts, $search, $sid);
$OUTPUT->send();
@@ -67,7 +129,6 @@
{
$name_a = is_array($a) ? $a['name'] : $a;
$name_b = is_array($b) ? $b['name'] : $b;
- return strcmp(trim($name_a, '" '), trim($name_b, '" '));
+ return strcoll(trim($name_a, '" '), trim($name_b, '" '));
}
-?>
--
Gitblit v1.9.1