extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 08:23:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix problem with missing first and lastname on emailadminprofile (select box of profiles)

Browse Source
This commit is contained in:
Klaus Leithoff 2012-08-14 10:25:12 +00:00
parent 96d5e48885
commit bc2e5836e2
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emailadmin/inc/class.defaultsmtp.inc.php
View File

@ -64,7 +64,7 @@
if(empty($emailAddress))
$emailAddress = $_accountName.'@'.$this->defaultDomain;
$realName = trim($GLOBALS['egw_info']['user']['firstname'] . (!empty($GLOBALS['egw_info']['user']['firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['lastname']);
$realName = trim($GLOBALS['egw_info']['user']['account_firstname'] . (!empty($GLOBALS['egw_info']['user']['account_firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['account_lastname']);
return array(
array(

2
emailadmin/inc/class.emailadmin_smtp_ldap.inc.php
View File

@ -178,7 +178,7 @@ class emailadmin_smtp_ldap extends defaultsmtp
if ($sri)
{
$realName = trim($GLOBALS['egw_info']['user']['firstname'] . (!empty($GLOBALS['egw_info']['user']['firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['lastname']);
$realName = trim($GLOBALS['egw_info']['user']['account_firstname'] . (!empty($GLOBALS['egw_info']['user']['account_firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['account_lastname']);
$allValues = ldap_get_entries($ds, $sri);
if(isset($allValues[0]['mail']))