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

Require JavaScript to be turned on for subsciption confirmations

Browse source
This commit is contained in:
Andris Reinman 2016-09-08 17:49:01 +03:00
parent f0e772933e
commit 78083c33fd
3 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/models/subscriptions.js
View file

@ -214,6 +214,9 @@ module.exports.addConfirmation = (list, email, optInIp, data, callback) => {
} }
setImmediate(() => { setImmediate(() => {
if (data._skip) {
return;
}
mailer.sendMail({ mailer.sendMail({
from: { from: {

8
routes/subscription.js
View file

@ -216,6 +216,11 @@ router.post('/:cid/subscribe', passport.parseForm, passport.csrfProtection, (req
return res.redirect('/subscription/' + encodeURIComponent(req.params.cid) + '?' + tools.queryParams(req.body)); return res.redirect('/subscription/' + encodeURIComponent(req.params.cid) + '?' + tools.queryParams(req.body));
} }
let subTime = Number(req.body.sub) || 0;
let subTest = !!(subTime > Date.now() - 3600 * 1000 && subTime < Date.now() + 3600 * 1000);
let addressTest = !req.body.address;
let testsPass = subTest && addressTest;
lists.getByCid(req.params.cid, (err, list) => { lists.getByCid(req.params.cid, (err, list) => {
if (!err && !list) { if (!err && !list) {
err = new Error('Selected list not found'); err = new Error('Selected list not found');
@ -232,6 +237,9 @@ router.post('/:cid/subscribe', passport.parseForm, passport.csrfProtection, (req
data[key] = (req.body[key] || '').toString().trim(); data[key] = (req.body[key] || '').toString().trim();
} }
}); });
data._address = req.body.address;
data._sub = req.body.sub;
data._skip = !testsPass;
data = tools.convertKeys(data); data = tools.convertKeys(data);
subscriptions.addConfirmation(list, email, req.ip, data, (err, confirmCid) => { subscriptions.addConfirmation(list, email, req.ip, data, (err, confirmCid) => {

7
views/subscription/subscribe.hbs
View file

@ -10,6 +10,9 @@
<input type="hidden" name="_csrf" value="{{csrfToken}}"> <input type="hidden" name="_csrf" value="{{csrfToken}}">
<input type="hidden" class="tz-detect" name="tz" id="tz" value="{{tz}}"> <input type="hidden" class="tz-detect" name="tz" id="tz" value="{{tz}}">
<input type="hidden" name="address" value="">
<input type="hidden" name="sub" id="sub" value="">
<div class="form-group"> <div class="form-group">
<label for="email">Email Address</label> <label for="email">Email Address</label>
<input type="email" class="form-control" name="email" id="email" placeholder="" value="{{email}}" required> <input type="email" class="form-control" name="email" id="email" placeholder="" value="{{email}}" required>
@ -121,3 +124,7 @@
<button type="submit" class="btn btn-primary">Subscribe to list</button> <button type="submit" class="btn btn-primary">Subscribe to list</button>
</div> </div>
</form> </form>
<script>
document.getElementById('sub').value = new Date().getTime();
</script>