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

Change the domain extraction

Browse Source 
to have a sequential array so that json_encode keeps it as an array.

[MAILPOET-5786]
This commit is contained in:
Brezo Cordero
2024-01-12 14:01:27 -06:00
committed by Aschepikov
parent 11df995d35
commit aef1d65b6d
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mailpoet/lib/AdminPages/Pages/Newsletters.php
View File

@ -142,8 +142,8 @@ class Newsletters {
if ($this->bridge->isMailpoetSendingServiceEnabled()) { if ($this->bridge->isMailpoetSendingServiceEnabled()) {
$data['authorized_emails'] = $this->bridge->getAuthorizedEmailAddresses(); $data['authorized_emails'] = $this->bridge->getAuthorizedEmailAddresses();
$data['verified_sender_domains'] = array_values($this->senderDomainController->getFullyVerifiedSenderDomains(true)); $data['verified_sender_domains'] = $this->senderDomainController->getFullyVerifiedSenderDomains(true);
$data['partially_verified_sender_domains'] = array_values($this->senderDomainController->getPartiallyVerifiedSenderDomains(true)); $data['partially_verified_sender_domains'] = $this->senderDomainController->getPartiallyVerifiedSenderDomains(true);
$data['all_sender_domains'] = $this->senderDomainController->getAllSenderDomains(); $data['all_sender_domains'] = $this->senderDomainController->getAllSenderDomains();
$data['sender_restrictions'] = [ $data['sender_restrictions'] = [
'lowerLimit' => AuthorizedSenderDomainController::LOWER_LIMIT, 'lowerLimit' => AuthorizedSenderDomainController::LOWER_LIMIT,

4
mailpoet/lib/AdminPages/Pages/Settings.php
View File

@ -101,8 +101,8 @@ class Settings {
if ($this->bridge->isMailpoetSendingServiceEnabled() && $mpApiKeyValid) { if ($this->bridge->isMailpoetSendingServiceEnabled() && $mpApiKeyValid) {
$data['authorized_emails'] = $this->bridge->getAuthorizedEmailAddresses(); $data['authorized_emails'] = $this->bridge->getAuthorizedEmailAddresses();
$data['verified_sender_domains'] = array_values($this->senderDomainController->getFullyVerifiedSenderDomains(true)); $data['verified_sender_domains'] = $this->senderDomainController->getFullyVerifiedSenderDomains(true);
$data['partially_verified_sender_domains'] = array_values($this->senderDomainController->getPartiallyVerifiedSenderDomains(true)); $data['partially_verified_sender_domains'] = $this->senderDomainController->getPartiallyVerifiedSenderDomains(true);
$data['all_sender_domains'] = $this->senderDomainController->getAllSenderDomains(); $data['all_sender_domains'] = $this->senderDomainController->getAllSenderDomains();
$data['sender_restrictions'] = [ $data['sender_restrictions'] = [
'lowerLimit' => AuthorizedSenderDomainController::LOWER_LIMIT, 'lowerLimit' => AuthorizedSenderDomainController::LOWER_LIMIT,

21
mailpoet/lib/Services/AuthorizedSenderDomainController.php
View File

@ -168,26 +168,25 @@ class AuthorizedSenderDomainController {
public function getFullyVerifiedSenderDomains($domainsOnly = false): array { public function getFullyVerifiedSenderDomains($domainsOnly = false): array {
$domainData = $this->getSenderDomainsByStatus(self::OVERALL_STATUS_VERIFIED); $domainData = $this->getSenderDomainsByStatus(self::OVERALL_STATUS_VERIFIED);
if ($domainsOnly) { return $domainsOnly ? $this->extractDomains($domainData) : $domainData;
return array_map([$this, 'domainExtractor'], $domainData);
}
return $domainData;
} }
public function getPartiallyVerifiedSenderDomains($domainsOnly = false): array { public function getPartiallyVerifiedSenderDomains($domainsOnly = false): array {
$domainData = $this->getSenderDomainsByStatus(self::OVERALL_STATUS_PARTIALLY_VERIFIED); $domainData = $this->getSenderDomainsByStatus(self::OVERALL_STATUS_PARTIALLY_VERIFIED);
if ($domainsOnly) { return $domainsOnly ? $this->extractDomains($domainData) : $domainData;
return array_map([$this, 'domainExtractor'], $domainData);
}
return $domainData;
} }
public function getUnverifiedSenderDomains($domainsOnly = false): array { public function getUnverifiedSenderDomains($domainsOnly = false): array {
$domainData = $this->getSenderDomainsByStatus(self::OVERALL_STATUS_UNVERIFIED); $domainData = $this->getSenderDomainsByStatus(self::OVERALL_STATUS_UNVERIFIED);
if ($domainsOnly) { return $domainsOnly ? $this->extractDomains($domainData) : $domainData;
return array_map([$this, 'domainExtractor'], $domainData); }
private function extractDomains(array $domainData): array {
$extractedDomains = [];
foreach ($domainData as $data) {
$extractedDomains[] = $this->domainExtractor($data);
} }
return $domainData; return $extractedDomains;
} }
private function domainExtractor(array $domainData): string { private function domainExtractor(array $domainData): string {