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

v1.18.0

Browse source
This commit is contained in:
Andris Reinman 2016-09-08 14:39:41 +03:00
parent 6c34091634
commit 95379f731f
17 changed files with 187 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
routes/api.js
View file

@ -122,7 +122,7 @@ router.post('/subscribe/:listId', (req, res) => {
}
if (/^(yes|true|1)$/i.test(input.REQUIRE_CONFIRMATION)) {
subscriptions.addConfirmation(list, input.EMAIL, subscription, (err, cid) => {
subscriptions.addConfirmation(list, input.EMAIL, req.ip, subscription, (err, cid) => {
if (err) {
log.error('API', err);
res.status(500);

1
routes/campaigns.js
View file

@ -233,7 +233,6 @@ router.get('/edit/:id', passport.csrfProtection, (req, res, next) => {
req.flash('danger', err.message || err);
return res.redirect('/');
}
campaign.mergeTags = mergeTags;
res.render(view, campaign);
});

2
routes/subscription.js
View file

@ -234,7 +234,7 @@ router.post('/:cid/subscribe', passport.parseForm, passport.csrfProtection, (req
});
data = tools.convertKeys(data);
subscriptions.addConfirmation(list, email, data, (err, confirmCid) => {
subscriptions.addConfirmation(list, email, req.ip, data, (err, confirmCid) => {
if (!err && !confirmCid) {
err = new Error('Could not store confirmation data');
}