From b0942449bb623a31a01923a2352ddc51f9074f46 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hcoren@shoretel.com>
Date: Fri, 12 Sep 2014 15:11:59 +0300
Subject: [PATCH] Changed from address when sending from yahoo or aol accounts

---
 app/ninja/mailers/Mailer.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/ninja/mailers/Mailer.php b/app/ninja/mailers/Mailer.php
index 162bd8d9fcfa..43c2d60eaebc 100755
--- a/app/ninja/mailers/Mailer.php
+++ b/app/ninja/mailers/Mailer.php
@@ -1,6 +1,7 @@
 <?php namespace ninja\mailers;
 
 use Mail;
+use Utils;
 
 class Mailer {
 
@@ -12,9 +13,18 @@ class Mailer {
 		];
 		
 		Mail::send($views, $data, function($message) use ($toEmail, $fromEmail, $fromName, $subject)
-		{			
+		{
+			$replyEmail = $fromEmail;
+
+			// We're unable to set the true fromEmail for emails sent from Yahoo or AOL accounts 
+			// http://blog.mandrill.com/yahoos-recent-dmarc-changes-and-how-that-impacts-senders.html
+			if (strpos($fromEmail, '@yahoo.') !== false || strpos($fromEmail, '@aol.') !== FALSE)			
+			{
+				$fromEmail = CONTACT_EMAIL;
+			}
+
 			$message->to($toEmail)->from($fromEmail, $fromName)->sender($fromEmail, $fromName)
-				->replyTo($fromEmail, $fromName)->returnPath($fromEmail)->subject($subject);
+				->replyTo($replyEmail, $fromName)->subject($subject);
 		});		
 	}
 }
\ No newline at end of file