diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcube_string_replacer.php | 2 | ||||
| -rw-r--r-- | program/steps/mail/list_contacts.inc | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php index ad55dd87b..edb2ac34f 100644 --- a/program/include/rcube_string_replacer.php +++ b/program/include/rcube_string_replacer.php @@ -37,7 +37,7 @@ class rcube_string_replacer { // Simplified domain expression for UTF8 characters handling // Support unicode/punycode in top-level domain part - $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-zA-Z0-9]{2,})'; + $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.?([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-zA-Z0-9]{2,})'; $url1 = '.:;,'; $url2 = 'a-zA-Z0-9%=#$@+?!&\\/_~\\[\\]{}\*-'; diff --git a/program/steps/mail/list_contacts.inc b/program/steps/mail/list_contacts.inc index 7c99a1309..9347190da 100644 --- a/program/steps/mail/list_contacts.inc +++ b/program/steps/mail/list_contacts.inc @@ -69,11 +69,14 @@ if ($CONTACTS && $CONTACTS->ready) { $name = rcube_addressbook::compose_list_name($row); // add record for every email address of the contact - foreach ($CONTACTS->get_col_values('email', $row, true) as $i => $email) { + $emails = $CONTACTS->get_col_values('email', $row, true); + foreach ($emails as $i => $email) { $row_id = $row['ID'].$i; $jsresult[$row_id] = format_email_recipient($email, $name); $OUTPUT->command('add_contact_row', $row_id, array( - 'contact' => html::span(array('title' => $email), Q($name ? $name : $email))), 'person'); + 'contact' => html::span(array('title' => $email), Q($name ? $name : $email) . + ($name && count($emails) > 1 ? ' ' . html::span('email', Q($email)) : '') + )), 'person'); } } } |