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

fix identities from aliases or imap-user without @ shown with empty label, if name is empty

Browse Source
This commit is contained in:
Ralf Becker 2016-11-14 13:41:21 +01:00
parent 7fe6eead5a
commit db1f92c7f8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Mail/Account.php
View File

@ -1583,7 +1583,6 @@ class Account implements \ArrayAccess
catch(\Exception $e) { catch(\Exception $e) {
_egw_log_exception($e); _egw_log_exception($e);
} }
} }
if (strlen(trim($account['ident_realname'].$account['ident_org']))) if (strlen(trim($account['ident_realname'].$account['ident_org'])))
{ {
@ -1593,11 +1592,11 @@ class Account implements \ArrayAccess
{ {
$name = $account['acc_name']; $name = $account['acc_name'];
} }
if (strpos($account['ident_email'], '@') !== false) if (!empty(trim($account['ident_email'])))
{ {
$name .= ' <'.$account['ident_email'].'>'; $name .= ' <'.$account['ident_email'].'>';
} }
elseif(strpos($account['acc_imap_username'], '@') !== false) elseif(!empty(trim($account['acc_imap_username'])))
{ {
$name .= ' <'.$account['acc_imap_username'].'>'; $name .= ' <'.$account['acc_imap_username'].'>';
} }