From 746faa948824917929c87ffaafda419916cb1826 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Wed, 26 Jun 2013 11:38:44 -0400
Subject: [PATCH 1/4] delete user button in admin/users. the latest/top posters
 and most reputation sorting is working now in admin/users

---
 public/templates/admin/header.tpl |  2 +-
 public/templates/admin/users.tpl  | 60 +++++++++++++++++++++++++------
 src/admin/user.js                 | 20 +++++++++++
 src/routes/admin.js               | 29 +++++++++++++--
 src/websockets.js                 |  6 ++++
 5 files changed, 104 insertions(+), 13 deletions(-)

diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl
index 065996d200..21ef16da22 100644
--- a/public/templates/admin/header.tpl
+++ b/public/templates/admin/header.tpl
@@ -63,7 +63,7 @@
 						<li class="nav-header">NodeBB</li>
 						<li class='active'><a href='/admin/index'><i class='icon-home'></i> Home</a></li>
 						<li class=''><a href='/admin/categories'><i class='icon-folder-close-alt'></i> Categories</a></li>
-						<li class=''><a href='/admin/users'><i class='icon-user'></i> Users</a></li>
+						<li class=''><a href='/admin/users/latest'><i class='icon-user'></i> Users</a></li>
 						<li class=''><a href='/admin/topics'><i class='icon-book'></i> Topics</a></li>
 						<li class=''><a href='/admin/themes'><i class='icon-th'></i> Themes</a></li>
 						<li class=''><a href='/admin/settings'><i class='icon-cogs'></i> Settings</a></li>
diff --git a/public/templates/admin/users.tpl b/public/templates/admin/users.tpl
index 8251eeef48..1b900b9255 100644
--- a/public/templates/admin/users.tpl
+++ b/public/templates/admin/users.tpl
@@ -1,7 +1,7 @@
 <h1>Users</h1>
 <hr />
 <ul class="nav nav-pills">
-	<li class='active'><a href='/admin/users'>Latest Users</a></li>
+	<li class='active'><a href='/admin/users/latest'>Latest Users</a></li>
 	<li class=''><a href='/admin/users/sort-posts'>Top Posters</a></li>
 	<li class=''><a href='/admin/users/sort-reputation'>Most Reputation</a></li>
 	<li class=''><a href='/admin/users/search'>Search</a></li>
@@ -14,7 +14,7 @@
 </div>
 
 <!-- BEGIN users -->
-<div class="users-box well" data-uid="{users.uid}">
+<div class="users-box well" data-uid="{users.uid}" data-admin="{users.administrator}" data-username="{users.username}">
 	<a href="/users/{users.userslug}">
 		<img src="{users.picture}" class="user-8080-picture"/>
 	</a>
@@ -30,7 +30,11 @@
 		<i class='icon-pencil'></i>
 	</div>
 	<div>
-		<a href="#" class="btn admin-btn" data-admin="{users.administrator}" data-username="{users.username}">Admin</a>
+		<a href="#" class="btn admin-btn">Admin</a>
+	</div>
+	<br/>
+	<div>
+		<a href="#" class="btn delete-btn btn-danger">Delete</a>
 	</div>
 
 </div>
@@ -58,9 +62,19 @@
 			}
 		});
 
+		function isUserAdmin(element) {
+			var parent = $(element).parents('.users-box');
+			return (parent.attr('data-admin') !== "0");
+		}
+
+		function getUID(element) {
+			var parent = $(element).parents('.users-box');
+			return parent.attr('data-uid');	
+		}
+
 		jQuery('.admin-btn').each(function(index, element) {
 			var adminBtn = $(element);
-			var isAdmin = adminBtn.attr('data-admin') !== "0";
+			var isAdmin = isUserAdmin(adminBtn);
 			
 			if(isAdmin)
 				adminBtn.addClass('btn-success');
@@ -69,30 +83,56 @@
 
 		});
 
+		jQuery('.delete-btn').each(function(index, element) {
+			var deleteBtn = $(element);
+			var isAdmin = isUserAdmin(deleteBtn);
+			
+			if(isAdmin)
+				deleteBtn.addClass('disabled');
+			else
+				deleteBtn.show();
+		});
+
 		jQuery('.admin-btn').on('click', function() {
 			var adminBtn = $(this);
-			var isAdmin = adminBtn.attr('data-admin') !== "0";
+			var isAdmin = isUserAdmin(adminBtn);
 			var parent = adminBtn.parents('.users-box');
-
-			var uid = parent.attr('data-uid');
+			var uid = getUID(adminBtn);
 
 			if(isAdmin) {
 				socket.emit('api:admin.user.removeAdmin', uid);		
 				adminBtn.removeClass('btn-success');
-				adminBtn.attr('data-admin', 0);
+				parent.find('.delete-btn').removeClass('disabled');
+				parent.attr('data-admin', 0);
 			}
 			else {
-				bootbox.confirm('Do you really want to make "' + adminBtn.attr('data-username') +'" an admin?', function(confirm) {
+				bootbox.confirm('Do you really want to make "' + parent.attr('data-username') +'" an admin?', function(confirm) {
 					if(confirm) {
 						socket.emit('api:admin.user.makeAdmin', uid);
 						adminBtn.addClass('btn-success');
-						adminBtn.attr('data-admin', 1);
+						parent.find('.delete-btn').addClass('disabled');
+						parent.attr('data-admin', 1);
 					}
 				});
 			}
 			
 			return false;
 		});
+
+		jQuery('.delete-btn').on('click', function() {
+			var deleteBtn = $(this);
+			var isAdmin = isUserAdmin(deleteBtn);
+			var parent = deleteBtn.parents('.users-box');
+			var uid = getUID(deleteBtn);
+
+			if(!isAdmin) {
+				bootbox.confirm('Do you really want to delete "' + parent.attr('data-username') +'"?', function(confirm) {
+					socket.emit('api:admin.user.deleteUser', uid);		
+				});
+			}
+			
+			return false;
+		});
 	
 	});
 	
diff --git a/src/admin/user.js b/src/admin/user.js
index 473fb0634c..f6c90725e9 100644
--- a/src/admin/user.js
+++ b/src/admin/user.js
@@ -35,5 +35,25 @@ var	RDB = require('./../redis.js'),
 		});
 	};
 
+	UserAdmin.deleteUser = function(uid, theirid, socket) {
+		user.isAdministrator(uid, function(amIAdmin) {
+			user.isAdministrator(theirid, function(areTheyAdmin){
+				if(amIAdmin && !areTheyAdmin) {
+					user.delete(theirid, function(data) {
+
+						socket.emit('event:alert', {
+							title: 'User Deleted',
+							message: 'This user is deleted!',
+							type: 'success',
+							timeout: 2000
+						});
+					});
+				}
+			});
+
+			
+		});
+	};
+
 }(exports));
 
diff --git a/src/routes/admin.js b/src/routes/admin.js
index b40ec0b9d9..6074ee3bad 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -40,8 +40,33 @@ var user = require('./../user.js'),
 				case 'users' :
 					if (req.params.tab == 'search') {
 						res.json({search_display: 'block', users: []});
-					} else {
-						user.getUserList(function(data){
+					} 
+					else if(req.params.tab == 'latest') {
+						user.getUserList(function(data) {
+							data = data.sort(function(a, b) {
+								return b.joindate - a.joindate;
+							});
+							res.json({search_display: 'none', users:data, yourid:req.user.uid});
+						});
+					}
+					else if(req.params.tab == 'sort-posts') {
+						user.getUserList(function(data) {
+							data = data.sort(function(a, b) {
+								return b.postcount - a.postcount;
+							});
+							res.json({search_display: 'none', users:data, yourid:req.user.uid});
+						});
+					}
+					else if(req.params.tab == 'sort-reputation') {
+						user.getUserList(function(data) {
+							data = data.sort(function(a, b) {
+								return b.reputation - a.reputation;
+							});
+							res.json({search_display: 'none', users:data, yourid:req.user.uid});
+						});
+					}
+					else {
+						user.getUserList(function(data) {
 							res.json({search_display: 'none', users:data, yourid:req.user.uid});
 						});
 					}
diff --git a/src/websockets.js b/src/websockets.js
index c7577c820a..4c4ba1508c 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -425,6 +425,12 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 				admin.user.removeAdmin(uid, theirid, socket);
 			}
 		});
+
+		socket.on('api:admin.user.deleteUser', function(theirid) {
+			if(uid && uid > 0) {
+				admin.user.deleteUser(uid, theirid, socket);
+			}
+		});
 	});
 	
 }(SocketIO));

From c870e8bbf389c1d84c35ee1c0b654931cef1d02a Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Wed, 26 Jun 2013 12:32:30 -0400
Subject: [PATCH 2/4] testing user search in admin panel

---
 public/src/forum/admin/users.js  | 106 +++++++++++++++++++++++++++++++
 public/src/forum/footer.js       |   3 +
 public/templates/admin/users.tpl |  99 +----------------------------
 src/user.js                      |  12 ++++
 src/websockets.js                |   8 +++
 5 files changed, 131 insertions(+), 97 deletions(-)
 create mode 100644 public/src/forum/admin/users.js

diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js
new file mode 100644
index 0000000000..99d6d8aa0f
--- /dev/null
+++ b/public/src/forum/admin/users.js
@@ -0,0 +1,106 @@
+
+(function() {
+	jQuery('document').ready(function() {
+
+		var yourid = templates.get('yourid');
+
+		var url = window.location.href,
+			parts = url.split('/'),
+			active = parts[parts.length-1];
+
+		jQuery('.nav-pills li').removeClass('active');
+		jQuery('.nav-pills li a').each(function() {
+			if (this.getAttribute('href').match(active)) {
+				jQuery(this.parentNode).addClass('active');
+				return false;
+			}
+		});
+
+		jQuery('#search-user').on('keyup', function () {
+			console.log('derp'); 
+			jQuery('.icon-spinner').removeClass('none');
+			console.log($('#search-user').val());
+			socket.emit('api:admin.user.search', $('#search-user').val());
+		});
+
+
+
+		socket.on('api:admin.user.search', function(data) {
+			console.log(data);
+		});
+
+		function isUserAdmin(element) {
+			var parent = $(element).parents('.users-box');
+			return (parent.attr('data-admin') !== "0");
+		}
+
+		function getUID(element) {
+			var parent = $(element).parents('.users-box');
+			return parent.attr('data-uid');	
+		}
+
+		jQuery('.admin-btn').each(function(index, element) {
+			var adminBtn = $(element);
+			var isAdmin = isUserAdmin(adminBtn);
+			
+			if(isAdmin)
+				adminBtn.addClass('btn-success');
+			else
+				adminBtn.removeClass('btn-success');
+
+		});
+
+		jQuery('.delete-btn').each(function(index, element) {
+			var deleteBtn = $(element);
+			var isAdmin = isUserAdmin(deleteBtn);
+			
+			if(isAdmin)
+				deleteBtn.addClass('disabled');
+			else
+				deleteBtn.show();
+		});
+
+		jQuery('.admin-btn').on('click', function() {
+			var adminBtn = $(this);
+			var isAdmin = isUserAdmin(adminBtn);
+			var parent = adminBtn.parents('.users-box');
+			var uid = getUID(adminBtn);
+
+			if(isAdmin) {
+				socket.emit('api:admin.user.removeAdmin', uid);		
+				adminBtn.removeClass('btn-success');
+				parent.find('.delete-btn').removeClass('disabled');
+				parent.attr('data-admin', 0);
+			}
+			else {
+				bootbox.confirm('Do you really want to make "' + parent.attr('data-username') +'" an admin?', function(confirm) {
+					if(confirm) {
+						socket.emit('api:admin.user.makeAdmin', uid);
+						adminBtn.addClass('btn-success');
+						parent.find('.delete-btn').addClass('disabled');
+						parent.attr('data-admin', 1);
+					}
+				});
+			}
+			
+			return false;
+		});
+
+		jQuery('.delete-btn').on('click', function() {
+			var deleteBtn = $(this);
+			var isAdmin = isUserAdmin(deleteBtn);
+			var parent = deleteBtn.parents('.users-box');
+			var uid = getUID(deleteBtn);
+
+			if(!isAdmin) {
+				bootbox.confirm('Do you really want to delete "' + parent.attr('data-username') +'"?', function(confirm) {
+					socket.emit('api:admin.user.deleteUser', uid);		
+				});
+			}
+			
+			return false;
+		});
+	
+	});
+	
+}());
\ No newline at end of file
diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js
index 6403518721..f3d40432f9 100644
--- a/public/src/forum/footer.js
+++ b/public/src/forum/footer.js
@@ -132,6 +132,9 @@
 	socket.emit('api:notifications.hasFlag');
 
 
+
+
+
 	require(['mobileMenu'], function(mobileMenu) {
 		mobileMenu.init();
 	});
diff --git a/public/templates/admin/users.tpl b/public/templates/admin/users.tpl
index 1b900b9255..bac6328897 100644
--- a/public/templates/admin/users.tpl
+++ b/public/templates/admin/users.tpl
@@ -9,7 +9,7 @@
 
 
 <div class="search {search_display} well">
-	<input type="text" placeholder="Enter a username to search" onkeypress="jQuery('.icon-spinner').removeClass('none');" /><br />
+	<input id="search-user" type="text" placeholder="Enter a username to search"/><br />
 	<i class="icon-spinner icon-spin none"></i>
 </div>
 
@@ -36,105 +36,10 @@
 	<div>
 		<a href="#" class="btn delete-btn btn-danger">Delete</a>
 	</div>
-
 </div>
 <!-- END users -->
 
 <input type="hidden" template-variable="yourid" value="{yourid}" />
 
 
-<script type="text/javascript">
-//DRY Failure. this needs to go into an ajaxify onready style fn. Currently is copy pasted into every single function so after ACP is off the ground fix asap 
-(function() {
-	jQuery('document').ready(function() {
-
-		var yourid = templates.get('yourid');
-
-		var url = window.location.href,
-			parts = url.split('/'),
-			active = parts[parts.length-1];
-
-		jQuery('.nav-pills li').removeClass('active');
-		jQuery('.nav-pills li a').each(function() {
-			if (this.getAttribute('href').match(active)) {
-				jQuery(this.parentNode).addClass('active');
-				return false;
-			}
-		});
-
-		function isUserAdmin(element) {
-			var parent = $(element).parents('.users-box');
-			return (parent.attr('data-admin') !== "0");
-		}
-
-		function getUID(element) {
-			var parent = $(element).parents('.users-box');
-			return parent.attr('data-uid');	
-		}
-
-		jQuery('.admin-btn').each(function(index, element) {
-			var adminBtn = $(element);
-			var isAdmin = isUserAdmin(adminBtn);
-			
-			if(isAdmin)
-				adminBtn.addClass('btn-success');
-			else
-				adminBtn.removeClass('btn-success');
-
-		});
-
-		jQuery('.delete-btn').each(function(index, element) {
-			var deleteBtn = $(element);
-			var isAdmin = isUserAdmin(deleteBtn);
-			
-			if(isAdmin)
-				deleteBtn.addClass('disabled');
-			else
-				deleteBtn.show();
-		});
-
-		jQuery('.admin-btn').on('click', function() {
-			var adminBtn = $(this);
-			var isAdmin = isUserAdmin(adminBtn);
-			var parent = adminBtn.parents('.users-box');
-			var uid = getUID(adminBtn);
-
-			if(isAdmin) {
-				socket.emit('api:admin.user.removeAdmin', uid);		
-				adminBtn.removeClass('btn-success');
-				parent.find('.delete-btn').removeClass('disabled');
-				parent.attr('data-admin', 0);
-			}
-			else {
-				bootbox.confirm('Do you really want to make "' + parent.attr('data-username') +'" an admin?', function(confirm) {
-					if(confirm) {
-						socket.emit('api:admin.user.makeAdmin', uid);
-						adminBtn.addClass('btn-success');
-						parent.find('.delete-btn').addClass('disabled');
-						parent.attr('data-admin', 1);
-					}
-				});
-			}
-			
-			return false;
-		});
-
-		jQuery('.delete-btn').on('click', function() {
-			var deleteBtn = $(this);
-			var isAdmin = isUserAdmin(deleteBtn);
-			var parent = deleteBtn.parents('.users-box');
-			var uid = getUID(deleteBtn);
-
-			if(!isAdmin) {
-				bootbox.confirm('Do you really want to delete "' + parent.attr('data-username') +'"?', function(confirm) {
-					socket.emit('api:admin.user.deleteUser', uid);		
-				});
-			}
-			
-			return false;
-		});
-	
-	});
-	
-}());
-</script>
\ No newline at end of file
+<script type="text/javascript" src="../../src/forum/admin/users.js"></script>
\ No newline at end of file
diff --git a/src/user.js b/src/user.js
index 7729509660..de561ca4f9 100644
--- a/src/user.js
+++ b/src/user.js
@@ -253,6 +253,18 @@ var utils = require('./../public/src/utils.js'),
 		});
 	}
 
+	User.search = function(username, callback) {
+		console.log('searching '+username);
+		RDB.keys('username:'+ username + '*:uid', function(err, data) {
+			if(err === null) {
+				console.log(data);
+				callback(data);
+			}	
+			else
+				console.log(err);
+		});
+	}
+
 	User.sendConfirmationEmail = function (email) {
 		if (global.config['email:host'] && global.config['email:port'] && global.config['email:from']) {
 			var confirm_code = utils.generateUUID(),
diff --git a/src/websockets.js b/src/websockets.js
index 4c4ba1508c..ea4bb44adf 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -431,6 +431,14 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 				admin.user.deleteUser(uid, theirid, socket);
 			}
 		});
+
+		socket.on('api:admin.user.search', function(username) {
+			if(uid && uid > 0) {
+				user.search(username, function(data) {
+					socket.emit('api:admin.user.search', data);
+				});
+			}
+		});
 	});
 	
 }(SocketIO));

From 0cc5b1f90734d6cff5d183d4ca6bd8ec40832295 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Wed, 26 Jun 2013 12:36:40 -0400
Subject: [PATCH 3/4] moved socket.on to admin index

---
 public/src/forum/admin/users.js  | 4 +---
 public/templates/admin/index.tpl | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js
index 99d6d8aa0f..7906579950 100644
--- a/public/src/forum/admin/users.js
+++ b/public/src/forum/admin/users.js
@@ -25,9 +25,7 @@
 
 
 
-		socket.on('api:admin.user.search', function(data) {
-			console.log(data);
-		});
+		
 
 		function isUserAdmin(element) {
 			var parent = $(element).parents('.users-box');
diff --git a/public/templates/admin/index.tpl b/public/templates/admin/index.tpl
index ab022f15b7..7d1d74fce0 100644
--- a/public/templates/admin/index.tpl
+++ b/public/templates/admin/index.tpl
@@ -41,4 +41,9 @@
 
 	app.enter_room('admin');
 	socket.emit('api:get_all_rooms');
+
+	socket.on('api:admin.user.search', function(data) {
+		console.log(data);
+	});
+
 </script>
\ No newline at end of file

From 7ca2c949dde2d8c26970cee7a591aca42c4606d9 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Wed, 26 Jun 2013 13:18:19 -0400
Subject: [PATCH 4/4] fixed safari script problem

---
 public/src/ajaxify.js      |  3 ++-
 public/src/forum/login.js  |  9 ++++++---
 public/templates/login.tpl |  4 ++--
 src/user.js                | 18 +++++++++++++++---
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 6e8e651d19..5e25ce5c78 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -118,7 +118,8 @@ var ajaxify = {};
 			}
 
 			head.insertBefore(script, head.firstChild);
-			head.removeChild(script);
+			//TODO: remove from head before inserting?, doing this breaks scripts in safari so commented out for now
+			//head.removeChild(script);
 		};
 
 		var scripts = [],
diff --git a/public/src/forum/login.js b/public/src/forum/login.js
index 6e83c0b9f2..12370b0ef0 100644
--- a/public/src/forum/login.js
+++ b/public/src/forum/login.js
@@ -1,3 +1,5 @@
+
+
 (function() {
 	// Alternate Logins
 	var altLoginEl = document.querySelector('.alt-logins');
@@ -12,7 +14,6 @@
 		}
 	});	
 	
-	
 	$('#login').on('click', function() {
 		
 		var loginData = {
@@ -32,9 +33,11 @@
 			error : function(data, textStatus, jqXHR) {
 				$('#login-error-notify').show().delay(1000).fadeOut(250);
 			},
-			dataType: 'json'
+			dataType: 'json',
+			async: true,
+			timeout: 2000
 		});
-		
+
 		return false;
 	});
 	
diff --git a/public/templates/login.tpl b/public/templates/login.tpl
index 4cf156f7a6..6f20aa4923 100644
--- a/public/templates/login.tpl
+++ b/public/templates/login.tpl
@@ -7,12 +7,12 @@
 			<strong>Failed Login Attempt</strong> <p></p>
 		</div>
 		
-		<form>
+		<div>
 			<label>Username</label><input type="text" placeholder="Enter Username" name="username" id="username" /><br />
 			<label>Password</label><input type="password" placeholder="Enter Password" name="password" id="password" /><br />
 			<input type="hidden" name="_csrf" value="{token}" id="csrf-token" />
 			<button class="btn btn-primary" id="login" type="submit">Login</button> &nbsp; <a href="/reset">Forgot Password?</a>
-		</form>
+		</div>
 		
 		<span id="login-error-notify" class="label label-important hide">Invalid username/password</span><br/>
 	</div>
diff --git a/src/user.js b/src/user.js
index de561ca4f9..2d26c535cd 100644
--- a/src/user.js
+++ b/src/user.js
@@ -255,10 +255,22 @@ var utils = require('./../public/src/utils.js'),
 
 	User.search = function(username, callback) {
 		console.log('searching '+username);
-		RDB.keys('username:'+ username + '*:uid', function(err, data) {
+		RDB.keys('username:'+ username + '*:uid', function(err, keys) {
 			if(err === null) {
-				console.log(data);
-				callback(data);
+				//console.log(data);
+				
+				/*var keys = [];
+				for(var i=0, ii=data.length; i<ii; ++i) {
+					keys.push('')
+				}*/
+
+				RDB.mget(keys, function(err, uids) {
+					console.log(uids);
+					User.getDataForUsers(uids, function(userdata) {
+						callback(userdata);
+					});
+				});
+			
 			}	
 			else
 				console.log(err);