From abf4aec1a26aa475225f436c235368bbc3697560 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 24 Feb 2010 10:13:30 -0800
Subject: [PATCH] Change user invitation emails to come from the sending site,
 instead of the user, since that can cause SPF problems.  Fixes bug #11435.

---
 docs/changelog/7.x.x.txt    | 1 +
 lib/WebGUI/Account/Inbox.pm | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index f72ae9202..b8ce1179b 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -12,6 +12,7 @@
  - fixed #11434: Inbox invitation adds text to email instead of html
  - fixed #11436: Inbox invitation use mail send instead of mail queue
  - fixed #11385: Wrong user in onCompletePurchase
+ - fixed #11435: Invitation mail uses wrong mail 'from' header
 
 7.8.12
  - fixed #11285: Pasting HTML into Code Editor in IE
diff --git a/lib/WebGUI/Account/Inbox.pm b/lib/WebGUI/Account/Inbox.pm
index ee05e04fd..560d05608 100644
--- a/lib/WebGUI/Account/Inbox.pm
+++ b/lib/WebGUI/Account/Inbox.pm
@@ -946,7 +946,8 @@ sub www_inviteUserSave {
         my $invitation = WebGUI::Mail::Send->create(
             $session, {
                 to      => $to,
-                from    => $email,
+                from    => $session->setting->get('companyEmail'),
+                replyTo => $email,
                 subject => $subject,
             }
         );