Page MenuHomePhabricator
Files F2309292

0001-T7477-Honor-messages-with-the-Phabricator-email-addr.patch
lyngvi (Greg Knight)
Actions

Authored By
lyngvi
Jan 5 2017, 4:26 PM
Size
2 KB
Referenced Files
None
Subscribers
None

0001-T7477-Honor-messages-with-the-Phabricator-email-addr.patch
View Options

From f58174e297f768a3f3eb50cf840e0f062998febb Mon Sep 17 00:00:00 2001
From: Greg Knight <g.knight@symetrica.com>
Date: Thu, 5 Jan 2017 16:24:34 +0000
Subject: [PATCH] T7477 Honor messages with the Phabricator email address in
the CC line as well as To line
---
src/applications/metamta/receiver/PhabricatorMailReceiver.php | 2 +-
.../metamta/receiver/PhabricatorObjectMailReceiver.php | 2 +-
.../metamta/storage/PhabricatorMetaMTAReceivedMail.php | 6 ++++++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/applications/metamta/receiver/PhabricatorMailReceiver.php b/src/applications/metamta/receiver/PhabricatorMailReceiver.php
index 07d364b..e98a1d7 100644
--- a/src/applications/metamta/receiver/PhabricatorMailReceiver.php
+++ b/src/applications/metamta/receiver/PhabricatorMailReceiver.php
@@ -25,7 +25,7 @@ abstract class PhabricatorMailReceiver extends Phobject {
->withApplicationPHIDs(array($app->getPHID()))
->execute();
- foreach ($mail->getToAddresses() as $to_address) {
+ foreach ($mail->getToOrCCAddresses() as $to_address) {
foreach ($application_emails as $application_email) {
$create_address = $application_email->getAddress();
if ($this->matchAddresses($create_address, $to_address)) {
diff --git a/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php b/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php
index 52a9a78..cb44ca8 100644
--- a/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php
+++ b/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php
@@ -149,7 +149,7 @@ abstract class PhabricatorObjectMailReceiver extends PhabricatorMailReceiver {
private function matchObjectAddressInMail(
PhabricatorMetaMTAReceivedMail $mail) {
- foreach ($mail->getToAddresses() as $address) {
+ foreach ($mail->getToOrCCAddresses() as $address) {
$parts = $this->matchObjectAddress($address);
if ($parts) {
return $parts;
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
index 18fa7dd..46dc4af 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
@@ -82,6 +82,12 @@ final class PhabricatorMetaMTAReceivedMail extends PhabricatorMetaMTADAO {
return $this->getRawEmailAddresses(idx($this->headers, 'to'));
}
+ public function getToOrCCAddresses() {
+ return array_merge(
+ $this->getToAddresses(),
+ $this->getCCAddresses());
+ }
+
public function loadAllRecipientPHIDs() {
$addresses = array_merge(
$this->getToAddresses(),
--
1.7.10.4

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
411505
Default Alt Text
0001-T7477-Honor-messages-with-the-Phabricator-email-addr.patch (2 KB)

Event Timeline

Phabricator · Built by Phacility