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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-02-24 12:46:40 -05:00
parent c09f994b0a 995f8296a4
commit 72e77772db
449 changed files with 9202 additions and 6984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/privileges/helpers.js
View File

@@ -27,8 +27,9 @@ function isUserAllowedToCids(privilege, uid, cids, callback) {
return isGuestAllowedToCids(privilege, cids, callback);
}
var userKeys = [], groupKeys = [];
for (var i = 0; i < cids.length; ++i) {
var userKeys = [];
var groupKeys = [];
for (var i = 0; i < cids.length; i += 1) {
userKeys.push('cid:' + cids[i] + ':privileges:' + privilege);
groupKeys.push('cid:' + cids[i] + ':privileges:groups:' + privilege);
}
@@ -39,14 +40,14 @@ function isUserAllowedToCids(privilege, uid, cids, callback) {
},
hasGroupPrivilege: function (next) {
groups.isMemberOfGroupsList(uid, groupKeys, next);
}
},
}, function (err, results) {
if (err) {
return callback(err);
}
var result = [];
for (var i = 0; i < cids.length; ++i) {
for (var i = 0; i < cids.length; i += 1) {
result.push(results.hasUserPrivilege[i] || results.hasGroupPrivilege[i]);
}
@@ -59,8 +60,9 @@ function isUserAllowedToPrivileges(privileges, uid, cid, callback) {
return isGuestAllowedToPrivileges(privileges, cid, callback);
}
var userKeys = [], groupKeys = [];
for (var i = 0; i < privileges.length; ++i) {
var userKeys = [];
var groupKeys = [];
for (var i = 0; i < privileges.length; i += 1) {
userKeys.push('cid:' + cid + ':privileges:' + privileges[i]);
groupKeys.push('cid:' + cid + ':privileges:groups:' + privileges[i]);
}
@@ -71,14 +73,14 @@ function isUserAllowedToPrivileges(privileges, uid, cid, callback) {
},
hasGroupPrivilege: function (next) {
groups.isMemberOfGroupsList(uid, groupKeys, next);
}
},
}, function (err, results) {
if (err) {
return callback(err);
}
var result = [];
for (var i = 0; i < privileges.length; ++i) {
for (var i = 0; i < privileges.length; i += 1) {
result.push(results.hasUserPrivilege[i] || results.hasGroupPrivilege[i]);
}
@@ -94,14 +96,14 @@ helpers.isUsersAllowedTo = function (privilege, uids, cid, callback) {
},
hasGroupPrivilege: function (next) {
groups.isMembersOfGroupList(uids, 'cid:' + cid + ':privileges:groups:' + privilege, next);
}
},
}, function (err, results) {
if (err) {
return callback(err);
}
var result = [];
for(var i = 0; i < uids.length; ++i) {
for (var i = 0; i < uids.length; i += 1) {
result.push(results.hasUserPrivilege[i] || results.hasGroupPrivilege[i]);
}
@@ -111,7 +113,7 @@ helpers.isUsersAllowedTo = function (privilege, uids, cid, callback) {
function isGuestAllowedToCids(privilege, cids, callback) {
var groupKeys = [];
for (var i = 0; i < cids.length; ++i) {
for (var i = 0; i < cids.length; i += 1) {
groupKeys.push('cid:' + cids[i] + ':privileges:groups:' + privilege);
}
@@ -120,11 +122,11 @@ function isGuestAllowedToCids(privilege, cids, callback) {
function isGuestAllowedToPrivileges(privileges, cid, callback) {
var groupKeys = [];
for (var i = 0; i < privileges.length; ++i) {
for (var i = 0; i < privileges.length; i += 1) {
groupKeys.push('cid:' + cid + ':privileges:groups:' + privileges[i]);
}
groups.isMemberOfGroups('guests', groupKeys, callback);
}
module.exports = helpers;
module.exports = helpers;