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

group escape fixes

Browse Source
This commit is contained in:
barisusakli
2015-09-17 00:21:50 -04:00
parent 2e1661a5e8
commit 8c2fdcc77c
6 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/groups.js
View File

@@ -88,7 +88,7 @@ var async = require('async'),
db.getSortedSetRevRange(set, start, stop, callback);
};
Groups.getGroupsAndMembers = function(groupNames, callback) {
Groups.getGroupsAndMembers = function(groupNames, callback) {
async.parallel({
groups: function(next) {
Groups.getGroupsData(groupNames, next);
@@ -100,11 +100,12 @@ var async = require('async'),
if (err) {
return callback(err);
}
data.groups.forEach(function(group, index) {
if (!group) {
return;
}
Groups.escapeGroupData(group);
group.members = data.members[index] || [];
group.truncated = group.memberCount > data.members.length;
});
@@ -118,7 +119,6 @@ var async = require('async'),
return callback(new Error('[[error:invalid-group]]'));
}
options.escape = options.hasOwnProperty('escape') ? options.escape : true;
var stop = -1;
async.parallel({
@@ -174,9 +174,7 @@ var async = require('async'),
return callback(err);
}
if (options.escape) {
Groups.escapeGroupData(results.base);
}
Groups.escapeGroupData(results.base);
results.base.descriptionParsed = descriptionParsed;
results.base.userTitleEnabled = results.base.userTitleEnabled ? !!parseInt(results.base.userTitleEnabled, 10) : true;
@@ -401,7 +399,7 @@ var async = require('async'),
groupData.forEach(function(group) {
if (group) {
group.userTitle = validator.escape(group.userTitle) || validator.escape(group.name);
Groups.escapeGroupData(group);
group.userTitleEnabled = group.userTitleEnabled ? parseInt(group.userTitleEnabled, 10) === 1 : true;
group.labelColor = group.labelColor || '#000000';
group.createtimeISO = utils.toISOString(group.createtime);
@@ -444,7 +442,7 @@ var async = require('async'),
}
});
Groups.getGroupsAndMembers(memberOf, next);
Groups.getGroupsData(memberOf, next);
});
}, next);
}