diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/main.inc.php.dist | 3 | ||||
| -rw-r--r-- | program/localization/en_US/labels.inc | 1 | ||||
| -rw-r--r-- | program/localization/pl_PL/labels.inc | 1 | ||||
| -rw-r--r-- | program/steps/mail/autocomplete.inc | 14 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 10 | ||||
| -rw-r--r-- | program/steps/settings/save_prefs.inc | 1 |
7 files changed, 29 insertions, 2 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Add option to skip alternative email addresses in autocompletion - Fix inconsistent behaviour of Compose button in Drafts folder, add Edit button for drafts - Fix problem with parsing HTML message body with non-unicode characters (#1487813) - Add option to define matching method for addressbook search (#1486564, #1487907) diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index ef76c2a8d..fe58350be 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -781,4 +781,7 @@ $rcmail_config['default_addressbook'] = null; // Enables spell checking before sending a message. $rcmail_config['spellcheck_before_send'] = false; +// Skip alternative email addresses in autocompletion (show one address per contact) +$rcmail_config['autocomplete_single'] = false; + // end of config file diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 77b31b6dd..6aefd6c4a 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -431,6 +431,7 @@ $labels['reqmdn'] = 'Always request a return receipt'; $labels['reqdsn'] = 'Always request a delivery status notification'; $labels['replysamefolder'] = 'Place replies in the folder of the message being replied to'; $labels['defaultaddressbook'] = 'Add new contacts to the selected addressbook'; +$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion'; $labels['spellcheckbeforesend'] = 'Check spelling before sending a message'; $labels['spellcheckoptions'] = 'Spellcheck Options'; $labels['spellcheckignoresyms'] = 'Ignore words with symbols'; diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc index d45a7a051..cdebe50f5 100644 --- a/program/localization/pl_PL/labels.inc +++ b/program/localization/pl_PL/labels.inc @@ -433,5 +433,6 @@ $labels['addtodict'] = 'Dodaj do słownika'; $labels['dateformat'] = 'Format daty'; $labels['timeformat'] = 'Format czasu'; $labels['isdraft'] = 'To jest kopia robocza wiadomości.'; +$labels['autocompletesingle'] = 'Nie pokazuj alternatywnych adresów przy autouzupełnianiu'; ?> diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc index 8ccfaaa6f..e40bb76c3 100644 --- a/program/steps/mail/autocomplete.inc +++ b/program/steps/mail/autocomplete.inc @@ -40,8 +40,9 @@ if ($RCMAIL->action == 'group-expand') { } -$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 @@ if (!empty($book_types) && strlen($search)) { $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; + } } } } diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index bb144d4cb..6ba524724 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -659,6 +659,16 @@ function rcmail_user_prefs($current=null) ); } + if (!isset($no_override['autocomplete_single'])) { + $field_id = 'rcmfd_autocomplete_single'; + $checkbox = new html_checkbox(array('name' => '_autocomplete_single', 'id' => $field_id, 'value' => 1)); + + $blocks['main']['options']['autocomplete_single'] = array( + 'title' => html::label($field_id, Q(rcube_label('autocompletesingle'))), + 'content' => $checkbox->show($config['autocomplete_single']?1:0), + ); + } + break; // Special IMAP folders diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index a32f5948c..d917e1157 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -93,6 +93,7 @@ switch ($CURR_SECTION) case 'addressbook': $a_user_prefs = array( 'default_addressbook' => get_input_value('_default_addressbook', RCUBE_INPUT_POST, true), + 'autocomplete_single' => isset($_POST['_autocomplete_single']) ? TRUE : FALSE, ); break; |