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

closes #2401

Browse Source
This commit is contained in:
barisusakli
2014-11-13 16:03:11 -05:00
parent 181e2b4132
commit c24e451c12
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/socket.io/modules.js
View File

@@ -141,15 +141,19 @@ SocketModules.chats.send = function(socket, data, callback) {
socket.lastChatMessageTime = now; socket.lastChatMessageTime = now;
user.getUserField(socket.uid, 'banned', function(err, banned) { user.getUserFields(socket.uid, ['banned', 'email:confirmed'], function(err, userData) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
if (parseInt(banned, 10) === 1) { if (parseInt(userData.banned, 10) === 1) {
return callback(new Error('[[error:user-banned]]')); return callback(new Error('[[error:user-banned]]'));
} }
if (parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) {
return callback(new Error('[[error:email-not-confirmed]]'));
}
Messaging.canMessage(socket.uid, touid, function(err, allowed) { Messaging.canMessage(socket.uid, touid, function(err, allowed) {
if (err || !allowed) { if (err || !allowed) {
return callback(err || new Error('[[error:chat-restricted]]')); return callback(err || new Error('[[error:chat-restricted]]'));

2
src/user.js
View File

@@ -175,7 +175,7 @@ var async = require('async'),
return callback(new Error('[[error:user-banned]]')); return callback(new Error('[[error:user-banned]]'));
} }
if (userData.email && parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) { if (parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) {
return callback(new Error('[[error:email-not-confirmed]]')); return callback(new Error('[[error:email-not-confirmed]]'));
} }
var now = Date.now(); var now = Date.now();