Merge pull request #2008 from MPOS/mail-return-path

[ADDED] Return-Path when sending mail
This commit is contained in:
Sebastian Grewe 2014-03-25 11:31:29 +01:00
commit 67884118c4

View File

@ -64,7 +64,7 @@ class Mail extends Base {
$headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";
if (strlen(@$aData['senderName']) > 0 && @strlen($aData['senderEmail']) > 0 )
$headers .= 'Reply-To: ' . $aData['senderName'] . ' <' . $aData['senderEmail'] . ">\n";
if (mail($aData['email'], $this->smarty->fetch(BASEPATH . 'templates/mail/subject.tpl'), $this->smarty->fetch(BASEPATH . 'templates/mail/' . $template . '.tpl'), $headers))
if (mail($aData['email'], $this->smarty->fetch(BASEPATH . 'templates/mail/subject.tpl'), $this->smarty->fetch(BASEPATH . 'templates/mail/' . $template . '.tpl'), $headers, '-f ' . $this->setting->getValue('website_email')))
return true;
$this->setErrorMessage($this->sqlError('E0031'));
return false;