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

Honour tracking settings from parent RSS-Campaign, fixes #319

Browse source
This commit is contained in:
witzig 2017-09-22 11:39:01 +02:00
parent 92fe9121f1
commit 544e221278
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
services/feedcheck.js
View file

@ -20,7 +20,7 @@ function feedLoop() {
return setTimeout(feedLoop, feed_timeout); return setTimeout(feedLoop, feed_timeout);
} }
let query = 'SELECT `id`, `source_url`, `from`, `address`, `subject`, `list`, `segment`, `html` FROM `campaigns` WHERE `type`=2 AND `status`=6 AND (`last_check` IS NULL OR `last_check`< NOW() - INTERVAL 10 MINUTE) LIMIT 1'; let query = 'SELECT `id`, `source_url`, `from`, `address`, `subject`, `list`, `segment`, `html`, `open_tracking_disabled`, `click_tracking_disabled` FROM `campaigns` WHERE `type`=2 AND `status`=6 AND (`last_check` IS NULL OR `last_check`< NOW() - INTERVAL 10 MINUTE) LIMIT 1';
connection.query(query, (err, rows) => { connection.query(query, (err, rows) => {
connection.release(); connection.release();
@ -148,7 +148,9 @@ function checkEntries(parent, entries, callback) {
address: parent.address, address: parent.address,
subject: entry.title || parent.subject, subject: entry.title || parent.subject,
list: parent.segment ? parent.list + ':' + parent.segment : parent.list, list: parent.segment ? parent.list + ':' + parent.segment : parent.list,
html html,
openTrackingDisabled: parent.openTrackingDisabled,
clickTrackingDisabled: parent.clickTrackingDisabled
}; };
campaigns.create(campaign, { campaigns.create(campaign, {