Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Check authorized emails on newsletter update

Browse Source 
[MAILPOET-2022]
This commit is contained in:
Rostislav Wolny
2019-05-27 14:14:50 +02:00
committed by M. Shull
parent 61c3630add
commit a1869a14cb
3 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Services/AuthorizedEmailsController.php
View File

@@ -14,11 +14,17 @@ class AuthorizedEmailsController {
const AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING = 'authorized_emails_addresses_check';
/** @var Bridge */
public $bridge;
private $bridge;
/** @var SettingsController */
private $settings;
private $automatic_email_types = [
Newsletter::TYPE_WELCOME,
Newsletter::TYPE_NOTIFICATION,
Newsletter::TYPE_AUTOMATIC,
];
function __construct(SettingsController $settingsController, Bridge $bridge) {
$this->settings = $settingsController;
$this->bridge = $bridge;
@@ -55,6 +61,18 @@ class AuthorizedEmailsController {
}
}
function onNewsletterUpdate(Newsletter $newsletter, Newsletter $old_newsletter = null) {
if ($old_newsletter === null || $newsletter->sender_address === $old_newsletter->sender_address) {
return;
}
if ($newsletter->type === Newsletter::TYPE_STANDARD && $newsletter->status === Newsletter::STATUS_SCHEDULED) {
$this->checkAuthorizedEmailAddresses();
}
if (in_array($newsletter->type, $this->automatic_email_types, true) && $newsletter->status === Newsletter::STATUS_ACTIVE) {
$this->checkAuthorizedEmailAddresses();
}
}
private function validateAddressesInSettings($authorized_emails, $result = []) {
$default_sender_address = $this->settings->get('sender.address');
$signup_confirmation_address = $this->settings->get('signup_confirmation.from.address');
@@ -74,7 +92,7 @@ class AuthorizedEmailsController {
"(`type` = '%s' AND `status` = '%s') OR (`type` IN ('%s') AND `status` = '%s')",
Newsletter::TYPE_STANDARD,
Newsletter::STATUS_SCHEDULED,
implode("', '", [ Newsletter::TYPE_WELCOME, Newsletter::TYPE_NOTIFICATION, Newsletter::TYPE_AUTOMATIC ]),
implode("', '", $this->automatic_email_types),
Newsletter::STATUS_ACTIVE
);