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

Converts special characters to HTML entities for all error messages

Browse Source
This commit is contained in:
Vlad
2017-02-21 09:55:18 -05:00
parent 97eb772ab8
commit 689c340081
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Mailer/Mailer.php
View File

@@ -170,7 +170,7 @@ class Mailer {
return array(
'response' => false,
'operation' => 'connect',
'error_message' => $error_message
'error_message' => htmlspecialchars($error_message)
);
}
@@ -178,7 +178,7 @@ class Mailer {
return array(
'response' => false,
'operation' => 'send',
'error_message' => $error_message
'error_message' => htmlspecialchars($error_message)
);
}

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

@@ -62,7 +62,7 @@ class AmazonSES {
$response = ($response) ?
$response->Error->Message->__toString() :
sprintf(__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_AMAZONSES);
$response .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), htmlspecialchars($subscriber));
$response .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), $subscriber);
return Mailer::formatMailerSendErrorResult($response);
}
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) {
Bridge::invalidateKey();
}
$result['message'] .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), htmlspecialchars($subscriber));
$result['message'] .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), $subscriber);
return Mailer::formatMailerSendErrorResult($result['message']);
case API::SENDING_STATUS_OK:
default:

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

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

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

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

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

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