From 86dfe421048a171841fe91462be7c630b10538a5 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 4 Jul 2013 17:45:20 +0000
Subject: [PATCH] replace no longer existing depricated egw_info->user email
 and fullname

---
 admin/inc/class.uiasyncservice.inc.php | 2 +-
 phpgwapi/inc/class.preferences.inc.php | 2 +-
 phpgwapi/inc/class.send.inc.php        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/inc/class.uiasyncservice.inc.php b/admin/inc/class.uiasyncservice.inc.php
index 5199d82a7c..beee52285b 100644
--- a/admin/inc/class.uiasyncservice.inc.php
+++ b/admin/inc/class.uiasyncservice.inc.php
@@ -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";
 				}
diff --git a/phpgwapi/inc/class.preferences.inc.php b/phpgwapi/inc/class.preferences.inc.php
index 1d6212b175..4299481e7f 100644
--- a/phpgwapi/inc/class.preferences.inc.php
+++ b/phpgwapi/inc/class.preferences.inc.php
@@ -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  = = = =
diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index a04e34c5f7..4263ab6bc1 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -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)');