Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 18:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #1592, closes #1634

Browse Source
This commit is contained in:
barisusakli
2014-06-03 16:10:24 -04:00
parent d7eb89336d
commit b537666e5c
9 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/user.js
View File

@@ -155,21 +155,20 @@ var bcrypt = require('bcryptjs'),
User.isReadyToPost = function(uid, callback) {
async.parallel({
banned: function(next) {
User.getUserField(uid, 'banned', next);
userData: function(next) {
User.getUserFields(uid, ['banned', 'lastposttime', 'email', 'email:confirmed'], next);
},
exists: function(next) {
db.exists('user:' + uid, next);
},
lastposttime: function(next) {
User.getUserField(uid, 'lastposttime', next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
if (parseInt(results.banned, 10) === 1) {
var userData = results.userData;
if (parseInt(userData.banned, 10) === 1) {
return callback(new Error('[[error:user-banned]]'));
}
@@ -177,7 +176,11 @@ var bcrypt = require('bcryptjs'),
return callback(new Error('[[error:no-user]]'));
}
var lastposttime = results.lastposttime;
if (userData.email && (parseInt(meta.config.requireEmailConfirmation, 10) === 1 || meta.config.requireEmailConfirmation === undefined) && parseInt(userData['email:confirmed'], 10) !== 1) {
return callback(new Error('[[error:email-not-confirmed]]'));
}
var lastposttime = userData.lastposttime;
if (!lastposttime) {
lastposttime = 0;
}