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

PR feedback: add type hints, create new methods and save on extra api request

Browse Source 
MAILPOET-4601
This commit is contained in:
Oluwaseun Olorunsola
2022-09-16 06:42:38 +01:00
committed by Aschepikov
parent 32a58301b0
commit a006701d78
5 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mailpoet/lib/API/JSON/v1/Services.php
View File

@ -238,25 +238,27 @@ class Services extends APIEndpoint {
return $this->createBadRequest(__('MailPoet Sending Service is not active.', 'mailpoet'));
}
$authorizedEmails = $this->bridge->getAuthorizedEmailAddresses();
$verifiedDomains = $this->senderDomainController->getVerifiedSenderDomains(true);
if (!$authorizedEmails && !$verifiedDomains) {
return $this->createBadRequest(__('No FROM email addresses are authorized.', 'mailpoet'));
}
$fromEmail = $this->settings->get('sender.address');
if (!$fromEmail) {
return $this->createBadRequest(__('Sender email address is not set.', 'mailpoet'));
}
$arrayOfItems = explode('@', $fromEmail);
$emailDomain = array_pop($arrayOfItems);
$verifiedDomains = $this->senderDomainController->getVerifiedSenderDomainsIgnoringCache();
if (!$this->isItemInArray($fromEmail, $authorizedEmails) && !$this->isItemInArray($emailDomain, $verifiedDomains)) {
// translators: %s is the email address, which is not authorized.
return $this->createBadRequest(sprintf(__("Sender email address '%s' is not authorized.", 'mailpoet'), $fromEmail));
$arrayOfItems = explode('@', trim($fromEmail));
$emailDomain = strtolower(array_pop($arrayOfItems));
if (!$this->isItemInArray($emailDomain, $verifiedDomains)) {
$authorizedEmails = $this->bridge->getAuthorizedEmailAddresses();
if (!$authorizedEmails) {
return $this->createBadRequest(__('No FROM email addresses are authorized.', 'mailpoet'));
}
if (!$this->isItemInArray($fromEmail, $authorizedEmails)) {
// translators: %s is the email address, which is not authorized.
return $this->createBadRequest(sprintf(__("Sender email address '%s' is not authorized.", 'mailpoet'), $fromEmail));
}
}
try {