Skip to content

Merge 3.0.1 into master #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sig-peggy merged 10 commits into from
Aug 30, 2024
Merged

Merge 3.0.1 into master #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e5f5f89
chore: Add phpunit to require-dev.
sig-owalker May 22, 2024
220fce0
test: Add unit tests for MailblockMailSubscriber.
sig-owalker May 22, 2024
6799e53
chore: Add php version constraint.
sig-owalker May 23, 2024
911e024
Merge branch 'test/unit-tests' into 3.x
sig-owalker May 23, 2024
fb431e9
fix: Fix bug where whitelisting did not work for 'to' addresses.
sig-owalker May 24, 2024
3c42c79
Merge branch 'fix/whitelisting' into 3.x
sig-owalker May 24, 2024
ef93de8
chore: Add php_codesniffer as dev requirement.
sig-owalker Jun 20, 2024
16f1b05
style: Update code to match PSR12 standard.
sig-owalker Jun 20, 2024
b4af667
Merge branch 'feat/psr12' into sigimm-2--ss5-upgrade
sig-owalker Jun 20, 2024
bbb388e
Merge pull request #5 from signify-nz/sigimm-2--ss5-upgrade
sig-peggy Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 21 additions & 16 deletions code/email/MailblockMailSubscriber.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public function onMessage(MessageEvent $event): void
$overrideConfiguration = $siteConfig->getField('MailblockOverrideConfiguration');
$sendAllTo = Email::getSendAllEmailsTo();

if ($enabled
if (
$enabled
&& ($enabledOnLive || !Director::isLive())
&& (!$sendAllTo || $overrideConfiguration)
) {
Expand All @@ -53,32 +54,37 @@ public function onMessage(MessageEvent $event): void
$bccRecipients = [];

$subject = $message->getSubject();
foreach ($message->getTo() as $to) {
$recipients[] = $to->getAddress();
}
foreach ($message->getCc() as $cc) {
$ccRecipients[] = $cc->getAddress();
}
foreach ($message->getBcc() as $bcc) {
$bccRecipients[] = $bcc->getAddress();
}
foreach ($message->getTo() as $to) {
$recipients[] = $to->getAddress();
}
foreach ($message->getCc() as $cc) {
$ccRecipients[] = $cc->getAddress();
}
foreach ($message->getBcc() as $bcc) {
$bccRecipients[] = $bcc->getAddress();
}

$recipients = implode(',', $recipients);
$ccRecipients = implode(',', $ccRecipients);
$bccRecipients = implode(',', $bccRecipients);
$recipients = implode(',', $recipients);
$ccRecipients = implode(',', $ccRecipients);
$bccRecipients = implode(',', $bccRecipients);

$mailblockRecipients = $siteConfig->getField('MailblockRecipients');

$subject .= " [addressed to $recipients";
if ($ccRecipients) $subject .= ", cc to $ccRecipients";
if ($bccRecipients) $subject .= ", bcc to $bccRecipients";
if ($ccRecipients) {
$subject .= ", cc to $ccRecipients";
}
if ($bccRecipients) {
$subject .= ", bcc to $bccRecipients";
}
$subject .= ']';
$message->setSubject($subject);

// If one of the orignial recipients is in the whitelist, add them
// to the new recipients list.
$mailblockWhitelist = $siteConfig->getField('MailblockWhitelist');
$whitelist = !empty($mailblockWhitelist) ? preg_split("/\r\n|\n|\r/", $mailblockWhitelist) : [];
$newRecipients = !empty($mailblockRecipients) ? preg_split("/\r\n|\n|\r/", $mailblockRecipients) : [];
$cc = [];
$bcc = [];
foreach ($whitelist as $whiteListed) {
Expand All @@ -94,7 +100,6 @@ public function onMessage(MessageEvent $event): void
}
}
}
$newRecipients = !empty($mailblockRecipients) ? preg_split("/\r\n|\n|\r/", $mailblockRecipients) : [];
$message->setTo($newRecipients);
$message->setBcc($bcc);
$message->setCc($cc);
Expand Down
Loading
Loading