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

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

Browse Source
This commit is contained in:
Ralf Becker 2013-07-04 18:00:11 +00:00
parent 46cb5a6e59
commit 8b2a596918
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/inc/class.uiasyncservice.inc.php
View File

@ -55,11 +55,11 @@ class uiasyncservice
if ($_POST['test']) if ($_POST['test'])
{ {
if (strpos($GLOBALS['egw_info']['user']['email'],'@') === false) if (strpos($GLOBALS['egw_info']['user']['account_email'],'@') === false)
{ {
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";
} }

4
emailadmin/inc/class.smtpplesk.inc.php
View File

@ -81,8 +81,8 @@ class smtpplesk extends defaultsmtp
//echo "<p>smtpplesk::getAccountEmailAddress()</p>\n"; //echo "<p>smtpplesk::getAccountEmailAddress()</p>\n";
return array(array( return array(array(
'name' => $GLOBALS['egw_info']['user']['fullname'], 'name' => $GLOBALS['egw_info']['user']['account_fullname'],
'address' => $GLOBALS['egw_info']['user']['email'], 'address' => $GLOBALS['egw_info']['user']['account_email'],
'type' => 'default' 'type' => 'default'
)); ));
} }

2
phpgwapi/inc/class.preferences.inc.php
View File

@ -1113,7 +1113,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 = = = =

4
phpgwapi/inc/class.send.inc.php
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)');