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

Fixed an issue with broken archive link. Added plaintext versions for transactional messages

Browse source
This commit is contained in:
Andris Reinman 2016-04-08 15:00:54 +03:00
parent 4584c85b4b
commit 06d5e0d9bf
11 changed files with 144 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

57
routes/archive.js
View file

@ -4,6 +4,7 @@ let settings = require('../lib/models/settings');
let campaigns = require('../lib/models/campaigns');
let lists = require('../lib/models/lists');
let subscriptions = require('../lib/models/subscriptions');
let fields = require('../lib/models/fields');
let tools = require('../lib/tools');
let express = require('express');
let router = new express.Router();
@ -51,24 +52,50 @@ router.get('/:campaign/:list/:subscription', (req, res, next) => {
return next(err);
}
campaigns.getMail(campaign.id, list.id, subscription.id, (err, mail) => {
if (err) {
req.flash('danger', err.message || err);
return res.redirect('/');
fields.list(list.id, (err, fieldList) => {
if (err || !fieldList) {
return fieldList = [];
}
if (!mail) {
err = new Error('Not Found');
err.status = 404;
return next(err);
}
subscription.mergeTags = {
EMAIL: subscription.email,
FIRST_NAME: subscription.firstName,
LAST_NAME: subscription.lastName,
FULL_NAME: [].concat(subscription.firstName || []).concat(subscription.lastName || []).join(' ')
};
res.render('archive/view', {
layout: 'archive/layout',
message: tools.formatMessage(serviceUrl, campaign, list, subscription, campaign.html),
campaign,
list,
subscription
fields.getRow(fieldList, subscription, true, true).forEach(field => {
if (field.mergeTag) {
subscription.mergeTags[field.mergeTag] = field.mergeValue || '';
}
if (field.options) {
field.options.forEach(subField => {
if (subField.mergeTag) {
subscription.mergeTags[subField.mergeTag] = subField.mergeValue || '';
}
});
}
});
campaigns.getMail(campaign.id, list.id, subscription.id, (err, mail) => {
if (err) {
req.flash('danger', err.message || err);
return res.redirect('/');
}
if (!mail) {
err = new Error('Not Found');
err.status = 404;
return next(err);
}
res.render('archive/view', {
layout: 'archive/layout',
message: tools.formatMessage(serviceUrl, campaign, list, subscription, campaign.html),
campaign,
list,
subscription
});
});
});
});

3
routes/subscription.js
View file

@ -209,7 +209,8 @@ router.post('/:cid/subscribe', passport.parseForm, passport.csrfProtection, (req
},
subject: list.name + ': Please Confirm Subscription'
}, {
template: 'emails/confirm-mail.hbs',
html: 'emails/confirm-html.hbs',
text: 'emails/confirm-text.hbs',
data: {
title: list.name,
contactAddress: configItems.defaultAddress,