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

closes #1922

Browse Source
This commit is contained in:
barisusakli
2014-07-30 14:29:48 -04:00
parent da780cdee7
commit efdd795084
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/database/mongo/sets.js
View File

@@ -57,7 +57,7 @@ module.exports = function(db, module) {
} }
values = values.map(function(value) { values = values.map(function(value) {
return items.members.indexOf(value) !== -1; return items && Array.isArray(items.members) && items.members.indexOf(value) !== -1;
}); });
callback(null, values); callback(null, values);

8
src/privileges/helpers.js
View File

@@ -80,6 +80,9 @@ function isGuestAllowedTo(privilege, cids, callback) {
userPrivilegeExists: function(next) { userPrivilegeExists: function(next) {
groups.exists(userKeys, next); groups.exists(userKeys, next);
}, },
groupPrivilegeExists: function(next) {
groups.exists(groupKeys, next);
},
hasGroupPrivilege: function(next) { hasGroupPrivilege: function(next) {
groups.isMemberOfGroups('guests', groupKeys, next); groups.isMemberOfGroups('guests', groupKeys, next);
} }
@@ -90,7 +93,10 @@ function isGuestAllowedTo(privilege, cids, callback) {
var result = []; var result = [];
for (var i = 0; i<cids.length; ++i) { for (var i = 0; i<cids.length; ++i) {
var groupPriv = privilege !== 'find' && privilege !== 'read' ? results.hasGroupPrivilege[i] === true : results.hasGroupPrivilege[i] !== false; var groupPriv = (privilege === 'find' || privilege === 'read') ?
(!results.groupPrivilegeExists[i] || results.hasGroupPrivilege[i] !== false) :
(results.groupPrivilegeExists[i] || results.hasGroupPrivilege[i] === true);
result.push(!results.userPrivilegeExists[i] && groupPriv); result.push(!results.userPrivilegeExists[i] && groupPriv);
} }