From a0e9e52e70a30d714672144ef32030e061030543 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Thu, 23 Jan 2014 15:16:30 -0500
Subject: [PATCH 1/7] adding xregexp to ACP header

---
 public/templates/admin/header.tpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl
index 539828daf2..2baa221059 100644
--- a/public/templates/admin/header.tpl
+++ b/public/templates/admin/header.tpl
@@ -22,6 +22,8 @@
 	<script src="{relative_path}/vendor/requirejs/require.js"></script>
 	<script src="{relative_path}/vendor/bootbox/bootbox.min.js"></script>
 	<script src="{relative_path}/vendor/colorpicker/colorpicker.js"></script>
+	<script src="{relative_path}/vendor/xregexp/xregexp.js"></script>
+	<script src="{relative_path}/vendor/xregexp/unicode/unicode-base.js"></script>
 
 	<script>
 		require.config({

From d380f693104e647fb75f2a2191361f73d4c9ac17 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Thu, 23 Jan 2014 16:19:10 -0500
Subject: [PATCH 2/7] support for "registered users" and "administrators" in
 access control (categories). Renamed "Administrators" group to
 "administrators", and made hidden

---
 src/admin/user.js      |  4 ++--
 src/groups.js          | 33 ++++++++++++++++++++++++++++++++-
 src/install.js         |  6 +++---
 src/socket.io/admin.js | 11 ++++++++++-
 src/upgrade.js         | 21 ++++++++++++++++++++-
 src/user.js            |  2 +-
 6 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/src/admin/user.js b/src/admin/user.js
index 3c1fb77ab0..36b8db4704 100644
--- a/src/admin/user.js
+++ b/src/admin/user.js
@@ -27,7 +27,7 @@ var utils = require('../../public/src/utils'),
 	UserAdmin.makeAdmin = function(uid, theirid, socket) {
 		user.isAdministrator(uid, function(err, isAdmin) {
 			if (isAdmin) {
-				groups.getGidFromName('Administrators', function(err, gid) {
+				groups.getGidFromName('administrators', function(err, gid) {
 					groups.join(gid, theirid, function(err) {
 						if (!err) {
 							socket.emit('event:alert', {
@@ -53,7 +53,7 @@ var utils = require('../../public/src/utils'),
 	UserAdmin.removeAdmin = function(uid, theirid, socket) {
 		user.isAdministrator(uid, function(err, isAdmin) {
 			if (isAdmin) {
-				groups.getGidFromName('Administrators', function(err, gid) {
+				groups.getGidFromName('administrators', function(err, gid) {
 					groups.leave(gid, theirid, function(err) {
 						if (!err) {
 
diff --git a/src/groups.js b/src/groups.js
index de931c3887..f0541f824f 100644
--- a/src/groups.js
+++ b/src/groups.js
@@ -28,6 +28,18 @@
 		});
 	};
 
+	Groups.listSystemGroups = function(options, callback) {
+		var	systemGroups = ['administrators', 'registered-users'],
+			humanNames = ['Administrators', 'Registered Users'];
+
+		async.map(systemGroups, function(groupName, next) {
+			Groups.getByGroupName(groupName, options, function(err, groupObj) {
+				groupObj['name'] = humanNames[systemGroups.indexOf(groupObj['name'])];
+				next(err, groupObj);
+			});
+		}, callback);
+	};
+
 	Groups.get = function(gid, options, callback) {
 		async.parallel({
 			base: function (next) {
@@ -199,7 +211,26 @@
 	Groups.update = function(gid, values, callback) {
 		db.exists('gid:' + gid, function (err, exists) {
 			if (!err && exists) {
-				db.setObject('gid:' + gid, values, callback);
+				// If the group was renamed, check for dupes, fix the assoc. hash
+				if (values['name']) {
+					Groups.exists(values['name'], function(err, exists) {
+						if (!exists) {
+							Groups.get(gid, {}, function(err, groupObj) {
+								if (err) {
+									return callback(new Error('group-not-found'));
+								}
+
+								db.deleteObjectField('group:gid', groupObj['name']);
+								db.setObjectField('group:gid', values['name'], gid);
+								db.setObject('gid:' + gid, values, callback);
+							});
+						} else {
+							callback(new Error('group-exists'));
+						}
+					});
+				} else {
+					db.setObject('gid:' + gid, values, callback);
+				}
 			} else {
 				if (callback) {
 					callback(new Error('gid-not-found'));
diff --git a/src/install.js b/src/install.js
index eae4de5dfa..2ee7049b62 100644
--- a/src/install.js
+++ b/src/install.js
@@ -289,7 +289,7 @@ var async = require('async'),
 					// Check if an administrator needs to be created
 					var Groups = require('./groups');
 
-					Groups.getGidFromName('Administrators', function (err, gid) {
+					Groups.getGidFromName('administrators', function (err, gid) {
 						if (err) {
 							return next(err.message);
 						}
@@ -417,11 +417,11 @@ var async = require('async'),
 							return callback(new Error('invalid-values'));
 						}
 
-						Groups.getGidFromName('Administrators', function (err, gid) {
+						Groups.getGidFromName('administrators', function (err, gid) {
 							if (gid) {
 								Groups.join(gid, uid, callback);
 							} else {
-								Groups.create('Administrators', 'Forum Administrators', function (err, groupObj) {
+								Groups.create('administrators', 'Forum Administrators', function (err, groupObj) {
 									Groups.join(groupObj.gid, uid, callback);
 								});
 							}
diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js
index 9ad8abe14d..c7d4b407b5 100644
--- a/src/socket.io/admin.js
+++ b/src/socket.io/admin.js
@@ -211,11 +211,20 @@ SocketAdmin.categories.setGroupPrivilege = function(socket, data, callback) {
 };
 
 SocketAdmin.categories.groupsList = function(socket, cid, callback) {
-	groups.list({expand:false}, function(err, data){
+	async.parallel({
+		groups: function(next) {
+			groups.list({expand:false}, next);
+		},
+		system: function(next) {
+			groups.listSystemGroups({expand: false}, next);
+		}
+	}, function(err, results) {
 		if(err) {
 			return callback(err);
 		}
 
+		var	data = results.groups.concat(results.system);
+
 		async.map(data, function(groupObj, next) {
 			CategoryTools.groupPrivileges(cid, groupObj.gid, function(err, privileges) {
 				if(err) {
diff --git a/src/upgrade.js b/src/upgrade.js
index 15d8613272..acd6585f8d 100644
--- a/src/upgrade.js
+++ b/src/upgrade.js
@@ -17,7 +17,7 @@ var db = require('./database'),
 
 Upgrade.check = function(callback) {
 	// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema
-	var	latestSchema = new Date(2014, 0, 19, 22, 19).getTime();
+	var	latestSchema = new Date(2014, 0, 23, 16, 5).getTime();
 
 	db.get('schemaDate', function(err, value) {
 		if (parseInt(value, 10) >= latestSchema) {
@@ -299,6 +299,25 @@ Upgrade.upgrade = function(callback) {
 				winston.info('[2014/1/19] Remove user search from Reds -- skipped');
 				next();
 			}
+		},
+		function(next) {
+			thisSchemaDate = new Date(2014, 0, 23, 16, 5).getTime();
+			if (schemaDate < thisSchemaDate) {
+				updatesMade = true;
+
+				Groups.getByGroupName('Administrators', {}, function(err, groupObj) {
+					Groups.update(groupObj.gid, {
+						name: 'administrators',
+						hidden: '1'
+					}, function() {
+						winston.info('[2014/1/23] Updating Administrators Group');
+						next();
+					});
+				})
+			} else {
+				winston.info('[2014/1/23] Updating Administrators Group -- skipped');
+				next();
+			}
 		}
 		// Add new schema updates here
 		// IMPORTANT: REMEMBER TO UPDATE VALUE OF latestSchema IN LINE 17!!!
diff --git a/src/user.js b/src/user.js
index 3fc8dca0da..e6ddfbf693 100644
--- a/src/user.js
+++ b/src/user.js
@@ -761,7 +761,7 @@ var bcrypt = require('bcrypt'),
 	};
 
 	User.isAdministrator = function(uid, callback) {
-		groups.getGidFromName('Administrators', function(err, gid) {
+		groups.getGidFromName('administrators', function(err, gid) {
 			if(err) {
 				return callback(err);
 			}

From c91ae0c4c4ab3193c2b37cd50fadfb1c2585c266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 24 Jan 2014 00:42:34 -0500
Subject: [PATCH 3/7] Update categories.js

---
 tests/categories.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/categories.js b/tests/categories.js
index 009d195e92..6f83d774f8 100644
--- a/tests/categories.js
+++ b/tests/categories.js
@@ -1,5 +1,4 @@
-// this test currently needs to talk to the redis database.
-// get the redis config info from root directory's config.json:
+
 var winston = require('winston');
 
 process.on('uncaughtException', function (err) {
@@ -59,4 +58,4 @@ describe('Categories', function() {
 		db.delete('category:' + categoryObj.cid);
 		db.listRemoveLast('categories:cid');
 	});
-});
\ No newline at end of file
+});

From ef450edfeaec73b6ac3ad774bfef061d25b9f8ca Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Fri, 24 Jan 2014 08:48:40 -0500
Subject: [PATCH 4/7] Revert "possible fix to #840", please see #867

This reverts commit 1d666bf7f0ee85909da7908d3386704d9f41b83c.
---
 public/src/ajaxify.js     | 13 +++++--------
 public/src/forum/topic.js |  1 -
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 5ce58f34b7..5401d24ff2 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -34,12 +34,6 @@ var ajaxify = {};
 	ajaxify.currentPage = null;
 
 	ajaxify.go = function (url, callback, quiet) {
-		if ($('#content').hasClass('ajaxifying')) {
-			return true;
-		}
-
-		jQuery('#footer, #content').addClass('ajaxifying');
-
 		// start: the following should be set like so: ajaxify.onchange(function(){}); where the code actually belongs
 		$(window).off('scroll');
 		app.enterRoom('global');
@@ -54,6 +48,9 @@ var ajaxify = {};
 		window.onscroll = null;
 		// end
 
+		if ($('#content').hasClass('ajaxifying')) {
+			templates.cancelRequest();
+		}
 
 		// Remove trailing slash
 		url = url.replace(/\/$/, "");
@@ -101,12 +98,11 @@ var ajaxify = {};
 
 			translator.load(tpl_url);
 
-			jQuery('#footer, #content').removeClass('hide');
+			jQuery('#footer, #content').removeClass('hide').addClass('ajaxifying');
 
 			templates.flush();
 			templates.load_template(function () {
 				exec_body_scripts(content);
-
 				require(['forum/' + tpl_url], function(script) {
 					if (script && script.init) {
 						script.init();
@@ -176,6 +172,7 @@ var ajaxify = {};
 					var url = this.href.replace(rootUrl + '/', '');
 
 					if (ajaxify.go(url)) {
+
 						e.preventDefault();
 					}
 				} else if (window.location.pathname !== '/outgoing') {
diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 223cc25ad1..a48d8c82cf 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -366,7 +366,6 @@ define(['composer'], function(composer) {
 			});
 		}
 
-
 		$('.topic').on('click', '.post_reply', function() {
 			var selectionText = '',
 				selection = window.getSelection() || document.getSelection();

From b587d7b5ad54c35ac8892ab95ca084b40605fb89 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Fri, 24 Jan 2014 09:48:41 -0500
Subject: [PATCH 5/7] fixed issue where calls to ajaxify.go were sending in a
 "template" argument that had since been removed, navigating back to NodeBB
 from an external link now no longer clobbers the History stack.

---
 public/src/ajaxify.js |  3 ++-
 src/webserver.js      | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 5401d24ff2..86a9c7062a 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -23,7 +23,6 @@ var ajaxify = {};
 
 
 	window.onpopstate = function (event) {
-		// "quiet": If set to true, will not call pushState
 		if (event !== null && event.state && event.state.url !== undefined) {
 			ajaxify.go(event.state.url, null, true);
 		}
@@ -34,6 +33,8 @@ var ajaxify = {};
 	ajaxify.currentPage = null;
 
 	ajaxify.go = function (url, callback, quiet) {
+		// "quiet": If set to true, will not call pushState
+
 		// start: the following should be set like so: ajaxify.onchange(function(){}); where the code actually belongs
 		$(window).off('scroll');
 		app.enterRoom('global');
diff --git a/src/webserver.js b/src/webserver.js
index ebffd122b2..0a81db656f 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -400,7 +400,7 @@ if(nconf.get('ssl')) {
 	};
 
 	app.create_route = function (url, tpl) { // to remove
-		return '<script>templates.ready(function(){ajaxify.go("' + url + '", null, "' + tpl + '", true);});</script>';
+		return '<script>templates.ready(function(){ajaxify.go("' + url + '", null, true);});</script>';
 	};
 
 	app.namespace(nconf.get('relative_path'), function () {
@@ -648,7 +648,7 @@ if(nconf.get('ssl')) {
 				res.send(
 					data.header +
 					'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/topic'].parse(data.topics) + '\n\t</noscript>' +
-					'\n\t<script>templates.ready(function(){ajaxify.go("topic/' + topic_url + '", undefined, undefined, true);});</script>' +
+					'\n\t<script>templates.ready(function(){ajaxify.go("topic/' + topic_url + '", undefined, true);});</script>' +
 					templates.footer
 				);
 			});
@@ -763,7 +763,7 @@ if(nconf.get('ssl')) {
 				res.send(
 					data.header +
 					'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/category'].parse(data.categories) + '\n\t</noscript>' +
-					'\n\t<script>templates.ready(function(){ajaxify.go("category/' + category_url + '", undefined, undefined, true);});</script>' +
+					'\n\t<script>templates.ready(function(){ajaxify.go("category/' + category_url + '", undefined, true);});</script>' +
 					templates.footer
 				);
 			});
@@ -774,7 +774,7 @@ if(nconf.get('ssl')) {
 				req: req,
 				res: res
 			}, function (err, header) {
-				res.send(header + '<script>templates.ready(function(){ajaxify.go("confirm/' + req.params.code + '", undefined, undefined, true);});</script>' + templates.footer);
+				res.send(header + '<script>templates.ready(function(){ajaxify.go("confirm/' + req.params.code + '", undefined, true);});</script>' + templates.footer);
 			});
 		});
 
@@ -847,7 +847,7 @@ if(nconf.get('ssl')) {
 			}, function (err, header) {
 				res.send(
 					header +
-					'\n\t<script>templates.ready(function(){ajaxify.go("outgoing?url=' + encodeURIComponent(req.query.url) + '", null, null, true);});</script>' +
+					'\n\t<script>templates.ready(function(){ajaxify.go("outgoing?url=' + encodeURIComponent(req.query.url) + '", null, true);});</script>' +
 					templates.footer
 				);
 			});

From 43808c01ecb0cacb329e6ae6013c7c13554fefb9 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Fri, 24 Jan 2014 10:00:57 -0500
Subject: [PATCH 6/7] reduced the number of 'ajaxify.go' calls to one, in /src

---
 src/webserver.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/webserver.js b/src/webserver.js
index 0a81db656f..615a3e44c8 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -400,7 +400,11 @@ if(nconf.get('ssl')) {
 	};
 
 	app.create_route = function (url, tpl) { // to remove
-		return '<script>templates.ready(function(){ajaxify.go("' + url + '", null, true);});</script>';
+		var	routerScript = '<script> \
+				templates.ready(function(){ajaxify.go("' + url + '", null, true);}); \
+			</script>';
+
+		return routerScript;
 	};
 
 	app.namespace(nconf.get('relative_path'), function () {
@@ -648,8 +652,7 @@ if(nconf.get('ssl')) {
 				res.send(
 					data.header +
 					'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/topic'].parse(data.topics) + '\n\t</noscript>' +
-					'\n\t<script>templates.ready(function(){ajaxify.go("topic/' + topic_url + '", undefined, true);});</script>' +
-					templates.footer
+					'\n\t' + app.create_route('topic/' + topic_url) + templates.footer
 				);
 			});
 		});
@@ -763,8 +766,7 @@ if(nconf.get('ssl')) {
 				res.send(
 					data.header +
 					'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/category'].parse(data.categories) + '\n\t</noscript>' +
-					'\n\t<script>templates.ready(function(){ajaxify.go("category/' + category_url + '", undefined, true);});</script>' +
-					templates.footer
+					'\n\t' + app.create_route('category/' + category_url) + templates.footer
 				);
 			});
 		});
@@ -774,7 +776,7 @@ if(nconf.get('ssl')) {
 				req: req,
 				res: res
 			}, function (err, header) {
-				res.send(header + '<script>templates.ready(function(){ajaxify.go("confirm/' + req.params.code + '", undefined, true);});</script>' + templates.footer);
+				res.send(header + app.create_route('confirm/' + req.params.code) + templates.footer);
 			});
 		});
 
@@ -845,11 +847,7 @@ if(nconf.get('ssl')) {
 				req: req,
 				res: res
 			}, function (err, header) {
-				res.send(
-					header +
-					'\n\t<script>templates.ready(function(){ajaxify.go("outgoing?url=' + encodeURIComponent(req.query.url) + '", null, true);});</script>' +
-					templates.footer
-				);
+				res.send(header + app.create_route('outgoing?url=' + encodeURIComponent(req.query.url)) + templates.footer);
 			});
 		});
 

From 459d5ddccdb185734ce7a5509f7b005b12ebaa66 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Fri, 24 Jan 2014 10:09:28 -0500
Subject: [PATCH 7/7] fixed #867 - added proper detection so that onpopstate
 would not react if it was a proper page load

---
 public/src/ajaxify.js | 3 ++-
 src/webserver.js      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 86a9c7062a..2f180dde73 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -23,7 +23,7 @@ var ajaxify = {};
 
 
 	window.onpopstate = function (event) {
-		if (event !== null && event.state && event.state.url !== undefined) {
+		if (event !== null && event.state && event.state.url !== undefined && !ajaxify.initialLoad) {
 			ajaxify.go(event.state.url, null, true);
 		}
 	};
@@ -31,6 +31,7 @@ var ajaxify = {};
 	var pagination, paginator_bar;
 
 	ajaxify.currentPage = null;
+	ajaxify.initialLoad = false;
 
 	ajaxify.go = function (url, callback, quiet) {
 		// "quiet": If set to true, will not call pushState
diff --git a/src/webserver.js b/src/webserver.js
index 615a3e44c8..bf31fd22f4 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -401,6 +401,7 @@ if(nconf.get('ssl')) {
 
 	app.create_route = function (url, tpl) { // to remove
 		var	routerScript = '<script> \
+				ajaxify.initialLoad = true; \
 				templates.ready(function(){ajaxify.go("' + url + '", null, true);}); \
 			</script>';