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

allow using only text content

Browse source
This commit is contained in:
Andris Reinman 2017-01-29 18:36:10 +02:00
parent fa5d2d012d
commit c42c71a308
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -56,6 +56,7 @@
"jsdom": "^9.9.1", "jsdom": "^9.9.1",
"juice": "^4.0.2", "juice": "^4.0.2",
"libmime": "^3.1.0", "libmime": "^3.1.0",
"marked": "^0.3.6",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"moment-timezone": "^0.5.11", "moment-timezone": "^0.5.11",
"morgan": "^1.7.0", "morgan": "^1.7.0",

9
routes/archive.js
View file

@ -10,6 +10,7 @@ let express = require('express');
let request = require('request'); let request = require('request');
let router = new express.Router(); let router = new express.Router();
let passport = require('../lib/passport'); let passport = require('../lib/passport');
let marked = require('marked');
router.get('/:campaign/:list/:subscription', passport.csrfProtection, (req, res, next) => { router.get('/:campaign/:list/:subscription', passport.csrfProtection, (req, res, next) => {
settings.get('serviceUrl', (err, serviceUrl) => { settings.get('serviceUrl', (err, serviceUrl) => {
@ -104,7 +105,13 @@ router.get('/:campaign/:list/:subscription', passport.csrfProtection, (req, res,
renderAndShow(body && body.toString(), false); renderAndShow(body && body.toString(), false);
}); });
} else { } else {
renderAndShow(campaign.html || (campaign.text || '').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/\n/g,'<br />'), true); renderAndShow(campaign.html || marked(campaign.text, {
breaks: true,
sanitize: true,
gfm: true,
tables: true,
smartypants: true
}), true);
} }
}); });
}); });