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

Use newsletter body content to check for unsubscribe link

Browse Source 
We used the whole newsletter but there is a defaultContent which always contains
unsubscribe link so the check always passed
This commit is contained in:
Pavel Dohnal
2018-09-05 16:10:32 +02:00
parent 8623cbb164
commit f8306635a7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
assets/js/src/newsletter_editor/components/save.js
View File

@@ -265,20 +265,24 @@ define([
} }
}, },
validateNewsletter: function (jsonObject) { validateNewsletter: function (jsonObject) {
var body = '';
var contents; var contents;
if (!App._contentContainer.isValid()) { if (!App._contentContainer.isValid()) {
this.showValidationError(App._contentContainer.validationError); this.showValidationError(App._contentContainer.validationError);
return; return;
} }
contents = JSON.stringify(jsonObject); if (jsonObject && jsonObject.body && jsonObject.body.content) {
body = JSON.stringify(jsonObject.body.content);
}
if (App.getConfig().get('validation.validateUnsubscribeLinkPresent') && if (App.getConfig().get('validation.validateUnsubscribeLinkPresent') &&
contents.indexOf('[link:subscription_unsubscribe_url]') < 0 && body.indexOf('[link:subscription_unsubscribe_url]') < 0 &&
contents.indexOf('[link:subscription_unsubscribe]') < 0) { body.indexOf('[link:subscription_unsubscribe]') < 0) {
this.showValidationError(MailPoet.I18n.t('unsubscribeLinkMissing')); this.showValidationError(MailPoet.I18n.t('unsubscribeLinkMissing'));
return; return;
} }
contents = JSON.stringify(jsonObject);
if ((App.getNewsletter().get('type') === 'notification') && if ((App.getNewsletter().get('type') === 'notification') &&
contents.indexOf('"type":"automatedLatestContent"') < 0 && contents.indexOf('"type":"automatedLatestContent"') < 0 &&
contents.indexOf('"type":"automatedLatestContentLayout"') < 0 contents.indexOf('"type":"automatedLatestContentLayout"') < 0