From 2502f5500aa88f4d53d6d4c526b54ad371198c89 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Tue, 24 Jun 2014 13:38:32 +0000 Subject: [PATCH] * Notification/Mail: make sure acc_smtp_username is used (if available), to cope with strict mailserver settings to prevent faking sender information --- phpgwapi/inc/class.send.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php index 4606fd9ec7..01b5e90ce3 100644 --- a/phpgwapi/inc/class.send.inc.php +++ b/phpgwapi/inc/class.send.inc.php @@ -60,7 +60,7 @@ class send extends egw_mailer $this->Username = $account->acc_smtp_username; $this->Password = $account->acc_smtp_password; $this->defaultDomain = $account->acc_domain; - $this->Sender = emailadmin_account::rfc822($account); + $this->Sender = $account->acc_smtp_username?$account->acc_smtp_username:emailadmin_account::rfc822($account); $this->Hostname = $GLOBALS['egw_info']['server']['hostname'];