mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-26 01:43:47 +01:00
replace no longer existing depricated egw_info->user email and fullname
This commit is contained in:
parent
93eac83b8a
commit
86dfe42104
@ -59,7 +59,7 @@ class uiasyncservice
|
||||
{
|
||||
echo '<p><b>'.lang("You have no email address for your user set !!!")."</b></p>\n";
|
||||
}
|
||||
elseif (!$async->set_timer($times,'test','admin.uiasyncservice.test',(array)$GLOBALS['egw_info']['user']['email']))
|
||||
elseif (!$async->set_timer($times,'test','admin.uiasyncservice.test',(array)$GLOBALS['egw_info']['user']['account_email']))
|
||||
{
|
||||
echo '<p><b>'.lang("Error setting timer, wrong syntax or maybe there's one already running !!!")."</b></p>\n";
|
||||
}
|
||||
|
@ -1194,7 +1194,7 @@ class preferences
|
||||
// the user does not directly manipulate this pref for the default email account
|
||||
if ((string)$acctnum == '0')
|
||||
{
|
||||
$prefs['email']['fullname'] = $GLOBALS['egw_info']['user']['fullname'];
|
||||
$prefs['email']['fullname'] = $GLOBALS['egw_info']['user']['account_fullname'];
|
||||
}
|
||||
|
||||
// = = = = SIMPLER PREFS = = = =
|
||||
|
@ -120,8 +120,8 @@ class send extends egw_mailer
|
||||
$this->ClearAttachments();
|
||||
$this->ClearCustomHeaders();
|
||||
|
||||
$this->FromName = $GLOBALS['egw_info']['user']['fullname'];
|
||||
$this->From = $GLOBALS['egw_info']['user']['email'];
|
||||
$this->FromName = $GLOBALS['egw_info']['user']['account_fullname'];
|
||||
$this->From = $GLOBALS['egw_info']['user']['account_email'];
|
||||
$this->Sender = '';
|
||||
|
||||
$this->AddCustomHeader('X-Mailer:eGroupWare (http://www.eGroupWare.org)');
|
||||
|
Loading…
Reference in New Issue
Block a user