From f21a04c024e57d2396c6a8ab78b055de098217ee Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 10 Nov 2011 07:57:56 +0000 Subject: - Add option to define matching method for addressbook search (#1486564, #1487907) --- program/steps/addressbook/copy.inc | 4 ++-- program/steps/addressbook/import.inc | 4 ++-- program/steps/addressbook/mailto.inc | 2 +- program/steps/addressbook/save.inc | 2 +- program/steps/addressbook/search.inc | 5 ++++- program/steps/mail/addcontact.inc | 6 +++--- program/steps/mail/autocomplete.inc | 5 +++-- 7 files changed, 16 insertions(+), 12 deletions(-) (limited to 'program/steps') diff --git a/program/steps/addressbook/copy.inc b/program/steps/addressbook/copy.inc index e07d62af9..5e526e1aa 100644 --- a/program/steps/addressbook/copy.inc +++ b/program/steps/addressbook/copy.inc @@ -60,9 +60,9 @@ foreach ($cids as $source => $cid) // Check if contact exists, if so, we'll need it's ID // Note: Some addressbooks allows empty email address field if (!empty($a_record['email'])) - $result = $TARGET->search('email', $a_record['email'], true, true, true); + $result = $TARGET->search('email', $a_record['email'], 1, true, true); else if (!empty($a_record['name'])) - $result = $TARGET->search('name', $a_record['name'], true, true, true); + $result = $TARGET->search('name', $a_record['name'], 1, true, true); else $result = new rcube_result_set(); diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc index 1b9aea18a..63a6dae30 100644 --- a/program/steps/addressbook/import.inc +++ b/program/steps/addressbook/import.inc @@ -174,9 +174,9 @@ if ($_FILES['_file']['tmp_name'] && is_uploaded_file($_FILES['_file']['tmp_name' if (!$replace && $email) { // compare e-mail address - $existing = $CONTACTS->search('email', $email, false, false); + $existing = $CONTACTS->search('email', $email, 1, false); if (!$existing->count && $vcard->displayname) { // compare display name - $existing = $CONTACTS->search('name', $vcard->displayname, false, false); + $existing = $CONTACTS->search('name', $vcard->displayname, 1, false); } if ($existing->count) { $IMPORT_STATS->skipped++; diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc index 99c022db2..c40ecdf72 100644 --- a/program/steps/addressbook/mailto.inc +++ b/program/steps/addressbook/mailto.inc @@ -31,7 +31,7 @@ foreach ($cids as $source => $cid) { $CONTACTS->set_page(1); $CONTACTS->set_pagesize(count($cid) + 2); // +2 to skip counting query - $recipients = $CONTACTS->search($CONTACTS->primary_key, $cid, false, true, true, 'email'); + $recipients = $CONTACTS->search($CONTACTS->primary_key, $cid, 0, true, true, 'email'); } } diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc index ddbd630ef..0a2d6dbff 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.inc @@ -162,7 +162,7 @@ else { // show notice if existing contacts with same e-mail are found $existing = false; foreach ($CONTACTS->get_col_values('email', $a_record, true) as $email) { - if ($email && ($res = $CONTACTS->search('email', $email, false, false, true)) && $res->count) { + if ($email && ($res = $CONTACTS->search('email', $email, 1, false, true)) && $res->count) { $OUTPUT->show_message('contactexists', 'notice', null, false); break; } diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc index ea9824727..643cc60a8 100644 --- a/program/steps/addressbook/search.inc +++ b/program/steps/addressbook/search.inc @@ -137,6 +137,9 @@ function rcmail_contact_search() } } + // Values matching mode + $mode = (int) $RCMAIL->config->get('addressbook_search_mode'); + // get sources list $sources = $RCMAIL->get_address_sources(); $search_set = array(); @@ -168,7 +171,7 @@ function rcmail_contact_search() $source->set_pagesize(9999); // get contacts count - $result = $source->search($fields, $search, false, false); + $result = $source->search($fields, $search, $mode, false); if (!$result->count) { continue; diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc index dafb2763c..a4feb7b58 100644 --- a/program/steps/mail/addcontact.inc +++ b/program/steps/mail/addcontact.inc @@ -50,7 +50,7 @@ if (!empty($_POST['_address']) && is_object($CONTACTS)) $OUTPUT->show_message('errorsavingcontact', 'error'); $OUTPUT->send(); } - + $email = rcube_idn_to_ascii($contact['email']); if (!check_email($email, false)) { $OUTPUT->show_message('emailformaterror', 'error', array('email' => $contact['email'])); @@ -65,13 +65,13 @@ if (!empty($_POST['_address']) && is_object($CONTACTS)) $error = $CONTACTS->get_error(); // TODO: show dialog to complete record // if ($error['type'] == rcube_addressbook::ERROR_VALIDATE) { } - + $OUTPUT->show_message($error['message'] ? $error['message'] : 'errorsavingcontact', 'error'); $OUTPUT->send(); } // check for existing contacts - $existing = $CONTACTS->search('email', $contact['email'], true, false); + $existing = $CONTACTS->search('email', $contact['email'], 1, false); if ($done = $existing->count) $OUTPUT->show_message('contactexists', 'warning'); diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc index 8b13f574d..c2df0b79c 100644 --- a/program/steps/mail/autocomplete.inc +++ b/program/steps/mail/autocomplete.inc @@ -41,6 +41,7 @@ if ($RCMAIL->action == 'group-expand') { $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 @@ if (!empty($book_types) && strlen($search)) { $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 @@ if (!empty($book_types) && strlen($search)) { } // 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']); -- cgit v1.2.3