Fixed option to display all online users in activeusers.

Author: dwn

library.js

@@ -58,15 +58,18 @@
 		callback(null, widget.data.html);
 	};
 
+  Widget.render
+
 	Widget.renderTextWidget = function(widget, callback) {
 		var parseAsPost = !!widget.data.parseAsPost,
 			text = widget.data.text;
-
+      
 		if (parseAsPost) {
 			plugins.fireHook('filter:parse.raw', text, callback);
 		} else {
 			callback(null, text.replace(/\r\n/g, "<br />"));
 		}
+
 	};
 
 	Widget.renderRecentViewWidget = function(widget, callback) {
@@ -86,6 +89,14 @@
 	};
 
 	Widget.renderActiveUsersWidget = function(widget, callback) {
+    function generateHtml(users) {
+				html = templates.parse(html, {
+					active_users: users,
+					relative_path: nconf.get('relative_path')
+				});
+        return html;
+    }
+
 		function getUserData(err, uids) {
 			if (err) {
 				return callback(err);
@@ -98,10 +109,7 @@
 					return callback(err);
 				}
 
-				html = templates.parse(html, {
-					active_users: users,
-					relative_path: nconf.get('relative_path')
-				});
+        html = generateHtml(users);
 
 				callback(err, html);
 			});
@@ -110,27 +118,32 @@
 		var count = Math.max(1, widget.data.numUsers || 24);
 		var html = Widget.templates['widgets/activeusers.tpl'], cidOrtid;
 		var match;
-		if (widget.data.global) {
+		if (!!widget.data.global) {
 			async.parallel({
 				users: function(next) {
-					user.getUsersFromSet('users:online', 0, 49, next);
+					user.getUsersFromSet('users:online', widget.uid, 0, 49, next);
 				},
 				isAdministrator: function(next) {
 					user.isAdministrator(widget.uid, next);
 				}
 			}, function(err, results) {
 				if (err) {
-					return getUserData(err);
+					return callback(err);
 				}
 
 				if (!results.isAdministrator) {
-					results.users = results.users.filter(function(user) {
-						return user && user.status !== 'offline';
+					results.users = results.users.filter(function(usr) {
+						return usr && usr.status !== 'offline';
 					});
 				}
 
-				results.users = results.users.map(function(a) { return a.uid; });
-				getUserData(err, results.users);
+				results.users = results.users.map(function(a) { 
+          return {'uid': a.uid, 'username': a.username, 'userslug': a.userslug, 'picture': a.picture}; 
+        });
+
+        html = generateHtml(results.users);
+
+        callback(null, html);
 			});
 		} else if (widget.data.cid) {
 			cidOrtid = widget.data.cid;

public/templates/admin/activeusers.tpl

@@ -1,5 +1,5 @@
 <label>
-  Include All Users: <input name="global" type="checkbox" name="includeall"><br />
+  Include All Users: <input name="global" type="checkbox"><br />
   <small>Active users will include all online users(regardless of current category).</small>
 </label>
 <br />