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

Merge branch 'master' of github.com:Mailtrain-org/mailtrain

Browse source 
Conflicts:
	languages/de_DE.po
This commit is contained in:
Tomas Bures 2017-05-04 17:58:55 -04:00
commit 11990d62b2
10 changed files with 743 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

7
services/feedcheck.js
View file

@ -132,8 +132,11 @@ function checkEntries(parent, entries, callback) {
let entryId = result.insertId;
let html = (parent.html || '').toString().trim();
if (/\[RSS_ENTRY\]/i.test(html)) {
html = html.replace(/\[RSS_ENTRY\]/, entry.content);
if (/\[RSS_ENTRY[\w]*\]/i.test(html)) {
html = html.replace(/\[RSS_ENTRY\]/, entry.content); //for backward compatibility
Object.keys(entry).forEach(key => {
html = html.replace('\[RSS_ENTRY_'+key.toUpperCase()+'\]', entry[key])
});
} else {
html = entry.content + html;
}

3
services/sender.js
View file

@ -318,6 +318,7 @@ function formatMessage(message, callback) {
}
let useVerp = config.verp.enabled && configItems.verpUse && configItems.verpHostname;
let useVerpSenderHeader = useVerp && config.verp.disablesenderheader !== true;
fields.list(list.id, (err, fieldList) => {
if (err) {
return callback(err);
@ -389,7 +390,7 @@ function formatMessage(message, callback) {
name: [].concat(message.subscription.firstName || []).concat(message.subscription.lastName || []).join(' '),
address: message.subscription.email
},
sender: useVerp ? campaignAddress + '@' + configItems.verpHostname : false,
sender: useVerpSenderHeader ? campaignAddress + '@' + configItems.verpHostname : false,
envelope: useVerp ? {
from: campaignAddress + '@' + configItems.verpHostname,