closes #1710, closes #1700

This commit is contained in:
barisusakli
2014-06-16 14:13:50 -04:00
parent db3523b10b
commit 2479a34c56
3 changed files with 13 additions and 5 deletions

View File

@@ -155,22 +155,29 @@ var bcrypt = require('bcryptjs'),
},
exists: function(next) {
db.exists('user:' + uid, next);
},
isAdmin: function(next) {
User.isAdministrator(uid, next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
if (!results.exists) {
return callback(new Error('[[error:no-user]]'));
}
if (results.isAdmin) {
return callback();
}
var userData = results.userData;
if (parseInt(userData.banned, 10) === 1) {
return callback(new Error('[[error:user-banned]]'));
}
if (!results.exists) {
return callback(new Error('[[error:no-user]]'));
}
if (userData.email && parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) {
return callback(new Error('[[error:email-not-confirmed]]'));
}