holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Klaus Leithoff 2015-03-20 11:01:29 +00:00
parent 63a7af621d
commit f7f5662e10
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/inc/class.mail_ui.inc.php
View File

@ -820,7 +820,7 @@ class mail_ui
// not to be used for IMAP Foldertree, as there is no Imap host // not to be used for IMAP Foldertree, as there is no Imap host
continue; 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, $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 '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), '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 // not to be used for IMAP Foldertree, as there is no Imap host
continue; 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 $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
} }
} }