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

privilege fixes

Browse Source
This commit is contained in:
barisusakli
2015-09-15 18:21:17 -04:00
parent 51cdd0800c
commit faae98892d
4 changed files with 128 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/socket.io/topics.js
View File

@@ -234,42 +234,33 @@ SocketTopics.doTopicAction = function(action, event, socket, data, callback) {
if (!socket.uid) {
return;
}
if(!data || !Array.isArray(data.tids) || !data.cid) {
if (!data || !Array.isArray(data.tids) || !data.cid) {
return callback(new Error('[[error:invalid-tid]]'));
}
if (typeof threadTools[action] !== 'function') {
return callback();
}
async.each(data.tids, function(tid, next) {
privileges.topics.canEdit(tid, socket.uid, function(err, canEdit) {
threadTools[action](tid, socket.uid, function(err, data) {
if (err) {
return next(err);
}
if (!canEdit) {
return next(new Error('[[error:no-privileges]]'));
emitToTopicAndCategory(event, data);
if (action === 'delete' || action === 'restore' || action === 'purge') {
events.log({
type: 'topic-' + action,
uid: socket.uid,
ip: socket.ip,
tid: tid
});
}
if (typeof threadTools[action] !== 'function') {
return next();
}
threadTools[action](tid, socket.uid, function(err, data) {
if (err) {
return next(err);
}
emitToTopicAndCategory(event, data);
if (action === 'delete' || action === 'restore' || action === 'purge') {
events.log({
type: 'topic-' + action,
uid: socket.uid,
ip: socket.ip,
tid: tid
});
}
next();
});
next();
});
}, callback);
};
@@ -325,7 +316,7 @@ SocketTopics.move = function(socket, data, callback) {
var topicData;
async.waterfall([
function(next) {
privileges.topics.canMove(tid, socket.uid, next);
privileges.topics.isAdminOrMod(tid, socket.uid, next);
},
function(canMove, next) {
if (!canMove) {