RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Unset website email, mail issues

Browse Source
This commit is contained in:
Sebastian Grewe 2014-04-06 10:05:08 +02:00
parent 5e0faa6e7a
commit 7e38b98e8f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/include/classes/mail.class.php
View File

@ -34,7 +34,7 @@ class Mail extends Base {
$aData['senderEmail'] = $senderEmail; $aData['senderEmail'] = $senderEmail;
$aData['senderSubject'] = $senderSubject; $aData['senderSubject'] = $senderSubject;
$aData['senderMessage'] = $senderMessage; $aData['senderMessage'] = $senderMessage;
$aData['email'] = $this->setting->getValue('website_email'); $aData['email'] = $this->setting->getValue('website_email', 'test@example.com');
$aData['subject'] = 'Contact Form'; $aData['subject'] = 'Contact Form';
if ($this->sendMail('contactform/body', $aData)) { if ($this->sendMail('contactform/body', $aData)) {
return true; return true;
@ -81,14 +81,16 @@ class Mail extends Base {
$this->smarty->assign('DATA', $aData); $this->smarty->assign('DATA', $aData);
// Create new message for Swiftmailer // Create new message for Swiftmailer
$senderEmail = $this->setting->getValue('website_email', 'test@example.com');
$senderName = $this->setting->getValue('website_name', 'test@example.com');
$message = Swift_Message::newInstance() $message = Swift_Message::newInstance()
->setSubject($this->smarty->fetch(BASEPATH . 'templates/mail/subject.tpl')) ->setSubject($this->smarty->fetch(BASEPATH . 'templates/mail/subject.tpl'))
->setFrom(array( $this->setting->getValue('website_email') => $this->setting->getValue('website_name'))) ->setFrom(array( $senderEmail => $senderName))
->setTo($aData['email']) ->setTo($aData['email'])
->setSender($this->setting->getValue('website_email')) ->setSender($senderEmail)
->setReturnPath($this->setting->getValue('website_email')) ->setReturnPath($senderEmail)
->setBody($this->smarty->fetch(BASEPATH . 'templates/mail/' . $template . '.tpl'), 'text/html'); ->setBody($this->smarty->fetch(BASEPATH . 'templates/mail/' . $template . '.tpl'), 'text/html');
if (strlen(@$aData['senderName']) > 0 && @strlen($aData['senderEmail']) > 0 ) if (strlen($aData['senderName']) > 0 && strlen($aData['senderEmail']) > 0 && filter_var($aData['senderEmail'], FILTER_VALIDATE_EMAIL))
$message->setReplyTo(array($aData['senderEmail'] => $aData['senderName'])); $message->setReplyTo(array($aData['senderEmail'] => $aData['senderName']));
// Send message out with configured transport // Send message out with configured transport