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

Improve the SPF check message [MAILPOET-2511]

Browse Source
This commit is contained in:
wxa
2019-11-28 11:51:22 +03:00
committed by Jack Kitterhing
parent 1a79305766
commit 7be762c462
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
assets/js/src/common/check_spf_record.jsx
View File

@ -1,13 +1,9 @@
import MailPoet from 'mailpoet';
import _ from 'underscore';
const getErrorMessage = (domainName, senderAddress) => `<h3>${MailPoet.I18n.t('spfCheckTitle')}</h3>
<p>${MailPoet.I18n.t('spfCheckMsgWhy').replace('%s', _.escape(domainName))}</p>
<p>${MailPoet.I18n.t('spfCheckMsgEdit').replace('%s', '<em>include:spf.sendingservice.net</em>')}
<br>
<em>v=spf1 include:spf.protection.outlook.com include:sendgrid.net include:spf.sendingservice.net -all</em>
</p>
<p>${MailPoet.I18n.t('spfCheckMsgAllow').replace('%s', _.escape(senderAddress))}</p>
const getErrorMessage = (senderAddress) => `<h3>${MailPoet.I18n.t('spfCheckTitle')}</h3>
<p>${MailPoet.I18n.t('spfCheckMsgWhy').replace('%s', _.escape(senderAddress))}</p>
<p>${MailPoet.I18n.t('spfCheckMsgEdit').replace('%s', '<em>include:spf.sendingservice.net</em>')}</p>
<p><a class="button button-primary" href="https://kb.mailpoet.com/article/151-email-authentication-spf-and-dkim" target="_blank">${MailPoet.I18n.t('spfCheckReadMore')}</a></p>`;
const checkSPFRecord = () => MailPoet.Ajax.post({
@ -16,9 +12,9 @@ const checkSPFRecord = () => MailPoet.Ajax.post({
action: 'checkSPFRecord',
data: {},
}).fail((response) => {
if (response.meta.domain_name && response.meta.sender_address) {
if (response.meta.sender_address) {
MailPoet.Notice.error(
getErrorMessage(response.meta.domain_name, response.meta.sender_address),
getErrorMessage(response.meta.sender_address),
{ static: true, scroll: true, id: 'spf_check_error' }
);
}