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

Remove confirmation sender settings and warnings

Browse Source 
[MAILPOET-2328]
This commit is contained in:
Amine Ben hammou
2019-09-09 18:48:34 +01:00
committed by Jack Kitterhing
parent 674d8f9926
commit 77322a08ce
2 changed files with 9 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Services/AuthorizedEmailsController.php
View File

@@ -53,8 +53,7 @@ class AuthorizedEmailsController {
function onSettingsSave($settings) {
$sender_address_set = !empty($settings['sender']['address']);
$confirmation_address_set = !empty($settings['signup_confirmation']['from']['address']);
if ($sender_address_set || $confirmation_address_set) {
if ($sender_address_set) {
$this->checkAuthorizedEmailAddresses();
}
}
@@ -73,14 +72,10 @@ class AuthorizedEmailsController {
private function validateAddressesInSettings($authorized_emails, $result = []) {
$default_sender_address = $this->settings->get('sender.address');
$signup_confirmation_address = $this->settings->get('signup_confirmation.from.address');
if (!$this->validateAuthorizedEmail($authorized_emails, $default_sender_address)) {
$result['invalid_sender_address'] = $default_sender_address;
}
if (!$this->validateAuthorizedEmail($authorized_emails, $signup_confirmation_address)) {
$result['invalid_confirmation_address'] = $signup_confirmation_address;
}
return $result;
}

37
lib/Util/Notices/UnauthorizedEmailNotice.php
View File

@@ -26,10 +26,7 @@ class UnauthorizedEmailNotice {
function init($should_display) {
$validation_error = $this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING);
if (
$should_display
&& (isset($validation_error['invalid_sender_address']) || isset($validation_error['invalid_confirmation_address']))
) {
if ($should_display && isset($validation_error['invalid_sender_address'])) {
return $this->display($validation_error);
}
}
@@ -44,23 +41,10 @@ class UnauthorizedEmailNotice {
}
private function getMessageText($validation_error) {
if (
!empty($validation_error['invalid_sender_address'])
&& !empty($validation_error['invalid_confirmation_address'])
&& $validation_error['invalid_sender_address'] !== $validation_error['invalid_confirmation_address']
) {
$text = $this->wp->_x('<b>Sending all of your emails has been paused</b> because your email addresses %default-sender-address and %signup-confirmation-address have not been authorized yet.',
'Email addresses have to be authorized to be used to send emails. %default-sender-address and %signup-confirmation-address will be replaced by email addresses.'
);
$message = str_replace('%default-sender-address', EscapeHelper::escapeHtmlText($validation_error['invalid_sender_address']), $text);
$message = str_replace('%signup-confirmation-address', EscapeHelper::escapeHtmlText($validation_error['invalid_confirmation_address']), $message);
} else {
$text = $this->wp->_x('<b>Sending all of your emails has been paused</b> because your email address %email-address hasn’t been authorized yet.</b>',
'Email addresses have to be authorized to be used to send emails. %email-address will be replaced by an email address.'
);
$email = isset($validation_error['invalid_sender_address']) ? $validation_error['invalid_sender_address'] : $validation_error['invalid_confirmation_address'];
$message = str_replace('%email-address', EscapeHelper::escapeHtmlText($email), $text);
}
$message = str_replace('%email-address', EscapeHelper::escapeHtmlText($validation_error['invalid_sender_address']), $text);
return "<p>$message</p>";
}
@@ -71,28 +55,13 @@ class UnauthorizedEmailNotice {
$button = Helpers::replaceLinkTags("[link]{$button}[/link]", 'admin.php?page=mailpoet-settings', ['class' => 'button button-secondary']);
$buttons .= "<p>$button</p>";
}
if (!empty($validation_error['invalid_confirmation_address'])) {
$button = $this->wp->_x('Update my Sign-up Confirmation email address', 'Please reuse the current translation of “Sign-up Confirmation”');
$button = Helpers::replaceLinkTags("[link]{$button}[/link]", 'admin.php?page=mailpoet-settings#signup', ['class' => 'button button-secondary']);
$buttons .= "<p>$button</p>";
}
return $buttons;
}
private function getAuthorizationLink($validation_error) {
if (
!empty($validation_error['invalid_sender_address'])
&& !empty($validation_error['invalid_confirmation_address'])
&& $validation_error['invalid_sender_address'] !== $validation_error['invalid_confirmation_address']
) {
$authorize_link = $this->wp->_x('Authorize %email1 and %email2', 'Link for user to authorize their email address');
$authorize_link = str_replace('%email1', EscapeHelper::escapeHtmlText($validation_error['invalid_sender_address']), $authorize_link);
$authorize_link = str_replace('%email2', EscapeHelper::escapeHtmlText($validation_error['invalid_confirmation_address']), $authorize_link);
} else {
$email = isset($validation_error['invalid_sender_address']) ? $validation_error['invalid_sender_address'] : $validation_error['invalid_confirmation_address'];
$email = $validation_error['invalid_sender_address'];
$authorize_link = $this->wp->_x('Authorize %email', 'Link for user to authorize their email address');
$authorize_link = str_replace('%email', EscapeHelper::escapeHtmlText($email), $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>";