replace no longer existing depricated egw_info->user email and fullname

This commit is contained in:
Hadi Nategh 2013-07-04 17:45:20 +00:00
parent 93eac83b8a
commit 86dfe42104
3 changed files with 4 additions and 4 deletions

View File

@ -59,7 +59,7 @@ class uiasyncservice
{ {
echo '<p><b>'.lang("You have no email address for your user set !!!")."</b></p>\n"; 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"; echo '<p><b>'.lang("Error setting timer, wrong syntax or maybe there's one already running !!!")."</b></p>\n";
} }

View File

@ -1194,7 +1194,7 @@ class preferences
// the user does not directly manipulate this pref for the default email account // the user does not directly manipulate this pref for the default email account
if ((string)$acctnum == '0') if ((string)$acctnum == '0')
{ {
$prefs['email']['fullname'] = $GLOBALS['egw_info']['user']['fullname']; $prefs['email']['fullname'] = $GLOBALS['egw_info']['user']['account_fullname'];
} }
// = = = = SIMPLER PREFS = = = = // = = = = SIMPLER PREFS = = = =

View File

@ -120,8 +120,8 @@ class send extends egw_mailer
$this->ClearAttachments(); $this->ClearAttachments();
$this->ClearCustomHeaders(); $this->ClearCustomHeaders();
$this->FromName = $GLOBALS['egw_info']['user']['fullname']; $this->FromName = $GLOBALS['egw_info']['user']['account_fullname'];
$this->From = $GLOBALS['egw_info']['user']['email']; $this->From = $GLOBALS['egw_info']['user']['account_email'];
$this->Sender = ''; $this->Sender = '';
$this->AddCustomHeader('X-Mailer:eGroupWare (http://www.eGroupWare.org)'); $this->AddCustomHeader('X-Mailer:eGroupWare (http://www.eGroupWare.org)');