Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-07 11:47:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

implemented emailer for welcome email (though the email confirmation system is horribly broken)

Browse Source
This commit is contained in:
Julian Lam
2013-12-31 18:00:10 -05:00
parent 5a527de287
commit 339ed4e47b
4 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/user.js
View File

@@ -15,7 +15,7 @@ var bcrypt = require('bcrypt'),
notifications = require('./notifications'),
topics = require('./topics'),
events = require('./events'),
Emailer = require('./emailer'),
websockets = require('./websockets');
(function(User) {
@@ -103,7 +103,7 @@ var bcrypt = require('bcrypt'),
if (email !== undefined) {
db.setObjectField('email:uid', email, uid);
User.sendConfirmationEmail(email);
User.sendConfirmationEmail(uid, email);
}
plugins.fireHook('action:user.create', {uid: uid, username: username, email: email, picture: gravatar, timestamp: timestamp});
@@ -823,15 +823,9 @@ var bcrypt = require('bcrypt'),
}
};
User.sendConfirmationEmail = function(email) {
User.sendConfirmationEmail = function(uid, email) {
var confirm_code = utils.generateUUID(),
confirm_link = nconf.get('url') + 'confirm/' + confirm_code/*,
confirm_email = global.templates['emails/header'] + global.templates['emails/email_confirm'].parse({
'CONFIRM_LINK': confirm_link
}) + global.templates['emails/footer'],
confirm_email_plaintext = global.templates['emails/email_confirm_plaintext'].parse({
'CONFIRM_LINK': confirm_link
})*/;
confirm_link = nconf.get('url') + 'confirm/' + confirm_code;
// Email confirmation code
var expiry_time = Date.now() / 1000 + 60 * 60 * 2;