public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added CSV export of subscribers

Browse source 
Fixed some bugs in subscriptions
Updated some packages to avoid warnings about vulnerabilities
Completed RSS feed campaigns
This commit is contained in:
Tomas Bures 2018-11-17 02:54:23 +01:00
parent 8683f8c91e
commit bf69e633c4
47 changed files with 5255 additions and 9651 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/tools.js
View file

@ -108,9 +108,7 @@ function validateEmailGetMessage(result, address) {
}
}
function formatMessage(campaign, list, subscription, mergeTags, message, filter, isHTML) {
filter = typeof filter === 'function' ? filter : (str => str);
function formatMessage(campaign, list, subscription, mergeTags, message, isHTML) {
const links = getMessageLinks(campaign, list, subscription);
const getValue = key => {
@ -135,11 +133,11 @@ function formatMessage(campaign, list, subscription, mergeTags, message, filter,
return match;
}
value = (value || fallback || '').trim();
return filter(value);
return value;
});
}
async function prepareHtml(html) {
async function prepareHtml(html) {
if (!(html || '').toString().trim()) {
return false;
}
@ -150,7 +148,7 @@ async function prepareHtml(html) {
FetchExternalResources: false, // disables resource loading over HTTP / filesystem
ProcessExternalResources: false // do not execute JS within script blocks
}
});pre
});
const head = win.document.querySelector('head');
let hasCharsetTag = false;