From 3f4521bcf4b538b6ac54817cfad22b51e347546d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 17 Jun 2015 03:03:03 -0400
Subject: [PATCH] Fix so plain text signature field uses monospace font (#1490435)
---
program/steps/mail/autocomplete.inc | 220 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 144 insertions(+), 76 deletions(-)
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 2968f03..38501eb 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -5,8 +5,12 @@
| program/steps/mail/autocomplete.inc |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2008-2010, Roundcube Dev Team |
- | Licensed under the GNU GPL |
+ | Copyright (C) 2008-2013, Roundcube Dev Team |
+ | Copyright (C) 2011-2013, Kolab Systems AG |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Perform a search on configured address books for the address |
@@ -14,98 +18,162 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
if ($RCMAIL->action == 'group-expand') {
- $abook = $RCMAIL->get_address_book(get_input_value('_source', RCUBE_INPUT_GPC));
- if ($gid = get_input_value('_gid', RCUBE_INPUT_GPC)) {
- $members = array();
- $abook->set_group($gid);
- $abook->set_pagesize(1000); // TODO: limit number of group members by config
- $result = $abook->list_records(array('email','name'));
- while ($result && ($sql_arr = $result->iterate())) {
- foreach ((array)$sql_arr['email'] as $email)
- $members[] = format_email_recipient($email, $sql_arr['name']);
+ $abook = $RCMAIL->get_address_book(rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC));
+ if ($gid = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_GPC)) {
+ $abook->set_group($gid);
+ $abook->set_pagesize(1000); // TODO: limit number of group members by config
+
+ $separator = trim($RCMAIL->config->get('recipients_separator', ',')) . ' ';
+ $result = $abook->list_records($RCMAIL->config->get('contactlist_fields'));
+ $members = array();
+
+ while ($result && ($sql_arr = $result->iterate())) {
+ $emails = (array) $abook->get_col_values('email', $sql_arr, true);
+ if (!empty($emails) && ($email = array_shift($emails))) {
+ $members[] = format_email_recipient($email, rcube_addressbook::compose_list_name($sql_arr));
+ }
+ }
+
+ $OUTPUT->command('replace_group_recipients', $gid, join($separator, array_unique($members)));
}
- $OUTPUT->command('replace_group_recipients', $gid, join(', ', $members));
- }
-
- $OUTPUT->send();
+ $OUTPUT->send();
}
-$MAXNUM = (int)$RCMAIL->config->get('autocomplete_max', 15);
-$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);
+$MAXNUM = (int) $RCMAIL->config->get('autocomplete_max', 15);
+$mode = (int) $RCMAIL->config->get('addressbook_search_mode');
+$single = (bool) $RCMAIL->config->get('autocomplete_single');
+$search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
+$source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
+$reqid = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
-if (strlen($source))
- $book_types = array($source);
-else
- $book_types = (array) $RCMAIL->config->get('autocomplete_addressbooks', 'sql');
+if (strlen($source)) {
+ $book_types = array($source);
+}
+else {
+ $book_types = (array) $RCMAIL->config->get('autocomplete_addressbooks', 'sql');
+}
if (!empty($book_types) && strlen($search)) {
- $contacts = array();
- $books_num = count($book_types);
+ $contacts = array();
+ $sort_keys = array();
+ $books_num = count($book_types);
+ $search_lc = mb_strtolower($search);
- foreach ($book_types as $id) {
- $abook = $RCMAIL->get_address_book($id);
- $abook->set_pagesize($MAXNUM);
+ foreach ($book_types as $id) {
+ $abook = $RCMAIL->get_address_book($id);
+ $abook->set_pagesize($MAXNUM);
- if ($result = $abook->search(array('email','name'), $search, false, 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);
- $email_cnt = count($email_arr);
- foreach ($email_arr as $email) {
- if (empty($email))
- continue;
- $contact = format_email_recipient($email, $sql_arr['name']);
- // skip entries that don't match
- if ($email_cnt > 1 && stripos($contact, $search) === false) {
- continue;
- }
- // when we've got more than one book, we need to skip duplicates
- if ($books_num == 1 || !in_array($contact, $contacts)) {
- $contacts[] = $contact;
- if (count($contacts) >= $MAXNUM)
- break 2;
- }
+ if ($result = $abook->search($RCMAIL->config->get('contactlist_fields'), $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);
+ $email_cnt = count($email_arr);
+ $idx = 0;
+
+ foreach ($email_arr as $email) {
+ if (empty($email)) {
+ continue;
+ }
+
+ $name = rcube_addressbook::compose_list_name($sql_arr);
+ $contact = format_email_recipient($email, $name);
+
+ // skip entries that don't match
+ if ($email_cnt > 1 && strpos(mb_strtolower($contact), $search_lc) === false) {
+ continue;
+ }
+
+ $index = $contact;
+
+ // skip duplicates
+ if (empty($contacts[$index])) {
+ $contact = array('name' => $contact, 'type' => $sql_arr['_type']);
+
+ if (($display = rcube_addressbook::compose_search_name($sql_arr, $email, $name)) && $display != $contact['name']) {
+ $contact['display'] = $display;
+ }
+
+ $contacts[$index] = $contact;
+ $sort_keys[$index] = sprintf('%s %03d', $contact['display'] ?: $name, $idx++);
+
+ if (count($contacts) >= $MAXNUM) {
+ break 2;
+ }
+ }
+
+ // skip redundant entries (show only first email address)
+ if ($single) {
+ break;
+ }
+ }
+ }
}
- }
+
+ // also list matching contact groups
+ if ($abook->groups && count($contacts) < $MAXNUM) {
+ foreach ($abook->list_groups($search, $mode) as $group) {
+ $abook->reset();
+ $abook->set_group($group['ID']);
+
+ $group_prop = $abook->get_group($group['ID']);
+
+ // group (distribution list) with email address(es)
+ if ($group_prop['email']) {
+ $idx = 0;
+ foreach ((array)$group_prop['email'] as $email) {
+ $index = format_email_recipient($email, $group['name']);
+
+ if (empty($contacts[$index])) {
+ $sort_keys[$index] = sprintf('%s %03d', $group['name'] , $idx++);
+ $contacts[$index] = array(
+ 'name' => $index,
+ 'email' => $email,
+ 'type' => 'group',
+ 'id' => $group['ID'],
+ 'source' => $id,
+ );
+
+ if (count($contacts) >= $MAXNUM) {
+ break 2;
+ }
+ }
+ }
+ }
+ // show group with count
+ else if (($result = $abook->count()) && $result->count) {
+ if (empty($contacts[$group['name']])) {
+ $sort_keys[$group['name']] = $group['name'];
+ $contacts[$group['name']] = array(
+ 'name' => $group['name'] . ' (' . intval($result->count) . ')',
+ 'type' => 'group',
+ 'id' => $group['ID'],
+ 'source' => $id
+ );
+
+ if (count($contacts) >= $MAXNUM) {
+ break;
+ }
+ }
+ }
+ }
+ }
}
- // also list matching contact groups
- if ($abook->groups) {
- foreach ($abook->list_groups($search) as $group) {
- $abook->reset();
- $abook->set_group($group['ID']);
- $result = $abook->count();
-
- if ($result->count) {
- $contacts[] = array('name' => $group['name'] . ' (' . intval($result->count) . ')', 'id' => $group['ID'], 'source' => $id);
- if (count($contacts) >= $MAXNUM)
- break;
+ if (count($contacts)) {
+ // sort contacts index
+ asort($sort_keys, SORT_LOCALE_STRING);
+ // re-sort contacts according to index
+ foreach ($sort_keys as $idx => $val) {
+ $sort_keys[$idx] = $contacts[$idx];
}
- }
+ $contacts = array_values($sort_keys);
}
- }
-
- usort($contacts, 'contact_results_sort');
}
-$OUTPUT->command('ksearch_query_results', $contacts, $search, $sid);
+$OUTPUT->command('ksearch_query_results', $contacts, $search, $reqid);
$OUTPUT->send();
-
-
-function contact_results_sort($a, $b)
-{
- $name_a = is_array($a) ? $a['name'] : $a;
- $name_b = is_array($b) ? $b['name'] : $b;
- return strcoll(trim($name_a, '" '), trim($name_b, '" '));
-}
-
--
Gitblit v1.9.1