Merge pull request #1 from designcreateplay/master

Merge changes into repo for edit
2026-07-11 21:31:52 +02:00 · 2013-09-30 11:42:16 -07:00
parent 504e2aac4a 9f67282a79
commit f5c4f98834
25 changed files with 188 additions and 330 deletions
--- a/app.js
+++ b/app.js
@@ -66,6 +66,7 @@
 		nconf.set('upload_url', nconf.get('url') + 'uploads/');

 		winston.info('Initializing NodeBB v' + pkg.version + ', on port ' + nconf.get('port') + ', using Redis store at ' + nconf.get('redis:host') + ':' + nconf.get('redis:port') + '.');
+		winston.info('NodeBB instance bound to: ' + (nconf.get('bind_address') || 'Any address'));

 		if (process.env.NODE_ENV === 'development') {
 			winston.info('Base Configuration OK.');
--- a/public/language/en/footer.json
+++ b/public/language/en/footer.json
@@ -1,7 +1,4 @@
 {
-	"disconnect.title": "Socket Disconnect",
-	"disconnect.message": "Looks like you disconnected, try reloading the page.",
-	"disconnect.reload_button": "Reload",
 	"chat.chatting_with": "Chat with <span id='chat-with-name'></span>",
 	"chat.placeholder": "type chat message, here press enter to send",
 	"chat.send": "Send",
--- a/public/language/en/topic.json
+++ b/public/language/en/topic.json
@@ -1,5 +1,6 @@
 {
 	"profile": "Profile",
+	"posted_by": "Posted by",
 	"chat": "Chat",
 	"notify_me": "Be notified of new replies in this topic",
 	"favourite": "Favourite",
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -38,8 +38,8 @@ var ajaxify = {};
 		window.onscroll = null;
 		// end

-
-		var url = url.replace(/\/$/, "");
+		// Remove trailing slash
+		url = url.replace(/\/$/, "");

 		var hash = window.location.hash;

--- a/public/src/app.js
+++ b/public/src/app.js
@@ -1,8 +1,6 @@
 var socket,
 	config,
-	app = {},
-	API_URL = null;
-
+	app = {};

 (function () {
 	var showWelcomeMessage = false;
@@ -12,8 +10,6 @@ var socket,
 		$.ajax({
 			url: RELATIVE_PATH + '/api/config',
 			success: function (data) {
-				API_URL = data.api_url;
-
 				config = data;
 				if(socket) {
 					socket.disconnect();
@@ -23,8 +19,8 @@ var socket,
 				} else {
 					socket = io.connect(config.socket.address);

-					var reconnecting = false;
-					var reconnectTries = 0;
+					var reconnecting = false,
+						reconnectEl, reconnectTimer;

 					socket.on('event:connect', function (data) {
 						app.username = data.username;
@@ -40,17 +36,12 @@ var socket,

 					socket.on('connect', function (data) {
 						if (reconnecting) {
-							setTimeout(function () {
-								app.alert({
-									alert_id: 'connection_alert',
-									title: 'Connected',
-									message: 'Connection successful.',
-									type: 'success',
-									timeout: 5000
-								});
-							}, 1000);
+							reconnectEl.html('<i class="icon-ok"></i> Connected!');
 							reconnecting = false;
-							reconnectTries = 0;
+
+							setTimeout(function() {
+								reconnectEl.removeClass('active');
+							}, 3000);
 						}

 						socket.emit('api:updateHeader', {
@@ -63,33 +54,11 @@ var socket,
 					});

 					socket.on('reconnecting', function (data) {
-						function showDisconnectModal() {
-							$('#disconnect-modal').modal({
-								backdrop: 'static',
-								show: true
-							});
-
-							$('#reload-button').on('click', function () {
-								$('#disconnect-modal').modal('hide');
-								window.location.reload();
-							});
-						}
-
+						if (!reconnectEl) reconnectEl = $('#reconnect');
 						reconnecting = true;
-						reconnectTries++;

-						if (reconnectTries > 4) {
-							showDisconnectModal();
-							return;
-						}
-
-						app.alert({
-							alert_id: 'connection_alert',
-							title: 'Reconnecting',
-							message: 'You have disconnected from NodeBB, we will try to reconnect you. <br/><i class="icon-refresh icon-spin"></i>',
-							type: 'warning',
-							timeout: 5000
-						});
+						reconnectEl.addClass('active');
+						reconnectEl.html('<i class="icon-spinner icon-spin"></i> Reconnecting...');
 					});

 					socket.on('api:user.get_online_users', function (users) {
--- a/public/src/forum/admin/footer.js
+++ b/public/src/forum/admin/footer.js
@@ -102,7 +102,7 @@ var nodebb_admin = (function(nodebb_admin) {
 				alert_id: 'config_status',
 				timeout: 2500,
 				title: 'Changes Saved',
-				message: 'Your changes to the NodeBB configuration have been saved. You may have to restart NodeBB to see the changes.',
+				message: 'Your changes to the NodeBB configuration have been saved.',
 				type: 'success'
 			});
 		} else {
--- a/public/src/forum/admin/users.js
+++ b/public/src/forum/admin/users.js
@@ -83,23 +83,6 @@
 			return false;
 		});

-		$('#users-container').on('click', '.delete-btn', 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) {
-					if (confirm) {
-						socket.emit('api:admin.user.deleteUser', uid);
-					}
-				});
-			}
-
-			return false;
-		});
-
 		$('#users-container').on('click', '.ban-btn', function() {
 			var banBtn = $(this);
 			var isAdmin = isUserAdmin(banBtn);
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -234,7 +234,6 @@

 			if ($(window).scrollTop() > bottom && !app.infiniteLoaderActive && $('#post-container').children().length) {
 				app.loadMorePosts(tid);
-				console.log('window scrolling');
 			}
 		});
 	}
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -187,7 +187,15 @@ define(['taskbar'], function(taskbar) {
 				switch(action) {
 					case 'post': composer.post(uuid); break;
 					case 'minimize': composer.minimize(uuid); break;
-					case 'discard': composer.discard(uuid); break;
+					case 'discard':
+						if (postContentEl.value.length > 0) {
+							bootbox.confirm('Are you sure you wish to discard this post?', function(discard) {
+								if (discard) composer.discard(uuid);
+							});
+						} else {
+							composer.discard(uuid);
+						}
+						break;
 				}
 			});

--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -114,13 +114,9 @@

 	templates.load_template = function (callback, url, template) {
 		var location = document.location || window.location,
-			rootUrl = location.protocol + '//' + (location.hostname || location.host) + (location.port ? ':' + location.port : '');
-
-		var api_url = (url === '' || url === '/') ? 'home' : url;
-
-		var tpl_url = templates.get_custom_map(api_url.split('?')[0]);
-
-		var trimmed = api_url;
+			api_url = (url === '' || url === '/') ? 'home' : url,
+			tpl_url = templates.get_custom_map(api_url.split('?')[0]),
+			trimmed = api_url;

 		if (!tpl_url) {
 			tpl_url = templates.getTemplateNameFromUrl(api_url);
@@ -128,7 +124,6 @@

 		var template_data = null;

-
 		(function () {
 			var timestamp = new Date().getTime(); //debug

@@ -155,8 +150,7 @@
 		}());

 		(function () {
-
-			jQuery.get(API_URL + api_url, function (data) {
+			jQuery.get(RELATIVE_PATH + '/api/' + api_url, function (data) {

 				if (!data) {
 					ajaxify.go('404');
--- a/public/templates/admin/header.tpl
+++ b/public/templates/admin/header.tpl
@@ -58,6 +58,9 @@
 					<li>
 					  <a href="/admin/settings"><i class="icon-cogs"></i> Settings</a>
 					</li>
+					<li>
+						<a href="#" id="reconnect"></a>
+					</li>
 				</ul>
 				<ul class="nav pull-right" id="right-menu">
 					<li><a href="/users" id="user_label"></a></li>
--- a/public/templates/admin/testing/categories.tpl
+++ b/public/templates/admin/testing/categories.tpl
@@ -10,7 +10,7 @@ jQuery(document).ready(function () {
 	QUnit.init();
 	asyncTest( "Loading Categories", function() {
 		
-		jQuery.get(config.api_url + 'home', function(data) {
+		jQuery.get(RELATIVE_PATH + '/api/home', function(data) {
 			ok( data.categories.length > 0, JSON.stringify(data.categories) );
 			
 			start();
--- a/public/templates/footer.tpl
+++ b/public/templates/footer.tpl
@@ -2,22 +2,6 @@

 	</div><!--END container -->

-	<div id="disconnect-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="You were disconnected" aria-hidden="true">
-		<div class="modal-dialog">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h3 id="myModalLabel">[[footer:disconnect.title]]</h3>
-				</div>
-				<div class="modal-body">
-					<span id="disconnect-text">[[footer:disconnect.message]]</span>
-				</div>
-				<div class="modal-footer">
-					<a id="reload-button" href="/" class="btn btn-primary">[[footer:disconnect.reload_button]]</a>
-				</div>
-			</div><!-- /.modal-content -->
-		</div><!-- /.modal-dialog -->
-	</div><!-- /.modal -->
-
 	<div id="chat-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="Chat" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -69,6 +69,10 @@
 				</form>

 				<ul id="logged-in-menu" class="nav navbar-nav navbar-right hide">
+					<li>
+						<a href="#" id="reconnect"></a>
+					</li>
+
 					<li id="notifications-list" class="notifications dropdown text-center hidden-xs">
 						<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="notif_dropdown"><i class="icon-circle-blank"></i></a>
 						<ul id="notif-list" class="dropdown-menu" aria-labelledby="notif_dropdown">
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -27,7 +27,7 @@

 						<div class="topic-buttons">
 							<div class="btn-group">
-								<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="[[topic:posted_by, {main_posts.username}]]">
+								<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="[[topic:posted_by]] {main_posts.username}">
 									<span class="username-field" href="/user/{main_posts.userslug}">{main_posts.username}&nbsp;</span>
 									<span class="caret"></span>
 								</button>
--- a/public/themes/vanilla/header.less
+++ b/public/themes/vanilla/header.less
@@ -65,3 +65,19 @@
 		overflow: hidden;
 	}
 }
+
+#reconnect {
+	font-size: 14px;
+	-webkit-transition: opacity 250ms linear;
+	-moz-transition: opacity 250ms linear;
+	-ms-transition: opacity 250ms linear;
+	-o-transition: opacity 250ms linear;
+	transition: opacity 250ms linear;
+	-moz-opacity: 0.00;
+	opacity: 0.00;
+
+	&.active {
+		-moz-opacity: 1;
+		opacity: 1;
+	}
+}
--- a/src/admin/user.js
+++ b/src/admin/user.js
@@ -11,8 +11,6 @@ var RDB = require('../redis'),
 				Groups.getGidFromName('Administrators', function(err, gid) {
 					Groups.join(gid, theirid, function(err) {
 						if (!err) {
-							user.setUserField(theirid, 'administrator', 1);
-
 							socket.emit('event:alert', {
 								title: 'User Modified',
 								message: 'This user is now an administrator!',
@@ -39,7 +37,6 @@ var RDB = require('../redis'),
 				Groups.getGidFromName('Administrators', function(err, gid) {
 					Groups.leave(gid, theirid, function(err) {
 						if (!err) {
-							user.setUserField(theirid, 'administrator', 0);

 							socket.emit('event:alert', {
 								title: 'User Modified',
@@ -54,24 +51,6 @@ var RDB = require('../redis'),
 		});
 	};

-	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
-						});
-					});
-				}
-			});
-		});
-	};
-
 	UserAdmin.banUser = function(uid, theirid, socket) {
 		user.isAdministrator(uid, function(amIAdmin) {
 			user.isAdministrator(theirid, function(areTheyAdmin) {
--- a/src/meta.js
+++ b/src/meta.js
@@ -7,9 +7,12 @@ var utils = require('./../public/src/utils.js'),
 	nconf = require('nconf');

 (function (Meta) {
+	Meta.config = {};

 	Meta.configs = {
 		init: function (callback) {
+			delete Meta.config;
+
 			Meta.configs.list(function (err, config) {
 				if (!err) {
 					Meta.config = config;
@@ -39,6 +42,8 @@ var utils = require('./../public/src/utils.js'),
 		set: function (field, value, callback) {
 			RDB.hset('config', field, value, function (err, res) {
 				if (callback) {
+					if(!err && Meta.config)
+						Meta.config[field] = value;
 					callback(err, res);
 				}
 			});
@@ -160,33 +165,7 @@ var utils = require('./../public/src/utils.js'),
 			'src/ajaxify.js',
 			'src/translator.js',
 			'src/jquery.form.js',
-			'src/utils.js',
-			'src/forum/account.js',
-			'src/forum/accountedit.js',
-			'src/forum/accountheader.js',
-			'src/forum/accountsettings.js',
-			'src/forum/category.js',
-			'src/forum/favourites.js',
-			'src/forum/followers.js',
-			'src/forum/following.js',
-			'src/forum/footer.js',
-			'src/forum/login.js',
-			'src/forum/recent.js',
-			'src/forum/register.js',
-			'src/forum/reset.js',
-			'src/forum/reset_code.js',
-			'src/forum/search.js',
-			'src/forum/topic.js',
-			'src/forum/unread.js',
-			'src/forum/users.js',
-			'src/forum/admin/categories.js',
-			'src/forum/admin/footer.js',
-			'src/forum/admin/groups.js',
-			'src/forum/admin/index.js',
-			'src/forum/admin/plugins.js',
-			'src/forum/admin/themes.js',
-			'src/forum/admin/topics.js',
-			'src/forum/admin/users'
+			'src/utils.js'
 		],
 		minFile: path.join(__dirname, '..', 'public/src/nodebb.min.js'),
 		get: function (callback) {
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -26,7 +26,6 @@ var fs = require('fs'),
 				function(plugins, next) {
 					if (plugins && Array.isArray(plugins) && plugins.length > 0) {
 						async.each(plugins, function(plugin, next) {
-							// TODO: Update this check to also check node_modules
 							var pluginPath = path.join(__dirname, '../plugins/', plugin),
 								modulePath = path.join(__dirname, '../node_modules/', plugin);
 							if (fs.existsSync(pluginPath)) _self.loadPlugin(pluginPath, next);
@@ -57,11 +56,13 @@ var fs = require('fs'),

 				if (global.env === 'development') winston.info('[plugins] Plugins OK');

+				_self.initialized = true;
 				_self.readyEvent.emit('ready');
 			});
 		},
 		ready: function(callback) {
-			this.readyEvent.once('ready', callback);
+			if (!this.initialized) this.readyEvent.once('ready', callback);
+			else callback();
 		},
 		initialized: false,
 		loadPlugin: function(pluginPath, callback) {
@@ -161,7 +162,7 @@ var fs = require('fs'),
 								}
 							}

-							callback(returnVal);
+							callback(err, returnVal);
 						});
 						break;
 					case 'action':
@@ -184,7 +185,7 @@ var fs = require('fs'),
 			} else {
 				// Otherwise, this hook contains no methods
 				var returnVal = (Array.isArray(args) ? args[0] : args);
-				if (callback) callback(returnVal);
+				if (callback) callback(err, returnVal);
 			}
 		},
 		isActive: function(id, callback) {
--- a/src/postTools.js
+++ b/src/postTools.js
@@ -102,8 +102,8 @@ var RDB = require('./redis.js'),

 		PostTools.privileges(pid, uid, function(privileges) {
 			if (privileges.editable) {
-				plugins.fireHook('filter:post.save', content, function(parsedContent) {
-					content = parsedContent;
+				plugins.fireHook('filter:post.save', content, function(err, parsedContent) {
+					if (!err) content = parsedContent;
 					success();
 				});
 			}
@@ -193,8 +193,8 @@ var RDB = require('./redis.js'),
 	PostTools.parse = function(raw, callback) {
 		raw = raw || '';

-		plugins.fireHook('filter:post.parse', raw, function(parsed) {
-			callback(null, parsed);
+		plugins.fireHook('filter:post.parse', raw, function(err, parsed) {
+			callback(null, !err ? parsed : raw);
 		});
 	}

--- a/src/posts.js
+++ b/src/posts.js
@@ -19,7 +19,6 @@ var RDB = require('./redis.js'),

 	Posts.getPostsByTid = function(tid, start, end, callback) {
 		RDB.lrange('tid:' + tid + ':posts', start, end, function(err, pids) {
-
 			RDB.handle(err);

 			if (pids.length) {
@@ -123,8 +122,9 @@ var RDB = require('./redis.js'),
 	Posts.getPostData = function(pid, callback) {
 		RDB.hgetall('post:' + pid, function(err, data) {
 			if (err === null) {
-				plugins.fireHook('filter:post.get', data, function(data) {
-					callback(data);
+				plugins.fireHook('filter:post.get', data, function(err, newData) {
+					if (!err) callback(newData);
+					else callback(data);
 				});
 			} else
 				console.log(err);
@@ -154,28 +154,23 @@ var RDB = require('./redis.js'),
 		RDB.hset('post:' + pid, field, value);
 	}

-
-
-
-	/* getPostsByPids using redis's multi pipeline */
 	Posts.getPostsByPids = function(pids, callback) {
-		var posts = []
-		var multi = RDB.multi();
+		var posts = [],
+			multi = RDB.multi();

-		for (v in pids) {
-			var _pid = pids[v]
-			multi.hgetall("post:"+_pid);
+		for(var x=0,numPids=pids.length;x<numPids;x++) {
+			multi.hgetall("post:"+pids[x]);
 		}

 		multi.exec(function (err, replies) {
-			async.eachSeries(replies, function(postData, _callback) {
-				if(postData) {
+			async.map(replies, function(postData, _callback) {
+				if (postData) {
 					postData.relativeTime = new Date(parseInt(postData.timestamp,10)).toISOString();
 					postData.post_rep = postData.reputation;
 					postData['edited-class'] = postData.editor !== '' ? '' : 'none';
 					postData['relativeEditTime'] = postData.edited !== '0' ? (new Date(parseInt(postData.edited,10)).toISOString()) : '';

-					if(postData.uploadedImages) {
+					if (postData.uploadedImages) {
 						try {
 							postData.uploadedImages = JSON.parse(postData.uploadedImages);
 						} catch(err) {
@@ -188,15 +183,13 @@ var RDB = require('./redis.js'),

                    postTools.parse(postData.content, function(err, content) {
                        postData.content = content;
-                        posts.push(postData);
+						_callback(null, postData);
                    });
-					return _callback(null)
+				} else {
+					_callback(null);
 				}
-				else {
-					return _callback(null)
-				}
-			}, function(err) {
-				if(!err) {
+			}, function(err, posts) {
+				if (!err) {
 					return callback(null, posts);
 				} else {
 					return callback(err, null);
@@ -205,37 +198,6 @@ var RDB = require('./redis.js'),
 		})
 	}

-
-
-
-
-	Posts.getPostsByPids_original = function(pids, callback) {
-		var posts = [];
-
-		async.eachSeries(pids, function(pid, callback) {
-			Posts.getPostData(pid, function(postData) {
-				if (postData) {
-					postData.relativeTime = new Date(parseInt(postData.timestamp,10)).toISOString();
-					postData.post_rep = postData.reputation;
-					postData['edited-class'] = postData.editor !== '' ? '' : 'none';
-					postData['relativeEditTime'] = postData.edited !== '0' ? (new Date(parseInt(postData.edited,10)).toISOString()) : '';
-
-					postTools.parse(postData.content, function(err, content) {
-						postData.content = content;
-						posts.push(postData);
-						callback(null);
-					});
-				}
-			});
-		}, function(err) {
-			if (!err) {
-				callback(null, posts);
-			} else {
-				callback(err, null);
-			}
-		});
-	}
-
 	Posts.get_cid_by_pid = function(pid, callback) {
 		Posts.getPostField(pid, 'tid', function(tid) {
 			if (tid) {
@@ -326,7 +288,9 @@ var RDB = require('./redis.js'),
 				RDB.incr('global:next_post_id', function(err, pid) {
 					RDB.handle(err);

-					plugins.fireHook('filter:post.save', content, function(content) {
+					plugins.fireHook('filter:post.save', content, function(err, newContent) {
+						if (!err) content = newContent;
+
 						var timestamp = Date.now(),
 							postData = {
 								'pid': pid,
@@ -376,7 +340,9 @@ var RDB = require('./redis.js'),

 						async.parallel({
 							content: function(next) {
-								plugins.fireHook('filter:post.get', postData, function(postData) {
+								plugins.fireHook('filter:post.get', postData, function(err, newPostData) {
+									if (!err) postData = newPostData;
+
 									postTools.parse(postData.content, function(err, content) {
 										next(null, content);
 									});
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -123,7 +123,7 @@ var user = require('./../user.js'),
 			app.get('/category/:id/:slug?', function (req, res, next) {
 				var uid = (req.user) ? req.user.uid : 0;
 				categories.getCategoryById(req.params.id, uid, function (err, data) {
-					if (!err)
+					if (!err && data && data.disabled === "0")
 						res.json(data);
 					else
 						next();
--- a/src/upgrade.js
+++ b/src/upgrade.js
@@ -100,7 +100,7 @@ function upgradeUserHash(uid, callback) {
 function upgradeAdmins(callback) {
 	Groups.getGidFromName('Administrators', function(err, gid) {
 		if (!err && !gid) {
-			winston.info('Upgading Administrators');
+			winston.info('Upgrading Administrators');

 			async.parallel([
 				function(next) {
--- a/src/user.js
+++ b/src/user.js
@@ -72,7 +72,6 @@ var utils = require('./../public/src/utils.js'),
 					'reputation': 0,
 					'postcount': 0,
 					'lastposttime': 0,
-					'administrator': (uid == 1) ? 1 : 0,
 					'banned': 0,
 					'showemail': 0
 				});
@@ -114,33 +113,6 @@ var utils = require('./../public/src/utils.js'),
 		});
 	};

-	User.delete = function(uid, callback) {
-		RDB.exists('user:' + uid, function(err, exists) {
-			if (exists === 1) {
-				console.log('deleting uid ' + uid);
-
-				User.getUserData(uid, function(err, data) {
-
-					RDB.hdel('username:uid', data['username']);
-					RDB.hdel('email:uid', data['email']);
-					RDB.hdel('userslug:uid', data['userslug']);
-
-					RDB.del('user:' + uid);
-					RDB.del('followers:' + uid);
-					RDB.del('following:' + uid);
-
-					RDB.zrem('users:joindate', uid);
-					RDB.zrem('users:postcount', uid);
-					RDB.zrem('users:reputation', uid);
-
-					callback(true);
-				});
-			} else {
-				callback(false);
-			}
-		});
-	}
-
 	User.ban = function(uid, callback) {
 		User.setUserField(uid, 'banned', 1, callback);
 	}
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -22,7 +22,8 @@ var express = require('express'),
 	meta = require('./meta.js'),
 	feed = require('./feed'),
 	plugins = require('./plugins'),
-	nconf = require('nconf');
+	nconf = require('nconf'),
+	winston = require('winston');

 (function (app) {
 	var templates = null,
@@ -72,54 +73,104 @@ var express = require('express'),
 	};

 	// Middlewares
-	app.use(express.compress());
-	app.use(express.favicon(path.join(__dirname, '../', 'public', 'favicon.ico')));
-	app.use(require('less-middleware')({
-		src: path.join(__dirname, '../', 'public'),
-		prefix: nconf.get('relative_path'),
-		yuicompress: true
-	}));
-	app.use(nconf.get('relative_path'), express.static(path.join(__dirname, '../', 'public')));
-	app.use(express.bodyParser()); // Puts POST vars in request.body
+	app.configure(function() {
+		async.series([
+			function(next) {
+				// Pre-router middlewares
+				app.use(express.compress());
+				app.use(express.favicon(path.join(__dirname, '../', 'public', 'favicon.ico')));
+				app.use(require('less-middleware')({
+					src: path.join(__dirname, '../', 'public'),
+					prefix: nconf.get('relative_path'),
+					yuicompress: true
+				}));
+				app.use(nconf.get('relative_path'), express.static(path.join(__dirname, '../', 'public')));
+				app.use(express.bodyParser()); // Puts POST vars in request.body
+				app.use(express.cookieParser()); // If you want to parse cookies (res.cookies)
+				app.use(express.session({
+					store: new RedisStore({
+						client: RDB,
+						ttl: 60 * 60 * 24 * 30
+					}),
+					secret: nconf.get('secret'),
+					key: 'express.sid',
+					cookie: {
+						maxAge: 60 * 60 * 24 * 30 * 1000 // 30 days
+					}
+				}));
+				app.use(express.csrf());

-	app.use(express.cookieParser()); // If you want to parse cookies (res.cookies)
-	app.use(express.session({
-		store: new RedisStore({
-			client: RDB,
-			ttl: 60 * 60 * 24 * 30
-		}),
-		secret: nconf.get('secret'),
-		key: 'express.sid',
-		cookie: {
-			maxAge: 60 * 60 * 24 * 30 * 1000 // 30 days
-		}
-	}));
-	app.use(express.csrf());
-	app.use(function (req, res, next) {
-		res.locals.csrf_token = req.session._csrf;
-		next();
-	});
+				// Local vars, other assorted setup
+				app.use(function (req, res, next) {
+					nconf.set('https', req.secure);
+					res.locals.csrf_token = req.session._csrf;
+					next();
+				});

-	// Static Directories for NodeBB Plugins
-	app.configure(function () {
-		var tailMiddlewares = [];
+				// Authentication Routes
+				auth.initialize(app);

-		plugins.ready(function () {
-			// Remove some middlewares until the router is gone
-			// This is not recommended behaviour: http://stackoverflow.com/a/13691542/122353
-			// Also: https://www.exratione.com/2013/03/nodejs-abusing-express-3-to-enable-late-addition-of-middleware/
-			tailMiddlewares.push(app.stack.pop());
-			tailMiddlewares.push(app.stack.pop());
-			tailMiddlewares.push(app.stack.pop());
-			for (d in plugins.staticDirs) {
-				app.use(nconf.get('relative_path') + '/plugins/' + d, express.static(plugins.staticDirs[d]));
+				next();
+			},
+			function(next) {
+				// Static Directories for NodeBB Plugins
+				plugins.ready(function () {
+					for (d in plugins.staticDirs) {
+						app.use(nconf.get('relative_path') + '/plugins/' + d, express.static(plugins.staticDirs[d]));
+						winston.info('Static directory routed for plugin: ' + d);
+					}
+
+					next();
+				});
+			},
+			function(next) {
+				// Router & post-router middlewares
+				app.use(app.router);
+
+				// 404 catch-all
+				app.use(function (req, res, next) {
+					res.status(404);
+
+					// respond with html page
+					if (req.accepts('html')) {
+						res.redirect(nconf.get('relative_path') + '/404');
+						return;
+					}
+
+					// respond with json
+					if (req.accepts('json')) {
+						res.send({
+							error: 'Not found'
+						});
+						return;
+					}
+
+					// default to plain-text. send()
+					res.type('txt').send('Not found');
+				});
+
+				app.use(function (err, req, res, next) {
+
+					// we may use properties of the error object
+					// here and next(err) appropriately, or if
+					// we possibly recovered from the error, simply next().
+					console.error(err.stack);
+
+					res.status(err.status || 500);
+
+					res.json('500', {
+						error: err.message
+					});
+				});
+
+				next();
+			}
+		], function(err) {
+			if (err) {
+				winston.error('Errors were encountered while attempting to initialise NodeBB.');
+			} else {
+				winston.info('Middlewares loaded.');
 			}
-
-			// Push the removed middlewares back onto the application stack
-			tailMiddlewares.reverse();
-			app.stack.push(tailMiddlewares.shift());
-			app.stack.push(tailMiddlewares.shift());
-			app.stack.push(tailMiddlewares.shift());
 		});
 	});

@@ -137,59 +188,10 @@ var express = require('express'),
 		server.listen(nconf.get('PORT') || nconf.get('port'), nconf.get('bind_address'));
 	}

-	auth.initialize(app);
-
-	app.use(function (req, res, next) {
-
-		nconf.set('https', req.secure);
-
-		next();
-	});
-
-	app.use(app.router);
-
-	app.use(function (req, res, next) {
-		res.status(404);
-
-		// respond with html page
-		if (req.accepts('html')) {
-			//res.json('404', { url: req.url });
-			res.redirect(nconf.get('relative_path') + '/404');
-			return;
-		}
-
-		// respond with json
-		if (req.accepts('json')) {
-			res.send({
-				error: 'Not found'
-			});
-			return;
-		}
-
-		// default to plain-text. send()
-		res.type('txt').send('Not found');
-	});
-
-	app.use(function (err, req, res, next) {
-
-		// we may use properties of the error object
-		// here and next(err) appropriately, or if
-		// we possibly recovered from the error, simply next().
-		console.error(err.stack);
-
-		res.status(err.status || 500);
-
-		res.json('500', {
-			error: err.message
-		});
-	});
-
-
 	app.create_route = function (url, tpl) { // to remove
 		return '<script>templates.ready(function(){ajaxify.go("' + url + '", null, "' + tpl + '");});</script>';
 	};

-
 	app.namespace(nconf.get('relative_path'), function () {

 		auth.create_routes(app);