From 710b1bd68465ad919aabd171f1ab597a192c367b Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 10 Nov 2011 09:30:51 -0500
Subject: [PATCH] - Add option to skip alternative email addresses in autocompletion
---
program/steps/mail/autocomplete.inc | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 8ccfaaa..e40bb76 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -40,8 +40,9 @@
}
-$MAXNUM = (int)$RCMAIL->config->get('autocomplete_max', 15);
+$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);
@@ -66,19 +67,28 @@
$email_arr = (array)$abook->get_col_values('email', $sql_arr, true);
$email_cnt = count($email_arr);
foreach ($email_arr as $email) {
- if (empty($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;
+ }
}
}
}
--
Gitblit v1.9.1