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

Merge remote-tracking branch 'origin/master' into socket.io1.x

Browse Source
This commit is contained in:
barisusakli
2014-11-28 16:00:36 -05:00
parent 49a73e1665 f9405c0423
commit 2c89d50322
7 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/socket.io/admin/categories.js
View File

@@ -36,7 +36,7 @@ Categories.search = function(socket, data, callback) {
var username = data.username,
cid = data.cid;
user.search(username, function(err, data) {
user.search(username, 'username', function(err, data) {
if (err) {
return callback(err);
}

14
src/socket.io/admin/user.js
View File

@@ -165,15 +165,15 @@ User.deleteUsers = function(socket, uids, callback) {
}, callback);
};
User.search = function(socket, username, callback) {
user.search(username, function(err, data) {
function isAdmin(userData, next) {
user.isAdministrator(userData.uid, function(err, isAdmin) {
if(err) {
User.search = function(socket, data, callback) {
user.search(data.query, data.type, function(err, data) {
function getEmail(userData, next) {
user.getUserField(userData.uid, 'email', function(err, email) {
if (err) {
return next(err);
}
userData.administrator = isAdmin;
userData.email = email;
next();
});
}
@@ -182,7 +182,7 @@ User.search = function(socket, username, callback) {
return callback(err);
}
async.each(data.users, isAdmin, function(err) {
async.each(data.users, getEmail, function(err) {
callback(err, data);
});
});

2
src/socket.io/user.js
View File

@@ -66,7 +66,7 @@ SocketUser.search = function(socket, username, callback) {
if (!socket.uid) {
return callback(new Error('[[error:not-logged-in]]'));
}
user.search(username, callback);
user.search(username, 'username', callback);
};
// Password Reset