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

Add an option to disable un/subscribe confirmation messages

Browse source
This commit is contained in:
Andris Reinman 2016-07-01 00:06:46 +03:00
parent 3182566526
commit 10bd4614ef
6 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
routes/campaigns.js
View file

@ -190,6 +190,9 @@ router.get('/edit/:id', passport.csrfProtection, (req, res, next) => {
}, {
key: 'LINK_BROWSER',
value: 'URL to preview the message in a browser'
}, {
key: 'EMAIL',
value: 'Email address'
}, {
key: 'FIRST_NAME',
value: 'First name'

4
routes/settings.js
View file

@ -11,7 +11,7 @@ let url = require('url');
let settings = require('../lib/models/settings');
let allowedKeys = ['service_url', 'smtp_hostname', 'smtp_port', 'smtp_encryption', 'smtp_disable_auth', 'smtp_user', 'smtp_pass', 'admin_email', 'smtp_log', 'smtp_max_connections', 'smtp_max_messages', 'smtp_self_signed', 'default_from', 'default_address', 'default_subject', 'default_homepage', 'default_postaddress', 'default_sender', 'verp_hostname', 'verp_use', 'disable_wysiwyg', 'pgp_private_key', 'pgp_passphrase', 'ua_code', 'shoutout'];
let allowedKeys = ['service_url', 'smtp_hostname', 'smtp_port', 'smtp_encryption', 'smtp_disable_auth', 'smtp_user', 'smtp_pass', 'admin_email', 'smtp_log', 'smtp_max_connections', 'smtp_max_messages', 'smtp_self_signed', 'default_from', 'default_address', 'default_subject', 'default_homepage', 'default_postaddress', 'default_sender', 'verp_hostname', 'verp_use', 'disable_wysiwyg', 'pgp_private_key', 'pgp_passphrase', 'ua_code', 'shoutout', 'disable_confirmations'];
router.all('/*', (req, res, next) => {
if (!req.user) {
@ -74,7 +74,7 @@ router.post('/update', passport.parseForm, passport.csrfProtection, (req, res) =
});
// checkboxs are not included in value listing if left unchecked
['smtp_log', 'smtp_self_signed', 'smtp_disable_auth', 'verp_use', 'disable_wysiwyg'].forEach(key => {
['smtp_log', 'smtp_self_signed', 'smtp_disable_auth', 'verp_use', 'disable_wysiwyg', 'disable_confirmations'].forEach(key => {
if (keys.indexOf(key) < 0) {
keys.push(key);
values.push('');

14
routes/subscription.js
View file

@ -35,7 +35,7 @@ router.get('/subscribe/:cid', (req, res, next) => {
return next(err);
}
settings.list(['defaultHomepage', 'serviceUrl', 'pgpPrivateKey', 'defaultAddress', 'defaultFrom'], (err, configItems) => {
settings.list(['defaultHomepage', 'serviceUrl', 'pgpPrivateKey', 'defaultAddress', 'defaultFrom', 'disableConfirmations'], (err, configItems) => {
if (err) {
return next(err);
}
@ -48,6 +48,10 @@ router.get('/subscribe/:cid', (req, res, next) => {
hasPubkey: !!configItems.pgpPrivateKey
});
if (configItems.disableConfirmations) {
return;
}
fields.list(list.id, (err, fieldList) => {
if (err) {
return log.error('Fields', err);
@ -378,9 +382,13 @@ router.post('/:lcid/unsubscribe', passport.parseForm, passport.csrfProtection, (
}
});
settings.list(['defaultHomepage', 'defaultFrom', 'defaultAddress', 'serviceUrl'], (err, configItems) => {
settings.list(['defaultHomepage', 'defaultFrom', 'defaultAddress', 'serviceUrl', 'disableConfirmations'], (err, configItems) => {
if (err) {
return next(err);
return log.error('Settings', err);
}
if (configItems.disableConfirmations) {
return;
}
mailer.sendMail({