|
|
@ -544,13 +544,20 @@ abstract class rcube_addressbook
|
|
|
|
|
|
|
|
|
|
|
|
$fn = trim($fn, ', ');
|
|
|
|
$fn = trim($fn, ', ');
|
|
|
|
|
|
|
|
|
|
|
|
// fallback to display name
|
|
|
|
// fallbacks...
|
|
|
|
if (empty($fn) && $contact['name'])
|
|
|
|
if ($fn === '') {
|
|
|
|
$fn = $contact['name'];
|
|
|
|
// ... display name
|
|
|
|
|
|
|
|
if (!empty($contact['name'])) {
|
|
|
|
// fallback to email address
|
|
|
|
$fn = $contact['name'];
|
|
|
|
if (empty($fn) && ($email = self::get_col_values('email', $contact, true)) && !empty($email)) {
|
|
|
|
}
|
|
|
|
return $email[0];
|
|
|
|
// ... organization
|
|
|
|
|
|
|
|
else if (!empty($contact['organization'])) {
|
|
|
|
|
|
|
|
$fn = $contact['organization'];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// ... email address
|
|
|
|
|
|
|
|
else if (($email = self::get_col_values('email', $contact, true)) && !empty($email)) {
|
|
|
|
|
|
|
|
$fn = $email[0];
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return $fn;
|
|
|
|
return $fn;
|
|
|
|