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

Display notice for unauthorized emails within newsletters

Browse Source 
[MAILPOET-2022]
This commit is contained in:
Rostislav Wolny
2019-05-27 12:55:44 +02:00
committed by M. Shull
parent 8712948cf2
commit 01dcdd0262
2 changed files with 92 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Util/Notices/PermanentNotices.php
View File

@@ -20,6 +20,9 @@ class PermanentNotices {
/** @var UnauthorizedEmailNotice */
private $unauthorized_emails_notice;
/** @var UnauthorizedEmailInNewslettersNotice */
private $unauthorized_emails_in_newsletters_notice;
/** @var WPFunctions */
private $wp;
@@ -29,6 +32,7 @@ class PermanentNotices {
$this->after_migration_notice = new AfterMigrationNotice();
$this->discounts_announcement = new DiscountsAnnouncement();
$this->unauthorized_emails_notice = new UnauthorizedEmailNotice(new SettingsController, $this->wp);
$this->unauthorized_emails_in_newsletters_notice = new UnauthorizedEmailInNewslettersNotice(new SettingsController, $this->wp);
}
public function init() {
@@ -47,6 +51,9 @@ class PermanentNotices {
$this->unauthorized_emails_notice->init(
Menu::isOnMailPoetAdminPage($exclude = ['mailpoet-welcome-wizard'])
);
$this->unauthorized_emails_in_newsletters_notice->init(
Menu::isOnMailPoetAdminPage($exclude = null, $page_id = 'mailpoet-newsletters')
);
$this->discounts_announcement->init(
empty($_GET['page'])
&& $this->wp->isAdmin()

85
lib/Util/Notices/UnauthorizedEmailInNewslettersNotice.php Normal file
View File

@@ -0,0 +1,85 @@
<?php
namespace MailPoet\Util\Notices;
use MailPoet\Config\Menu;
use MailPoet\Mailer\MailerError;
use MailPoet\Mailer\MailerLog;
use MailPoet\Newsletter\Renderer\EscapeHelper;
use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Settings\SettingsController;
use MailPoet\Util\Helpers;
use MailPoet\WP\Functions as WPFunctions;
use function MailPoet\Util\array_column;
class UnauthorizedEmailInNewslettersNotice {
const OPTION_NAME = 'unauthorized-email-in-newsletters-addresses-notice';
/** @var SettingsController */
private $settings;
/** @var WPFunctions */
private $wp;
function __construct(SettingsController $settings, WPFunctions $wp) {
$this->settings = $settings;
$this->wp = $wp;
}
function init($should_display) {
$validation_error = $this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING);
if ($should_display && isset($validation_error['invalid_senders_in_newsletters'])) {
return $this->display($validation_error);
}
}
function display($validation_error) {
$message = $this->getMessageText();
$message .= $this->getNewslettersLinks($validation_error);
$message .= $this->getAuthorizationLink($validation_error);
$message .= $this->getResumeSendingButton();
// Use Mailer log errors display system to display this notice
$mailer_log = MailerLog::setError(MailerLog::getMailerLog(), MailerError::OPERATION_AUTHORIZATION, $message);
MailerLog::updateMailerLog($mailer_log);
}
private function getMessageText() {
$message = $this->wp->__('<b>Your automatic emails has been paused</b>, because some email addresses hasn’t been authorized yet.');
return "<p>$message</p>";
}
private function getNewslettersLinks($validation_error) {
$links = '';
foreach ($validation_error['invalid_senders_in_newsletters'] as $error) {
$link_text = $this->wp->_x('Update the from address of %subject', '%subject will be replaced by a newsletter subject');
$link_text = str_replace('%subject', EscapeHelper::escapeHtmlText($error['subject']), $link_text);
$link_url = $this->wp->adminUrl('admin.php?page=' . Menu::MAIN_PAGE_SLUG . '#/send/' . $error['newsletter_id']);
$link = Helpers::replaceLinkTags("[link]{$link_text}[/link]", $link_url, ['target' => '_blank']);
$links .= "<p>$link</p>";
}
return $links;
}
private function getAuthorizationLink($validation_error) {
$emails = array_unique(array_column($validation_error['invalid_senders_in_newsletters'], 'sender_address'));
if (count($emails) > 1) {
$authorize_link = $this->wp->_x('Authorize %email1 and %email2', 'Link for user to authorize their email address');
$authorize_link = str_replace('%email2', EscapeHelper::escapeHtmlText(array_pop($emails)), $authorize_link);
$authorize_link = str_replace('%email1', EscapeHelper::escapeHtmlText(implode(', ', $emails)), $authorize_link);
} else {
$authorize_link = $this->wp->_x('Authorize %email', 'Link for user to authorize their email address');
$authorize_link = str_replace('%email', EscapeHelper::escapeHtmlText($emails[0]), $authorize_link);
}
$authorize_link = Helpers::replaceLinkTags("[link]{$authorize_link}[/link]", 'https://account.mailpoet.com/authorization', ['target' => '_blank']);
$html = '<p><b>' . $this->wp->_x('OR', 'User has to choose between two options') . '</b></p>';
$html .= "<p>$authorize_link</p>";
return $html;
}
private function getResumeSendingButton() {
$button = '<button class="button button-primary mailpoet-js-button-resume-sending">' . $this->wp->__('Resume sending', 'mailpoet') . '</button>';
return "<p>$button</p>";
}
}