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

Convert special characters to HTML entities when displaying email

Browse Source 
addresses
This commit is contained in:
Vlad
2017-02-20 13:03:08 -05:00
parent bdcfd77d42
commit bc40bbb44b
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Mailer/Methods/AmazonSES.php
View File

@ -62,7 +62,7 @@ class AmazonSES {
$response = ($response) ? $response = ($response) ?
$response->Error->Message->__toString() : $response->Error->Message->__toString() :
sprintf(__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_AMAZONSES); sprintf(__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_AMAZONSES);
$response .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), $subscriber); $response .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), htmlspecialchars($subscriber));
return Mailer::formatMailerSendErrorResult($response); return Mailer::formatMailerSendErrorResult($response);
} }
return Mailer::formatMailerSendSuccessResult(); return Mailer::formatMailerSendSuccessResult();

2
lib/Mailer/Methods/MailPoet.php
View File

@ -37,7 +37,7 @@ class MailPoet {
if(!empty($result['code']) && $result['code'] === API::RESPONSE_CODE_KEY_INVALID) { if(!empty($result['code']) && $result['code'] === API::RESPONSE_CODE_KEY_INVALID) {
Bridge::invalidateKey(); Bridge::invalidateKey();
} }
$result['message'] .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), $subscriber); $result['message'] .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), htmlspecialchars($subscriber));
return Mailer::formatMailerSendErrorResult($result['message']); return Mailer::formatMailerSendErrorResult($result['message']);
case API::SENDING_STATUS_OK: case API::SENDING_STATUS_OK:
default: default:

2
lib/Mailer/Methods/PHPMail.php
View File

@ -31,7 +31,7 @@ class PHPMail {
Mailer::formatMailerSendSuccessResult(); Mailer::formatMailerSendSuccessResult();
} else { } else {
$result = sprintf(__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_PHPMAIL); $result = sprintf(__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_PHPMAIL);
$result .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), $subscriber); $result .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), htmlspecialchars($subscriber));
return Mailer::formatMailerSendErrorResult($result); return Mailer::formatMailerSendErrorResult($result);
} }
} }

2
lib/Mailer/Methods/SMTP.php
View File

@ -116,7 +116,7 @@ class SMTP {
} else { } else {
$message = sprintf(__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_SMTP); $message = sprintf(__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_SMTP);
} }
$message .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), $subscriber); $message .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), htmlspecialchars($subscriber));
return $message; return $message;
} }

2
lib/Mailer/Methods/SendGrid.php
View File

@ -30,7 +30,7 @@ class SendGrid {
$response = (!empty($response['errors'][0])) ? $response = (!empty($response['errors'][0])) ?
$response['errors'][0] : $response['errors'][0] :
sprintf(__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_SENDGRID); sprintf(__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_SENDGRID);
$response .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), $subscriber); $response .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), htmlspecialchars($subscriber));
return Mailer::formatMailerSendErrorResult($response); return Mailer::formatMailerSendErrorResult($response);
} }
return Mailer::formatMailerSendSuccessResult(); return Mailer::formatMailerSendSuccessResult();