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

Modify the check for sender address

Browse Source 
to implement rule for existing campaigns.

[MAILPOET-5832]
This commit is contained in:
Brezo Cordero
2024-01-17 16:03:58 -06:00
committed by Aschepikov
parent 56556493fe
commit ab23a01423
4 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mailpoet/lib/Services/AuthorizedEmailsController.php
View File

@ -153,16 +153,16 @@ class AuthorizedEmailsController {
}
}
public function isSenderAddressValidForActivation(NewsletterEntity $newsletter): bool {
if ($this->settings->get('mta.method') !== Mailer::METHOD_MAILPOET) {
return true;
}
public function isSenderAddressValid(NewsletterEntity $newsletter, string $context = 'activation'): bool {
if (!in_array($newsletter->getType(), NewsletterEntity::CAMPAIGN_TYPES)) {
return true;
}
if (!$this->senderDomainController->isAuthorizedDomainRequiredForNewCampaigns()) {
$isAuthorizedDomainRequired = $context === 'activation' ?
$this->senderDomainController->isAuthorizedDomainRequiredForNewCampaigns() :
$this->senderDomainController->isAuthorizedDomainRequiredForExistingCampaigns();
if (!$isAuthorizedDomainRequired) {
return true;
}