From d3af2781238f682504b296a428d315bfdb0d16f0 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 25 Mar 2015 16:09:38 -0400
Subject: [PATCH] removed old code that was no longer necessary, updated
 privilege table to show all groups (similar to previous behaviour), fixes
 #2887

---
 src/groups.js                     |  1 +
 src/privileges/categories.js      | 34 +++++++++++--------------
 src/socket.io/admin/categories.js | 42 -------------------------------
 3 files changed, 16 insertions(+), 61 deletions(-)

diff --git a/src/groups.js b/src/groups.js
index a4369a6785..89c3eba9b8 100644
--- a/src/groups.js
+++ b/src/groups.js
@@ -47,6 +47,7 @@ var async = require('async'),
 			getEphemeralGroup: function(groupName) {
 				return {
 					name: groupName,
+					slug: utils.slugify(groupName),
 					description: '',
 					deleted: '0',
 					hidden: '0',
diff --git a/src/privileges/categories.js b/src/privileges/categories.js
index 92cf9b2a56..f1dd6f6898 100644
--- a/src/privileges/categories.js
+++ b/src/privileges/categories.js
@@ -82,29 +82,25 @@ module.exports = function(privileges) {
 						}), next);
 					},
 					function(memberSets, next) {
-						// Reduce into a single array
-						var members = memberSets.reduce(function(combined, curMembers) {
-								return combined.concat(curMembers);
-							}).filter(function(member, index, combined) {
-								return combined.indexOf(member) === index;
-							});
-
-						// Special handling for "guests" group
-						members.splice(members.indexOf('guests'), 1);
-
-						groups.getMultipleGroupFields(members, ['name', 'slug', 'memberCount'], function(err, memberData) {
-							memberData.push({
-								name: 'guests',
-								slug: 'guests'
-							});
-
-							memberData = memberData.map(function(member) {
+						groups.list({
+							expand: false,
+							isAdmin: true,
+							showSystemGroups: true
+						}, function(err, memberData) {
+							memberData = memberData.filter(function(member) {
+								return member.name.indexOf(':privileges:') === -1;
+							}).map(function(member) {
 								member.privileges = {};
 								for(var x=0,numPrivs=privileges.length;x<numPrivs;x++) {
-									member.privileges[privileges[x]] = memberSets[x].indexOf(member.name) !== -1
+									member.privileges[privileges[x]] = memberSets[x].indexOf(member.slug) !== -1
 								}
 
-								return member;
+								return {
+									name: member.name,
+									slug: member.slug,
+									memberCount: member.memberCount,
+									privileges: member.privileges,
+								};
 							});
 
 							next(null, memberData);
diff --git a/src/socket.io/admin/categories.js b/src/socket.io/admin/categories.js
index 76d1f5f941..4db4445d4d 100644
--- a/src/socket.io/admin/categories.js
+++ b/src/socket.io/admin/categories.js
@@ -66,46 +66,4 @@ Categories.getPrivilegeSettings = function(socket, cid, callback) {
 	privileges.categories.list(cid, callback);
 };
 
-// Categories.setGroupPrivilege = function(socket, data, callback) {
-// 	if(!data) {
-// 		return callback(new Error('[[error:invalid-data]]'));
-// 	}
-
-// 	groups[data.set ? 'join' : 'leave']('cid:' + data.cid + ':privileges:' + data.privilege, data.name, function (err) {
-// 		if (err) {
-// 			return callback(err);
-// 		}
-
-// 		groups.hide('cid:' + data.cid + ':privileges:' + data.privilege, callback);
-// 	});
-// };
-
-// Categories.groupsList = function(socket, cid, callback) {
-// 	groups.list({
-// 		expand: false,
-// 		isAdmin: true,
-// 		showSystemGroups: true
-// 	}, function(err, data) {
-// 		if(err) {
-// 			return callback(err);
-// 		}
-
-// 		// Remove privilege groups
-// 		data = data.filter(function(groupObj) {
-// 			return groupObj.name.indexOf(':privileges:') === -1;
-// 		});
-
-// 		async.map(data, function(groupObj, next) {
-// 			privileges.categories.groupPrivileges(cid, groupObj.name, function(err, privileges) {
-// 				if(err) {
-// 					return next(err);
-// 				}
-
-// 				groupObj.privileges = privileges;
-// 				next(null, groupObj);
-// 			});
-// 		}, callback);
-// 	});
-// };
-
 module.exports = Categories;
\ No newline at end of file