From cb2bc809ef29f349d38c89e202d821e67bb4c947 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 21 Sep 2010 14:47:55 -0400
Subject: [PATCH] Fix db_mode check in insert_id()
---
program/steps/mail/autocomplete.inc | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 724f14a..4b6b6f9 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -26,36 +26,42 @@
$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()))
$members[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
-
+
$OUTPUT->command('replace_group_recipients', $gid, join(', ', $members));
}
}
else if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_GPC, true)) {
$contacts = array();
+ $books_num = count($book_types);
foreach ($book_types as $id) {
$abook = $RCMAIL->get_address_book($id);
$abook->set_pagesize($MAXNUM);
- if ($result = $abook->search(array('email','name'), $search, false, true, true)) {
+ if ($result = $abook->search(array('email','name'), $search, false, true, true, 'email')) {
while ($sql_arr = $result->iterate()) {
- $contacts[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
+ $contact = format_email_recipient($sql_arr['email'], $sql_arr['name']);
+ // when we've got more than one book, we need to skip duplicates
+ if ($books_num == 1 || !in_array($contact, $contacts)) {
+ $contacts[] = $contact;
if (count($contacts) >= $MAXNUM)
break 2;
+ }
}
}
-
+
// also list matching contact groups
if ($abook->groups) {
foreach ($abook->list_groups($search) as $group) {
$abook->reset();
$abook->set_group($group['ID']);
$result = $abook->count();
-
+
if ($result->count) {
$contacts[] = array('name' => $group['name'] . ' (' . intval($result->count) . ')', 'id' => $group['ID'], 'source' => $id);
if (count($contacts) >= $MAXNUM)
@@ -64,7 +70,7 @@
}
}
}
-
+
usort($contacts, 'contact_results_sort');
}
@@ -76,7 +82,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