summaryrefslogtreecommitdiff
path: root/program/include/rcube_addressbook.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-07-25 11:48:50 +0000
committeralecpl <alec@alec.pl>2011-07-25 11:48:50 +0000
commit71e8cc3bce5053ca986a95ef119101d15317ddc6 (patch)
treefa40f9e958aa918939cafae5038cdc978dfd81ad /program/include/rcube_addressbook.php
parent0213f8d4dddf88b1a3eec91ff0f95832ebac3008 (diff)
- Fixed display name on contact lists
Diffstat (limited to 'program/include/rcube_addressbook.php')
-rw-r--r--program/include/rcube_addressbook.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/program/include/rcube_addressbook.php b/program/include/rcube_addressbook.php
index 45ad0be5d..6d126e9e3 100644
--- a/program/include/rcube_addressbook.php
+++ b/program/include/rcube_addressbook.php
@@ -434,9 +434,11 @@ abstract class rcube_addressbook
* Compose a valid display name from the given structured contact data
*
* @param array Hash array with contact data as key-value pairs
+ * @param bool The name will be used on the list
+ *
* @return string Display name
*/
- public static function compose_display_name($contact)
+ public static function compose_display_name($contact, $list_mode = false)
{
$contact = rcmail::get_instance()->plugins->exec_hook('contact_displayname', $contact);
$fn = $contact['name'];
@@ -446,7 +448,12 @@ abstract class rcube_addressbook
// use email address part for name
$email = is_array($contact['email']) ? $contact['email'][0] : $contact['email'];
+
if ($email && (empty($fn) || $fn == $email)) {
+ // Use full email address on contacts list
+ if ($list_mode)
+ return $email;
+
list($emailname) = explode('@', $email);
if (preg_match('/(.*)[\.\-\_](.*)/', $emailname, $match))
$fn = trim(ucfirst($match[1]).' '.ucfirst($match[2]));