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

Prevent that 2 same email addresses will display in error message

Browse Source 
[MAILPOET-1987]
This commit is contained in:
Rostislav Wolny
2019-05-20 16:34:37 +02:00
committed by M. Shull
parent fb65f19085
commit 19444bb66d
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,11 @@ class UnauthorizedEmailNotice {
} }
private function getMessageText($validation_error) { private function getMessageText($validation_error) {
if (!empty($validation_error['invalid_sender_address']) && !empty($validation_error['invalid_confirmation_address'])) { 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.</b>', $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.</b>',
'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.' '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.'
); );
@ -73,9 +77,13 @@ class UnauthorizedEmailNotice {
} }
private function getAuthorizationLink($validation_error) { private function getAuthorizationLink($validation_error) {
if (!empty($validation_error['invalid_sender_address']) && !empty($validation_error['invalid_confirmation_address'])) { if (
$authorize_link = $this->wp->x('Authorize %email and %email2', 'Link for user to authorize their email address'); !empty($validation_error['invalid_sender_address'])
$authorize_link = str_replace('%email', EscapeHelper::escapeHtmlText($validation_error['invalid_sender_address']), $authorize_link); && !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); $authorize_link = str_replace('%email2', EscapeHelper::escapeHtmlText($validation_error['invalid_confirmation_address']), $authorize_link);
} else { } else {
$email = isset($validation_error['invalid_sender_address']) ? $validation_error['invalid_sender_address'] : $validation_error['invalid_confirmation_address']; $email = isset($validation_error['invalid_sender_address']) ? $validation_error['invalid_sender_address'] : $validation_error['invalid_confirmation_address'];