From f7f5662e10f71e8a3559fcd2f31f9c8d95e3066d Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Fri, 20 Mar 2015 11:01:29 +0000 Subject: [PATCH] fix for function identity_name to use the same logic on missing identity values (like ident_realname and ident_email) as iterator on identities; if no ident_email is present use the users email-address, if still empty use acc_imap_username if it passes a simple test on qualifying as email address --- mail/inc/class.mail_ui.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index e3c809e3ad..c6ae758446 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -820,7 +820,7 @@ class mail_ui // not to be used for IMAP Foldertree, as there is no Imap host continue; } - $identity_name = emailadmin_account::identity_name($accountObj); + $identity_name = emailadmin_account::identity_name($accountObj,true,$GLOBALS['egw_info']['user']['acount_id']); $oA = array('id' => $acc_id, 'text' => str_replace(array('<','>'),array('[',']'),$identity_name),// as angle brackets are quoted, display in Javascript messages when used is ugly, so use square brackets instead 'tooltip' => '('.$acc_id.') '.htmlspecialchars_decode($identity_name), @@ -1082,7 +1082,7 @@ class mail_ui // not to be used for IMAP Foldertree, as there is no Imap host continue; } - $identity_name = emailadmin_account::identity_name($accountObj); + $identity_name = emailadmin_account::identity_name($accountObj,true,$GLOBALS['egw_info']['user']['acount_id']); $accArray[$acc_id] = str_replace(array('<','>'),array('[',']'),$identity_name);// as angle brackets are quoted, display in Javascript messages when used is ugly, so use square brackets instead } }