From 576fcb9c79e647bbb331fb2d3b3311a2d2b6391d Mon Sep 17 00:00:00 2001 From: eileen Date: Wed, 6 Jun 2018 20:17:39 +1200 Subject: [PATCH] Towards CRM-17753 - consolidate code location for do-not-reply@emaildomain.com --- CRM/Campaign/BAO/Petition.php | 2 +- CRM/Core/BAO/Domain.php | 8 ++++++++ CRM/Mailing/Event/BAO/Confirm.php | 8 +++----- CRM/Mailing/Event/BAO/Reply.php | 12 ++++-------- CRM/Mailing/Event/BAO/Resubscribe.php | 8 +++----- CRM/Mailing/Event/BAO/Subscribe.php | 2 +- CRM/Mailing/Event/BAO/Unsubscribe.php | 6 +++--- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CRM/Campaign/BAO/Petition.php b/CRM/Campaign/BAO/Petition.php index 43246cc66f6..f8b0500ca27 100644 --- a/CRM/Campaign/BAO/Petition.php +++ b/CRM/Campaign/BAO/Petition.php @@ -586,7 +586,7 @@ public static function sendEmail($params, $sendEmailMode) { $toName = CRM_Contact_BAO_Contact::displayName($params['contactId']); - $replyTo = "do-not-reply@$emailDomain"; + $replyTo = CRM_Core_BAO_Domain::getNoReplyEmailAddress(); // set additional general message template params (custom tokens to use in email msg templates) // tokens then available in msg template as {$petition.title}, etc diff --git a/CRM/Core/BAO/Domain.php b/CRM/Core/BAO/Domain.php index c3a9094d6f4..58a06e16d16 100644 --- a/CRM/Core/BAO/Domain.php +++ b/CRM/Core/BAO/Domain.php @@ -319,4 +319,12 @@ public static function getDefaultReceiptFrom() { return array($userName, $userEmail); } + /** + * Get address to be used for system from addresses when a reply is not expected. + */ + public static function getNoReplyEmailAddress() { + $emailDomain = CRM_Core_BAO_MailSettings::defaultDomain(); + return "do-not-reply@$emailDomain"; + } + } diff --git a/CRM/Mailing/Event/BAO/Confirm.php b/CRM/Mailing/Event/BAO/Confirm.php index f01e188d8ab..1d3c2d4d18d 100644 --- a/CRM/Mailing/Event/BAO/Confirm.php +++ b/CRM/Mailing/Event/BAO/Confirm.php @@ -118,8 +118,6 @@ public static function confirm($contact_id, $subscribe_id, $hash) { $component->find(TRUE); - $emailDomain = CRM_Core_BAO_MailSettings::defaultDomain(); - $html = $component->body_html; if ($component->body_text) { @@ -143,11 +141,11 @@ public static function confirm($contact_id, $subscribe_id, $hash) { $mailParams = array( 'groupName' => 'Mailing Event ' . $component->component_type, 'subject' => $component->subject, - 'from' => "\"$domainEmailName\" ", + 'from' => "\"$domainEmailName\" <" . CRM_Core_BAO_Domain::getNoReplyEmailAddress() . '>', 'toEmail' => $email, 'toName' => $display_name, - 'replyTo' => "do-not-reply@$emailDomain", - 'returnPath' => "do-not-reply@$emailDomain", + 'replyTo' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), + 'returnPath' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), 'html' => $html, 'text' => $text, ); diff --git a/CRM/Mailing/Event/BAO/Reply.php b/CRM/Mailing/Event/BAO/Reply.php index 00d8cd3eac0..679822ffe02 100644 --- a/CRM/Mailing/Event/BAO/Reply.php +++ b/CRM/Mailing/Event/BAO/Reply.php @@ -173,8 +173,6 @@ public static function send($queue_id, &$mailing, &$bodyTxt, $replyto, &$bodyHTM } } else { - $emailDomain = CRM_Core_BAO_MailSettings::defaultDomain(); - if (empty($eq->display_name)) { $from = $eq->email; } @@ -189,7 +187,7 @@ public static function send($queue_id, &$mailing, &$bodyTxt, $replyto, &$bodyHTM 'To' => $mailing->replyto_email, 'From' => $from, 'Reply-To' => empty($replyto) ? $eq->email : $replyto, - 'Return-Path' => "do-not-reply@{$emailDomain}", + 'Return-Path' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), // CRM-17754 Include re-sent headers to indicate that we have forwarded on the email 'Resent-From' => $domainValues['values'][0]['from_email'], 'Resent-Date' => date('r'), @@ -253,14 +251,12 @@ private static function autoRespond(&$mailing, $queue_id, $replyto) { $domain = CRM_Core_BAO_Domain::getDomain(); list($domainEmailName, $_) = CRM_Core_BAO_Domain::getNameAndEmail(); - $emailDomain = CRM_Core_BAO_MailSettings::defaultDomain(); - $headers = array( 'Subject' => $component->subject, 'To' => $to, - 'From' => "\"$domainEmailName\" ", - 'Reply-To' => "do-not-reply@$emailDomain", - 'Return-Path' => "do-not-reply@$emailDomain", + 'From' => "\"$domainEmailName\" <" . CRM_Core_BAO_Domain::getNoReplyEmailAddress() . '>', + 'Reply-To' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), + 'Return-Path' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), ); // TODO: do we need reply tokens? diff --git a/CRM/Mailing/Event/BAO/Resubscribe.php b/CRM/Mailing/Event/BAO/Resubscribe.php index 483f35641d2..360bd36bfec 100644 --- a/CRM/Mailing/Event/BAO/Resubscribe.php +++ b/CRM/Mailing/Event/BAO/Resubscribe.php @@ -267,14 +267,12 @@ public static function send_resub_response($queue_id, $groups, $is_domain = FALS $message->setTxtBody($text); } - $emailDomain = CRM_Core_BAO_MailSettings::defaultDomain(); - $headers = array( 'Subject' => $component->subject, - 'From' => "\"$domainEmailName\" ", + 'From' => "\"$domainEmailName\" <" . CRM_Core_BAO_Domain::getNoReplyEmailAddress() . '>', 'To' => $eq->email, - 'Reply-To' => "do-not-reply@$emailDomain", - 'Return-Path' => "do-not-reply@$emailDomain", + 'Reply-To' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), + 'Return-Path' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), ); CRM_Mailing_BAO_Mailing::addMessageIdHeader($headers, 'e', $job, $queue_id, $eq->hash); $b = CRM_Utils_Mail::setMimeParams($message); diff --git a/CRM/Mailing/Event/BAO/Subscribe.php b/CRM/Mailing/Event/BAO/Subscribe.php index d3257557b75..d82776413b4 100644 --- a/CRM/Mailing/Event/BAO/Subscribe.php +++ b/CRM/Mailing/Event/BAO/Subscribe.php @@ -227,7 +227,7 @@ public function send_confirm_request($email) { 'From' => "\"{$domainEmailName}\" <{$domainEmailAddress}>", 'To' => $email, 'Reply-To' => $confirm, - 'Return-Path' => "do-not-reply@$emailDomain", + 'Return-Path' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), ); $url = CRM_Utils_System::url('civicrm/mailing/confirm', diff --git a/CRM/Mailing/Event/BAO/Unsubscribe.php b/CRM/Mailing/Event/BAO/Unsubscribe.php index 76f3fef7fb6..aa6950cb8c8 100644 --- a/CRM/Mailing/Event/BAO/Unsubscribe.php +++ b/CRM/Mailing/Event/BAO/Unsubscribe.php @@ -418,10 +418,10 @@ public static function send_unsub_response($queue_id, $groups, $is_domain = FALS $headers = array( 'Subject' => $component->subject, - 'From' => "\"$domainEmailName\" ", + 'From' => "\"$domainEmailName\" <" . CRM_Core_BAO_Domain::getNoReplyEmailAddress() . '>', 'To' => $eq->email, - 'Reply-To' => "do-not-reply@$emailDomain", - 'Return-Path' => "do-not-reply@$emailDomain", + 'Reply-To' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), + 'Return-Path' => CRM_Core_BAO_Domain::getNoReplyEmailAddress(), ); CRM_Mailing_BAO_Mailing::addMessageIdHeader($headers, 'u', $job, $queue_id, $eq->hash);