From 916c07a0d6e17c688dec9f15217a8ba7704e7abe Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Palmer" <jtpalmer@buffalo.edu>
Date: Tue, 10 Dec 2019 07:25:49 -0500
Subject: [PATCH 1/3] Update organization change email

---
 classes/XDUser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/XDUser.php b/classes/XDUser.php
index 991b7af91e..13016eda62 100644
--- a/classes/XDUser.php
+++ b/classes/XDUser.php
@@ -94,7 +94,7 @@ class XDUser extends CCR\Loggable implements JsonSerializable
 
 This email is to notify you that XDMoD has detected a change in your organization affiliation. We
 have taken steps to ensure that this is accurately reflected in our systems. If you have any questions
-or concerns please contact us @ %s.
+or concerns please contact us at %s.
 
 Thank You,
 
@@ -2522,7 +2522,7 @@ public function synchronizeOrganization()
                         'body' => sprintf(
                             self::USER_NOTIFICATION_EMAIL,
                             $this->getFormalName(),
-                            \xd_utilities\getConfiguration('mailer', 'sender_email')
+                            \xd_utilities\getConfiguration('general', 'contact_page_recipient')
                         ),
                         'toAddress' => $this->getEmailAddress()
                     )

From e198070083ae29f3dfa3faf9768543058f61eb14 Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Palmer" <jtpalmer@buffalo.edu>
Date: Tue, 10 Dec 2019 12:19:57 -0500
Subject: [PATCH 2/3] Remove blank line

---
 classes/XDUser.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/classes/XDUser.php b/classes/XDUser.php
index 13016eda62..f32bb4b822 100644
--- a/classes/XDUser.php
+++ b/classes/XDUser.php
@@ -89,7 +89,6 @@ class XDUser extends CCR\Loggable implements JsonSerializable
 EML;
 
     const USER_NOTIFICATION_EMAIL = <<<EML
-
 Dear %s,
 
 This email is to notify you that XDMoD has detected a change in your organization affiliation. We

From 1778878e1212f90ef11a5a1808383795d3363d7b Mon Sep 17 00:00:00 2001
From: "Jeffrey T. Palmer" <jtpalmer@buffalo.edu>
Date: Tue, 10 Dec 2019 12:20:07 -0500
Subject: [PATCH 3/3] Set reply-to address

---
 classes/XDUser.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/classes/XDUser.php b/classes/XDUser.php
index f32bb4b822..3eca3c0453 100644
--- a/classes/XDUser.php
+++ b/classes/XDUser.php
@@ -2514,6 +2514,8 @@ public function synchronizeOrganization()
                     )
                 );
 
+                $contactAddress = \xd_utilities\getConfiguration('general', 'contact_page_recipient');
+
                 // Notify the user that there was an organization change detected.
                 MailWrapper::sendMail(
                     array(
@@ -2521,9 +2523,10 @@ public function synchronizeOrganization()
                         'body' => sprintf(
                             self::USER_NOTIFICATION_EMAIL,
                             $this->getFormalName(),
-                            \xd_utilities\getConfiguration('general', 'contact_page_recipient')
+                            $contactAddress
                         ),
-                        'toAddress' => $this->getEmailAddress()
+                        'toAddress' => $this->getEmailAddress(),
+                        'replyAddress' => $contactAddress
                     )
                 );
             }