Changeset 710b1bd in github

Timestamp:

Nov 10, 2011 9:30:51 AM (19 months ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8

Children:

8c2b883

Parents:

bed577e

Message:

• Add option to skip alternative email addresses in autocompletion

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (1 diff)
• program/localization/pl_PL/labels.inc (modified) (1 diff)
• program/steps/mail/autocomplete.inc (modified) (3 diffs)
• program/steps/settings/func.inc (modified) (1 diff)
• program/steps/settings/save_prefs.inc (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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)

config/main.inc.php.dist

@@ -782 +782 @@
 $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

program/localization/en_US/labels.inc

@@ -432 +432 @@
 $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';

program/localization/pl_PL/labels.inc

@@ -487 +487 @@
 $labels['timeformat'] = 'Format czasu';
 $labels['isdraft'] = 'To jest kopia robocza wiadomości.';
+$labels['autocompletesingle'] = 'Nie pokazuj alternatywnych adresów przy autouzupełnianiu';
 
 ?>

program/steps/mail/autocomplete.inc

@@ -41 +41 @@
 
 
-$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);
@@ -67 +68 @@
         $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)) {
@@ -79 +84 @@
             if (count($contacts) >= $MAXNUM)
               break 2;
+          }
+
+          // skip redundant entries (show only first email address)
+          if ($single) {
+            break;
           }
         }

program/steps/settings/func.inc

@@ -660 +660 @@
     }
 
+    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;
 

program/steps/settings/save_prefs.inc

@@ -94 +94 @@
     $a_user_prefs = array(
       'default_addressbook' => get_input_value('_default_addressbook', RCUBE_INPUT_POST, true),
+      'autocomplete_single' => isset($_POST['_autocomplete_single']) ? TRUE : FALSE,
     );