diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcube_addressbook.php | 48 | ||||
| -rw-r--r-- | program/include/rcube_contacts.php | 7 |
2 files changed, 43 insertions, 12 deletions
diff --git a/program/include/rcube_addressbook.php b/program/include/rcube_addressbook.php index 308aee4f5..b56b58a65 100644 --- a/program/include/rcube_addressbook.php +++ b/program/include/rcube_addressbook.php @@ -472,24 +472,24 @@ 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 + * @param bool Don't attempt to extract components from the email address * * @return string Display name */ - public static function compose_display_name($contact, $list_mode = false) + public static function compose_display_name($contact, $full_email = false) { $contact = rcmail::get_instance()->plugins->exec_hook('contact_displayname', $contact); $fn = $contact['name']; - if (!$fn) + if (!$fn) // default display name composition according to vcard standard $fn = join(' ', array_filter(array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix']))); // 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 full email + if ($full_email) return $email; list($emailname) = explode('@', $email); @@ -502,5 +502,43 @@ abstract class rcube_addressbook return $fn; } + + /** + * Compose the name to display in the contacts list for the given contact record. + * This respects the settings parameter how to list conacts. + * + * @param array Hash array with contact data as key-value pairs + * @return string List name + */ + public static function compose_list_name($contact) + { + static $compose_mode; + + if (!isset($compose_mode)) // cache this + $compose_mode = rcmail::get_instance()->config->get('addressbook_name_listing', 0); + + if ($compose_mode == 3) + $fn = join(' ', array($contact['surname'] . ',', $contact['firstname'], $contact['middlename'])); + else if ($compose_mode == 2) + $fn = join(' ', array($contact['surname'], $contact['firstname'], $contact['middlename'])); + else if ($compose_mode == 1) + $fn = join(' ', array($contact['firstname'], $contact['middlename'], $contact['surname'])); + else + $fn = !empty($contact['name']) ? $contact['name'] : join(' ', array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix'])); + + $fn = trim($fn, ', '); + + // fallback to display name + if (empty($fn) && $contact['name']) + $fn = $contact['name']; + + // fallback to email address + $email = is_array($contact['email']) ? $contact['email'][0] : $contact['email']; + if (empty($fn) && $email) + return $email; + + return $fn; + } + } diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php index 1a4950d84..11fbde09a 100644 --- a/program/include/rcube_contacts.php +++ b/program/include/rcube_contacts.php @@ -254,13 +254,6 @@ class rcube_contacts extends rcube_addressbook $sql_arr['email'] = array_map('trim', $sql_arr['email']); } - // make sure we have a name to display - if (empty($sql_arr['name'])) { - if (empty($sql_arr['email'])) - $sql_arr['email'] = $this->get_col_values('email', $sql_arr, true); - $sql_arr['name'] = $sql_arr['email'][0]; - } - $this->result->add($sql_arr); } |