From f21a04c024e57d2396c6a8ab78b055de098217ee Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 10 Nov 2011 02:57:56 -0500
Subject: [PATCH] - Add option to define matching method for addressbook search (#1486564, #1487907)
---
program/steps/mail/autocomplete.inc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 8b13f57..c2df0b7 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -41,6 +41,7 @@
$MAXNUM = (int)$RCMAIL->config->get('autocomplete_max', 15);
+$mode = (int) $RCMAIL->config->get('addressbook_search_mode');
$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);
@@ -58,7 +59,7 @@
$abook = $RCMAIL->get_address_book($id);
$abook->set_pagesize($MAXNUM);
- if ($result = $abook->search(array('email','name'), $search, false, true, true, 'email')) {
+ if ($result = $abook->search(array('email','name'), $search, $mode, true, true, 'email')) {
while ($sql_arr = $result->iterate()) {
// Contact can have more than one e-mail address
$email_arr = (array)$abook->get_col_values('email', $sql_arr, true);
@@ -82,7 +83,7 @@
}
// also list matching contact groups
- if ($abook->groups) {
+ if ($abook->groups && count($contacts) < $MAXNUM) {
foreach ($abook->list_groups($search) as $group) {
$abook->reset();
$abook->set_group($group['ID']);
--
Gitblit v1.9.1