Merge remote-tracking branch 'origin'

.editorconfig

@@ -1,8 +1,4 @@
 root = true
 
-[*]
-end_of_line = lf
-insert_final_newline = true
-
 [*.js, *.css, *.tpl]
 indent_style = tab

.jsbeautifyrc

@@ -0,0 +1,17 @@
+{
+    "indent_size": 4,
+    "indent_char": " ",
+    "indent_level": 0,
+    "indent_with_tabs": false,
+    "preserve_newlines": true,
+    "max_preserve_newlines": 10,
+    "jslint_happy": false,
+    "brace_style": "collapse",
+    "keep_array_indentation": false,
+    "keep_function_indentation": false,
+    "space_before_conditional": true,
+    "break_chained_methods": false,
+    "eval_code": false,
+    "unescape_strings": false,
+    "wrap_line_length": 0
+}

.jshintrc

@@ -0,0 +1,86 @@
+{
+    // JSHint Default Configuration File (as on JSHint website)
+    // See http://jshint.com/docs/ for more details
+
+    "maxerr" : 50, // {int} Maximum error before stopping
+
+    // Enforcing
+    "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
+    "camelcase" : false, // true: Identifiers must be in camelCase
+    "curly" : true, // true: Require {} for every new block or scope
+    "eqeqeq" : true, // true: Require triple equals (===) for comparison
+    "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
+    "immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
+    "indent" : 4, // {int} Number of spaces to use for indentation
+    "latedef" : false, // true: Require variables/functions to be defined before being used
+    "newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
+    "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
+    "noempty" : true, // true: Prohibit use of empty blocks
+    "nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
+    "plusplus" : false, // true: Prohibit use of `++` & `--`
+    "quotmark" : false, // Quotation mark consistency:
+                                // false : do nothing (default)
+                                // true : ensure whatever is used is consistent
+                                // "single" : require single quotes
+                                // "double" : require double quotes
+    "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
+    "unused" : true, // true: Require all defined variables be used
+    "strict" : true, // true: Requires all functions run in ES5 Strict Mode
+    "trailing" : false, // true: Prohibit trailing whitespaces
+    "maxparams" : false, // {int} Max number of formal params allowed per function
+    "maxdepth" : false, // {int} Max depth of nested blocks (within functions)
+    "maxstatements" : false, // {int} Max number statements per function
+    "maxcomplexity" : false, // {int} Max cyclomatic complexity per function
+    "maxlen" : false, // {int} Max number of characters per line
+
+    // Relaxing
+    "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
+    "boss" : false, // true: Tolerate assignments where comparisons would be expected
+    "debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
+    "eqnull" : false, // true: Tolerate use of `== null`
+    "es5" : false, // true: Allow ES5 syntax (ex: getters and setters)
+    "esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
+    "moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
+                                 // (ex: `for each`, multiple try/catch, function expression…)
+    "evil" : false, // true: Tolerate use of `eval` and `new Function()`
+    "expr" : false, // true: Tolerate `ExpressionStatement` as Programs
+    "funcscope" : false, // true: Tolerate defining variables inside control statements"
+    "globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
+    "iterator" : false, // true: Tolerate using the `__iterator__` property
+    "lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
+    "laxbreak" : false, // true: Tolerate possibly unsafe line breakings
+    "laxcomma" : false, // true: Tolerate comma-first style coding
+    "loopfunc" : false, // true: Tolerate functions being defined in loops
+    "multistr" : false, // true: Tolerate multi-line strings
+    "proto" : false, // true: Tolerate using the `__proto__` property
+    "scripturl" : false, // true: Tolerate script-targeted URLs
+    "smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment
+    "shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
+    "sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
+    "supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
+    "validthis" : false, // true: Tolerate using this in a non-constructor function
+
+    // Environments
+    "browser" : true, // Web Browser (window, document, etc)
+    "couch" : false, // CouchDB
+    "devel" : true, // Development/debugging (alert, confirm, etc)
+    "dojo" : false, // Dojo Toolkit
+    "jquery" : true, // jQuery
+    "mootools" : false, // MooTools
+    "node" : true, // Node.js
+    "nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
+    "prototypejs" : false, // Prototype and Scriptaculous
+    "rhino" : false, // Rhino
+    "worker" : false, // Web Workers
+    "wsh" : false, // Windows Scripting Host
+    "yui" : false, // Yahoo User Interface
+
+    // Legacy
+    "nomen" : false, // true: Prohibit dangling `_` in variables
+    "onevar" : false, // true: Allow only one `var` statement per function
+    "passfail" : false, // true: Stop on first error
+    "white" : false, // true: Check against strict whitespace and indentation rules
+
+    // Custom Globals
+    "globals" : {} // additional predefined global variables
+}

app.js

@@ -32,12 +32,12 @@ global.env = process.env.NODE_ENV || 'production';
 
 winston.remove(winston.transports.Console);
 winston.add(winston.transports.Console, {
-	colorize:true
+	colorize: true
 });
 
 winston.add(winston.transports.File, {
-	filename:'error.log',
-	level:'error'
+	filename: 'error.log',
+	level: 'error'
 });
 
 // TODO: remove once https://github.com/flatiron/winston/issues/280 is fixed
@@ -53,7 +53,9 @@ winston.info('');
 
 if (fs.existsSync(__dirname + '/config.json') && (!nconf.get('setup') && !nconf.get('upgrade'))) {
 	// Load server-side config
-	nconf.file({ file: __dirname + '/config.json'});
+	nconf.file({
+		file: __dirname + '/config.json'
+	});
 
 	var meta = require('./src/meta.js');
 
@@ -93,7 +95,9 @@ if (fs.existsSync(__dirname + '/config.json') && (!nconf.get('setup') && !nconf.
 	});
 
 } else if (nconf.get('upgrade')) {
-	nconf.file({ file: __dirname + '/config.json'});
+	nconf.file({
+		file: __dirname + '/config.json'
+	});
 	var meta = require('./src/meta.js');
 
 	meta.configs.init(function() {

public/src/ajaxify.js

@@ -12,7 +12,7 @@ var ajaxify = {};
 
 	var events = [];
 	ajaxify.register_events = function(new_page_events) {
-		for (var i = 0, ii = events.length; i<ii; i++) {
+		for (var i = 0, ii = events.length; i < ii; i++) {
 			socket.removeAllListeners(events[i]); // optimize this to user removeListener(event, listener) instead.
 		}
 
@@ -42,14 +42,14 @@ var ajaxify = {};
 
 		var hash = window.location.hash;
 
-		if(url.indexOf(RELATIVE_PATH.slice(1)) !== -1) {
+		if (url.indexOf(RELATIVE_PATH.slice(1)) !== -1) {
 			url = url.slice(RELATIVE_PATH.length);
 		}
 
 		var tpl_url = templates.get_custom_map(url.split('?')[0]);
 
 		if (tpl_url == false && !templates[url]) {
-			if(url === '' || url === '/') {
+			if (url === '' || url === '/') {
 				tpl_url = 'home';
 			} else {
 				tpl_url = url.split('/')[0].split('?')[0];
@@ -79,9 +79,9 @@ var ajaxify = {};
 				app.process_page();
 
 				jQuery('#content, #footer').stop(true, true).fadeIn(200, function() {
-					if(window.location.hash)
+					if (window.location.hash)
 						hash = window.location.hash;
-					if(hash)
+					if (hash)
 						app.scrollToPost(hash.substr(1));
 				});
 
@@ -107,9 +107,9 @@ var ajaxify = {};
 				return href == 'javascript:;' || href == window.location.href + "#" || href.slice(-1) === "#";
 			}
 
-			if(hrefEmpty(this.href)) return;
+			if (hrefEmpty(this.href)) return;
 
-			var url = this.href.replace(rootUrl +'/', '');
+			var url = this.href.replace(rootUrl + '/', '');
 
 			if (this.target !== '') return;
 
@@ -130,7 +130,7 @@ var ajaxify = {};
 		};
 
 		function evalScript(elem) {
-			var data = (elem.text || elem.textContent || elem.innerHTML || "" ),
+			var data = (elem.text || elem.textContent || elem.innerHTML || ""),
 				head = document.getElementsByTagName("head")[0] ||
 					document.documentElement,
 				script = document.createElement("script");
@@ -138,7 +138,7 @@ var ajaxify = {};
 			script.type = "text/javascript";
 			try {
 				script.appendChild(document.createTextNode(data));
-			} catch(e) {
+			} catch (e) {
 				script.text = data;
 			}
 
@@ -159,7 +159,7 @@ var ajaxify = {};
 
 		for (i = 0; children_nodes[i]; i++) {
 			child = children_nodes[i];
-			if (nodeName(child, "script" ) &&
+			if (nodeName(child, "script") &&
 				(!child.type || child.type.toLowerCase() === "text/javascript")) {
 				scripts.push(child);
 			}

public/src/app.js

@@ -30,9 +30,9 @@ var socket,
 					app.alert(data);
 				});
 
-				socket.on('connect', function(data){
-					if(reconnecting) {
-						setTimeout(function(){
+				socket.on('connect', function(data) {
+					if (reconnecting) {
+						setTimeout(function() {
 							app.alert({
 								alert_id: 'connection_alert',
 								title: 'Connected',
@@ -43,18 +43,20 @@ var socket,
 						}, 1000);
 						reconnecting = false;
 						reconnectTries = 0;
-						socket.emit('api:updateHeader', { fields: ['username', 'picture', 'userslug'] });
+						socket.emit('api:updateHeader', {
+							fields: ['username', 'picture', 'userslug']
+						});
 					}
 				});
 
 				socket.on('reconnecting', function(data) {
 					function showDisconnectModal() {
 						$('#disconnect-modal').modal({
-							backdrop:'static',
-							show:true
+							backdrop: 'static',
+							show: true
 						});
 
-						$('#reload-button').on('click',function(){
+						$('#reload-button').on('click', function() {
 							$('#disconnect-modal').modal('hide');
 							window.location.reload();
 						});
@@ -63,7 +65,7 @@ var socket,
 					reconnecting = true;
 					reconnectTries++;
 
-					if(reconnectTries > 4) {
+					if (reconnectTries > 4) {
 						showDisconnectModal();
 						return;
 					}
@@ -132,7 +134,7 @@ var socket,
 		var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi,
 			commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
 
-		return input.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
+		return input.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
 			return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
 		});
 	}
@@ -146,7 +148,7 @@ var socket,
 	app.alert = function(params) {
 		var alert_id = 'alert_button_' + ((params.alert_id) ? params.alert_id : new Date().getTime());
 
-		var alert = $('#'+alert_id);
+		var alert = $('#' + alert_id);
 
 		function startTimeout(div, timeout) {
 			var timeoutId = setTimeout(function() {
@@ -158,15 +160,14 @@ var socket,
 			$(div).attr('timeoutId', timeoutId);
 		}
 
-		if(alert.length > 0) {
+		if (alert.length > 0) {
 			alert.find('strong').html(params.title);
 			alert.find('p').html(params.message);
 			alert.attr('class', "alert toaster-alert " + "alert-" + params.type);
 
 			clearTimeout(alert.attr('timeoutId'));
 			startTimeout(alert, params.timeout);
-		}
-		else {
+		} else {
 			var div = document.createElement('div'),
 				button = document.createElement('button'),
 				strong = document.createElement('strong'),
@@ -191,7 +192,7 @@ var socket,
 			if (params.location == null)
 				params.location = 'alert_window';
 
-			jQuery('#'+params.location).prepend(jQuery(div).fadeIn('100'));
+			jQuery('#' + params.location).prepend(jQuery(div).fadeIn('100'));
 
 			if (params.timeout) {
 				startTimeout(div, params.timeout);
@@ -209,7 +210,7 @@ var socket,
 	}
 
 	app.alertSuccess = function(message, timeout) {
-		if(!timeout)
+		if (!timeout)
 			timeout = 2000;
 
 		app.alert({
@@ -221,7 +222,7 @@ var socket,
 	}
 
 	app.alertError = function(message, timeout) {
-		if(!timeout)
+		if (!timeout)
 			timeout = 2000;
 
 		app.alert({
@@ -234,7 +235,7 @@ var socket,
 
 	app.current_room = null;
 	app.enter_room = function(room) {
-		if(socket) {
+		if (socket) {
 			if (app.current_room === room)
 				return;
 
@@ -268,13 +269,13 @@ var socket,
 
 		var url = window.location.href,
 			parts = url.split('/'),
-			active = parts[parts.length-1];
+			active = parts[parts.length - 1];
 
 		jQuery('#main-nav li').removeClass('active');
-		if(active) {
+		if (active) {
 			jQuery('#main-nav li a').each(function() {
 				var href = this.getAttribute('href');
-				if(active.match(/^users/))
+				if (active.match(/^users/))
 					active = 'users';
 				if (href && href.match(active)) {
 					jQuery(this.parentNode).addClass('active');
@@ -298,9 +299,9 @@ var socket,
 			});
 		}
 
-		if(showWelcomeMessage) {
+		if (showWelcomeMessage) {
 			showWelcomeMessage = false;
-			if(document.readyState !== 'complete') {
+			if (document.readyState !== 'complete') {
 				$(document).ready(showAlert);
 			} else {
 				showAlert();
@@ -317,7 +318,7 @@ var socket,
 	app.openChat = function(username, touid) {
 		require(['chat'], function(chat) {
 			var chatModal;
-			if(!chat.modalExists(touid)) {
+			if (!chat.modalExists(touid)) {
 				chatModal = chat.createModal(username, touid);
 			} else {
 				chatModal = chat.getModal(touid);
@@ -336,7 +337,7 @@ var socket,
 				.append(html)
 				.fadeIn('slow');
 
-		for(var x=0,numPosts=data.posts.length;x<numPosts;x++) {
+		for (var x = 0, numPosts = data.posts.length; x < numPosts; x++) {
 			socket.emit('api:post.privileges', data.posts[x].pid);
 		}
 
@@ -350,11 +351,11 @@ var socket,
 	app.infiniteLoaderActive = false;
 
 	app.loadMorePosts = function(tid, callback) {
-		if(app.infiniteLoaderActive)
+		if (app.infiniteLoaderActive)
 			return;
 		app.infiniteLoaderActive = true;
 
-		if($('#loading-indicator').attr('done') === '0')
+		if ($('#loading-indicator').attr('done') === '0')
 			$('#loading-indicator').removeClass('hide');
 
 		socket.emit('api:topic.loadMore', {
@@ -362,14 +363,14 @@ var socket,
 			after: document.querySelectorAll('#post-container li[data-pid]').length
 		}, function(data) {
 			app.infiniteLoaderActive = false;
-			if(data.posts.length) {
+			if (data.posts.length) {
 				$('#loading-indicator').attr('done', '0');
 				app.createNewPosts(data);
 			} else {
 				$('#loading-indicator').attr('done', '1');
 			}
 			$('#loading-indicator').addClass('hide');
-			if(callback)
+			if (callback)
 				callback(data.posts);
 		});
 	}
@@ -388,7 +389,7 @@ var socket,
 
 	app.scrollToPost = function(pid) {
 
-		if(!pid)
+		if (!pid)
 			return;
 
 		var container = $(document.body),
@@ -401,22 +402,22 @@ var socket,
 			});
 		}
 
-		if(!scrollTo.length && tid) {
+		if (!scrollTo.length && tid) {
 
 			var intervalID = setInterval(function() {
 				app.loadMorePosts(tid, function(posts) {
 					scrollTo = $('#post_anchor_' + pid);
 
-					if(tid && scrollTo.length) {
+					if (tid && scrollTo.length) {
 						animateScroll();
 					}
 
-					if(!posts.length || scrollTo.length)
+					if (!posts.length || scrollTo.length)
 						clearInterval(intervalID);
 				});
 			}, 100);
 
-		} else if(tid) {
+		} else if (tid) {
 			animateScroll();
 		}
 
@@ -425,7 +426,7 @@ var socket,
 	jQuery('document').ready(function() {
 		$('#search-form').on('submit', function() {
 			var input = $(this).find('input');
-			ajaxify.go("search/"+input.val(), null, "search");
+			ajaxify.go("search/" + input.val(), null, "search");
 			input.val('');
 			return false;
 		})

public/src/forum/account.js

@@ -12,8 +12,8 @@
 		var followBtn = $('#follow-btn');
 		var unfollowBtn = $('#unfollow-btn');
 
-		if(yourid !== theirid) {
-			if(isFollowing) {
+		if (yourid !== theirid) {
+			if (isFollowing) {
 				followBtn.hide();
 				unfollowBtn.show();
 			} else {
@@ -26,8 +26,10 @@
 		}
 
 		followBtn.on('click', function() {
-			socket.emit('api:user.follow', {uid: theirid}, function(success) {
-				if(success) {
+			socket.emit('api:user.follow', {
+				uid: theirid
+			}, function(success) {
+				if (success) {
 					followBtn.hide();
 					unfollowBtn.show();
 					app.alertSuccess('You are now following ' + username + '!');
@@ -39,8 +41,10 @@
 		});
 
 		unfollowBtn.on('click', function() {
-			socket.emit('api:user.unfollow', {uid: theirid}, function(success) {
-				if(success) {
+			socket.emit('api:user.unfollow', {
+				uid: theirid
+			}, function(success) {
+				if (success) {
 					followBtn.show();
 					unfollowBtn.hide();
 					app.alertSuccess('You are no longer following ' + username + '!');
@@ -58,7 +62,7 @@
 		var onlineStatus = $('.account-online-status');
 
 		function handleUserOnline(data) {
-			if(data.online) {
+			if (data.online) {
 				onlineStatus.find('span span').text('online');
 				onlineStatus.find('i').attr('class', 'icon-circle');
 			} else {

public/src/forum/accountedit.js

@@ -1,5 +1,3 @@
-
-
 var gravatarPicture = templates.get('gravatarpicture');
 var uploadedPicture = templates.get('uploadedpicture');
 
@@ -14,7 +12,7 @@ $(document).ready(function() {
 		$('#upload-progress-box').show();
 		$('#upload-progress-box').removeClass('hide');
 
-		if(!$('#userPhotoInput').val()) {
+		if (!$('#userPhotoInput').val()) {
 			error('select an image to upload!');
 			return false;
 		}
@@ -28,13 +26,13 @@ $(document).ready(function() {
 				error('Error: ' + xhr.status);
 			},
 
-			uploadProgress : function(event, position, total, percent) {
-				$('#upload-progress-bar').css('width', percent+'%');
+			uploadProgress: function(event, position, total, percent) {
+				$('#upload-progress-bar').css('width', percent + '%');
 			},
 
 
 			success: function(response) {
-				if(response.error) {
+				if (response.error) {
 					error(response.error);
 					return;
 				}
@@ -51,7 +49,9 @@ $(document).ready(function() {
 					$('#upload-picture-modal').modal('hide');
 				}, 750);
 
-				socket.emit('api:updateHeader', { fields: ['username', 'picture', 'userslug'] });
+				socket.emit('api:updateHeader', {
+					fields: ['username', 'picture', 'userslug']
+				});
 				success('File uploaded successfully!');
 			}
 		});
@@ -87,7 +87,7 @@ $(document).ready(function() {
 		};
 
 		socket.emit('api:user.changePicture', userData, function(success) {
-			if(!success) {
+			if (!success) {
 				app.alertError('There was an error changing picture!');
 			}
 		});
@@ -95,26 +95,26 @@ $(document).ready(function() {
 
 	var selectedImageType = '';
 
-	$('#submitBtn').on('click',function(){
+	$('#submitBtn').on('click', function() {
 
 		var userData = {
-			uid:$('#inputUID').val(),
-			email:$('#inputEmail').val(),
-			fullname:$('#inputFullname').val(),
-			website:$('#inputWebsite').val(),
-			birthday:$('#inputBirthday').val(),
-			location:$('#inputLocation').val(),
-			signature:$('#inputSignature').val()
+			uid: $('#inputUID').val(),
+			email: $('#inputEmail').val(),
+			fullname: $('#inputFullname').val(),
+			website: $('#inputWebsite').val(),
+			birthday: $('#inputBirthday').val(),
+			location: $('#inputLocation').val(),
+			signature: $('#inputSignature').val()
 		};
 
 		socket.emit('api:user.updateProfile', userData, function(err, data) {
-			if(data.success) {
+			if (data.success) {
 				app.alertSuccess('Your profile has been updated successfully!');
-				if(data.picture) {
+				if (data.picture) {
 					$('#user-current-picture').attr('src', data.picture);
 					$('#user_label img').attr('src', data.picture);
 				}
-				if(data.gravatarpicture) {
+				if (data.gravatarpicture) {
 					$('#user-gravatar-picture').attr('src', data.gravatarpicture);
 					gravatarPicture = data.gravatarpicture;
 				}
@@ -128,27 +128,25 @@ $(document).ready(function() {
 	function updateImages() {
 		var currentPicture = $('#user-current-picture').attr('src');
 
-		if(gravatarPicture) {
+		if (gravatarPicture) {
 			$('#user-gravatar-picture').attr('src', gravatarPicture);
 			$('#gravatar-box').show();
-		}
-		else
+		} else
 			$('#gravatar-box').hide();
 
-		if(uploadedPicture) {
+		if (uploadedPicture) {
 			$('#user-uploaded-picture').attr('src', uploadedPicture);
 			$('#uploaded-box').show();
-		}
-		else
+		} else
 			$('#uploaded-box').hide();
 
 
-		 if(currentPicture == gravatarPicture)
+		if (currentPicture == gravatarPicture)
 			$('#gravatar-box .icon-ok').show();
 		else
 			$('#gravatar-box .icon-ok').hide();
 
-		if(currentPicture == uploadedPicture)
+		if (currentPicture == uploadedPicture)
 			$('#uploaded-box .icon-ok').show();
 		else
 			$('#uploaded-box .icon-ok').hide();
@@ -165,13 +163,13 @@ $(document).ready(function() {
 		return false;
 	});
 
-	$('#gravatar-box').on('click', function(){
+	$('#gravatar-box').on('click', function() {
 		$('#gravatar-box .icon-ok').show();
 		$('#uploaded-box .icon-ok').hide();
 		selectedImageType = 'gravatar';
 	});
 
-	$('#uploaded-box').on('click', function(){
+	$('#uploaded-box').on('click', function() {
 		$('#gravatar-box .icon-ok').hide();
 		$('#uploaded-box .icon-ok').show();
 		selectedImageType = 'uploaded';
@@ -180,12 +178,12 @@ $(document).ready(function() {
 	$('#savePictureChangesBtn').on('click', function() {
 		$('#change-picture-modal').modal('hide');
 
-		if(selectedImageType) {
+		if (selectedImageType) {
 			changeUserPicture(selectedImageType);
 
-			if(selectedImageType == 'gravatar')
+			if (selectedImageType == 'gravatar')
 				$('#user-current-picture').attr('src', gravatarPicture);
-			else if(selectedImageType == 'uploaded')
+			else if (selectedImageType == 'uploaded')
 				$('#user-current-picture').attr('src', uploadedPicture);
 		}
 
@@ -195,7 +193,7 @@ $(document).ready(function() {
 		$('#userPhotoInput').val('');
 	});
 
-	$('#uploadPictureBtn').on('click', function(){
+	$('#uploadPictureBtn').on('click', function() {
 
 		$('#change-picture-modal').modal('hide');
 		$('#upload-picture-modal').modal('show');
@@ -226,7 +224,7 @@ $(document).ready(function() {
 				password_notify.html('Password too short');
 				password_notify.attr('class', 'alert alert-danger');
 				password_notify.removeClass('hide');
-			} else if(!passwordvalid) {
+			} else if (!passwordvalid) {
 				password_notify.html('Invalid password');
 				password_notify.attr('class', 'alert alert-danger');
 				password_notify.removeClass('hide');
@@ -240,11 +238,11 @@ $(document).ready(function() {
 		}
 
 		function onPasswordConfirmChanged() {
-			if(password_notify.hasClass('alert-danger') || !password_confirm.val()) {
+			if (password_notify.hasClass('alert-danger') || !password_confirm.val()) {
 				password_confirm_notify.addClass('hide');
 				return;
 			}
-			if(password.val() !== password_confirm.val()) {
+			if (password.val() !== password_confirm.val()) {
 				password_confirm_notify.html('Passwords must match!');
 				password_confirm_notify.attr('class', 'alert alert-danger');
 				password_confirm_notify.removeClass('hide');
@@ -262,8 +260,11 @@ $(document).ready(function() {
 
 		$('#changePasswordBtn').on('click', function() {
 
-			if(passwordvalid && passwordsmatch && currentPassword.val()) {
-				socket.emit('api:user.changePassword', {'currentPassword': currentPassword.val(),'newPassword': password.val()	}, function(err) {
+			if (passwordvalid && passwordsmatch && currentPassword.val()) {
+				socket.emit('api:user.changePassword', {
+					'currentPassword': currentPassword.val(),
+					'newPassword': password.val()
+				}, function(err) {
 
 					currentPassword.val('');
 					password.val('');
@@ -273,7 +274,7 @@ $(document).ready(function() {
 					passwordsmatch = false;
 					passwordvalid = false;
 
-					if(err) {
+					if (err) {
 						app.alertError(err.error);
 						return;
 					}

public/src/forum/accountheader.js

@@ -24,7 +24,7 @@
 		var settingsLink = $('#settingsLink');
 		var favouritesLink = $('#favouritesLink');
 
-		if(yourid === "0" || yourid !== theirid) {
+		if (yourid === "0" || yourid !== theirid) {
 			editLink.hide();
 			settingsLink.hide();
 			favouritesLink.hide();

public/src/forum/accountsettings.js

@@ -1,16 +1,13 @@
-
-
-
 $(document).ready(function() {
 
 	$('#submitBtn').on('click', function() {
 
 		var settings = {
-			showemail: $('#showemailCheckBox').is(':checked')?1:0
+			showemail: $('#showemailCheckBox').is(':checked') ? 1 : 0
 		};
 
 		socket.emit('api:user.saveSettings', settings, function(success) {
-			if(success) {
+			if (success) {
 				app.alertSuccess('Settings saved!');
 			} else {
 				app.alertError('There was an error saving settings!');

public/src/forum/admin/categories.js

@@ -1,11 +1,10 @@
-
 var modified_categories = {};
 
 function modified(el) {
 	var cid = $(el).parents('li').attr('data-cid');
 
 	modified_categories[cid] = modified_categories[cid] || {};
-	modified_categories[cid][el.attr('data-name')] = el.val();
+	modified_categories[cid][$(el).attr('data-name')] = $(el).val();
 }
 
 function save() {
@@ -16,7 +15,7 @@ function save() {
 function select_icon(el) {
 	var selected = el.attr('class').replace(' icon-2x', '');
 	jQuery('#icons .selected').removeClass('selected');
-	if(selected)
+	if (selected)
 		jQuery('#icons .' + selected).parent().addClass('selected');
 
 
@@ -57,14 +56,14 @@ jQuery('.blockclass').each(function() {
 
 	function createNewCategory() {
 		var category = {
-			name:$('#inputName').val(),
-			description:$('#inputDescription').val(),
-			icon:$('#new-category-modal i').attr('value'),
-			blockclass:$('#inputBlockclass').val()
+			name: $('#inputName').val(),
+			description: $('#inputDescription').val(),
+			icon: $('#new-category-modal i').attr('value'),
+			blockclass: $('#inputBlockclass').val()
 		};
 
 		socket.emit('api:admin.categories.create', category, function(err, data) {
-			if(!err) {
+			if (!err) {
 				app.alert({
 					alert_id: 'category_created',
 					title: 'Created',
@@ -73,7 +72,9 @@ jQuery('.blockclass').each(function() {
 					timeout: 2000
 				});
 
-				var html = templates.prepare(templates['admin/categories'].blocks['categories']).parse({categories:[data]});
+				var html = templates.prepare(templates['admin/categories'].blocks['categories']).parse({
+					categories: [data]
+				});
 				$('#entry-container').append(html);
 
 				$('#new-category-modal').modal('hide');
@@ -84,7 +85,7 @@ jQuery('.blockclass').each(function() {
 	jQuery('document').ready(function() {
 		var url = window.location.href,
 			parts = url.split('/'),
-			active = parts[parts.length-1];
+			active = parts[parts.length - 1];
 
 		jQuery('.nav-pills li').removeClass('active');
 		jQuery('.nav-pills li a').each(function() {
@@ -112,7 +113,7 @@ jQuery('.blockclass').each(function() {
 
 		jQuery('.entry-row button').each(function(index, element) {
 			var disabled = $(element).attr('data-disabled');
-			if(disabled == "0" || disabled == "")
+			if (disabled == "0" || disabled == "")
 				$(element).html('Disable');
 			else
 				$(element).html('Enable');
@@ -124,7 +125,7 @@ jQuery('.blockclass').each(function() {
 			var categoryRow = btn.parents('li');
 			var cid = categoryRow.attr('data-cid');
 
-			var disabled = btn.html() == "Disable" ? "1":"0";
+			var disabled = btn.html() == "Disable" ? "1" : "0";
 			categoryRow.remove();
 			modified_categories[cid] = modified_categories[cid] || {};
 			modified_categories[cid]['disabled'] = disabled;

public/src/forum/admin/footer.js

@@ -1,6 +1,3 @@
-
-
-
 var nodebb_admin = (function(nodebb_admin) {
 
 	nodebb_admin.config = undefined;
@@ -19,12 +16,12 @@ var nodebb_admin = (function(nodebb_admin) {
 			numFields = fields.length,
 			saveBtn = document.getElementById('save'),
 			x, key, inputType;
-		for(x=0;x<numFields;x++) {
+		for (x = 0; x < numFields; x++) {
 			key = fields[x].getAttribute('data-field');
 			inputType = fields[x].getAttribute('type');
 			if (fields[x].nodeName === 'INPUT') {
 				if (nodebb_admin.config[key]) {
-					switch(inputType) {
+					switch (inputType) {
 						case 'text':
 						case 'textarea':
 						case 'number':
@@ -45,11 +42,11 @@ var nodebb_admin = (function(nodebb_admin) {
 			var key, value;
 			e.preventDefault();
 
-			for(x=0;x<numFields;x++) {
+			for (x = 0; x < numFields; x++) {
 				key = fields[x].getAttribute('data-field');
 				if (fields[x].nodeName === 'INPUT') {
 					inputType = fields[x].getAttribute('type');
-					switch(inputType) {
+					switch (inputType) {
 						case 'text':
 						case 'number':
 							value = fields[x].value;
@@ -63,7 +60,10 @@ var nodebb_admin = (function(nodebb_admin) {
 					value = fields[x].value;
 				}
 
-				socket.emit('api:config.set', { key: key, value: value });
+				socket.emit('api:config.set', {
+					key: key,
+					value: value
+				});
 			}
 		});
 	}
@@ -82,7 +82,7 @@ var nodebb_admin = (function(nodebb_admin) {
 		menuEl.addEventListener('click', function(e) {
 			parentEl = e.target.parentNode;
 			if (parentEl.nodeName === 'LI') {
-				for(var x=0,numLis=liEls.length;x<numLis;x++) {
+				for (var x = 0, numLis = liEls.length; x < numLis; x++) {
 					if (liEls[x] !== parentEl) jQuery(liEls[x]).removeClass('active');
 					else jQuery(parentEl).addClass('active');
 				}
@@ -119,4 +119,3 @@ var nodebb_admin = (function(nodebb_admin) {
 	return nodebb_admin;
 
 }(nodebb_admin || {}));
-

public/src/forum/admin/groups.js

@@ -28,7 +28,7 @@ $(document).ready(function() {
 
 		socket.emit('api:groups.create', submitObj, function(err, data) {
 			if (err) {
-				switch(err) {
+				switch (err) {
 					case 'group-exists':
 						errorText = '<strong>Please choose another name</strong><p>There seems to be a group with this name already.</p>';
 						break;
@@ -54,7 +54,7 @@ $(document).ready(function() {
 		var action = this.getAttribute('data-action'),
 			gid = $(this).parents('li[data-gid]').attr('data-gid');
 
-		switch(action) {
+		switch (action) {
 			case 'delete':
 				bootbox.confirm('Are you sure you wish to delete this group?', function(confirm) {
 					if (confirm) {
@@ -83,7 +83,7 @@ $(document).ready(function() {
 					memberIconImg = memberIcon.querySelector('img');
 					memberIconLabel = memberIcon.querySelector('span');
 					if (numMembers > 0) {
-						for(x=0;x<numMembers;x++) {
+						for (x = 0; x < numMembers; x++) {
 							memberIconImg.src = groupObj.members[x].picture;
 							memberIconLabel.innerHTML = groupObj.members[x].username;
 							memberIcon.setAttribute('data-uid', groupObj.members[x].uid);
@@ -121,7 +121,7 @@ $(document).ready(function() {
 						resultsSlug = document.createDocumentFragment(),
 						x;
 					if (numResults > 4) numResults = 4;
-					for(x=0;x<numResults;x++) {
+					for (x = 0; x < numResults; x++) {
 						foundUserImg.src = results[x].picture;
 						foundUserLabel.innerHTML = results[x].username;
 						foundUser.setAttribute('title', results[x].username);

public/src/forum/admin/index.js

@@ -8,7 +8,7 @@
 			total = 0;
 			active_users.innerHTML = '';
 
-		for(var room in data) {
+		for (var room in data) {
 			if (room !== '') {
 				var count = data[room].length;
 				total += count;

public/src/forum/admin/themes.js

@@ -1,5 +1,3 @@
-
-
 var nodebb_admin = (function(nodebb_admin) {
 
 	var themes = {};
@@ -10,7 +8,7 @@ var nodebb_admin = (function(nodebb_admin) {
 			themeContainer = document.querySelector('#bootstrap_themes'),
 			numThemes = bootswatch.themes.length;
 
-		for(var x=0;x<numThemes;x++) {
+		for (var x = 0; x < numThemes; x++) {
 			var theme = bootswatch.themes[x];
 			themeEl.setAttribute('data-css', theme.cssMin);
 			themeEl.setAttribute('data-theme', theme.name);
@@ -46,7 +44,7 @@ var nodebb_admin = (function(nodebb_admin) {
 		installedThemeContainer = document.querySelector('#installed_themes'),
 		themeEvent = function(e) {
 			if (e.target.hasAttribute('data-action')) {
-				switch(e.target.getAttribute('data-action')) {
+				switch (e.target.getAttribute('data-action')) {
 					case 'preview':
 						var cssSrc = $(e.target).parents('li').attr('data-css'),
 							cssEl = document.getElementById('base-theme');
@@ -58,10 +56,12 @@ var nodebb_admin = (function(nodebb_admin) {
 							cssSrc = parentEl.attr('data-css'),
 							cssName = parentEl.attr('data-theme');
 						socket.emit('api:config.set', {
-							key: 'theme:id', value: 'bootswatch:' + cssName
+							key: 'theme:id',
+							value: 'bootswatch:' + cssName
 						});
 						socket.emit('api:config.set', {
-							key: 'theme:src', value: cssSrc
+							key: 'theme:src',
+							value: cssSrc
 						});
 						break;
 				}
@@ -87,7 +87,7 @@ var nodebb_admin = (function(nodebb_admin) {
 			liEl = document.createElement('li');
 
 		if (themes.length > 0) {
-			for(var x=0,numThemes=themes.length;x<numThemes;x++) {
+			for (var x = 0, numThemes = themes.length; x < numThemes; x++) {
 				liEl.setAttribute('data-theme', themes[x].id);
 				liEl.setAttribute('data-css', themes[x].src);
 				liEl.innerHTML = '<img src="' + themes[x].screenshot + '" />' +

public/src/forum/admin/topics.js

@@ -7,18 +7,30 @@ $(document).ready(function() {
 			action = this.getAttribute('data-action'),
 			tid = $this.parents('[data-tid]').attr('data-tid');
 
-		switch(action) {
+		switch (action) {
 			case 'pin':
-				if (!$this.hasClass('active')) socket.emit('api:topic.pin', { tid: tid });
-				else socket.emit('api:topic.unpin', { tid: tid });
+				if (!$this.hasClass('active')) socket.emit('api:topic.pin', {
+					tid: tid
+				});
+				else socket.emit('api:topic.unpin', {
+					tid: tid
+				});
 				break;
 			case 'lock':
-				if (!$this.hasClass('active')) socket.emit('api:topic.lock', { tid: tid });
-				else socket.emit('api:topic.unlock', { tid: tid });
+				if (!$this.hasClass('active')) socket.emit('api:topic.lock', {
+					tid: tid
+				});
+				else socket.emit('api:topic.unlock', {
+					tid: tid
+				});
 				break;
 			case 'delete':
-				if (!$this.hasClass('active')) socket.emit('api:topic.delete', { tid: tid });
-				else socket.emit('api:topic.restore', { tid: tid });
+				if (!$this.hasClass('active')) socket.emit('api:topic.delete', {
+					tid: tid
+				});
+				else socket.emit('api:topic.restore', {
+					tid: tid
+				});
 				break;
 		}
 	});
@@ -56,7 +68,7 @@ $(document).ready(function() {
 	// Resolve proper button state for all topics
 	var topicEls = topicsListEl.querySelectorAll('li'),
 		numTopics = topicEls.length;
-	for(var x=0;x<numTopics;x++) {
+	for (var x = 0; x < numTopics; x++) {
 		if (topicEls[x].getAttribute('data-pinned') === '1') topicEls[x].querySelector('[data-action="pin"]').className += ' active';
 		if (topicEls[x].getAttribute('data-locked') === '1') topicEls[x].querySelector('[data-action="lock"]').className += ' active';
 		if (topicEls[x].getAttribute('data-deleted') === '1') topicEls[x].querySelector('[data-action="delete"]').className += ' active';

public/src/forum/admin/users.js

@@ -1,4 +1,3 @@
-
 (function() {
 
 	var yourid = templates.get('yourid');
@@ -24,19 +23,19 @@
 			var adminBtn = $(element);
 			var uid = getUID(adminBtn);
 
-			if(isUserAdmin(adminBtn))
+			if (isUserAdmin(adminBtn))
 				adminBtn.addClass('btn-success');
 			else
 				adminBtn.removeClass('btn-success');
 
-			if(uid === yourid)
+			if (uid === yourid)
 				adminBtn.addClass('disabled');
 		});
 
 		jQuery('.delete-btn').each(function(index, element) {
 			var deleteBtn = $(element);
 
-			if(isUserAdmin(deleteBtn))
+			if (isUserAdmin(deleteBtn))
 				deleteBtn.addClass('disabled');
 			else
 				deleteBtn.show();
@@ -45,9 +44,9 @@
 		jQuery('.ban-btn').each(function(index, element) {
 			var banBtn = $(element);
 
-			if(isUserAdmin(banBtn))
+			if (isUserAdmin(banBtn))
 				banBtn.addClass('disabled');
-			else if(isUserBanned(banBtn))
+			else if (isUserBanned(banBtn))
 				banBtn.addClass('btn-warning');
 			else
 				banBtn.removeClass('btn-warning');
@@ -65,14 +64,14 @@
 			var parent = adminBtn.parents('.users-box');
 			var uid = getUID(adminBtn);
 
-			if(isAdmin && uid != yourid) {
+			if (isAdmin && uid != yourid) {
 				socket.emit('api:admin.user.removeAdmin', uid);
 				adminBtn.removeClass('btn-success');
 				parent.find('.delete-btn').removeClass('disabled');
 				parent.attr('data-admin', 0);
-			} else if(uid != yourid) {
-				bootbox.confirm('Do you really want to make "' + parent.attr('data-username') +'" an admin?', function(confirm) {
-					if(confirm) {
+			} else if (uid != yourid) {
+				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');
@@ -90,8 +89,8 @@
 			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 (!isAdmin) {
+				bootbox.confirm('Do you really want to delete "' + parent.attr('data-username') + '"?', function(confirm) {
 					if (confirm) {
 						socket.emit('api:admin.user.deleteUser', uid);
 					}
@@ -108,13 +107,13 @@
 			var parent = banBtn.parents('.users-box');
 			var uid = getUID(banBtn);
 
-			if(!isAdmin) {
-				if(isBanned) {
+			if (!isAdmin) {
+				if (isBanned) {
 					socket.emit('api:admin.user.unbanUser', uid);
 					banBtn.removeClass('btn-warning');
 					parent.attr('data-banned', 0);
 				} else {
-					bootbox.confirm('Do you really want to ban "' + parent.attr('data-username') +'"?', function(confirm) {
+					bootbox.confirm('Do you really want to ban "' + parent.attr('data-username') + '"?', function(confirm) {
 						if (confirm) {
 							socket.emit('api:admin.user.banUser', uid);
 							banBtn.addClass('btn-warning');
@@ -136,7 +135,7 @@
 
 		var url = window.location.href,
 			parts = url.split('/'),
-			active = parts[parts.length-1];
+			active = parts[parts.length - 1];
 
 		jQuery('.nav-pills li').removeClass('active');
 		jQuery('.nav-pills li a').each(function() {
@@ -146,8 +145,8 @@
 			}
 		});
 
-		jQuery('#search-user').on('keyup', function () {
-			if(timeoutId !== 0) {
+		jQuery('#search-user').on('keyup', function() {
+			if (timeoutId !== 0) {
 				clearTimeout(timeoutId);
 				timeoutId = 0;
 			}
@@ -174,14 +173,13 @@
 			userListEl.innerHTML = html;
 			jQuery('.icon-spinner').addClass('none');
 
-			if(data && data.length === 0) {
+			if (data && data.length === 0) {
 				$('#user-notfound-notify').html('User not found!')
 					.show()
 					.addClass('label-danger')
 					.removeClass('label-success');
-			}
-			else {
-				$('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!')
+			} else {
+				$('#user-notfound-notify').html(data.length + ' user' + (data.length > 1 ? 's' : '') + ' found!')
 					.show()
 					.addClass('label-success')
 					.removeClass('label-danger');
@@ -191,28 +189,30 @@
 		});
 
 		function onUsersLoaded(users) {
-			var html = templates.prepare(templates['admin/users'].blocks['users']).parse({ users: users });
+			var html = templates.prepare(templates['admin/users'].blocks['users']).parse({
+				users: users
+			});
 			$('#users-container').append(html);
 			updateUserButtons();
 		}
 
 		function loadMoreUsers() {
 			var set = '';
-			if(active === 'latest') {
+			if (active === 'latest') {
 				set = 'users:joindate';
-			} else if(active === 'sort-posts') {
+			} else if (active === 'sort-posts') {
 				set = 'users:postcount';
-			} else if(active === 'sort-reputation') {
+			} else if (active === 'sort-reputation') {
 				set = 'users:reputation';
 			}
 
-			if(set) {
+			if (set) {
 				loadingMoreUsers = true;
 				socket.emit('api:users.loadMore', {
 					set: set,
 					after: $('#users-container').children().length
 				}, function(data) {
-					if(data.users.length) {
+					if (data.users.length) {
 						onUsersLoaded(data.users);
 					}
 					loadingMoreUsers = false;

public/src/forum/category.js

@@ -36,7 +36,9 @@
 	]);
 
 	function onNewTopic(data) {
-		var html = templates.prepare(templates['category'].blocks['topics']).parse({ topics: [data] }),
+		var html = templates.prepare(templates['category'].blocks['topics']).parse({
+			topics: [data]
+		}),
 			topic = document.createElement('div'),
 			container = document.getElementById('topics-container'),
 			topics = document.querySelectorAll('#topics-container a'),
@@ -50,7 +52,7 @@
 		topic = topic.querySelector('a');
 
 		if (numTopics > 0) {
-			for(x=0;x<numTopics;x++) {
+			for (x = 0; x < numTopics; x++) {
 				if (topics[x].querySelector('.icon-pushpin')) continue;
 				container.insertBefore(topic, topics[x]);
 				$(topic).hide().fadeIn('slow');
@@ -78,13 +80,13 @@
 
 		var frag = document.createDocumentFragment(),
 			li = document.createElement('li');
-		for (var i=0,numPosts=posts.length; i<numPosts; i++) {
+		for (var i = 0, numPosts = posts.length; i < numPosts; i++) {
 			var dateString = utils.relativeTime(posts[i].timestamp);
 			li.setAttribute('data-pid', posts[i].pid);
 
 
 			li.innerHTML = '<a href="/users/' + posts[i].userslug + '"><img title="' + posts[i].username + '" style="width: 48px; height: 48px; /*temporary*/" class="img-rounded" src="' + posts[i].picture + '" class="" /></a>' +
-								'<a href="/topic/'+ posts[i].topicSlug + '#' + posts[i].pid + '">' +
+				'<a href="/topic/' + posts[i].topicSlug + '#' + posts[i].pid + '">' +
 				'<p>' +
 				posts[i].content +
 				'</p>' +
@@ -98,7 +100,9 @@
 
 	function onTopicsLoaded(topics) {
 
-		var html = templates.prepare(templates['category'].blocks['topics']).parse({ topics: topics }),
+		var html = templates.prepare(templates['category'].blocks['topics']).parse({
+			topics: topics
+		}),
 			container = $('#topics-container');
 
 		jQuery('#topics-container, .category-sidebar').removeClass('hidden');
@@ -115,7 +119,7 @@
 			cid: cid,
 			after: $('#topics-container').children().length
 		}, function(data) {
-			if(data.topics.length) {
+			if (data.topics.length) {
 				onTopicsLoaded(data.topics);
 			}
 			loadingMoreTopics = false;

public/src/forum/favourites.js

@@ -1,11 +1,7 @@
 (function() {
-
 	$(document).ready(function() {
-
 		$('.user-favourite-posts .topic-row').on('click', function() {
 			ajaxify.go($(this).attr('topic-url'));
 		});
-
 	});
-
 }());

public/src/forum/followers.js

@@ -6,7 +6,7 @@
 
 	$(document).ready(function() {
 
-		if(parseInt(followersCount, 10) === 0) {
+		if (parseInt(followersCount, 10) === 0) {
 			$('#no-followers-notice').removeClass('hide');
 		}
 

public/src/forum/following.js

@@ -6,22 +6,23 @@
 
 	$(document).ready(function() {
 
-		if(parseInt(followingCount, 10) === 0) {
+		if (parseInt(followingCount, 10) === 0) {
 			$('#no-following-notice').removeClass('hide');
 		}
 
 
-		if(yourid !== theirid) {
+		if (yourid !== theirid) {
 			$('.unfollow-btn').hide();
-		}
-		else {
-			$('.unfollow-btn').on('click',function() {
+		} else {
+			$('.unfollow-btn').on('click', function() {
 				var unfollowBtn = $(this);
 				var followingUid = $(this).attr('followingUid');
 
-				socket.emit('api:user.unfollow', {uid: followingUid}, function(success) {
+				socket.emit('api:user.unfollow', {
+					uid: followingUid
+				}, function(success) {
 					var username = unfollowBtn.attr('data-username');
-					if(success) {
+					if (success) {
 						unfollowBtn.parent().remove();
 						app.alertSuccess('You are no longer following ' + username + '!');
 					} else {

public/src/forum/footer.js

@@ -22,7 +22,9 @@
 		stats_online.innerHTML = data.users;
 	});
 
-	socket.emit('api:updateHeader', { fields: ['username', 'picture', 'userslug'] });
+	socket.emit('api:updateHeader', {
+		fields: ['username', 'picture', 'userslug']
+	});
 	socket.on('api:updateHeader', function(data) {
 
 		jQuery('#search-button').on('click', function() {
@@ -49,18 +51,18 @@
 			jQuery('.nodebb-loggedout').hide();
 
 			var userLabel = rightMenu.find('#user_label');
-			if(userLabel.length) {
-				if(data['userslug'])
-					userLabel.attr('href','/users/' + data['userslug']);
-				if(data['picture'])
-					userLabel.find('img').attr('src',data['picture']);
-				if(data['username'])
+			if (userLabel.length) {
+				if (data['userslug'])
+					userLabel.attr('href', '/users/' + data['userslug']);
+				if (data['picture'])
+					userLabel.find('img').attr('src', data['picture']);
+				if (data['username'])
 					userLabel.find('span').html(data['username']);
 			} else {
 				var userli = $('<li> \
-									<a id="user_label" href="/users/'+data['userslug']+'"> \
-										<img src="'+data['picture']+'"/> \
-										<span>'+data['username']+'</span> \
+									<a id="user_label" href="/users/' + data['userslug'] + '"> \
+										<img src="' + data['picture'] + '"/> \
+										<span>' + data['username'] + '</span> \
 									</a> \
 								</li>');
 				rightMenu.append(userli);
@@ -102,13 +104,13 @@
 					x;
 				notifList.innerHTML = '';
 				if ((data.read.length + data.unread.length) > 0) {
-					for(x=0;x<numUnread;x++) {
+					for (x = 0; x < numUnread; x++) {
 						notifEl.setAttribute('data-nid', data.unread[x].nid);
 						notifEl.className = 'unread';
 						notifEl.innerHTML = '<a href="' + data.unread[x].path + '"><span class="pull-right">' + utils.relativeTime(data.unread[x].datetime, true) + '</span>' + data.unread[x].text + '</a>';
 						notifFrag.appendChild(notifEl.cloneNode(true));
 					}
-					for(x=0;x<numRead;x++) {
+					for (x = 0; x < numRead; x++) {
 						notifEl.setAttribute('data-nid', data.read[x].nid);
 						notifEl.className = '';
 						notifEl.innerHTML = '<a href="' + data.read[x].path + '"><span class="pull-right">' + utils.relativeTime(data.read[x].datetime, true) + '</span>' + data.read[x].text + '</a>';
@@ -133,10 +135,16 @@
 
 	notifList.addEventListener('click', function(e) {
 		var target;
-		switch(e.target.nodeName) {
-			case 'SPAN': target = e.target.parentNode.parentNode; break;
-			case 'A': target = e.target.parentNode; break;
-			case 'li': target = e.target; break;
+		switch (e.target.nodeName) {
+			case 'SPAN':
+				target = e.target.parentNode.parentNode;
+				break;
+			case 'A':
+				target = e.target.parentNode;
+				break;
+			case 'li':
+				target = e.target;
+				break;
 		}
 		if (target) {
 			var nid = parseInt(target.getAttribute('data-nid'));
@@ -161,7 +169,7 @@
 
 		require(['chat'], function(chat) {
 			var modal = null;
-			if(chat.modalExists(data.fromuid)) {
+			if (chat.modalExists(data.fromuid)) {
 				modal = chat.getModal(data.fromuid);
 				chat.appendChatMessage(modal, data.message, data.timestamp);
 			} else {

public/src/forum/login.js

@@ -1,13 +1,15 @@
-
-
 (function() {
 	// Alternate Logins
 	var altLoginEl = document.querySelector('.alt-logins');
 	altLoginEl.addEventListener('click', function(e) {
 		var target;
-		switch(e.target.nodeName) {
-			case 'LI': target = e.target; break;
-			case 'I': target = e.target.parentNode; break;
+		switch (e.target.nodeName) {
+			case 'LI':
+				target = e.target;
+				break;
+			case 'I':
+				target = e.target.parentNode;
+				break;
 		}
 		if (target) {
 			document.location.href = target.getAttribute('data-url');
@@ -26,14 +28,14 @@
 			url: RELATIVE_PATH + '/login',
 			data: loginData,
 			success: function(data, textStatus, jqXHR) {
-				if(!data.success) {
+				if (!data.success) {
 					$('#login-error-notify').show();
 				} else {
 					$('#login-error-notify').hide();
 					window.location.replace(RELATIVE_PATH + "/?loggedin");
 				}
 			},
-			error : function(data, textStatus, jqXHR) {
+			error: function(data, textStatus, jqXHR) {
 				$('#login-error-notify').show();
 			},
 			dataType: 'json',

public/src/forum/recent.js

@@ -8,7 +8,8 @@
 		'event:new_post'
 	]);
 
-	var newTopicCount = 0, newPostCount = 0;
+	var newTopicCount = 0,
+		newPostCount = 0;
 
 	$('#new-topics-alert').on('click', function() {
 		$(this).hide();
@@ -24,16 +25,16 @@
 	function updateAlertText() {
 		var text = '';
 
-		if(newTopicCount > 1)
+		if (newTopicCount > 1)
 			text = 'There are ' + newTopicCount + ' new topics';
-		else if(newTopicCount === 1)
+		else if (newTopicCount === 1)
 			text = 'There is 1 new topic';
 		else
 			text = 'There are no new topics';
 
-		if(newPostCount > 1)
+		if (newPostCount > 1)
 			text += ' and ' + newPostCount + ' new posts.';
-		else if(newPostCount === 1)
+		else if (newPostCount === 1)
 			text += ' and 1 new post.';
 		else
 			text += ' and no new posts.';
@@ -50,7 +51,9 @@
 
 	function onTopicsLoaded(topics) {
 
-		var html = templates.prepare(templates['recent'].blocks['topics']).parse({ topics: topics }),
+		var html = templates.prepare(templates['recent'].blocks['topics']).parse({
+			topics: topics
+		}),
 			container = $('#topics-container');
 
 		$('#category-no-topics').remove();
@@ -60,8 +63,10 @@
 
 	function loadMoreTopics() {
 		loadingMoreTopics = true;
-		socket.emit('api:topics.loadMoreRecentTopics', {after:$('#topics-container').children().length}, function(data) {
-			if(data.topics && data.topics.length) {
+		socket.emit('api:topics.loadMoreRecentTopics', {
+			after: $('#topics-container').children().length
+		}, function(data) {
+			if (data.topics && data.topics.length) {
 				onTopicsLoaded(data.topics);
 			}
 			loadingMoreTopics = false;

public/src/forum/register.js

@@ -29,16 +29,17 @@
 	}
 
 	function validateEmail() {
-		if(!emailEl.val()) {
+		if (!emailEl.val()) {
 			validationError = true;
 			return;
 		}
 
-		if(!utils.isEmailValid(emailEl.val())) {
+		if (!utils.isEmailValid(emailEl.val())) {
 			showError(email_notify, 'Invalid email address.');
-		}
-		else
-			socket.emit('user.email.exists', { email: emailEl.val() });
+		} else
+			socket.emit('user.email.exists', {
+				email: emailEl.val()
+			});
 	}
 
 	emailEl.on('blur', function() {
@@ -46,19 +47,21 @@
 	});
 
 	function validateUsername() {
-		if(!username.val()) {
+		if (!username.val()) {
 			validationError = true;
 			return;
 		}
 
-		if(username.val().length < config.minimumUsernameLength) {
+		if (username.val().length < config.minimumUsernameLength) {
 			showError(username_notify, 'Username too short!');
-		} else if(username.val().length > config.maximumUsernameLength) {
+		} else if (username.val().length > config.maximumUsernameLength) {
 			showError(username_notify, 'Username too long!');
-		} else if(!utils.isUserNameValid(username.val())) {
+		} else if (!utils.isUserNameValid(username.val())) {
 			showError(username_notify, 'Invalid username!');
 		} else {
-			socket.emit('user.exists', {username: username.val()});
+			socket.emit('user.exists', {
+				username: username.val()
+			});
 		}
 	}
 
@@ -70,20 +73,20 @@
 	});
 
 	function validatePassword() {
-		if(!password.val()){
+		if (!password.val()) {
 			validationError = true;
 			return;
 		}
 
 		if (password.val().length < config.minimumPasswordLength) {
 			showError(password_notify, 'Password too short!');
-		} else if(!utils.isPasswordValid(password.val())) {
+		} else if (!utils.isPasswordValid(password.val())) {
 			showError(password_notify, 'Invalid password!');
 		} else {
 			showSuccess(password_notify, successIcon);
 		}
 
-		if(password.val() !== password_confirm.val() && password_confirm.val() !== '') {
+		if (password.val() !== password_confirm.val() && password_confirm.val() !== '') {
 			showError(password_confirm_notify, 'Passwords must match!');
 		}
 	}
@@ -93,11 +96,11 @@
 	});
 
 	function validatePasswordConfirm() {
-		if(!password.val() || password_notify.hasClass('alert-error')) {
+		if (!password.val() || password_notify.hasClass('alert-error')) {
 			return;
 		}
 
-		if(password.val() !== password_confirm.val()) {
+		if (password.val() !== password_confirm.val()) {
 			showError(password_confirm_notify, 'Passwords must match!');
 		} else {
 			showSuccess(password_confirm_notify, successIcon);

public/src/forum/reset.js

@@ -5,7 +5,9 @@
 
 	document.getElementById('reset').onclick = function() {
 		if (inputEl.value.length > 0 && inputEl.value.indexOf('@') !== -1) {
-			socket.emit('user:reset.send', { email: inputEl.value });
+			socket.emit('user:reset.send', {
+				email: inputEl.value
+			});
 		} else {
 			jQuery('#success').hide();
 			jQuery(errorEl).show();
@@ -26,7 +28,7 @@
 		} else {
 			jQuery('#success').hide();
 			jQuery(errorEl).show();
-			switch(data.message) {
+			switch (data.message) {
 				case 'invalid-email':
 					errorTextEl.innerHTML = 'The email you put in (<span>' + data.email + '</span>) is not registered with us. Please try again.';
 					break;

public/src/forum/reset_code.js

@@ -18,17 +18,22 @@
 			noticeEl.querySelector('p').innerHTML = 'The two passwords you\'ve entered do not match.';
 			noticeEl.style.display = 'block';
 		} else {
-			socket.emit('user:reset.commit', { code: reset_code, password: password.value });
+			socket.emit('user:reset.commit', {
+				code: reset_code,
+				password: password.value
+			});
 		}
 	}, false);
 
 	// Enable the form if the code is valid
-	socket.emit('user:reset.valid', { code: reset_code });
+	socket.emit('user:reset.valid', {
+		code: reset_code
+	});
 
 
 	ajaxify.register_events(['user:reset.valid', 'user:reset.commit']);
 	socket.on('user:reset.valid', function(data) {
-		if (!!data.valid) resetEl.disabled = false;
+		if ( !! data.valid) resetEl.disabled = false;
 		else {
 			var formEl = document.getElementById('reset-form');
 			// Show error message

public/src/forum/search.js

@@ -6,7 +6,7 @@
 		$('.search-result-text').each(function() {
 			var text = $(this).html();
 			var regex = new RegExp(searchQuery, 'gi');
-			text = text.replace(regex, '<span class="label label-success">'+searchQuery+'</span>');
+			text = text.replace(regex, '<span class="label label-success">' + searchQuery + '</span>');
 			$(this).html(text);
 		});
 

public/src/forum/topic.js

@@ -34,11 +34,15 @@
 			$('#delete_thread').on('click', function(e) {
 				if (thread_state.deleted !== '1') {
 					bootbox.confirm('Are you sure you want to delete this thread?', function(confirm) {
-						if (confirm) socket.emit('api:topic.delete', { tid: tid });
+						if (confirm) socket.emit('api:topic.delete', {
+							tid: tid
+						});
 					});
 				} else {
 					bootbox.confirm('Are you sure you want to restore this thread?', function(confirm) {
-						if (confirm) socket.emit('api:topic.restore', { tid: tid });
+						if (confirm) socket.emit('api:topic.restore', {
+							tid: tid
+						});
 					});
 				}
 				return false;
@@ -46,18 +50,26 @@
 
 			$('#lock_thread').on('click', function(e) {
 				if (thread_state.locked !== '1') {
-					socket.emit('api:topic.lock', { tid: tid });
+					socket.emit('api:topic.lock', {
+						tid: tid
+					});
 				} else {
-					socket.emit('api:topic.unlock', { tid: tid });
+					socket.emit('api:topic.unlock', {
+						tid: tid
+					});
 				}
 				return false;
 			});
 
 			$('#pin_thread').on('click', function(e) {
 				if (thread_state.pinned !== '1') {
-					socket.emit('api:topic.pin', { tid: tid });
+					socket.emit('api:topic.pin', {
+						tid: tid
+					});
 				} else {
-					socket.emit('api:topic.unpin', { tid: tid });
+					socket.emit('api:topic.unpin', {
+						tid: tid
+					});
 				}
 				return false;
 			});
@@ -85,7 +97,7 @@
 							x, info, targetCid, targetCatLabel;
 
 						categoriesEl.className = 'category-list';
-						for(x=0;x<numCategories;x++) {
+						for (x = 0; x < numCategories; x++) {
 							info = data.categories[x];
 							categoryEl.className = info.blockclass;
 							categoryEl.innerHTML = '<i class="' + info.icon + '"></i> ' + info.name;
@@ -132,7 +144,10 @@
 										});
 									}
 								});
-								socket.emit('api:topic.move', { tid: tid, cid: targetCid });
+								socket.emit('api:topic.move', {
+									tid: tid,
+									cid: targetCid
+								});
 							}
 						});
 					});
@@ -143,7 +158,7 @@
 
 		// Fix delete state for this thread's posts
 		var postEls = document.querySelectorAll('#post-container li[data-deleted]');
-		for(var x=0,numPosts=postEls.length;x<numPosts;x++) {
+		for (var x = 0, numPosts = postEls.length; x < numPosts; x++) {
 			if (postEls[x].getAttribute('data-deleted') === '1') toggle_post_delete_state(postEls[x].getAttribute('data-pid'));
 			postEls[x].removeAttribute('data-deleted');
 		}
@@ -194,7 +209,7 @@
 		});
 
 		socket.emit('api:topic.followCheck', tid);
-		if(followEl[0]) {
+		if (followEl[0]) {
 			followEl[0].addEventListener('click', function() {
 				socket.emit('api:topic.follow', tid);
 			}, false);
@@ -242,7 +257,9 @@
 					cmp.push(tid, null, null, quoted);
 				});
 			});
-			socket.emit('api:posts.getRawPost', { pid: pid });
+			socket.emit('api:posts.getRawPost', {
+				pid: pid
+			});
 		}
 	});
 
@@ -251,11 +268,16 @@
 		var uid = $(this).parents('li').attr('data-uid');
 
 		var element = $(this).find('i');
-		if(element.attr('class') == 'icon-star-empty') {
-			socket.emit('api:posts.favourite', {pid: pid, room_id: app.current_room});
-		}
-		else {
-			socket.emit('api:posts.unfavourite', {pid: pid, room_id: app.current_room});
+		if (element.attr('class') == 'icon-star-empty') {
+			socket.emit('api:posts.favourite', {
+				pid: pid,
+				room_id: app.current_room
+			});
+		} else {
+			socket.emit('api:posts.unfavourite', {
+				pid: pid,
+				room_id: app.current_room
+			});
 		}
 	});
 
@@ -276,8 +298,12 @@
 
 		if (confirmDel) {
 			deleteAction ?
-			socket.emit('api:posts.delete', { pid: pid }) :
-			socket.emit('api:posts.restore', { pid: pid });
+				socket.emit('api:posts.delete', {
+					pid: pid
+				}) :
+				socket.emit('api:posts.restore', {
+					pid: pid
+				});
 		}
 	});
 
@@ -285,7 +311,7 @@
 		var username = $(this).parents('li.row').attr('data-username');
 		var touid = $(this).parents('li.row').attr('data-uid');
 
-		if(username === app.username || !app.username)
+		if (username === app.username || !app.username)
 			return;
 
 		app.openChat(username, touid);
@@ -302,7 +328,7 @@
 
 	socket.on('api:get_users_in_room', function(data) {
 		var activeEl = $('#thread_active_users');
-		if(activeEl.length)
+		if (activeEl.length)
 			activeEl.html(data);
 
 		app.populate_online_users();
@@ -363,9 +389,9 @@
 	socket.on('event:post_edited', function(data) {
 		var editedPostEl = document.getElementById('content_' + data.pid);
 
-		var editedPostTitle = $('#topic_title_'+data.pid);
+		var editedPostTitle = $('#topic_title_' + data.pid);
 
-		if(editedPostTitle.length > 0) {
+		if (editedPostTitle.length > 0) {
 			editedPostTitle.fadeOut(250, function() {
 				editedPostTitle.html(data.title);
 				editedPostTitle.fadeIn(250);
@@ -377,17 +403,6 @@
 			$(this).fadeIn(250);
 		});
 
-		if(data.uploadedImages && data.uploadedImages.length) {
-			$('#images_'+data.pid).html('');
-			for(var i=0; i< data.uploadedImages.length; ++i) {
-				var img = $('<i class="icon-picture icon-1"></i><a href="' + data.uploadedImages[i].url +'"> '+data.uploadedImages[i].name+'</a><br/>');
-				$('#images_' + data.pid).append(img);
-			}
-		} else {
-			$('#images_'+data.pid).html('');
-		}
-
-		console.log('time to recreate images', data);
 	});
 
 	socket.on('api:posts.favourite', function(data) {
@@ -432,8 +447,8 @@
 		ptotal += value;
 		utotal += value;
 
-		post_rep.html(ptotal+ ' ');
-		user_rep.html(utotal+ ' ');
+		post_rep.html(ptotal + ' ');
+		user_rep.html(utotal + ' ');
 	}
 
 	function set_locked_state(locked, alert) {
@@ -450,7 +465,7 @@
 			lockThreadEl.innerHTML = '<i class="icon-unlock"></i> Unlock Thread';
 			threadReplyBtn.disabled = true;
 			threadReplyBtn.innerHTML = 'Locked <i class="icon-lock"></i>';
-			for(x=0;x<numPosts;x++) {
+			for (x = 0; x < numPosts; x++) {
 				postReplyBtns[x].innerHTML = 'Locked <i class="icon-lock"></i>';
 				quoteBtns[x].style.display = 'none';
 				editBtns[x].style.display = 'none';
@@ -472,7 +487,7 @@
 			lockThreadEl.innerHTML = '<i class="icon-lock"></i> Lock Thread';
 			threadReplyBtn.disabled = false;
 			threadReplyBtn.innerHTML = 'Reply';
-			for(x=0;x<numPosts;x++) {
+			for (x = 0; x < numPosts; x++) {
 				postReplyBtns[x].innerHTML = 'Reply <i class="icon-reply"></i>';
 				quoteBtns[x].style.display = 'inline-block';
 				editBtns[x].style.display = 'inline-block';
@@ -655,8 +670,7 @@
 			var height = Math.floor(el.height());
 			var elBottom = elTop + (height < 300 ? height : 300);
 
-			var inView = ((elBottom >= scrollTop) && (elTop <= scrollBottom)
-					&& (elBottom <= scrollBottom) &&  (elTop >= scrollTop));
+			var inView = ((elBottom >= scrollTop) && (elTop <= scrollBottom) && (elBottom <= scrollBottom) && (elTop >= scrollTop));
 
 
 			if (inView) {
@@ -667,7 +681,7 @@
 		});
 
 		setTimeout(function() {
-			if(scrollTop + windowHeight == jQuery(document).height()) {
+			if (scrollTop + windowHeight == jQuery(document).height()) {
 				pagination.innerHTML = postcount + ' out of ' + postcount;
 			}
 		}, 100);

public/src/forum/unread.js

@@ -8,7 +8,8 @@
 		'event:new_post'
 	]);
 
-	var newTopicCount = 0, newPostCount = 0;
+	var newTopicCount = 0,
+		newPostCount = 0;
 
 	$('#new-topics-alert').on('click', function() {
 		$(this).hide();
@@ -24,16 +25,16 @@
 	function updateAlertText() {
 		var text = '';
 
-		if(newTopicCount > 1)
+		if (newTopicCount > 1)
 			text = 'There are ' + newTopicCount + ' new topics';
-		else if(newTopicCount === 1)
+		else if (newTopicCount === 1)
 			text = 'There is 1 new topic';
 		else
 			text = 'There are no new topics';
 
-		if(newPostCount > 1)
+		if (newPostCount > 1)
 			text += ' and ' + newPostCount + ' new posts.';
-		else if(newPostCount === 1)
+		else if (newPostCount === 1)
 			text += ' and 1 new post.';
 		else
 			text += ' and no new posts.';
@@ -50,8 +51,8 @@
 
 	$('#mark-allread-btn').on('click', function() {
 		var btn = $(this);
-		socket.emit('api:topics.markAllRead', {} , function(success) {
-			if(success) {
+		socket.emit('api:topics.markAllRead', {}, function(success) {
+			if (success) {
 				btn.remove();
 				$('#topics-container').empty();
 				$('#category-no-topics').removeClass('hidden');
@@ -68,7 +69,9 @@
 
 	function onTopicsLoaded(topics) {
 
-		var html = templates.prepare(templates['unread'].blocks['topics']).parse({ topics: topics }),
+		var html = templates.prepare(templates['unread'].blocks['topics']).parse({
+			topics: topics
+		}),
 			container = $('#topics-container');
 
 		$('#category-no-topics').remove();
@@ -78,8 +81,10 @@
 
 	function loadMoreTopics() {
 		loadingMoreTopics = true;
-		socket.emit('api:topics.loadMoreUnreadTopics', {after:parseInt($('#topics-container').attr('data-next-start'), 10)}, function(data) {
-			if(data.topics && data.topics.length) {
+		socket.emit('api:topics.loadMoreUnreadTopics', {
+			after: parseInt($('#topics-container').attr('data-next-start'), 10)
+		}, function(data) {
+			if (data.topics && data.topics.length) {
 				onTopicsLoaded(data.topics);
 				$('#topics-container').attr('data-next-start', data.nextStart);
 			} else {
@@ -99,7 +104,7 @@
 	});
 
 
-	if($("body").height() <= $(window).height() && $('#topics-container').children().length >= 20)
+	if ($("body").height() <= $(window).height() && $('#topics-container').children().length >= 20)
 		$('#load-more-btn').show();
 
 	$('#load-more-btn').on('click', function() {

public/src/forum/users.js

@@ -6,7 +6,7 @@
 
 		var url = window.location.href,
 			parts = url.split('/'),
-			active = parts[parts.length-1];
+			active = parts[parts.length - 1];
 
 		var lastSearch = null;
 
@@ -20,8 +20,8 @@
 			}
 		});
 
-		jQuery('#search-user').on('keyup', function () {
-			if(timeoutId !== 0) {
+		jQuery('#search-user').on('keyup', function() {
+			if (timeoutId !== 0) {
 				clearTimeout(timeoutId);
 				timeoutId = 0;
 			}
@@ -50,7 +50,7 @@
 		socket.removeAllListeners('api:admin.user.search');
 
 		socket.on('api:admin.user.search', function(data) {
-			if(data === null) {
+			if (data === null) {
 				$('#user-notfound-notify').html('You need to be logged in to search!');
 				$('#user-notfound-notify').parent().addClass('btn-warning label-warning');
 				return;
@@ -64,12 +64,11 @@
 			userListEl.innerHTML = html;
 
 
-			if(data && data.length === 0) {
+			if (data && data.length === 0) {
 				$('#user-notfound-notify').html('User not found!');
 				$('#user-notfound-notify').parent().addClass('btn-warning label-warning');
-			}
-			else {
-				$('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!');
+			} else {
+				$('#user-notfound-notify').html(data.length + ' user' + (data.length > 1 ? 's' : '') + ' found!');
 				$('#user-notfound-notify').parent().addClass('btn-success label-success');
 			}
 
@@ -78,27 +77,29 @@
 
 
 		function onUsersLoaded(users) {
-			var html = templates.prepare(templates['users'].blocks['users']).parse({ users: users });
+			var html = templates.prepare(templates['users'].blocks['users']).parse({
+				users: users
+			});
 			$('#users-container').append(html);
 		}
 
 		function loadMoreUsers() {
 			var set = '';
-			if(active === 'users-latest' || active === 'users') {
+			if (active === 'users-latest' || active === 'users') {
 				set = 'users:joindate';
-			} else if(active === 'users-sort-posts') {
+			} else if (active === 'users-sort-posts') {
 				set = 'users:postcount';
-			} else if(active === 'users-sort-reputation') {
+			} else if (active === 'users-sort-reputation') {
 				set = 'users:reputation';
 			}
 
-			if(set) {
+			if (set) {
 				loadingMoreUsers = true;
 				socket.emit('api:users.loadMore', {
 					set: set,
 					after: $('#users-container').children().length
 				}, function(data) {
-					if(data.users.length) {
+					if (data.users.length) {
 						onUsersLoaded(data.users);
 					} else {
 						$('#load-more-users-btn').addClass('disabled');

public/src/modules/composer.js

@@ -7,29 +7,33 @@ define(['taskbar'], function(taskbar) {
 		postContainer: undefined,
 	};
 
-	function createImageLabel(img, postImages) {
-		var imageLabel = $('<span class="label label-primary">' + img.name +'</span>');
-		var closeButton = $('<button class="close">&times;</button>');
+	var uploadsInProgress = [];
 
-		closeButton.on('click', function(e) {
+	function createImagePlaceholder(img) {
+		var text = $('.post-window textarea').val(),
+			textarea = $('.post-window textarea'),
+			imgText = "!["+img.name+"](uploading...)";
 
-			imageLabel.remove();
-			var index = postImages.indexOf(img);
-			if(index !== -1) {
-				postImages.splice(index, 1);
-			}
+		text += imgText;
+		textarea.val(text + " ");
+		uploadsInProgress.push(1);
+		socket.emit("api:posts.uploadImage", img, function(err, data) {
+
+			var currentText = textarea.val();
+			imgText = "!["+data.name+"](uploading...)";
+
+			if(!err)
+				textarea.val(currentText.replace(imgText, "!["+data.name+"]("+data.url+")"));
+			else
+				textarea.val(currentText.replace(imgText, "!["+data.name+"](upload error)"));
+			uploadsInProgress.pop();
 		});
-
-		imageLabel.append(closeButton);
-		return imageLabel;
 	}
 
 	function loadFile(file) {
 		var reader = new FileReader(),
 			dropDiv = $('.post-window .imagedrop'),
-			imagelist = $('.post-window .imagelist'),
-			uuid = dropDiv.parents('[data-uuid]').attr('data-uuid'),
-			posts = composer.posts[uuid];
+			uuid = dropDiv.parents('[data-uuid]').attr('data-uuid');
 
 		$(reader).on('loadend', function(e) {
 			var bin = this.result;
@@ -40,11 +44,8 @@ define(['taskbar'], function(taskbar) {
 				data: bin
 			};
 
-			posts.images.push(img);
+			createImagePlaceholder(img);
 
-			var imageLabel = createImageLabel(img, posts.images);
-
-			imagelist.append(imageLabel);
 			dropDiv.hide();
 		});
 
@@ -89,7 +90,6 @@ define(['taskbar'], function(taskbar) {
 			drop.on('drop', function(e) {
 				e.preventDefault();
 				var uuid = drop.parents('[data-uuid]').attr('data-uuid'),
-					posts = composer.posts[uuid],
 					dt = e.dataTransfer,
 					files = dt.files;
 
@@ -121,7 +121,6 @@ define(['taskbar'], function(taskbar) {
 														'</div>' +
 													'</div>' +
 													'<textarea tabIndex="2"></textarea>' +
-													'<div class="imagelist"></div>'+
 													'<div class="imagedrop"><div>Drag and Drop Images Here</div></div>'+
 													'<div class="btn-toolbar action-bar">' +
 														'<div class="btn-group" style="float: right; margin-right: -8px">' +
@@ -151,8 +150,7 @@ define(['taskbar'], function(taskbar) {
 						cid: threadData.cid,
 						pid: threadData.pid,
 						title: threadData.title || '',
-						body: threadData.body || '',
-						images: threadData.uploadedImages || []
+						body: threadData.body || ''
 					};
 					composer.load(uuid);
 				} else {
@@ -265,18 +263,6 @@ define(['taskbar'], function(taskbar) {
 		});
 	}
 
-	function createPostImages(images) {
-		var imagelist = $(composer.postContainer).find('.imagelist');
-		imagelist.empty();
-
-		if(images && images.length) {
-			for(var i=0; i<images.length; ++i) {
-				var imageLabel = createImageLabel(images[i], images);
-				imagelist.append(imageLabel);
-			}
-		}
-	}
-
 	composer.load = function(post_uuid) {
 		var post_data = composer.posts[post_uuid],
 			titleEl = composer.postContainer.querySelector('input'),
@@ -299,7 +285,6 @@ define(['taskbar'], function(taskbar) {
 		}
 		bodyEl.value = post_data.body;
 
-		createPostImages(post_data.images);
 
 		// Direct user focus to the correct element
 		if ((parseInt(post_data.tid) || parseInt(post_data.pid)) > 0) {
@@ -334,6 +319,16 @@ define(['taskbar'], function(taskbar) {
 		titleEl.value = titleEl.value.trim();
 		bodyEl.value = bodyEl.value.trim();
 
+		if(uploadsInProgress.length) {
+			return app.alert({
+				type: 'warning',
+				timeout: 2000,
+				title: 'Still uploading',
+				message: "Please wait for uploads to complete.",
+				alert_id: 'post_error'
+			});
+		}
+
 		if (titleEl.value.length < config.minimumTitleLength) {
 			return app.alert({
 				type: 'danger',
@@ -359,21 +354,18 @@ define(['taskbar'], function(taskbar) {
 			socket.emit('api:topics.post', {
 				'title' : titleEl.value,
 				'content' : bodyEl.value,
-				'category_id' : postData.cid,
-				images: composer.posts[post_uuid].images
+				'category_id' : postData.cid
 			});
 		} else if (parseInt(postData.tid) > 0) {
 			socket.emit('api:posts.reply', {
 				'topic_id' : postData.tid,
-				'content' : bodyEl.value,
-				images: composer.posts[post_uuid].images
+				'content' : bodyEl.value
 			});
 		} else if (parseInt(postData.pid) > 0) {
 			socket.emit('api:posts.edit', {
 				pid: postData.pid,
 				content: bodyEl.value,
-				title: titleEl.value,
-				images: composer.posts[post_uuid].images
+				title: titleEl.value
 			});
 		}
 
@@ -383,7 +375,6 @@ define(['taskbar'], function(taskbar) {
 	composer.discard = function(post_uuid) {
 		if (composer.posts[post_uuid]) {
 			$(composer.postContainer).find('.imagedrop').hide();
-			$(composer.postContainer).find('.imagelist').empty();
 			delete composer.posts[post_uuid];
 			composer.minimize();
 			taskbar.discard('composer', post_uuid);

public/src/templates.js

@@ -1,6 +1,4 @@
-
-
-(function (module) {
+(function(module) {
 
 	var config = {},
 		templates,
@@ -105,7 +103,7 @@
 	templates.getTemplateNameFromUrl = function(url) {
 		var parts = url.split('?')[0].split('/');
 
-		for(var i=0; i<parts.length; ++i) {
+		for (var i = 0; i < parts.length; ++i) {
 			if (templates.is_available(parts[i])) {
 				return parts[i];
 			}
@@ -124,7 +122,7 @@
 
 		var trimmed = api_url;
 
-		if(!tpl_url) {
+		if (!tpl_url) {
 			tpl_url = templates.getTemplateNameFromUrl(api_url);
 		}
 
@@ -160,7 +158,7 @@
 
 			jQuery.get(API_URL + api_url, function(data) {
 
-				if(!data) {
+				if (!data) {
 					ajaxify.go('404');
 					return;
 				}
@@ -177,7 +175,7 @@
 		function parse_template() {
 			if (!templates[tpl_url] || !template_data) return;
 
-			if(typeof global !== "undefined")
+			if (typeof global !== "undefined")
 				template_data['relative_path'] = nconf.get('relative_path');
 			else
 				template_data['relative_path'] = RELATIVE_PATH;
@@ -187,7 +185,7 @@
 			jQuery('#content [template-variable]').each(function(index, element) {
 				var value = null;
 
-				switch(element.getAttribute('template-type')) {
+				switch (element.getAttribute('template-type')) {
 					case 'boolean':
 						value = (element.value === 'true' || element.value === '1') ? true : false;
 						break;
@@ -252,7 +250,8 @@
 			return template.replace(regex, block);
 		}
 
-		var template = this.html, regex, block;
+		var template = this.html,
+			regex, block;
 
 		return (function parse(data, namespace, template) {
 			if (!data || data.length == 0) {
@@ -267,14 +266,16 @@
 						namespace += d + '.';
 
 						var regex = makeRegex(d),
-							block = getBlock(regex, namespace.substring(0, namespace.length-1), template);
+							block = getBlock(regex, namespace.substring(0, namespace.length - 1), template);
 
 						if (block == null) {
 							namespace = namespace.replace(d + '.', '');
 							continue;
 						}
 
-						var numblocks = data[d].length - 1, i = 0, result = "";
+						var numblocks = data[d].length - 1,
+							i = 0,
+							result = "";
 
 						do {
 							result += parse(data[d][i], namespace, block);
@@ -312,7 +313,8 @@
 		templates.init();
 	}
 
-})('undefined' === typeof module ? {module:{exports:{}}} : module)
-
-
-
+})('undefined' === typeof module ? {
+	module: {
+		exports: {}
+	}
+} : module)

public/src/utils.js

@@ -1,4 +1,4 @@
-(function (module) {
+(function(module) {
 
 	var utils, fs;
 
@@ -10,7 +10,8 @@
 	module.exports = utils = {
 		generateUUID: function() {
 			return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-				var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
+				var r = Math.random() * 16 | 0,
+					v = c == 'x' ? r : (r & 0x3 | 0x8);
 				return v.toString(16);
 			});
 		},
@@ -74,7 +75,7 @@
 			// remove accents, swap ñ for n, etc
 			var from = "àáäâèéëêìíïîıòóöôùúüûñçşğ·/_,:;";
 			var to = "aaaaeeeeiiiiioooouuuuncsg------";
-			for (var i=0, l=from.length ; i<l ; i++) {
+			for (var i = 0, l = from.length; i < l; i++) {
 				str = str.replace(new RegExp(from.charAt(i), 'g'), to.charAt(i));
 			}
 
@@ -106,7 +107,7 @@
 			var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi,
 				commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
 
-			return input.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
+			return input.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
 				return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
 			});
 		},
@@ -114,10 +115,10 @@
 		buildMetaTags: function(tagsArr) {
 			var tags = '',
 				tag;
-			for(var x=0,numTags=tagsArr.length;x<numTags;x++) {
+			for (var x = 0, numTags = tagsArr.length; x < numTags; x++) {
 				if (tags.length > 0) tags += "\n\t";
 				tag = '<meta';
-				for(y in tagsArr[x]) {
+				for (y in tagsArr[x]) {
 					tag += ' ' + y + '="' + tagsArr[x][y] + '"';
 				}
 				tag += ' />';
@@ -150,8 +151,7 @@
 					badge
 						.removeClass('badge-inverse')
 						.addClass('badge-important')
-				}
-				else {
+				} else {
 					badge
 						.removeClass('badge-important')
 						.addClass('badge-inverse')
@@ -167,19 +167,27 @@
 
 
 	if (!String.prototype.trim) {
-		String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g, '');};
+		String.prototype.trim = function() {
+			return this.replace(/^\s+|\s+$/g, '');
+		};
 	}
 
 	if (!String.prototype.ltrim) {
-		String.prototype.ltrim=function(){return this.replace(/^\s+/,'');};
+		String.prototype.ltrim = function() {
+			return this.replace(/^\s+/, '');
+		};
 	}
 
 	if (!String.prototype.rtrim) {
-		String.prototype.rtrim=function(){return this.replace(/\s+$/,'');};
+		String.prototype.rtrim = function() {
+			return this.replace(/\s+$/, '');
+		};
 	}
 
 	if (!String.prototype.fulltrim) {
-		String.prototype.fulltrim=function(){return this.replace(/(?:(?:^|\n)\s+|\s+(?:$|\n))/g,'').replace(/\s+/g,' ');};
+		String.prototype.fulltrim = function() {
+			return this.replace(/(?:(?:^|\n)\s+|\s+(?:$|\n))/g, '').replace(/\s+/g, ' ');
+		};
 	}
 
 
@@ -187,4 +195,8 @@
 		window.utils = module.exports;
 	}
 
-})('undefined' === typeof module ? {module:{exports:{}}} : module)
+})('undefined' === typeof module ? {
+	module: {
+		exports: {}
+	}
+} : module)

public/templates/admin/footer.tpl

@@ -1,6 +1,9 @@
 
 		</div>
 	</div>
+
+	<div id="alert_window"></div>
+
 	<div id="footer" class="container" style="padding-top: 50px; display:none;">
 		<footer class="footer">Copyright &copy; 2013 <a target="_blank" href="http://www.nodebb.com">NodeBB</a> by <a target="_blank" href="https://github.com/psychobunny">psychobunny</a>, <a href="https://github.com/julianlam" target="_blank">julianlam</a>, <a href="https://github.com/barisusakli" target="_blank">barisusakli</a> from <a target="_blank" href="http://www.designcreateplay.com">designcreateplay</a></footer>
 	</div>

public/templates/admin/header.tpl

@@ -63,8 +63,6 @@
 		</div>
 	</div>
 
-	<div id="alert_window"></div>
-
 	<div class="container">
 		<div class="row">
 			<div class="col-md-3">

public/templates/recent.tpl

@@ -19,7 +19,7 @@
 		<a href="../../topic/{topics.slug}" id="tid-{topics.tid}">
 			<li class="category-item {topics.deleted-class}">
 				<div class="row">
-					<div class="col-md-12 topic-row img-thumbnail">
+					<div class="col-md-12 col-xs-12 topic-row img-thumbnail">
 						<div class="latest-post visible-lg visible-md">
 							<div class="pull-right">
 								<img style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" />

public/templates/topic.tpl

@@ -56,13 +56,8 @@
 						</div>
 
 						<div id="content_{main_posts.pid}" class="post-content">{main_posts.content}</div>
-						<div id="images_{main_posts.pid}" class="post-images">
-							<!-- BEGIN uploadedImages -->
-							<i class="icon-picture icon-1"></i><a href="{main_posts.uploadedImages.url}"> {main_posts.uploadedImages.name}</a><br/>
-							<!-- END uploadedImages -->
-						</div>
 						<div class="post-signature">{main_posts.signature}</div>
-						<div class="profile-block">
+						<div class="post-info">
 							<span class="pull-right">
 								posted <span class="relativeTimeAgo">{main_posts.relativeTime} ago</span>
 								<span class="{main_posts.edited-class}">| last edited by <strong><a href="/users/{main_posts.editorslug}">{main_posts.editorname}</a></strong> {main_posts.relativeEditTime} ago</span>
@@ -116,13 +111,8 @@
 						</div>
 
 						<div id="content_{posts.pid}" class="post-content">{posts.content}</div>
-						<div id="images_{posts.pid}" class="post-images">
-							<!-- BEGIN uploadedImages -->
-							<i class="icon-picture icon-1"></i><a href="{posts.uploadedImages.url}"> {posts.uploadedImages.name}</a><br/>
-							<!-- END uploadedImages -->
-						</div>
 						<div class="post-signature">{posts.signature}</div>
-						<div class="profile-block">
+						<div class="post-info">
 							<span class="pull-right">
 								posted <span class="relativeTimeAgo">{posts.relativeTime} ago</span>
 								<span class="{posts.edited-class}">| last edited by <strong><a href="/users/{posts.editorslug}">{posts.editorname}</a></strong> {posts.relativeEditTime} ago</span>

public/themes/cerulean/topic.less

@@ -35,15 +35,16 @@
 		}
 	}
 
-	.profile-block {
+	.main-post, .sub-posts {
+		.post-info {
 			background: rgba(0, 0, 0, 0.02);
 			margin: 15px -11px -11px -11px;
 			border-radius: 0 0 5px 5px;
 			font-size: 10px;
-		line-height: 15px;
-		padding: 5px 8px 5px 5px;
 			color: #777;
 		}
+	}
+
 
 	.active-users {
 		color: rgb(153,153,153);

public/themes/vanilla/footer.less

@@ -1,4 +1,5 @@
 .footer {
+	display: none;
 	text-align: center;
 
 	&.footer-stats {

public/themes/vanilla/topic.less

@@ -42,10 +42,10 @@
 	}
 
 	.main-post, .sub-posts {
-		.profile-block, .post-block {
+		.post-info, .post-block {
 			position: relative;
 			border: 1px solid rgba(0, 0, 0, 0.06);
-			border-radius: 5px;
+			border-radius: 0 0 5px 5px;
 			padding: 10px;
 
 			.post-signature {
@@ -64,6 +64,8 @@
 		}
 
 		.post-block {
+			border-radius: 5px;
+
 			.topic-buttons {
 				background: rgba(0, 0, 0, 0.02);
 				border: 1px solid rgba(0, 0, 0, 0.06);

src/admin/user.js

@@ -7,7 +7,7 @@ var	RDB = require('../redis'),
 
 	UserAdmin.makeAdmin = function(uid, theirid, socket) {
 		user.isAdministrator(uid, function(isAdmin) {
-			if(isAdmin) {
+			if (isAdmin) {
 				Groups.getGidFromName('Administrators', function(err, gid) {
 					Groups.join(gid, theirid, function(err) {
 						if (!err) {
@@ -35,7 +35,7 @@ var	RDB = require('../redis'),
 
 	UserAdmin.removeAdmin = function(uid, theirid, socket) {
 		user.isAdministrator(uid, function(isAdmin) {
-			if(isAdmin) {
+			if (isAdmin) {
 				Groups.getGidFromName('Administrators', function(err, gid) {
 					Groups.leave(gid, theirid, function(err) {
 						if (!err) {
@@ -57,7 +57,7 @@ var	RDB = require('../redis'),
 	UserAdmin.deleteUser = function(uid, theirid, socket) {
 		user.isAdministrator(uid, function(amIAdmin) {
 			user.isAdministrator(theirid, function(areTheyAdmin) {
-				if(amIAdmin && !areTheyAdmin) {
+				if (amIAdmin && !areTheyAdmin) {
 					user.delete(theirid, function(data) {
 
 						socket.emit('event:alert', {
@@ -75,7 +75,7 @@ var	RDB = require('../redis'),
 	UserAdmin.banUser = function(uid, theirid, socket) {
 		user.isAdministrator(uid, function(amIAdmin) {
 			user.isAdministrator(theirid, function(areTheyAdmin) {
-				if(amIAdmin && !areTheyAdmin) {
+				if (amIAdmin && !areTheyAdmin) {
 					user.ban(theirid, function(err, result) {
 
 						socket.emit('event:alert', {
@@ -92,7 +92,7 @@ var	RDB = require('../redis'),
 
 	UserAdmin.unbanUser = function(uid, theirid, socket) {
 		user.isAdministrator(uid, function(amIAdmin) {
-			if(amIAdmin) {
+			if (amIAdmin) {
 				user.unban(theirid, function(err, result) {
 					socket.emit('event:alert', {
 						title: 'User Unbanned',
@@ -106,4 +106,3 @@ var	RDB = require('../redis'),
 	};
 
 }(exports));
-

src/categories.js

@@ -10,7 +10,7 @@ var	RDB = require('./redis.js'),
 
 	Categories.create = function(data, callback) {
 		RDB.incr('global:next_category_id', function(err, cid) {
-			if(err)
+			if (err)
 				return callback(err, null);
 
 			var slug = cid + '/' + utils.slugify(data.name);
@@ -57,16 +57,16 @@ var	RDB = require('./redis.js'),
 					active_users = results[1];
 
 				var categoryData = {
-					'category_name' : category_name,
+					'category_name': category_name,
 					'category_description': category_description,
 					'disabled': disabled,
-					'show_sidebar' : 'show',
+					'show_sidebar': 'show',
 					'show_topic_button': 'inline-block',
 					'no_topics_message': 'hidden',
 					'topic_row_size': 'col-md-9',
 					'category_id': category_id,
 					'active_users': [],
-					'topics' : [],
+					'topics': [],
 					'twitter-intent-url': 'https://twitter.com/intent/tweet?url=' + encodeURIComponent(nconf.get('url') + 'category/' + category_slug) + '&text=' + encodeURIComponent(category_name),
 					'facebook-share-url': 'https://www.facebook.com/sharer/sharer.php?u=' + encodeURIComponent(nconf.get('url') + 'category/' + category_slug),
 					'google-share-url': 'https://plus.google.com/share?url=' + encodeURIComponent(nconf.get('url') + 'category/' + category_slug)
@@ -102,7 +102,7 @@ var	RDB = require('./redis.js'),
 						categoryData.moderator_block_class = results[1].length > 0 ? '' : 'none';
 						categoryData.moderators = results[1];
 						categoryData.active_users = results[2];
-						categoryData.show_sidebar = categoryData.topics.length > 0 ? 'show':'hidden';
+						categoryData.show_sidebar = categoryData.topics.length > 0 ? 'show' : 'hidden';
 						callback(null, categoryData);
 					});
 				}
@@ -136,8 +136,8 @@ var	RDB = require('./redis.js'),
 
 	Categories.getModerators = function(cid, callback) {
 		RDB.smembers('cid:' + cid + ':moderators', function(err, mods) {
-			if(!err) {
-				if(mods && mods.length) {
+			if (!err) {
+				if (mods && mods.length) {
 					user.getMultipleUserFields(mods, ['username'], function(err, moderators) {
 						callback(err, moderators);
 					});
@@ -179,8 +179,8 @@ var	RDB = require('./redis.js'),
 			topics.hasReadTopics(tids, uid, function(hasRead) {
 
 				var allread = true;
-				for (var i=0, ii=tids.length; i<ii; i++) {
-					if(hasRead[i] === 0) {
+				for (var i = 0, ii = tids.length; i < ii; i++) {
+					if (hasRead[i] === 0) {
 						allread = false;
 						break;
 					}
@@ -197,7 +197,7 @@ var	RDB = require('./redis.js'),
 	Categories.hasReadCategories = function(cids, uid, callback) {
 		var batch = RDB.multi();
 
-		for (var i=0, ii=cids.length; i<ii; i++) {
+		for (var i = 0, ii = cids.length; i < ii; i++) {
 			batch.sismember('cid:' + cids[i] + ':read_by_uid', uid);
 		}
 
@@ -215,9 +215,9 @@ var	RDB = require('./redis.js'),
 	};
 
 	Categories.getRecentReplies = function(cid, count, callback) {
-		RDB.zrevrange('categories:recent_posts:cid:' + cid, 0, (count<10)?10:count, function(err, pids) {
+		RDB.zrevrange('categories:recent_posts:cid:' + cid, 0, (count < 10) ? 10 : count, function(err, pids) {
 
-			if(err) {
+			if (err) {
 				winston.err(err);
 				callback([]);
 				return;
@@ -229,7 +229,7 @@ var	RDB = require('./redis.js'),
 			}
 
 			posts.getPostSummaryByPids(pids, function(err, postData) {
-				if(postData.length > count) {
+				if (postData.length > count) {
 					postData = postData.slice(0, count);
 				}
 				callback(postData);
@@ -246,9 +246,9 @@ var	RDB = require('./redis.js'),
 		}
 
 		topics.getPids(tid, function(err, pids) {
-			if(!err) {
+			if (!err) {
 				async.each(pids, movePost, function(err) {
-					if(!err) {
+					if (!err) {
 						callback(null, 1);
 					} else {
 						winston.err(err);
@@ -267,15 +267,15 @@ var	RDB = require('./redis.js'),
 			Categories.addActiveUser(cid, uid);
 			Categories.isUserActiveIn(oldCid, uid, function(err, active) {
 
-				if(!err && !active) {
+				if (!err && !active) {
 					Categories.removeActiveUser(oldCid, uid);
 				}
 			});
 		}
 
 		topics.getUids(tid, function(err, uids) {
-			if(!err && uids) {
-				for(var i=0; i<uids.length; ++i) {
+			if (!err && uids) {
+				for (var i = 0; i < uids.length; ++i) {
 					updateUser(uids[i]);
 				}
 			}
@@ -295,7 +295,7 @@ var	RDB = require('./redis.js'),
 
 	Categories.getCategoryFields = function(cid, fields, callback) {
 		RDB.hmgetObject('category:' + cid, fields, function(err, data) {
-			if(err === null)
+			if (err === null)
 				callback(data);
 			else
 				winston.err(err);
@@ -312,7 +312,9 @@ var	RDB = require('./redis.js'),
 
 	Categories.getCategories = function(cids, callback, current_user) {
 		if (!cids || !Array.isArray(cids) || cids.length === 0) {
-			callback({'categories' : []});
+			callback({
+				'categories': []
+			});
 			return;
 		}
 
@@ -321,7 +323,7 @@ var	RDB = require('./redis.js'),
 		function getCategory(cid, callback) {
 			Categories.getCategoryData(cid, function(err, categoryData) {
 
-				if(err) {
+				if (err) {
 					callback(err);
 					return;
 				}
@@ -331,18 +333,20 @@ var	RDB = require('./redis.js'),
 
 					categories.push(categoryData);
 					callback(null);
-				}) ;
+				});
 			});
 		}
 
 		async.eachSeries(cids, getCategory, function(err) {
-			if(err) {
+			if (err) {
 				winston.err(err);
 				callback(null);
 				return;
 			}
 
-			callback({'categories': categories});
+			callback({
+				'categories': categories
+			});
 		});
 
 	};
@@ -350,14 +354,14 @@ var	RDB = require('./redis.js'),
 	Categories.isUserActiveIn = function(cid, uid, callback) {
 
 		RDB.lrange('uid:' + uid + ':posts', 0, -1, function(err, pids) {
-			if(err)
+			if (err)
 				return callback(err, null);
 
 			function getPostCategory(pid, callback) {
 				posts.getPostField(pid, 'tid', function(tid) {
 
 					topics.getTopicField(tid, 'cid', function(err, postCid) {
-						if(err)
+						if (err)
 							return callback(err, null);
 
 						return callback(null, postCid);
@@ -374,16 +378,16 @@ var	RDB = require('./redis.js'),
 				},
 				function(callback) {
 					getPostCategory(pids[index], function(err, postCid) {
-						if(err)
+						if (err)
 							return callback(err);
-						if(postCid === cid)
+						if (postCid === cid)
 							active = true;
 						++index;
 						callback(null);
 					});
 				},
 				function(err) {
-					if(err)
+					if (err)
 						return callback(err, null);
 
 					callback(null, active);

src/favourites.js

@@ -32,7 +32,10 @@ var	RDB = require('./redis.js'),
 					}
 
 					if (room_id) {
-						io.sockets.in(room_id).emit('event:rep_up', {uid: uid !== postData.uid ? postData.uid : 0, pid: pid});
+						io.sockets. in (room_id).emit('event:rep_up', {
+							uid: uid !== postData.uid ? postData.uid : 0,
+							pid: pid
+						});
 					}
 
 					socket.emit('api:posts.favourite', {
@@ -71,7 +74,10 @@ var	RDB = require('./redis.js'),
 					}
 
 					if (room_id) {
-						io.sockets.in(room_id).emit('event:rep_down', {uid: uid !== uid_of_poster ? uid_of_poster : 0, pid: pid});
+						io.sockets. in (room_id).emit('event:rep_down', {
+							uid: uid !== uid_of_poster ? uid_of_poster : 0,
+							pid: pid
+						});
 					}
 
 					socket.emit('api:posts.unfavourite', {
@@ -95,12 +101,12 @@ var	RDB = require('./redis.js'),
 		var loaded = 0;
 		var data = {};
 
-		for (var i=0, ii=pids.length; i<ii; i++) {
+		for (var i = 0, ii = pids.length; i < ii; i++) {
 			(function(post_id) {
 				Favourites.hasFavourited(post_id, uid, function(hasFavourited) {
 
 					data[post_id] = hasFavourited;
-					loaded ++;
+					loaded++;
 					if (loaded === pids.length)
 						callback(data);
 				});

src/feed.js

@@ -17,8 +17,8 @@
 	Feed.saveFeed = function(location, feed, callback) {
 		var savePath = path.join(__dirname, '../', location);
 
-		fs.writeFile(savePath, feed.xml(), function (err) {
-			if(err) return winston.err(err);
+		fs.writeFile(savePath, feed.xml(), function(err) {
+			if (err) return winston.err(err);
 
 			if (callback) callback(err);
 		});

src/imgur.js

@@ -1,5 +1,3 @@
-
-
 var request = require('request');
 
 
@@ -15,14 +13,17 @@ var request = require('request');
 		};
 
 		var post = request.post(options, function(err, req, body) {
-			try{
+			try {
 				callback(err, JSON.parse(body));
-			} catch(e) {
+			} catch (e) {
 				callback(err, body);
 			}
 		});
 
-		var upload = post.form({type:type, image:image});
+		var upload = post.form({
+			type: type,
+			image: image
+		});
 	}
 
 	imgur.setClientID = function(id) {
@@ -30,4 +31,3 @@ var request = require('request');
 	}
 
 }(exports));
-

src/install.js

@@ -8,46 +8,38 @@ var	async = require('async'),
 	reds = require('reds'),
 
 	install = {
-		questions: [
-			{
+		questions: [{
 			name: 'base_url',
 			description: 'URL of this installation',
 			'default': 'http://localhost',
 			pattern: /^http(?:s)?:\/\//,
 			message: 'Base URL must begin with \'http://\' or \'https://\'',
-			},
-			{
+		}, {
 			name: 'port',
 			description: 'Port number of your NodeBB',
 			'default': 4567
-			},
-			{
+		}, {
 			name: 'use_port',
 			description: 'Use a port number to access NodeBB?',
 			'default': 'y',
 			pattern: /y[es]*|n[o]?/,
 			message: 'Please enter \'yes\' or \'no\'',
-			},
-			{
+		}, {
 			name: 'secret',
 			description: 'Please enter a NodeBB secret',
 			'default': utils.generateUUID()
-			},
-			{
+		}, {
 			name: 'redis:host',
 			description: 'Host IP or address of your Redis instance',
 			'default': '127.0.0.1'
-			},
-			{
+		}, {
 			name: 'redis:port',
 			description: 'Host port of your Redis instance',
 			'default': 6379
-			},
-			{
+		}, {
 			name: 'redis:password',
 			description: 'Password of your Redis database'
-			}
-		],
+		}],
 		setup: function(callback) {
 			async.series([
 				function(next) {
@@ -97,15 +89,28 @@ var	async = require('async'),
 					// Applying default database configs
 					winston.info('Populating database with default configs, if not already set...')
 					var meta = require('./meta'),
-						defaults = [
-							{ field: 'postDelay', value: 10000 },
-							{ field: 'minimumPostLength', value: 8 },
-							{ field: 'minimumTitleLength', value: 3 },
-							{ field: 'minimumUsernameLength', value: 2 },
-							{ field: 'maximumUsernameLength', value: 16 },
-							{ field: 'minimumPasswordLength', value: 6 },
-							{ field: 'imgurClientID', value: '' }
-						];
+						defaults = [{
+							field: 'postDelay',
+							value: 10000
+						}, {
+							field: 'minimumPostLength',
+							value: 8
+						}, {
+							field: 'minimumTitleLength',
+							value: 3
+						}, {
+							field: 'minimumUsernameLength',
+							value: 2
+						}, {
+							field: 'maximumUsernameLength',
+							value: 16
+						}, {
+							field: 'minimumPasswordLength',
+							value: 6
+						}, {
+							field: 'imgurClientID',
+							value: ''
+						}];
 
 					async.each(defaults, function(configObj, next) {
 						meta.configs.setOnEmpty(configObj.field, configObj.value, next);
@@ -189,27 +194,23 @@ var	async = require('async'),
 				Groups = require('./groups');
 
 			winston.warn('No administrators have been detected, running initial user setup');
-			var	questions = [
-					{
+			var questions = [{
 				name: 'username',
 				description: 'Administrator username',
 				required: true,
 				type: 'string'
-					},
-					{
+			}, {
 				name: 'email',
 				description: 'Administrator email address',
 				pattern: /.+@.+/,
 				required: true
-					},
-					{
+			}, {
 				name: 'password',
 				description: 'Password',
 				required: true,
 				hidden: true,
 				type: 'string'
-					}
-				],
+			}],
 				getAdminInfo = function(callback) {
 					prompt.get(questions, function(err, results) {
 						if (!results) return callback(new Error('aborted'));
@@ -251,7 +252,9 @@ var	async = require('async'),
 			], function(err) {
 				winston.info('Configuration Saved OK');
 
-				nconf.file({ file: path.join(__dirname, '..', 'config.json') });
+				nconf.file({
+					file: path.join(__dirname, '..', 'config.json')
+				});
 
 				var RDB = require('./redis');
 				reds.createClient = function() {

src/login.js

@@ -1,11 +1,10 @@
-
 var user = require('./user.js'),
 	bcrypt = require('bcrypt'),
 	RDB = require('./redis.js'),
 	path = require('path'),
 	winston = require('winston');
 
-(function(Login){
+(function(Login) {
 
 	Login.loginViaLocal = function(username, password, next) {
 		if (!username || !password) {
@@ -24,9 +23,9 @@ var user = require('./user.js'),
 				}
 
 				user.getUserFields(uid, ['password', 'banned'], function(err, userData) {
-					if(err) return next(err);
+					if (err) return next(err);
 
-					if(userData.banned && userData.banned === '1') {
+					if (userData.banned && userData.banned === '1') {
 						return next({
 							status: "error",
 							message: "user-banned"
@@ -34,14 +33,18 @@ var user = require('./user.js'),
 					}
 
 					bcrypt.compare(password, userData.password, function(err, res) {
-						if(err) {
+						if (err) {
 							winston.err(err.message);
 							next(new Error('bcrypt compare error'));
 							return;
 						}
 
 						if (res) {
-							next(null, { user: { uid: uid } });
+							next(null, {
+								user: {
+									uid: uid
+								}
+							});
 						} else {
 							next(new Error('invalid-password'));
 						}
@@ -158,4 +161,3 @@ var user = require('./user.js'),
 	}
 
 }(exports));
-

src/messaging.js

@@ -1,4 +1,3 @@
-
 var RDB = require('./redis'),
 	async = require('async');
 
@@ -15,7 +14,7 @@ var RDB = require('./redis'),
 		var uids = sortUids(fromuid, touid);
 
 		RDB.incr('global:next_message_id', function(err, mid) {
-			if(err)
+			if (err)
 				return callback(err, null);
 
 			var message = {
@@ -36,10 +35,10 @@ var RDB = require('./redis'),
 		var uids = sortUids(fromuid, touid);
 
 		RDB.lrange('messages:' + uids[0] + ':' + uids[1], 0, -1, function(err, mids) {
-			if(err)
+			if (err)
 				return callback(err, null);
 
-			if(!mids || !mids.length) {
+			if (!mids || !mids.length) {
 				return callback(null, []);
 			}
 
@@ -50,10 +49,10 @@ var RDB = require('./redis'),
 
 				function getMessage(mid, next) {
 					RDB.hgetall('message:' + mid, function(err, message) {
-						if(err)
+						if (err)
 							return next(err);
 
-						if(message.fromuid === fromuid)
+						if (message.fromuid === fromuid)
 							message.content = 'You : ' + message.content;
 						else
 							message.content = tousername + ' : ' + message.content;
@@ -64,7 +63,7 @@ var RDB = require('./redis'),
 				}
 
 				async.eachSeries(mids, getMessage, function(err) {
-					if(err)
+					if (err)
 						return callback(err, null);
 
 					callback(null, messages);

src/meta.js

@@ -35,7 +35,7 @@ var utils = require('./../public/src/utils.js'),
 		},
 		set: function(field, value, callback) {
 			RDB.hset('config', field, value, function(err, res) {
-				if(callback)
+				if (callback)
 					callback(err, res);
 			});
 		},
@@ -130,4 +130,3 @@ var utils = require('./../public/src/utils.js'),
 
 
 }(exports));
-

src/notifications.js

@@ -47,13 +47,13 @@ var	RDB = require('./redis.js'),
 				x;
 
 			notifications.get(nid, function(notif_data) {
-				for(x=0;x<numUids;x++) {
+				for (x = 0; x < numUids; x++) {
 					if (parseInt(uids[x]) > 0) {
 						(function(uid) {
 							notifications.remove_by_uniqueId(notif_data.uniqueId, uid, function() {
 								RDB.zadd('uid:' + uid + ':notifications:unread', notif_data.score, nid);
 								RDB.set('uid:' + uid + ':notifications:flag', 1);
-								global.io.sockets.in('uid_' + uid).emit('event:new_notification');
+								global.io.sockets. in ('uid_' + uid).emit('event:new_notification');
 								if (callback) callback(true);
 							});
 						})(uids[x]);

src/plugins.js

@@ -126,7 +126,7 @@ var	fs = require('fs'),
 				if (!data.priority) data.priority = 10;
 
 				_self.loadedHooks[data.hook] = _self.loadedHooks[data.hook] || [];
-				_self.loadedHooks[data.hook].push([id, data.method, !!data.callbacked, data.priority]);
+				_self.loadedHooks[data.hook].push([id, data.method, !! data.callbacked, data.priority]);
 
 				if (global.env === 'development') winston.info('[plugins] Hook registered: ' + data.hook + ' will call ' + id);
 				callback();
@@ -139,7 +139,7 @@ var	fs = require('fs'),
 			if (hookList && Array.isArray(hookList)) {
 				if (global.env === 'development') winston.info('[plugins] Firing hook: \'' + hook + '\'');
 				var hookType = hook.split(':')[0];
-				switch(hookType) {
+				switch (hookType) {
 					case 'filter':
 						// Filters only take one argument, so only args[0] will be passed in
 						var returnVal = (Array.isArray(args) ? args[0] : args);
@@ -242,7 +242,7 @@ var	fs = require('fs'),
 							return path.join(npmPluginPath, file);
 						}).filter(function(file) {
 							var stats = fs.statSync(file);
-							if (stats.isDirectory() && file.substr(npmPluginPath.length+1, 14) === 'nodebb-plugin-') return true;
+							if (stats.isDirectory() && file.substr(npmPluginPath.length + 1, 14) === 'nodebb-plugin-') return true;
 							else return false;
 						});
 

src/postTools.js

@@ -56,7 +56,8 @@ var	RDB = require('./redis.js'),
 		});
 	}
 
-	PostTools.edit = function(uid, pid, title, content, images) {
+
+	PostTools.edit = function(uid, pid, title, content) {
 		var	success = function() {
 			posts.setPostField(pid, 'content', content);
 			posts.setPostField(pid, 'edited', Date.now());
@@ -67,11 +68,6 @@ var	RDB = require('./redis.js'),
 			});
 
 			async.parallel([
-				function(next) {
-					posts.uploadPostImages(pid, images, function(err, uploadedImages) {
-						next(err, uploadedImages);
-					});
-				},
 				function(next) {
 					posts.getPostField(pid, 'tid', function(tid) {
 						PostTools.isMain(pid, tid, function(isMainPost) {
@@ -82,7 +78,10 @@ var	RDB = require('./redis.js'),
 								});
 							}
 
-							next(null, {tid:tid, isMainPost:isMainPost});
+							next(null, {
+								tid: tid,
+								isMainPost: isMainPost
+							});
 						});
 					});
 				},
@@ -90,12 +89,12 @@ var	RDB = require('./redis.js'),
 					PostTools.toHTML(content, next);
 				}
 			], function(err, results) {
-				io.sockets.in('topic_' + results[1].tid).emit('event:post_edited', {
+				io.sockets.in('topic_' + results[0].tid).emit('event:post_edited', {
 					pid: pid,
 					title: title,
-					isMainPost: results[1].isMainPost,
-					content: results[2],
-					uploadedImages:results[0]
+					isMainPost: results[0].isMainPost,
+					content: results[1]
+
 				});
 			});
 		};
@@ -117,13 +116,13 @@ var	RDB = require('./redis.js'),
 			postSearch.remove(pid);
 
 			posts.getPostFields(pid, ['tid', 'uid'], function(postData) {
-				RDB.hincrby('topic:'+postData.tid, 'postcount', -1);
+				RDB.hincrby('topic:' + postData.tid, 'postcount', -1);
 
 				user.decrementUserFieldBy(postData.uid, 'postcount', 1, function(err, postcount) {
 					RDB.zadd('users:postcount', postcount, postData.uid);
 				});
 
-				io.sockets.in('topic_' + postData.tid).emit('event:post_deleted', {
+				io.sockets. in ('topic_' + postData.tid).emit('event:post_deleted', {
 					pid: pid
 				});
 
@@ -156,11 +155,11 @@ var	RDB = require('./redis.js'),
 			posts.setPostField(pid, 'deleted', 0);
 
 			posts.getPostFields(pid, ['tid', 'uid', 'content'], function(postData) {
-					RDB.hincrby('topic:'+postData.tid, 'postcount', 1);
+				RDB.hincrby('topic:' + postData.tid, 'postcount', 1);
 
 				user.incrementUserFieldBy(postData.uid, 'postcount', 1);
 
-					io.sockets.in('topic_' + postData.tid).emit('event:post_restored', {
+				io.sockets. in ('topic_' + postData.tid).emit('event:post_restored', {
 					pid: pid
 				});
 

src/posts.js

@@ -34,7 +34,7 @@ var	RDB = require('./redis.js'),
 
 	Posts.addUserInfoToPost = function(post, callback) {
 		user.getUserFields(post.uid, ['username', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned'], function(err, userData) {
-			if(err) return callback();
+			if (err) return callback();
 
 			postTools.toHTML(userData.signature, function(err, signature) {
 				post.username = userData.username || 'anonymous';
@@ -42,12 +42,12 @@ var	RDB = require('./redis.js'),
 				post.user_rep = userData.reputation || 0;
 				post.user_postcount = userData.postcount || 0;
 				post.user_banned = userData.banned || '0';
-				post.picture = userData.picture || require('gravatar').url('', {}, https=nconf.get('https'));
+				post.picture = userData.picture || require('gravatar').url('', {}, https = nconf.get('https'));
 				post.signature = signature;
 
-				if(post.editor !== '') {
+				if (post.editor !== '') {
 					user.getUserFields(post.editor, ['username', 'userslug'], function(err, editorData) {
-						if(err) return callback();
+						if (err) return callback();
 
 						post.editorname = editorData.username;
 						post.editorslug = editorData.userslug;
@@ -104,7 +104,7 @@ var	RDB = require('./redis.js'),
 		}
 
 		async.eachSeries(pids, getPostSummary, function(err) {
-			if(!err) {
+			if (!err) {
 				callback(null, posts);
 			} else {
 				callback(err, null);
@@ -120,22 +120,20 @@ var	RDB = require('./redis.js'),
 
 	Posts.getPostData = function(pid, callback) {
 		RDB.hgetall('post:' + pid, function(err, data) {
-			if(err === null) {
+			if (err === null) {
 				plugins.fireHook('filter:post.get', data, function(data) {
 					callback(data);
 				});
-			}
-			else
+			} else
 				console.log(err);
 		});
 	}
 
 	Posts.getPostFields = function(pid, fields, callback) {
 		RDB.hmgetObject('post:' + pid, fields, function(err, data) {
-			if(err === null) {
+			if (err === null) {
 				callback(data);
-			}
-			else {
+			} else {
 				console.log(err);
 			}
 		});
@@ -143,7 +141,7 @@ var	RDB = require('./redis.js'),
 
 	Posts.getPostField = function(pid, field, callback) {
 		RDB.hget('post:' + pid, field, function(err, data) {
-			if(err === null)
+			if (err === null)
 				callback(data);
 			else
 				console.log(err);
@@ -158,25 +156,14 @@ var	RDB = require('./redis.js'),
 	Posts.getPostsByPids = function(pids, callback) {
 		var posts = [];
 
-		async.eachSeries(pids, function (pid, callback) {
+		async.eachSeries(pids, function(pid, callback) {
 			Posts.getPostData(pid, function(postData) {
-				if(postData) {
+				if (postData) {
 					postData.relativeTime = utils.relativeTime(postData.timestamp);
 					postData.post_rep = postData.reputation;
 					postData['edited-class'] = postData.editor !== '' ? '' : 'none';
 					postData['relativeEditTime'] = postData.edited !== '0' ? utils.relativeTime(postData.edited) : '';
 
-					if(postData.uploadedImages) {
-						try {
-							postData.uploadedImages = JSON.parse(postData.uploadedImages);
-						} catch(err) {
-							postData.uploadedImages = [];
-							winston.err(err);
-						}
-					} else {
-						postData.uploadedImages = [];
-					}
-
 					postTools.toHTML(postData.content, function(err, content) {
 						postData.content = content;
 						posts.push(postData);
@@ -185,7 +172,7 @@ var	RDB = require('./redis.js'),
 				}
 			});
 		}, function(err) {
-			if(!err) {
+			if (!err) {
 				callback(null, posts);
 			} else {
 				callback(err, null);
@@ -220,13 +207,13 @@ var	RDB = require('./redis.js'),
 	Posts.emitTooManyPostsAlert = function(socket) {
 		socket.emit('event:alert', {
 			title: 'Too many posts!',
-			message: 'You can only post every '+ meta.config.postDelay/1000 + ' seconds.',
+			message: 'You can only post every ' + meta.config.postDelay / 1000 + ' seconds.',
 			type: 'danger',
 			timeout: 2000
 		});
 	}
 
-	Posts.reply = function(tid, uid, content, images, callback) {
+	Posts.reply = function(tid, uid, content, callback) {
 		if(content) {
 			content = content.trim();
 		}
@@ -237,12 +224,12 @@ var	RDB = require('./redis.js'),
 		}
 
 		user.getUserField(uid, 'lastposttime', function(lastposttime) {
-			if(Date.now() - lastposttime < meta.config.postDelay) {
+			if (Date.now() - lastposttime < meta.config.postDelay) {
 				callback(new Error('too-many-posts'), null);
 				return;
 			}
 
-			Posts.create(uid, tid, content, images, function(postData) {
+			Posts.create(uid, tid, content, function(postData) {
 				if (postData) {
 
 					topics.markUnRead(tid);
@@ -256,10 +243,12 @@ var	RDB = require('./redis.js'),
 					threadTools.notify_followers(tid, uid);
 
 					Posts.addUserInfoToPost(postData, function() {
-						var	socketData = { posts: [postData] };
-						io.sockets.in('topic_' + tid).emit('event:new_post', socketData);
-						io.sockets.in('recent_posts').emit('event:new_post', socketData);
-						io.sockets.in('users/' + uid).emit('event:new_post', socketData);
+						var socketData = {
+							posts: [postData]
+						};
+						io.sockets. in ('topic_' + tid).emit('event:new_post', socketData);
+						io.sockets. in ('recent_posts').emit('event:new_post', socketData);
+						io.sockets. in ('users/' + uid).emit('event:new_post', socketData);
 					});
 
 					callback(null, 'Reply successful');
@@ -270,7 +259,7 @@ var	RDB = require('./redis.js'),
 		});
 	};
 
-	Posts.create = function(uid, tid, content, images, callback) {
+	Posts.create = function(uid, tid, content, callback) {
 		if (uid === null) {
 			callback(null);
 			return;
@@ -293,7 +282,6 @@ var	RDB = require('./redis.js'),
 								'editor': '',
 								'edited': 0,
 								'deleted': 0,
-								'uploadedImages': '[]',
 								'fav_button_class': '',
 								'fav_star_class': 'icon-star-empty',
 								'show_banned': 'hide',
@@ -331,16 +319,6 @@ var	RDB = require('./redis.js'),
 						user.onNewPostMade(uid, tid, pid, timestamp);
 
 						async.parallel({
-							uploadedImages: function(next) {
-								Posts.uploadPostImages(postData.pid, images, function(err, uploadedImages) {
-									if(err) {
-										winston.error('Uploading images failed!', err.stack);
-										next(null, []);
-									} else {
-										next(null, uploadedImages);
-									}
-								});
-							},
 							content: function(next) {
 								plugins.fireHook('filter:post.get', postData, function(postData) {
 									postTools.toHTML(postData.content, function(err, content) {
@@ -349,7 +327,6 @@ var	RDB = require('./redis.js'),
 								});
 							}
 						}, function(err, results) {
-							postData.uploadedImages = results.uploadedImages;
 							postData.content = results.content;
 							callback(postData);
 						});
@@ -365,72 +342,53 @@ var	RDB = require('./redis.js'),
 		});
 	}
 
-	Posts.uploadPostImages = function(pid, images, callback) {
+	Posts.uploadPostImage = function(image, callback) {
 		var imgur = require('./imgur');
 		imgur.setClientID(meta.config.imgurClientID);
 
-		if(!images)
-			return callback(null, []);
-
-		var uploadedImages = images.filter(function(image) { return !!image.url; });
-
-		function uploadImage(image, next) {
-			if(!image.data)
-				return next(null);
+		if(!image)
+			return callback('invalid image', null);
 
 		imgur.upload(image.data, 'base64', function(err, data) {
 			if(err) {
-					next(err);
+				callback('Can\'t upload image!', null);
 			} else {
 				if(data.success) {
 					var img= {url:data.data.link, name:image.name};
-						uploadedImages.push(img);
-						next(null);
+
+					callback(null, img);
 				} else {
 					winston.error('Can\'t upload image, did you set imgurClientID?');
-						next(data);
+					callback("upload error", null);
 				}
 			}
 		});
 	}
 
-		async.each(images, uploadImage, function(err) {
-			if(!err) {
-				Posts.setPostField(pid, 'uploadedImages', JSON.stringify(uploadedImages));
-				callback(null, uploadedImages);
-			} else {
-				console.log(err);
-				callback(err, null);
-			}
-		});
-	}
-
 	Posts.getPostsByUid = function(uid, start, end, callback) {
 
 		user.getPostIds(uid, start, end, function(pids) {
 
-			if(pids && pids.length) {
+			if (pids && pids.length) {
 
 				Posts.getPostsByPids(pids, function(err, posts) {
 					callback(posts);
 				});
-			}
-			else
+			} else
 				callback([]);
 		});
 	}
 
 	Posts.getTopicPostStats = function(socket) {
 		RDB.mget(['totaltopiccount', 'totalpostcount'], function(err, data) {
-			if(err === null) {
+			if (err === null) {
 				var stats = {
-					topics: data[0]?data[0]:0,
-					posts: data[1]?data[1]:0
+					topics: data[0] ? data[0] : 0,
+					posts: data[1] ? data[1] : 0
 				};
 
 				socket.emit('post.stats', stats);
-			}
-			else
+			} else
 				console.log(err);
 		});
 	}
@@ -442,7 +400,7 @@ var	RDB = require('./redis.js'),
 			Posts.getPostField(pid, 'content', function(content) {
 				postSearch.remove(pid, function() {
 
-					if(content && content.length) {
+					if (content && content.length) {
 						postSearch.index(content, pid);
 					}
 					callback(null);
@@ -451,7 +409,7 @@ var	RDB = require('./redis.js'),
 		}
 
 		async.each(pids, reIndex, function(err) {
-			if(err) {
+			if (err) {
 				callback(err, null);
 			} else {
 				callback(null, 'Posts reindexed');
@@ -461,11 +419,11 @@ var	RDB = require('./redis.js'),
 
 	Posts.getFavourites = function(uid, callback) {
 		RDB.zrevrange('uid:' + uid + ':favourites', 0, -1, function(err, pids) {
-			if(err)
+			if (err)
 				return callback(err, null);
 
 			Posts.getPostSummaryByPids(pids, function(err, posts) {
-				if(err)
+				if (err)
 					return callback(err, null);
 
 				callback(null, posts);

src/redis.js

@@ -5,7 +5,7 @@
 
 	RedisDB.exports = redis.createClient(nconf.get('redis:port'), nconf.get('redis:host'));
 
-	if(nconf.get('redis:password')) {
+	if (nconf.get('redis:password')) {
 		RedisDB.exports.auth(nconf.get('redis:password'));
 	}
 
@@ -35,18 +35,17 @@
 	/*
 	 * gets fields of a hash as an object instead of an array
 	 */
-	RedisDB.exports.hmgetObject = function (key, fields, callback) {
+	RedisDB.exports.hmgetObject = function(key, fields, callback) {
 		RedisDB.exports.hmget(key, fields, function(err, data) {
-			if(err === null) {
+			if (err === null) {
 				var returnData = {};
 
-				for(var i=0, ii=fields.length; i<ii; ++i) {
+				for (var i = 0, ii = fields.length; i < ii; ++i) {
 					returnData[fields[i]] = data[i];
 				}
 
 				callback(null, returnData);
-			}
-			else {
+			} else {
 				console.log(err);
 				callback(err, null);
 			}

src/routes/admin.js

@@ -1,4 +1,3 @@
-
 var user = require('./../user.js'),
 	Groups = require('../groups'),
 	topics = require('./../topics.js'),
@@ -18,7 +17,7 @@ var user = require('./../user.js'),
 
 	Admin.build_header = function(res) {
 		return templates['admin/header'].parse({
-			csrf:res.locals.csrf_token,
+			csrf: res.locals.csrf_token,
 			relative_path: nconf.get('relative_path')
 		});
 	}
@@ -33,7 +32,7 @@ var user = require('./../user.js'),
 				'users/search', 'plugins'
 			];
 
-			for (var i=0, ii=routes.length; i<ii; i++) {
+			for (var i = 0, ii = routes.length; i < ii; i++) {
 				(function(route) {
 					app.get('/admin/' + route, Admin.isAdmin, function(req, res) {
 						res.send(Admin.build_header(res) + app.create_route('admin/' + route) + templates['admin/footer']);
@@ -43,7 +42,7 @@ var user = require('./../user.js'),
 
 			var unit_tests = ['categories'];
 
-			for (var i=0, ii=unit_tests.length; i<ii; i++) {
+			for (var i = 0, ii = unit_tests.length; i < ii; i++) {
 				(function(route) {
 					app.get('/admin/testing/' + route, Admin.isAdmin, function(req, res) {
 						res.send(Admin.build_header(res) + app.create_route('admin/testing/' + route) + templates['admin/footer']);
@@ -62,34 +61,59 @@ var user = require('./../user.js'),
 		});
 
 		app.get('/api/admin/index', function(req, res) {
-			res.json({version:pkg.version});
+			res.json({
+				version: pkg.version
+			});
 		});
 
 		app.get('/api/admin/users/search', function(req, res) {
-			res.json({search_display: 'block', loadmore_display:'none', users: []});
+			res.json({
+				search_display: 'block',
+				loadmore_display: 'none',
+				users: []
+			});
 		});
 
 		app.get('/api/admin/users/latest', function(req, res) {
 			user.getUsers('users:joindate', 0, 49, function(err, data) {
-				res.json({ search_display: 'none', loadmore_display:'block', users:data, yourid:req.user.uid });
+				res.json({
+					search_display: 'none',
+					loadmore_display: 'block',
+					users: data,
+					yourid: req.user.uid
+				});
 			});
 		});
 
 		app.get('/api/admin/users/sort-posts', function(req, res) {
 			user.getUsers('users:postcount', 0, 49, function(err, data) {
-				res.json({ search_display: 'none', loadmore_display:'block', users:data, yourid:req.user.uid });
+				res.json({
+					search_display: 'none',
+					loadmore_display: 'block',
+					users: data,
+					yourid: req.user.uid
+				});
 			});
 		});
 
 		app.get('/api/admin/users/sort-reputation', function(req, res) {
 			user.getUsers('users:reputation', 0, 49, function(err, data) {
-				res.json({ search_display: 'none', loadmore_display:'block', users:data, yourid:req.user.uid });
+				res.json({
+					search_display: 'none',
+					loadmore_display: 'block',
+					users: data,
+					yourid: req.user.uid
+				});
 			});
 		});
 
 		app.get('/api/admin/users', function(req, res) {
 			user.getUsers('users:joindate', 0, 49, function(err, data) {
-				res.json({ search_display: 'none', users:data, yourid:req.user.uid });
+				res.json({
+					search_display: 'none',
+					users: data,
+					yourid: req.user.uid
+				});
 			});
 		});
 
@@ -130,20 +154,20 @@ var user = require('./../user.js'),
 				data = data.split("\r\n");
 				var finalData = {};
 
-				for(var i in data) {
+				for (var i in data) {
 
-					if(data[i].indexOf(':') == -1 || !data[i])
+					if (data[i].indexOf(':') == -1 || !data[i])
 						continue;
 
 					try {
-						data[i] = data[i].replace(/:/,"\":\"");
+						data[i] = data[i].replace(/:/, "\":\"");
 						var json = "{\"" + data[i] + "\"}";
 
 						var jsonObject = JSON.parse(json);
-						for(var key in jsonObject) {
+						for (var key in jsonObject) {
 							finalData[key] = jsonObject[key];
 						}
-					} catch(err){
+					} catch (err) {
 						winston.warn('can\'t parse redis status variable, ignoring', i, data[i], err);
 					}
 				}

src/routes/api.js

@@ -22,7 +22,7 @@ var user = require('./../user.js'),
 			config['postDelay'] = meta.config['postDelay'];
 			config['minimumTitleLength'] = meta.config['minimumTitleLength'];
 			config['minimumPostLength'] = meta.config['minimumPostLength'];
-			config['imgurClientIDSet'] = !!meta.config['imgurClientID'];
+			config['imgurClientIDSet'] = !! meta.config['imgurClientID'];
 			config['minimumUsernameLength'] = meta.config['minimumUsernameLength'];
 			config['maximumUsernameLength'] = meta.config['maximumUsernameLength'];
 			config['minimumPasswordLength'] = meta.config['minimumPasswordLength'];
@@ -40,7 +40,7 @@ var user = require('./../user.js'),
 				function iterator(category, callback) {
 					categories.getRecentReplies(category.cid, 2, function(posts) {
 						category["posts"] = posts;
-						category["post_count"] = posts.length>2 ? 2 : posts.length;
+						category["post_count"] = posts.length > 2 ? 2 : posts.length;
 						callback(null);
 					});
 				}
@@ -69,7 +69,7 @@ var user = require('./../user.js'),
 					'login_window:spansize': 'col-md-6',
 					'alternate_logins:display': 'block'
 				}
-				for (var i=0, ii=num_strategies; i<ii; i++) {
+				for (var i = 0, ii = num_strategies; i < ii; i++) {
 					data[login_strategies[i] + ':display'] = 'active';
 				}
 			}
@@ -94,7 +94,7 @@ var user = require('./../user.js'),
 					'register_window:spansize': 'col-md-6',
 					'alternate_logins:display': 'block'
 				}
-				for (var i=0, ii=num_strategies; i<ii; i++) {
+				for (var i = 0, ii = num_strategies; i < ii; i++) {
 					data[login_strategies[i] + ':display'] = 'active';
 				}
 			}
@@ -110,7 +110,7 @@ var user = require('./../user.js'),
 			var uid = (req.user) ? req.user.uid : 0;
 			topics.getTopicWithPosts(req.params.id, uid, 0, 10, function(err, data) {
 				if (!err) {
-					if(data.deleted === '1' && data.expose_tools === 0) {
+					if (data.deleted === '1' && data.expose_tools === 0) {
 						return res.json(404, {});
 					}
 					res.json(data);
@@ -183,11 +183,11 @@ var user = require('./../user.js'),
 
 		app.get('/api/search', function(req, res) {
 			return res.json({
-				show_no_topics:'hide',
-				show_no_posts:'hide',
-				search_query:'',
-				posts:[],
-				topics:[]
+				show_no_topics: 'hide',
+				show_no_posts: 'hide',
+				search_query: '',
+				posts: [],
+				topics: []
 			});
 		});
 
@@ -205,11 +205,11 @@ var user = require('./../user.js'),
 
 			function searchPosts(callback) {
 				search(postSearch, function(err, pids) {
-					if(err)
+					if (err)
 						return callback(err, null);
 
 					posts.getPostSummaryByPids(pids, function(err, posts) {
-						if(err)
+						if (err)
 							return callback(err, null);
 						callback(null, posts);
 					});
@@ -218,7 +218,7 @@ var user = require('./../user.js'),
 
 			function searchTopics(callback) {
 				search(topicSearch, function(err, tids) {
-					if(err)
+					if (err)
 						return callback(err, null);
 
 					topics.getTopicsByTids(tids, 0, function(topics) {
@@ -232,11 +232,11 @@ var user = require('./../user.js'),
 					return next();
 
 				return res.json({
-					show_no_topics: results[1].length? 'hide':'',
-					show_no_posts: results[0].length? 'hide':'',
-					search_query:req.params.term,
-					posts:results[0],
-					topics:results[1]
+					show_no_topics: results[1].length ? 'hide' : '',
+					show_no_posts: results[0].length ? 'hide' : '',
+					search_query: req.params.term,
+					posts: results[0],
+					topics: results[1]
 				});
 			});
 		});
@@ -246,7 +246,9 @@ var user = require('./../user.js'),
 		});
 
 		app.get('/api/reset/:code', function(req, res) {
-			res.json({ reset_code: req.params.code });
+			res.json({
+				reset_code: req.params.code
+			});
 		});
 
 		app.get('/api/404', function(req, res) {

src/routes/authentication.js

@@ -25,7 +25,9 @@
 			callbackURL: nconf.get('url') + 'auth/twitter/callback'
 		}, function(token, tokenSecret, profile, done) {
 			login_module.loginViaTwitter(profile.id, profile.username, profile.photos, function(err, user) {
-				if (err) { return done(err); }
+				if (err) {
+					return done(err);
+				}
 				done(null, user);
 			});
 		}));
@@ -40,7 +42,9 @@
 			callbackURL: nconf.get('url') + 'auth/google/callback'
 		}, function(accessToken, refreshToken, profile, done) {
 			login_module.loginViaGoogle(profile.id, profile.displayName, profile.emails[0].value, function(err, user) {
-				if (err) { return done(err); }
+				if (err) {
+					return done(err);
+				}
 				done(null, user);
 			});
 		}));
@@ -55,7 +59,9 @@
 			callbackURL: nconf.get('url') + 'auth/facebook/callback'
 		}, function(accessToken, refreshToken, profile, done) {
 			login_module.loginViaFacebook(profile.id, profile.displayName, profile.emails[0].value, function(err, user) {
-				if (err) { return done(err); }
+				if (err) {
+					return done(err);
+				}
 				done(null, user);
 			});
 		}));
@@ -90,7 +96,10 @@
 				winston.info('[Auth] Session ' + req.sessionID + ' logout (uid: ' + req.user.uid + ')');
 				login_module.logout(req.sessionID, function(logout) {
 					req.logout();
-					app.build_header({ req: req, res: res }, function(err, header) {
+					app.build_header({
+						req: req,
+						res: res
+					}, function(err, header) {
 						res.send(header + templates['logout'] + templates['footer']);
 					});
 				});
@@ -107,7 +116,9 @@
 		}
 
 		if (login_strategies.indexOf('google') !== -1) {
-			app.get('/auth/google', passport.authenticate('google', { scope: 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email' }));
+			app.get('/auth/google', passport.authenticate('google', {
+				scope: 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email'
+			}));
 
 			app.get('/auth/google/callback', passport.authenticate('google', {
 				successRedirect: '/',
@@ -116,7 +127,9 @@
 		}
 
 		if (login_strategies.indexOf('facebook') !== -1) {
-			app.get('/auth/facebook', passport.authenticate('facebook', { scope: 'email' }));
+			app.get('/auth/facebook', passport.authenticate('facebook', {
+				scope: 'email'
+			}));
 
 			app.get('/auth/facebook/callback', passport.authenticate('facebook', {
 				successRedirect: '/',
@@ -127,29 +140,41 @@
 
 
 		app.get('/reset/:code', function(req, res) {
-			app.build_header({ req: req, res: res }, function(err, header) {
-				res.send(header + app.create_route('reset/'+req.params.code) + templates['footer']);
+			app.build_header({
+				req: req,
+				res: res
+			}, function(err, header) {
+				res.send(header + app.create_route('reset/' + req.params.code) + templates['footer']);
 			});
 		});
 
 		app.get('/reset', function(req, res) {
-			app.build_header({ req: req, res: res }, function(err, header) {
+			app.build_header({
+				req: req,
+				res: res
+			}, function(err, header) {
 				res.send(header + app.create_route('reset') + templates['footer']);
 			});
 		});
 
 		app.post('/login', function(req, res, next) {
 			passport.authenticate('local', function(err, user, info) {
-				if(err) {
+				if (err) {
 					return next(err);
 				}
 				if (!user) {
-					return res.send({ success : false, message : info.message });
+					return res.send({
+						success: false,
+						message: info.message
+					});
 				}
 				req.login({
 					uid: user.uid
 				}, function() {
-					res.send({ success : true, message : 'authentication succeeded' });
+					res.send({
+						success: true,
+						message: 'authentication succeeded'
+					});
 				});
 			})(req, res, next);
 		});

src/routes/testbed.js

@@ -1,5 +1,3 @@
-
-
 (function(TestBed) {
 	TestBed.create_routes = function(app) {
 
@@ -17,7 +15,7 @@
 			function withCaching() {
 				var time = process.hrtime();
 
-				for(var n=0; n<runCount; ++n) {
+				for (var n = 0; n < runCount; ++n) {
 					for (var i = 0, len = myArray.length; i < len; ++i) {
 						f(myArray[i]);
 					}
@@ -31,7 +29,7 @@
 			function withoutCaching() {
 				var time = process.hrtime();
 
-				for(var n=0; n<runCount; ++n) {
+				for (var n = 0; n < runCount; ++n) {
 					for (var i = 0; i < myArray.length; ++i) {
 						f(myArray[i]);
 					}
@@ -45,7 +43,7 @@
 			function withForeach() {
 				var time = process.hrtime();
 
-				for(var n=0; n<runCount; ++n) {
+				for (var n = 0; n < runCount; ++n) {
 					myArray.forEach(function(index) {
 
 					});

src/routes/user.js

@@ -11,62 +11,82 @@ var user = require('./../user.js'),
 
 		app.get('/uid/:uid', function(req, res) {
 
-			if(!req.params.uid)
+			if (!req.params.uid)
 				return res.redirect('/404');
 
 			user.getUserData(req.params.uid, function(err, data) {
-				if(data) {
+				if (data) {
 					res.send(data);
 				} else {
-					res.json(404, {error:"User doesn't exist!"});
+					res.json(404, {
+						error: "User doesn't exist!"
+					});
 				}
 			});
 
 		});
 
 		app.get('/users', function(req, res) {
-			app.build_header({ req: req, res: res }, function(err, header) {
+			app.build_header({
+				req: req,
+				res: res
+			}, function(err, header) {
 				res.send(header + app.create_route("users", "users") + templates['footer']);
 			});
 		});
 
 		app.get('/users-latest', function(req, res) {
-			app.build_header({ req: req, res: res }, function(err, header) {
+			app.build_header({
+				req: req,
+				res: res
+			}, function(err, header) {
 				res.send(header + app.create_route("users-latest", "users") + templates['footer']);
 			});
 		});
 
 		app.get('/users-sort-posts', function(req, res) {
-			app.build_header({ req: req, res: res }, function(err, header) {
+			app.build_header({
+				req: req,
+				res: res
+			}, function(err, header) {
 				res.send(header + app.create_route("users-sort-posts", "users") + templates['footer']);
 			});
 		});
 
 		app.get('/users-sort-reputation', function(req, res) {
-			app.build_header({ req: req, res: res }, function(err, header) {
+			app.build_header({
+				req: req,
+				res: res
+			}, function(err, header) {
 				res.send(header + app.create_route("users-sort-reputation", "users") + templates['footer']);
 			});
 		});
 
 		app.get('/users-search', function(req, res) {
-			app.build_header({ req: req, res: res }, function(err, header) {
+			app.build_header({
+				req: req,
+				res: res
+			}, function(err, header) {
 				res.send(header + app.create_route("users-search", "users") + templates['footer']);
 			});
 		});
 
 		app.get('/users/:userslug', function(req, res, next) {
 
-			if(!req.params.userslug) {
+			if (!req.params.userslug) {
 				next();
 				return;
 			}
 
 			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
-				if(!uid) {
+				if (!uid) {
 					return next();
 				}
 
-				app.build_header({ req: req, res: res }, function(err, header) {
+				app.build_header({
+					req: req,
+					res: res
+				}, function(err, header) {
 					res.send(header + app.create_route('users/' + req.params.userslug, 'account') + templates['footer']);
 				});
 
@@ -75,13 +95,16 @@ var user = require('./../user.js'),
 
 		app.get('/users/:userslug/edit', function(req, res) {
 
-			if(!req.user)
+			if (!req.user)
 				return res.redirect('/403');
 
 			user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
-				if(req.params.userslug && userslug === req.params.userslug) {
-					app.build_header({ req: req, res: res }, function(err, header) {
-						res.send(header + app.create_route('users/'+req.params.userslug+'/edit','accountedit') + templates['footer']);
+				if (req.params.userslug && userslug === req.params.userslug) {
+					app.build_header({
+						req: req,
+						res: res
+					}, function(err, header) {
+						res.send(header + app.create_route('users/' + req.params.userslug + '/edit', 'accountedit') + templates['footer']);
 					});
 				} else {
 					return res.redirect('/404');
@@ -91,13 +114,16 @@ var user = require('./../user.js'),
 
 		app.get('/users/:userslug/settings', function(req, res) {
 
-			if(!req.user)
+			if (!req.user)
 				return res.redirect('/403');
 
 			user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
-				if(req.params.userslug && userslug === req.params.userslug) {
-					app.build_header({ req: req, res: res }, function(err, header) {
-						res.send(header + app.create_route('users/'+req.params.userslug+'/settings','accountsettings') + templates['footer']);
+				if (req.params.userslug && userslug === req.params.userslug) {
+					app.build_header({
+						req: req,
+						res: res
+					}, function(err, header) {
+						res.send(header + app.create_route('users/' + req.params.userslug + '/settings', 'accountsettings') + templates['footer']);
 					})
 				} else {
 					return res.redirect('/404');
@@ -106,10 +132,10 @@ var user = require('./../user.js'),
 		});
 
 		app.post('/users/uploadpicture', function(req, res) {
-			if(!req.user)
+			if (!req.user)
 				return res.redirect('/403');
 
-			if(req.files.userPhoto.size > 262144) {
+			if (req.files.userPhoto.size > 262144) {
 				res.send({
 					error: 'Images must be smaller than 256kb!'
 				});
@@ -118,7 +144,7 @@ var user = require('./../user.js'),
 
 			var allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif'];
 
-			if(allowedTypes.indexOf(req.files.userPhoto.type) === -1) {
+			if (allowedTypes.indexOf(req.files.userPhoto.type) === -1) {
 				res.send({
 					error: 'Allowed image types are png, jpg and gif!'
 				});
@@ -126,7 +152,7 @@ var user = require('./../user.js'),
 			}
 
 			user.getUserField(req.user.uid, 'uploadedpicture', function(err, oldpicture) {
-				if(!oldpicture) {
+				if (!oldpicture) {
 					uploadUserPicture(req.user.uid, path.extname(req.files.userPhoto.name), req.files.userPhoto.path, res);
 					return;
 				}
@@ -134,7 +160,7 @@ var user = require('./../user.js'),
 				var absolutePath = path.join(process.cwd(), global.nconf.get('upload_path'), path.basename(oldpicture));
 
 				fs.unlink(absolutePath, function(err) {
-					if(err) {
+					if (err) {
 						winston.err(err);
 					}
 
@@ -144,7 +170,7 @@ var user = require('./../user.js'),
 		});
 
 		function uploadUserPicture(uid, extension, tempPath, res) {
-			if(!extension) {
+			if (!extension) {
 				res.send({
 					error: 'Error uploading file! Error : Invalid extension!'
 				});
@@ -154,7 +180,7 @@ var user = require('./../user.js'),
 			var filename = uid + '-profileimg' + extension;
 			var uploadPath = path.join(process.cwd(), global.nconf.get('upload_path'), filename);
 
-			winston.info('Attempting upload to: '+ uploadPath);
+			winston.info('Attempting upload to: ' + uploadPath);
 
 			var is = fs.createReadStream(tempPath);
 			var os = fs.createWriteStream(uploadPath);
@@ -172,12 +198,14 @@ var user = require('./../user.js'),
 					dstPath: uploadPath,
 					width: 128,
 					height: 128
-				}, function(err, stdout, stderr){
+				}, function(err, stdout, stderr) {
 					if (err) {
 						winston.err(err);
 					}
 
-					res.json({ path: imageUrl });
+					res.json({
+						path: imageUrl
+					});
 				});
 			});
 
@@ -191,49 +219,58 @@ var user = require('./../user.js'),
 
 		app.get('/users/:userslug/following', function(req, res) {
 
-			if(!req.user)
+			if (!req.user)
 				return res.redirect('/403');
 
 			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
-				if(!uid) {
+				if (!uid) {
 					res.redirect('/404');
 					return;
 				}
 
-				app.build_header({ req: req, res: res }, function(err, header) {
-					res.send(header + app.create_route('users/'+req.params.userslug+'/following','following') + templates['footer']);
+				app.build_header({
+					req: req,
+					res: res
+				}, function(err, header) {
+					res.send(header + app.create_route('users/' + req.params.userslug + '/following', 'following') + templates['footer']);
 				});
 			});
 		});
 
 		app.get('/users/:userslug/followers', function(req, res) {
 
-			if(!req.user)
+			if (!req.user)
 				return res.redirect('/403');
 
 			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
-				if(!uid) {
+				if (!uid) {
 					res.redirect('/404');
 					return;
 				}
-				app.build_header({ req: req, res: res }, function(err, header) {
-					res.send(header + app.create_route('users/'+req.params.userslug+'/followers','followers') + templates['footer']);
+				app.build_header({
+					req: req,
+					res: res
+				}, function(err, header) {
+					res.send(header + app.create_route('users/' + req.params.userslug + '/followers', 'followers') + templates['footer']);
 				});
 			});
 		});
 
 		app.get('/users/:userslug/favourites', function(req, res) {
 
-			if(!req.user)
+			if (!req.user)
 				return res.redirect('/403');
 
 			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
-				if(!uid) {
+				if (!uid) {
 					res.redirect('/404');
 					return;
 				}
-				app.build_header({ req: req, res: res }, function(err, header) {
-					res.send(header + app.create_route('users/'+req.params.userslug+'/favourites','favourites') + templates['footer']);
+				app.build_header({
+					req: req,
+					res: res
+				}, function(err, header) {
+					res.send(header + app.create_route('users/' + req.params.userslug + '/favourites', 'favourites') + templates['footer']);
 				});
 			});
 		});
@@ -242,7 +279,7 @@ var user = require('./../user.js'),
 			var callerUID = req.user ? req.user.uid : 0;
 
 			getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) {
-				if(userData) {
+				if (userData) {
 					user.getFollowing(userData.uid, function(followingData) {
 						userData.following = followingData;
 						userData.followingCount = followingData.length;
@@ -250,7 +287,9 @@ var user = require('./../user.js'),
 					});
 
 				} else {
-					res.json(404, { error: 'User not found!' })	;
+					res.json(404, {
+						error: 'User not found!'
+					});
 				}
 			});
 		});
@@ -259,14 +298,16 @@ var user = require('./../user.js'),
 			var callerUID = req.user ? req.user.uid : 0;
 
 			getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) {
-				if(userData) {
+				if (userData) {
 					user.getFollowers(userData.uid, function(followersData) {
 						userData.followers = followersData;
 						userData.followersCount = followersData.length;
 						res.json(userData);
 					});
 				} else {
-					res.json(404, { error: 'User not found!' })	;
+					res.json(404, {
+						error: 'User not found!'
+					});
 				}
 			});
 		});
@@ -283,27 +324,33 @@ var user = require('./../user.js'),
 			var callerUID = req.user ? req.user.uid : 0;
 
 			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
-				if(!uid) {
-					res.json(404, { error: 'User not found!' })	;
+				if (!uid) {
+					res.json(404, {
+						error: 'User not found!'
+					});
 					return;
 				}
 
-				if(uid !== callerUID || callerUID === "0") {
-					res.json(403, { error: 'Not allowed!' });
+				if (uid !== callerUID || callerUID === "0") {
+					res.json(403, {
+						error: 'Not allowed!'
+					});
 					return;
 				}
-				user.getUserFields(uid, ['username','userslug','showemail'], function(err, userData) {
-					if(err)
+				user.getUserFields(uid, ['username', 'userslug', 'showemail'], function(err, userData) {
+					if (err)
 						return next(err);
 
-					if(userData) {
-						if(userData.showemail && userData.showemail === "1")
+					if (userData) {
+						if (userData.showemail && userData.showemail === "1")
 							userData.showemail = "checked";
 						else
 							userData.showemail = "";
 						res.json(userData);
 					} else {
-						res.json(404, { error: 'User not found!' })	;
+						res.json(404, {
+							error: 'User not found!'
+						});
 					}
 				});
 			});
@@ -313,30 +360,36 @@ var user = require('./../user.js'),
 			var callerUID = req.user ? req.user.uid : 0;
 
 			user.get_uid_by_userslug(req.params.userslug, function(err, uid) {
-				if(!uid) {
-					res.json(404, { error: 'User not found!' })	;
+				if (!uid) {
+					res.json(404, {
+						error: 'User not found!'
+					});
 					return;
 				}
 
-				if(uid !== callerUID || callerUID === "0") {
-					res.json(403, { error: 'Not allowed!' });
+				if (uid !== callerUID || callerUID === "0") {
+					res.json(403, {
+						error: 'Not allowed!'
+					});
 					return;
 				}
 
-				user.getUserFields(uid, ['username','userslug'], function(err, userData) {
-					if(err)
+				user.getUserFields(uid, ['username', 'userslug'], function(err, userData) {
+					if (err)
 						return next(err);
 
-					if(userData) {
+					if (userData) {
 						posts.getFavourites(uid, function(err, posts) {
-							if(err)
+							if (err)
 								return next(err);
 							userData.posts = posts;
-							userData.show_nofavourites = posts.length?'hide':'show';
+							userData.show_nofavourites = posts.length ? 'hide' : 'show';
 							res.json(userData);
 						});
 					} else {
-						res.json(404, { error: 'User not found!' })	;
+						res.json(404, {
+							error: 'User not found!'
+						});
 					}
 				});
 			});
@@ -346,15 +399,17 @@ var user = require('./../user.js'),
 			var callerUID = req.user ? req.user.uid : 0;
 
 			getUserDataByUserSlug(req.params.userslug, callerUID, function(userData) {
-				if(userData) {
+				if (userData) {
 					user.isFollowing(callerUID, userData.theirid, function(isFollowing) {
 						posts.getPostsByUid(userData.theirid, 0, 9, function(posts) {
 
-							userData.posts = posts.filter(function(p) {return p.deleted !== "1";});
+							userData.posts = posts.filter(function(p) {
+								return p.deleted !== "1";
+							});
 							userData.isFollowing = isFollowing;
-							if(!userData.profileviews)
+							if (!userData.profileviews)
 								userData.profileviews = 1;
-							if(callerUID !== userData.uid)
+							if (callerUID !== userData.uid)
 								user.incrementUserFieldBy(userData.uid, 'profileviews', 1);
 
 							postTools.toHTML(userData.signature, function(err, signature) {
@@ -364,7 +419,9 @@ var user = require('./../user.js'),
 						});
 					});
 				} else {
-					res.json(404, { error: 'User not found!' })	;
+					res.json(404, {
+						error: 'User not found!'
+					});
 				}
 			});
 		});
@@ -378,39 +435,55 @@ var user = require('./../user.js'),
 
 		function getUsersSortedByJoinDate(req, res) {
 			user.getUsers('users:joindate', 0, 49, function(err, data) {
-				res.json({ search_display: 'none', loadmore_display:'block', users:data });
+				res.json({
+					search_display: 'none',
+					loadmore_display: 'block',
+					users: data
+				});
 			});
 		}
 
 		function getUsersSortedByPosts(req, res) {
 			user.getUsers('users:postcount', 0, 49, function(err, data) {
-				res.json({ search_display: 'none', loadmore_display:'block', users:data });
+				res.json({
+					search_display: 'none',
+					loadmore_display: 'block',
+					users: data
+				});
 			});
 		}
 
 		function getUsersSortedByReputation(req, res) {
 			user.getUsers('users:reputation', 0, 49, function(err, data) {
-				res.json({ search_display: 'none', loadmore_display:'block', users:data });
+				res.json({
+					search_display: 'none',
+					loadmore_display: 'block',
+					users: data
+				});
 			});
 		}
 
 		function getUsersForSearch(req, res) {
-			res.json({ search_display: 'block', loadmore_display:'none', users: [] });
+			res.json({
+				search_display: 'block',
+				loadmore_display: 'none',
+				users: []
+			});
 		}
 
 		function getUserDataByUserSlug(userslug, callerUID, callback) {
 			user.get_uid_by_userslug(userslug, function(err, uid) {
 
-				if(uid === null) {
+				if (uid === null) {
 					callback(null);
 					return;
 				}
 
 				user.getUserData(uid, function(err, data) {
-					if(data) {
+					if (data) {
 						data.joindate = utils.relativeTime(data.joindate);
 
-						if(!data.birthday) {
+						if (!data.birthday) {
 							data.age = '';
 						} else {
 							data.age = new Date().getFullYear() - new Date(data.birthday).getFullYear();
@@ -420,15 +493,15 @@ var user = require('./../user.js'),
 							return callerUID === uid || (data.email && (data.showemail && data.showemail === "1"));
 						}
 
-						if(!canSeeEmail())
+						if (!canSeeEmail())
 							data.email = "";
 
-						if(callerUID === uid && (!data.showemail || data.showemail === "0"))
+						if (callerUID === uid && (!data.showemail || data.showemail === "0"))
 							data.emailClass = "";
 						else
 							data.emailClass = "hide";
 
-						data.show_banned = data.banned === '1'?'':'hide';
+						data.show_banned = data.banned === '1' ? '' : 'hide';
 
 						data.uid = uid;
 						data.yourid = callerUID;

src/sitemap.js

@@ -6,11 +6,19 @@ var	path = require('path'),
 	topics = require('./topics'),
 	sitemap = {
 		getStaticUrls: function(callback) {
-			callback(null, [
-				{ url: '', changefreq: 'weekly', priority: '0.6' },
-				{ url: 'recent', changefreq: 'daily', priority: '0.4' },
-				{ url: 'users', changefreq: 'daily', priority: '0.4' }
-			]);
+			callback(null, [{
+				url: '',
+				changefreq: 'weekly',
+				priority: '0.6'
+			}, {
+				url: 'recent',
+				changefreq: 'daily',
+				priority: '0.4'
+			}, {
+				url: 'users',
+				changefreq: 'daily',
+				priority: '0.4'
+			}]);
 		},
 		getDynamicUrls: function(callback) {
 			var returnUrls = [];

src/threadTools.js

@@ -15,7 +15,7 @@ var	RDB = require('./redis.js'),
 	ThreadTools.exists = function(tid, callback) {
 		RDB.sismember('topics:tid', tid, function(err, ismember) {
 			if (err) RDB.handle(err);
-			callback(!!ismember || false);
+			callback( !! ismember || false);
 		});
 	}
 
@@ -52,7 +52,7 @@ var	RDB = require('./redis.js'),
 				topics.setTopicField(tid, 'locked', 1);
 
 				if (socket) {
-					io.sockets.in('topic_' + tid).emit('event:topic_locked', {
+					io.sockets. in ('topic_' + tid).emit('event:topic_locked', {
 						tid: tid,
 						status: 'ok'
 					});
@@ -72,7 +72,7 @@ var	RDB = require('./redis.js'),
 				topics.setTopicField(tid, 'locked', 0);
 
 				if (socket) {
-					io.sockets.in('topic_' + tid).emit('event:topic_unlocked', {
+					io.sockets. in ('topic_' + tid).emit('event:topic_unlocked', {
 						tid: tid,
 						status: 'ok'
 					});
@@ -95,7 +95,7 @@ var	RDB = require('./redis.js'),
 
 				topicSearch.remove(tid);
 
-				io.sockets.in('topic_' + tid).emit('event:topic_deleted', {
+				io.sockets. in ('topic_' + tid).emit('event:topic_deleted', {
 					tid: tid,
 					status: 'ok'
 				});
@@ -112,7 +112,7 @@ var	RDB = require('./redis.js'),
 				topics.restore(tid);
 				ThreadTools.unlock(tid, uid);
 
-				io.sockets.in('topic_' + tid).emit('event:topic_restored', {
+				io.sockets. in ('topic_' + tid).emit('event:topic_restored', {
 					tid: tid,
 					status: 'ok'
 				});
@@ -137,11 +137,11 @@ var	RDB = require('./redis.js'),
 
 				topics.setTopicField(tid, 'pinned', 1);
 				topics.getTopicField(tid, 'cid', function(err, cid) {
-					RDB.zadd('categories:' + cid + ':tid', Math.pow(2,53), tid);
+					RDB.zadd('categories:' + cid + ':tid', Math.pow(2, 53), tid);
 				});
 
 				if (socket) {
-					io.sockets.in('topic_' + tid).emit('event:topic_pinned', {
+					io.sockets. in ('topic_' + tid).emit('event:topic_pinned', {
 						tid: tid,
 						status: 'ok'
 					});
@@ -164,7 +164,7 @@ var	RDB = require('./redis.js'),
 					RDB.zadd('categories:' + topicData.cid + ':tid', topicData.lastposttime, tid);
 				});
 				if (socket) {
-					io.sockets.in('topic_' + tid).emit('event:topic_unpinned', {
+					io.sockets. in ('topic_' + tid).emit('event:topic_unpinned', {
 						tid: tid,
 						status: 'ok'
 					});
@@ -194,13 +194,13 @@ var	RDB = require('./redis.js'),
 					topics.setTopicField(tid, 'cid', cid);
 
 					categories.moveRecentReplies(tid, oldCid, cid, function(err, data) {
-						if(err) {
+						if (err) {
 							winston.err(err);
 						}
 					});
 
 					categories.moveActiveUsers(tid, oldCid, cid, function(err, data) {
-						if(err) {
+						if (err) {
 							winston.err(err);
 						}
 					});
@@ -212,7 +212,7 @@ var	RDB = require('./redis.js'),
 						status: 'ok'
 					});
 
-					io.sockets.in('topic_' + tid).emit('event:topic_moved', {
+					io.sockets. in ('topic_' + tid).emit('event:topic_moved', {
 						tid: tid
 					});
 				} else {
@@ -240,7 +240,9 @@ var	RDB = require('./redis.js'),
 								status: 'ok',
 								follow: true
 							});
-						} else callback({ status: 'error' });
+						} else callback({
+							status: 'error'
+						});
 					}
 				});
 			} else {
@@ -251,7 +253,9 @@ var	RDB = require('./redis.js'),
 								status: 'ok',
 								follow: false
 							});
-						} else callback({ status: 'error' });
+						} else callback({
+							status: 'error'
+						});
 					}
 				});
 			}
@@ -297,11 +301,11 @@ var	RDB = require('./redis.js'),
 		posts.getPostsByTid(tid, 0, -1, function(posts) {
 
 			var numPosts = posts.length;
-			if(!numPosts)
+			if (!numPosts)
 				return callback(new Error('no-undeleted-pids-found'));
 
-			while(numPosts--) {
-				if(posts[numPosts].deleted !== '1') {
+			while (numPosts--) {
+				if (posts[numPosts].deleted !== '1') {
 					callback(null, posts[numPosts].pid);
 					return;
 				}

src/topics.js

@@ -1,5 +1,5 @@
 var RDB = require('./redis.js')
-	schema = require('./schema.js'),
+schema = require('./schema.js'),
 	posts = require('./posts.js'),
 	utils = require('./../public/src/utils.js'),
 	user = require('./user.js'),
@@ -19,7 +19,7 @@ var	RDB = require('./redis.js')
 
 	Topics.getTopicData = function(tid, callback) {
 		RDB.hgetall('topic:' + tid, function(err, data) {
-			if(err === null)
+			if (err === null)
 				callback(data);
 			else
 				console.log(err);
@@ -37,12 +37,12 @@ var	RDB = require('./redis.js')
 
 	Topics.getTopicPosts = function(tid, start, end, current_user, callback) {
 		posts.getPostsByTid(tid, start, end, function(postData) {
-			if(Array.isArray(postData) && !postData.length)
+			if (Array.isArray(postData) && !postData.length)
 				return callback([]);
 
 			function getFavouritesData(next) {
 				var pids = [];
-				for(var i=0; i<postData.length; ++i)
+				for (var i = 0; i < postData.length; ++i)
 					pids.push(postData[i].pid);
 
 				favourites.getFavouritesByPostIDs(pids, current_user, function(fav_data) {
@@ -72,11 +72,11 @@ var	RDB = require('./redis.js')
 				var fav_data = results[0],
 					privileges = results[2];
 
-				for(var i=0; i<postData.length; ++i) {
-					postData[i].fav_button_class = fav_data[postData[i].pid]? 'btn-warning' : '';
+				for (var i = 0; i < postData.length; ++i) {
+					postData[i].fav_button_class = fav_data[postData[i].pid] ? 'btn-warning' : '';
 					postData[i].fav_star_class = fav_data[postData[i].pid] ? 'icon-star' : 'icon-star-empty';
 					postData[i]['display_moderator_tools'] = (postData[i].uid == current_user || privileges.editable) ? 'show' : 'none';
-					postData[i].show_banned = postData[i].user_banned === '1'?'show':'hide';
+					postData[i].show_banned = postData[i].user_banned === '1' ? 'show' : 'hide';
 				}
 
 				callback(postData);
@@ -94,18 +94,18 @@ var	RDB = require('./redis.js')
 
 		var timestamp = Date.now();
 
-		var args = [ 'topics:recent', '+inf', timestamp - 86400000, 'WITHSCORES', 'LIMIT', start, end - start + 1];
+		var args = ['topics:recent', '+inf', timestamp - 86400000, 'WITHSCORES', 'LIMIT', start, end - start + 1];
 
 		RDB.zrevrangebyscore(args, function(err, tids) {
 
 			var latestTopics = {
-				'category_name' : 'Recent',
-				'show_sidebar' : 'hidden',
-				'show_topic_button' : 'hidden',
-				'no_topics_message' : 'hidden',
+				'category_name': 'Recent',
+				'show_sidebar': 'hidden',
+				'show_topic_button': 'hidden',
+				'no_topics_message': 'hidden',
 				'topic_row_size': 'col-md-12',
 				'category_id': false,
-				'topics' : []
+				'topics': []
 			};
 
 			if (!tids || !tids.length) {
@@ -129,14 +129,16 @@ var	RDB = require('./redis.js')
 			done = false;
 
 		async.whilst(
-			function () { return unreadTids.length < 21 && !done; },
-			function (callback) {
+			function() {
+				return unreadTids.length < 21 && !done;
+			},
+			function(callback) {
 				RDB.zrevrange('topics:recent', start, stop, function(err, tids) {
 
-					if(err)
+					if (err)
 						return callback(err);
 
-					if(tids && !tids.length) {
+					if (tids && !tids.length) {
 						done = true;
 						return callback(null);
 					}
@@ -155,7 +157,7 @@ var	RDB = require('./redis.js')
 					});
 				});
 			},
-			function (err) {
+			function(err) {
 				callback({
 					count: unreadTids.length
 				});
@@ -166,13 +168,13 @@ var	RDB = require('./redis.js')
 	Topics.getUnreadTopics = function(uid, start, stop, callback) {
 
 		var unreadTopics = {
-			'category_name' : 'Unread',
-			'show_sidebar' : 'hidden',
-			'show_topic_button' : 'hidden',
+			'category_name': 'Unread',
+			'show_sidebar': 'hidden',
+			'show_topic_button': 'hidden',
 			'show_markallread_button': 'show',
-			'no_topics_message' : 'hidden',
+			'no_topics_message': 'hidden',
 			'topic_row_size': 'col-md-12',
-			'topics' : []
+			'topics': []
 		};
 
 		function noUnreadTopics() {
@@ -185,9 +187,9 @@ var	RDB = require('./redis.js')
 			Topics.getTopicsByTids(topicIds, uid, function(topicData) {
 				unreadTopics.topics = topicData;
 				unreadTopics.nextStart = start + topicIds.length;
-				if(!topicData || topicData.length === 0)
+				if (!topicData || topicData.length === 0)
 					unreadTopics.no_topics_message = 'show';
-				if(uid === 0 || topicData.length === 0)
+				if (uid === 0 || topicData.length === 0)
 					unreadTopics.show_markallread_button = 'hidden';
 				callback(unreadTopics);
 			});
@@ -197,18 +199,20 @@ var	RDB = require('./redis.js')
 			done = false;
 
 		async.whilst(
-			function () { return unreadTids.length < 20 && !done; },
-			function (callback) {
+			function() {
+				return unreadTids.length < 20 && !done;
+			},
+			function(callback) {
 				RDB.zrevrange('topics:recent', start, stop, function(err, tids) {
-					if(err)
+					if (err)
 						return callback(err);
 
-					if(tids && !tids.length) {
+					if (tids && !tids.length) {
 						done = true;
 						return callback(null);
 					}
 
-					if(uid === 0) {
+					if (uid === 0) {
 						unreadTids.push.apply(unreadTids, tids);
 						callback(null);
 					} else {
@@ -226,10 +230,10 @@ var	RDB = require('./redis.js')
 					}
 				});
 			},
-			function (err) {
-				if(err)
+			function(err) {
+				if (err)
 					return callback([]);
-				if(unreadTids.length)
+				if (unreadTids.length)
 					sendUnreadTopics(unreadTids);
 				else
 					noUnreadTopics();
@@ -242,7 +246,7 @@ var	RDB = require('./redis.js')
 
 		var retrieved_topics = [];
 
-		if(!Array.isArray(tids) || tids.length === 0) {
+		if (!Array.isArray(tids) || tids.length === 0) {
 			callback(retrieved_topics);
 			return;
 		}
@@ -266,6 +270,7 @@ var	RDB = require('./redis.js')
 			}
 
 			// temporary. I don't think this call should belong here
+
 			function getPrivileges(next) {
 				categories.privileges(category_id, current_user, function(user_privs) {
 					next(null, user_privs);
@@ -290,7 +295,7 @@ var	RDB = require('./redis.js')
 
 		function loadTopic(tid, callback) {
 			Topics.getTopicData(tid, function(topicData) {
-				if(!topicData) {
+				if (!topicData) {
 					return callback(null);
 				}
 
@@ -318,7 +323,7 @@ var	RDB = require('./redis.js')
 		}
 
 		async.eachSeries(tids, loadTopic, function(err) {
-			if(!err) {
+			if (!err) {
 				callback(retrieved_topics);
 			}
 		});
@@ -369,14 +374,14 @@ var	RDB = require('./redis.js')
 				var main_posts = topicPosts.splice(0, 1);
 
 				callback(null, {
-					'topic_name':topicData.title,
-					'category_name':categoryData.name,
-					'category_slug':categoryData.slug,
+					'topic_name': topicData.title,
+					'category_name': categoryData.name,
+					'category_slug': categoryData.slug,
 					'locked': topicData.locked,
 					'deleted': topicData.deleted,
 					'pinned': topicData.pinned,
 					'slug': topicData.slug,
-					'postcount' : topicData.postcount,
+					'postcount': topicData.postcount,
 					'topic_id': tid,
 					'expose_tools': privileges.editable ? 1 : 0,
 					'posts': topicPosts,
@@ -438,11 +443,13 @@ var	RDB = require('./redis.js')
 				numTids, x;
 
 			// Sort into ascending order
-			tids.sort(function(a, b) { return a - b; });
+			tids.sort(function(a, b) {
+				return a - b;
+			});
 
 			// Eliminate everything after the "after" tid
 			if (after) {
-				for(x=0,numTids=tids.length;x<numTids;x++) {
+				for (x = 0, numTids = tids.length; x < numTids; x++) {
 					if (tids[x] >= after) {
 						tids = tids.slice(0, x);
 						break;
@@ -457,7 +464,9 @@ var	RDB = require('./redis.js')
 			}
 
 			// Sort into descending order
-			tids.sort(function(a, b) { return b - a; });
+			tids.sort(function(a, b) {
+				return b - a;
+			});
 
 			async.each(tids, function(tid, next) {
 				Topics.getTopicDataWithUsername(tid, function(topicData) {
@@ -472,14 +481,14 @@ var	RDB = require('./redis.js')
 
 	Topics.markAllRead = function(uid, callback) {
 		RDB.smembers('topics:tid', function(err, tids) {
-			if(err) {
+			if (err) {
 				console.log(err);
 				callback(err, null);
 				return;
 			}
 
-			if(tids && tids.length) {
-				for(var i=0; i<tids.length; ++i) {
+			if (tids && tids.length) {
+				for (var i = 0; i < tids.length; ++i) {
 					Topics.markAsRead(tids[i], uid);
 				}
 			}
@@ -507,7 +516,7 @@ var	RDB = require('./redis.js')
 		Topics.getTopicField(tid, 'cid', function(err, cid) {
 
 			categories.isTopicsRead(cid, uid, function(read) {
-				if(read) {
+				if (read) {
 					categories.markAsRead(cid, uid);
 				}
 			});
@@ -525,7 +534,7 @@ var	RDB = require('./redis.js')
 	Topics.hasReadTopics = function(tids, uid, callback) {
 		var batch = RDB.multi();
 
-		for (var i=0, ii=tids.length; i<ii; i++) {
+		for (var i = 0, ii = tids.length; i < ii; i++) {
 			batch.sismember(schema.topics(tids[i]).read_by_uid, uid);
 		}
 
@@ -537,7 +546,7 @@ var	RDB = require('./redis.js')
 	Topics.hasReadTopic = function(tid, uid, callback) {
 		RDB.sismember(schema.topics(tid).read_by_uid, uid, function(err, hasRead) {
 
-			if(err === null) {
+			if (err === null) {
 				callback(hasRead);
 			} else {
 				console.log(err);
@@ -567,7 +576,7 @@ var	RDB = require('./redis.js')
 				posts.getPostFields(pid, ['content', 'uid', 'timestamp'], function(postData) {
 
 					user.getUserFields(postData.uid, ['username', 'picture'], function(err, userData) {
-						if(err)
+						if (err)
 							return callback(err, null);
 
 						var stripped = postData.content,
@@ -575,7 +584,7 @@ var	RDB = require('./redis.js')
 							returnObj = {
 								"username": userData.username,
 								"picture": userData.picture,
-								"timestamp" : timestamp
+								"timestamp": timestamp
 							};
 
 						if (postData.content) {
@@ -604,19 +613,19 @@ var	RDB = require('./redis.js')
 		});
 	}
 
-	Topics.post = function(uid, title, content, category_id, images, callback) {
+	Topics.post = function(uid, title, content, category_id, callback) {
 		if (!category_id)
 			throw new Error('Attempted to post without a category_id');
 
-		if(content)
+		if (content)
 			content = content.trim();
-		if(title)
+		if (title)
 			title = title.trim();
 
 		if (uid === 0) {
 			callback(new Error('not-logged-in'), null);
 			return;
-		} else if(!title || title.length < meta.config.minimumTitleLength) {
+		} else if (!title || title.length < meta.config.minimumTitleLength) {
 			callback(new Error('title-too-short'), null);
 			return;
 		} else if (!content || content.length < meta.config.miminumPostLength) {
@@ -626,7 +635,7 @@ var	RDB = require('./redis.js')
 
 		user.getUserField(uid, 'lastposttime', function(err, lastposttime) {
 			if (err) lastposttime = 0;
-			if(Date.now() - lastposttime < meta.config.postDelay) {
+			if (Date.now() - lastposttime < meta.config.postDelay) {
 				callback(new Error('too-many-posts'), null);
 				return;
 			}
@@ -678,7 +687,7 @@ var	RDB = require('./redis.js')
 
 				feed.updateCategory(category_id);
 
-				posts.create(uid, tid, content, images, function(postData) {
+				posts.create(uid, tid, content, function(postData) {
 					if (postData) {
 
 						// Auto-subscribe the post creator to the newly created topic
@@ -686,9 +695,11 @@ var	RDB = require('./redis.js')
 
 						// Notify any users looking at the category that a new topic has arrived
 						Topics.getTopicForCategoryView(tid, uid, function(topicData) {
-							io.sockets.in('category_' + category_id).emit('event:new_topic', topicData);
-							io.sockets.in('recent_posts').emit('event:new_topic', topicData);
-							io.sockets.in('users/' + uid).emit('event:new_post', {posts:postData});
+							io.sockets. in ('category_' + category_id).emit('event:new_topic', topicData);
+							io.sockets. in ('recent_posts').emit('event:new_topic', topicData);
+							io.sockets. in ('users/' + uid).emit('event:new_post', {
+								posts: postData
+							});
 						});
 
 						callback(null, postData);
@@ -739,7 +750,7 @@ var	RDB = require('./redis.js')
 
 			function getUid(pid, next) {
 				posts.getPostField(pid, 'uid', function(uid) {
-					if(err)
+					if (err)
 						return next(err);
 					uids[uid] = 1;
 					next(null);
@@ -747,7 +758,7 @@ var	RDB = require('./redis.js')
 			}
 
 			async.each(pids, getUid, function(err) {
-				if(err)
+				if (err)
 					return callback(err, null);
 
 				callback(null, Object.keys(uids));
@@ -777,11 +788,11 @@ var	RDB = require('./redis.js')
 
 	Topics.reIndexTopic = function(tid, callback) {
 		Topics.getPids(tid, function(err, pids) {
-			if(err) {
+			if (err) {
 				callback(err);
 			} else {
 				posts.reIndexPids(pids, function(err) {
-					if(err) {
+					if (err) {
 						callback(err);
 					} else {
 						callback(null);
@@ -793,12 +804,12 @@ var	RDB = require('./redis.js')
 
 	Topics.reIndexAll = function(callback) {
 		RDB.smembers('topics:tid', function(err, tids) {
-			if(err) {
+			if (err) {
 				callback(err, null);
 			} else {
 
 				async.each(tids, Topics.reIndexTopic, function(err) {
-					if(err) {
+					if (err) {
 						callback(err, null);
 					} else {
 						callback(null, 'All topics reindexed.');

src/upgrade.js

@@ -6,32 +6,31 @@ var RDB = require('./redis.js'),
 
 
 function upgradeCategory(cid, callback) {
-	RDB.type('categories:'+ cid +':tid', function(err, type) {
+	RDB.type('categories:' + cid + ':tid', function(err, type) {
 		if (type === 'set') {
 			RDB.smembers('categories:' + cid + ':tid', function(err, tids) {
 
 				function moveTopic(tid, callback) {
 					RDB.hget('topic:' + tid, 'timestamp', function(err, timestamp) {
-						if(err)
+						if (err)
 							return callback(err);
 
-						RDB.zadd('temp_categories:'+ cid + ':tid', timestamp, tid);
+						RDB.zadd('temp_categories:' + cid + ':tid', timestamp, tid);
 						callback(null);
 					});
 				}
 
 				async.each(tids, moveTopic, function(err) {
-					if(!err) {
+					if (!err) {
 						RDB.rename('temp_categories:' + cid + ':tid', 'categories:' + cid + ':tid');
 						callback(null);
-					}
-					else
+					} else
 						callback(err);
 				});
 
 			});
 		} else {
-			winston.info('category already upgraded '+ cid);
+			winston.info('category already upgraded ' + cid);
 			callback(null);
 		}
 	});
@@ -39,24 +38,24 @@ function upgradeCategory(cid, callback) {
 
 function upgradeUser(uid, callback) {
 	user.getUserFields(uid, ['joindate', 'postcount', 'reputation'], function(err, userData) {
-		if(err)
+		if (err)
 			return callback(err);
 
 		async.parallel([
 			function(next) {
-				if(userData.joindate)
+				if (userData.joindate)
 					RDB.zadd('users:joindate', userData.joindate, uid, next);
 				else
 					next(null);
 			},
 			function(next) {
-				if(userData.postcount)			
+				if (userData.postcount)
 					RDB.zadd('users:postcount', userData.postcount, uid, next);
 				else
 					next(null);
 			},
 			function(next) {
-				if(userData.reputation)
+				if (userData.reputation)
 					RDB.zadd('users:reputation', userData.reputation, uid, next);
 				else
 					next(null);
@@ -69,24 +68,24 @@ function upgradeUser(uid, callback) {
 
 function upgradeUserHash(uid, callback) {
 	user.getUserFields(uid, ['username', 'userslug', 'email'], function(err, userData) {
-		if(err)
+		if (err)
 			return callback(err);
 
 		async.parallel([
 			function(next) {
-				if(userData.username)
+				if (userData.username)
 					RDB.hset('username:uid', userData.username, uid, next);
 				else
 					next(null);
 			},
 			function(next) {
-				if(userData.userslug)
+				if (userData.userslug)
 					RDB.hset('userslug:uid', userData.userslug, uid, next);
 				else
 					next(null);
 			},
 			function(next) {
-				if(userData.email)
+				if (userData.email)
 					RDB.hset('email:uid', userData.email, uid, next);
 				else
 					next(null);
@@ -135,7 +134,7 @@ exports.upgrade = function() {
 			RDB.lrange('categories:cid', 0, -1, function(err, cids) {
 
 				async.each(cids, upgradeCategory, function(err) {
-					if(!err) {
+					if (!err) {
 						winston.info('upgraded categories');
 						next(null, null);
 					} else {
@@ -151,7 +150,7 @@ exports.upgrade = function() {
 			RDB.lrange('userlist', 0, -1, function(err, uids) {
 
 				async.each(uids, upgradeUser, function(err) {
-					if(!err) {
+					if (!err) {
 						winston.info('upgraded users');
 						next(null, null);
 					} else {
@@ -165,11 +164,11 @@ exports.upgrade = function() {
 		function upgradeUserHashes(next) {
 			winston.info('upgrading user hashes');
 			RDB.zrange('users:joindate', 0, -1, function(err, uids) {
-				if(err)
+				if (err)
 					return next(err);
 
 				async.each(uids, upgradeUserHash, function(err) {
-					if(!err) {
+					if (!err) {
 						winston.info('upgraded user hashes');
 						next(null, null);
 					} else {
@@ -183,7 +182,7 @@ exports.upgrade = function() {
 	];
 
 	async.series(schema, function(err, results) {
-		if(!err)
+		if (!err)
 			winston.info('upgrade complete');
 		else
 			winston.err(err);

src/user.js

@@ -38,7 +38,7 @@ var utils = require('./../public/src/utils.js'),
 			function(next) {
 				if (email !== undefined) {
 					User.isEmailAvailable(email, function(err, available) {
-						if(err)
+						if (err)
 							return next(err);
 						next(!available ? new Error('Email taken!') : null);
 					});
@@ -53,19 +53,19 @@ var utils = require('./../public/src/utils.js'),
 				var gravatar = User.createGravatarURLFromEmail(email);
 				var timestamp = Date.now();
 
-				RDB.hmset('user:'+uid, {
+				RDB.hmset('user:' + uid, {
 					'uid': uid,
-					'username' : username,
-					'userslug' : userslug,
+					'username': username,
+					'userslug': userslug,
 					'fullname': '',
-					'location':'',
-					'birthday':'',
-					'website':'',
-					'email' : email || '',
-					'signature':'',
-					'joindate' : timestamp,
+					'location': '',
+					'birthday': '',
+					'website': '',
+					'email': email || '',
+					'signature': '',
+					'joindate': timestamp,
 					'picture': gravatar,
-					'gravatarpicture' : gravatar,
+					'gravatarpicture': gravatar,
 					'uploadedpicture': '',
 					'profileviews': 0,
 					'reputation': 0,
@@ -87,7 +87,9 @@ var utils = require('./../public/src/utils.js'),
 				RDB.incr('usercount', function(err, count) {
 					RDB.handle(err);
 
-					if (typeof io !== 'undefined') io.sockets.emit('user.count', {count: count});
+					if (typeof io !== 'undefined') io.sockets.emit('user.count', {
+						count: count
+					});
 				});
 
 				RDB.zadd('users:joindate', timestamp, uid);
@@ -96,7 +98,10 @@ var utils = require('./../public/src/utils.js'),
 
 				userSearch.index(username, uid);
 
-				if (typeof io !== 'undefined') io.sockets.emit('user.latest', {userslug: userslug, username: username});
+				if (typeof io !== 'undefined') io.sockets.emit('user.latest', {
+					userslug: userslug,
+					username: username
+				});
 
 				if (password !== undefined) {
 					User.hashPassword(password, function(err, hash) {
@@ -109,8 +114,8 @@ var utils = require('./../public/src/utils.js'),
 	};
 
 	User.delete = function(uid, callback) {
-		RDB.exists('user:'+uid, function(err, exists) {
-			if(exists === 1) {
+		RDB.exists('user:' + uid, function(err, exists) {
+			if (exists === 1) {
 				console.log('deleting uid ' + uid);
 
 				User.getUserData(uid, function(err, data) {
@@ -152,7 +157,7 @@ var utils = require('./../public/src/utils.js'),
 	}
 
 	User.getMultipleUserFields = function(uids, fields, callback) {
-		if(uids.length === 0) {
+		if (uids.length === 0) {
 			return callback(null, []);
 		}
 
@@ -164,7 +169,7 @@ var utils = require('./../public/src/utils.js'),
 
 		function iterator(uid, next) {
 			User.getUserFields(uid, fields, function(err, userData) {
-				if(err)
+				if (err)
 					return next(err);
 				returnData.push(userData);
 				next(null);
@@ -179,7 +184,7 @@ var utils = require('./../public/src/utils.js'),
 	User.getUserData = function(uid, callback) {
 		RDB.hgetall('user:' + uid, function(err, data) {
 
-			if(data && data['password']) {
+			if (data && data['password']) {
 				delete data['password'];
 			}
 			callback(err, data);
@@ -195,28 +200,34 @@ var utils = require('./../public/src/utils.js'),
 	User.updateProfile = function(uid, data, callback) {
 
 		var fields = ['email', 'fullname', 'website', 'location', 'birthday', 'signature'];
-		var returnData = {success:false};
+		var returnData = {
+			success: false
+		};
 
 		function isSignatureValid(next) {
-			if(data['signature'] !== undefined && data['signature'].length > 150) {
-				next({error:'Signature can\'t be longer than 150 characters!'}, false);
+			if (data['signature'] !== undefined && data['signature'].length > 150) {
+				next({
+					error: 'Signature can\'t be longer than 150 characters!'
+				}, false);
 			} else {
 				next(null, true);
 			}
 		}
 
 		function isEmailAvailable(next) {
-			if(!data['email']) {
+			if (!data['email']) {
 				return next(null, true);
 			}
 
 			User.getUserField(uid, 'email', function(err, email) {
-				if(email !== data['email']) {
+				if (email !== data['email']) {
 					User.isEmailAvailable(data['email'], function(err, available) {
-						if(err)
+						if (err)
 							return next(err, null);
-						if(!available) {
-							next({error:'Email not available!'}, false);
+						if (!available) {
+							next({
+								error: 'Email not available!'
+							}, false);
 						} else {
 							next(null, true);
 						}
@@ -228,11 +239,11 @@ var utils = require('./../public/src/utils.js'),
 		}
 
 		async.series([isSignatureValid, isEmailAvailable], function(err, results) {
-			if(err) {
+			if (err) {
 				callback(err, returnData);
 			} else {
 				async.each(fields, updateField, function(err) {
-					if(err) {
+					if (err) {
 						callback(err, returnData);
 					} else {
 						returnData.success = true;
@@ -243,18 +254,18 @@ var utils = require('./../public/src/utils.js'),
 		});
 
 		function updateField(field, next) {
-			if(data[field] !== undefined) {
-				if(field === 'email') {
+			if (data[field] !== undefined) {
+				if (field === 'email') {
 					var gravatarpicture = User.createGravatarURLFromEmail(data[field]);
 					User.setUserField(uid, 'gravatarpicture', gravatarpicture);
 					User.getUserFields(uid, ['email', 'picture', 'uploadedpicture'], function(err, userData) {
-						if(err)
+						if (err)
 							return next(err);
 
 						RDB.hdel('email:uid', userData['email']);
 						RDB.hset('email:uid', data['email'], uid);
 						User.setUserField(uid, field, data[field]);
-						if(userData.picture !== userData.uploadedpicture) {
+						if (userData.picture !== userData.uploadedpicture) {
 							returnData.picture = gravatarpicture;
 							User.setUserField(uid, 'picture', gravatarpicture);
 						}
@@ -262,7 +273,7 @@ var utils = require('./../public/src/utils.js'),
 						next(null);
 					});
 					return;
-				} else if(field === 'signature') {
+				} else if (field === 'signature') {
 					data[field] = utils.strip_tags(data[field]);
 				}
 
@@ -282,13 +293,15 @@ var utils = require('./../public/src/utils.js'),
 	}
 
 	User.changePassword = function(uid, data, callback) {
-		if(!utils.isPasswordValid(data.newPassword)) {
-			return callback({error:'Invalid password!'});
+		if (!utils.isPasswordValid(data.newPassword)) {
+			return callback({
+				error: 'Invalid password!'
+			});
 		}
 
 		User.getUserField(uid, 'password', function(err, user_password) {
 			bcrypt.compare(data.currentPassword, user_password, function(err, res) {
-				if(err) {
+				if (err) {
 					return callback(err);
 				}
 
@@ -299,7 +312,9 @@ var utils = require('./../public/src/utils.js'),
 						callback(null);
 					});
 				} else {
-					callback({error:'Your current password is not correct!'});
+					callback({
+						error: 'Your current password is not correct!'
+					});
 				}
 			});
 		});
@@ -325,13 +340,13 @@ var utils = require('./../public/src/utils.js'),
 		var data = [];
 
 		RDB.zrevrange(set, start, stop, function(err, uids) {
-			if(err) {
+			if (err) {
 				return callback(err, null);
 			}
 
 			function iterator(uid, callback) {
 				User.getUserData(uid, function(err, userData) {
-					if(userData) {
+					if (userData) {
 						data.push(userData);
 					}
 					callback(null);
@@ -356,11 +371,11 @@ var utils = require('./../public/src/utils.js'),
 			options.forcedefault = 'y';
 		}
 
-		return require('gravatar').url(email, options, https=nconf.get('https'));
+		return require('gravatar').url(email, options, https = nconf.get('https'));
 	}
 
 	User.hashPassword = function(password, callback) {
-		if(!password) {
+		if (!password) {
 			callback(password);
 			return;
 		}
@@ -372,17 +387,17 @@ var utils = require('./../public/src/utils.js'),
 
 	User.reIndexAll = function(callback) {
 		User.getUsers('users:joindate', 0, -1, function(err, usersData) {
-			if(err) {
+			if (err) {
 				return callback(err, null);
 			}
 
 			function reIndexUser(uid, username) {
-				userSearch.remove(uid, function(){
+				userSearch.remove(uid, function() {
 					userSearch.index(username, uid);
 				})
 			}
 
-			for(var i=0; i<usersData.length; ++i) {
+			for (var i = 0; i < usersData.length; ++i) {
 				reIndexUser(usersData[i].uid, usersData[i].username);
 			}
 			callback(null, 1);
@@ -390,17 +405,17 @@ var utils = require('./../public/src/utils.js'),
 	}
 
 	User.search = function(username, callback) {
-		if(!username) {
+		if (!username) {
 			callback([]);
 			return;
 		}
 
 		userSearch.query(query = username).type('or').end(function(err, uids) {
-			if(err) {
+			if (err) {
 				console.log(err);
 				return;
 			}
-			if(uids && uids.length) {
+			if (uids && uids.length) {
 				User.getDataForUsers(uids, function(userdata) {
 					callback(userdata);
 				});
@@ -432,8 +447,8 @@ var utils = require('./../public/src/utils.js'),
 
 	User.getPostIds = function(uid, start, end, callback) {
 		RDB.lrange('uid:' + uid + ':posts', start, end, function(err, pids) {
-			if(!err) {
-				if(pids && pids.length)
+			if (!err) {
+				if (pids && pids.length)
 					callback(pids);
 				else
 					callback([]);
@@ -444,15 +459,19 @@ var utils = require('./../public/src/utils.js'),
 		});
 	}
 
-	User.sendConfirmationEmail = function (email) {
+	User.sendConfirmationEmail = function(email) {
 		if (meta.config['email:host'] && meta.config['email:port'] && meta.config['email:from']) {
 			var confirm_code = utils.generateUUID(),
 				confirm_link = nconf.get('url') + 'confirm/' + confirm_code,
-				confirm_email = global.templates['emails/header'] + global.templates['emails/email_confirm'].parse({'CONFIRM_LINK': confirm_link}) + global.templates['emails/footer'],
-				confirm_email_plaintext = global.templates['emails/email_confirm_plaintext'].parse({ 'CONFIRM_LINK': confirm_link });
+				confirm_email = global.templates['emails/header'] + global.templates['emails/email_confirm'].parse({
+					'CONFIRM_LINK': confirm_link
+				}) + global.templates['emails/footer'],
+				confirm_email_plaintext = global.templates['emails/email_confirm_plaintext'].parse({
+					'CONFIRM_LINK': confirm_link
+				});
 
 			// Email confirmation code
-			var expiry_time = 60*60*2,	// Expire after 2 hours
+			var expiry_time = 60 * 60 * 2, // Expire after 2 hours
 				email_key = 'email:' + email + ':confirm',
 				confirm_key = 'confirm:' + confirm_code + ':email';
 
@@ -467,12 +486,10 @@ var utils = require('./../public/src/utils.js'),
 				from: meta.config.mailer.from,
 				to: email,
 				subject: '[NodeBB] Registration Email Verification',
-				attachment: [
-					{
+				attachment: [{
 					data: confirm_email,
 					alternative: true
-					}
-				]
+				}]
 			});
 
 			emailjsServer.send(message, function(err, success) {
@@ -485,9 +502,9 @@ var utils = require('./../public/src/utils.js'),
 
 	User.follow = function(uid, followid, callback) {
 		RDB.sadd('following:' + uid, followid, function(err, data) {
-			if(!err) {
+			if (!err) {
 				RDB.sadd('followers:' + followid, uid, function(err, data) {
-					if(!err) {
+					if (!err) {
 						callback(true);
 					} else {
 						console.log(err);
@@ -502,9 +519,9 @@ var utils = require('./../public/src/utils.js'),
 	}
 
 	User.unfollow = function(uid, unfollowid, callback) {
-		RDB.srem('following:' + uid, unfollowid, function(err, data){
-			if(!err) {
-				RDB.srem('followers:' + unfollowid, uid, function(err, data){
+		RDB.srem('following:' + uid, unfollowid, function(err, data) {
+			if (!err) {
+				RDB.srem('followers:' + unfollowid, uid, function(err, data) {
 					callback(data);
 				});
 			} else {
@@ -515,7 +532,7 @@ var utils = require('./../public/src/utils.js'),
 
 	User.getFollowing = function(uid, callback) {
 		RDB.smembers('following:' + uid, function(err, userIds) {
-			if(!err) {
+			if (!err) {
 				User.getDataForUsers(userIds, callback);
 			} else {
 				console.log(err);
@@ -525,7 +542,7 @@ var utils = require('./../public/src/utils.js'),
 
 	User.getFollowers = function(uid, callback) {
 		RDB.smembers('followers:' + uid, function(err, userIds) {
-			if(!err) {
+			if (!err) {
 				User.getDataForUsers(userIds, callback);
 			} else {
 				console.log(err);
@@ -535,7 +552,7 @@ var utils = require('./../public/src/utils.js'),
 
 	User.getFollowingCount = function(uid, callback) {
 		RDB.smembers('following:' + uid, function(err, userIds) {
-			if(!err) {
+			if (!err) {
 				callback(userIds.length);
 			} else {
 				console.log(err);
@@ -549,7 +566,7 @@ var utils = require('./../public/src/utils.js'),
 			// either go with not-error-dosomething-else-dosomethingelse, or
 			// go with if-error-dosomething-return
 			// also why is console.log(err) being used when below we're using RDB.handle()?
-			if(!err) {
+			if (!err) {
 				callback(userIds.length);
 			} else {
 				console.log(err);
@@ -560,7 +577,7 @@ var utils = require('./../public/src/utils.js'),
 	User.getDataForUsers = function(uids, callback) {
 		var returnData = [];
 
-		if(!uids || !Array.isArray(uids) || uids.length === 0) {
+		if (!uids || !Array.isArray(uids) || uids.length === 0) {
 			callback(returnData);
 			return;
 		}
@@ -584,7 +601,7 @@ var utils = require('./../public/src/utils.js'),
 				topics.getTopicField(tid, 'slug', function(err, slug) {
 					var message = '<strong>' + username + '</strong> made a new post';
 
-					notifications.create(message, 5, nconf.get('relative_path') + '/topic/' + slug + '#' + pid, 'topic:'+ tid, function(nid) {
+					notifications.create(message, 5, nconf.get('relative_path') + '/topic/' + slug + '#' + pid, 'topic:' + tid, function(nid) {
 						notifications.push(nid, followers);
 					});
 				});
@@ -594,7 +611,7 @@ var utils = require('./../public/src/utils.js'),
 
 	User.isFollowing = function(uid, theirid, callback) {
 		RDB.sismember('following:' + uid, theirid, function(err, data) {
-			if(!err) {
+			if (!err) {
 				callback(data === 1);
 			} else {
 				console.log(err);
@@ -604,7 +621,7 @@ var utils = require('./../public/src/utils.js'),
 
 	User.exists = function(userslug, callback) {
 		User.get_uid_by_userslug(userslug, function(err, exists) {
-			callback(!!exists);
+			callback( !! exists);
 		});
 	};
 
@@ -612,7 +629,9 @@ var utils = require('./../public/src/utils.js'),
 		RDB.get('usercount', function(err, count) {
 			RDB.handle(err);
 
-			socket.emit('user.count', { count: count ? count : 0 });
+			socket.emit('user.count', {
+				count: count ? count : 0
+			});
 		});
 	};
 
@@ -621,8 +640,11 @@ var utils = require('./../public/src/utils.js'),
 			RDB.handle(err);
 
 			User.getUserFields(uid, ['username', 'userslug'], function(err, userData) {
-				if(!err && userData)
-					socket.emit('user.latest', {userslug: userData.userslug, username: userData.username});
+				if (!err && userData)
+					socket.emit('user.latest', {
+						userslug: userData.userslug,
+						username: userData.username
+					});
 			});
 		});
 	}
@@ -725,7 +747,7 @@ var utils = require('./../public/src/utils.js'),
 				RDB.handle(err);
 			}
 
-			var expiry = 60*60*24*14, // Login valid for two weeks
+			var expiry = 60 * 60 * 24 * 14, // Login valid for two weeks
 				sess_key = 'sess:' + sessionID + ':uid',
 				uid_key = 'uid:' + uid + ':session';
 
@@ -739,14 +761,14 @@ var utils = require('./../public/src/utils.js'),
 	User.isModerator = function(uid, cid, callback) {
 		RDB.sismember('cid:' + cid + ':moderators', uid, function(err, exists) {
 			RDB.handle(err);
-			callback(!!exists);
+			callback( !! exists);
 		});
 	}
 
 	User.isAdministrator = function(uid, callback) {
 		Groups.getGidFromName('Administrators', function(err, gid) {
 			Groups.isMember(uid, gid, function(err, isAdmin) {
-				callback(!!isAdmin);
+				callback( !! isAdmin);
 			});
 		});
 	}
@@ -769,9 +791,11 @@ var utils = require('./../public/src/utils.js'),
 							RDB.handle(err);
 						}
 
-						if (expiry >= +Date.now()/1000|0) {
+						if (expiry >= +Date.now() / 1000 | 0) {
 							if (!callback) {
-								socket.emit('user:reset.valid', { valid: true });
+								socket.emit('user:reset.valid', {
+									valid: true
+								});
 							} else {
 								callback(true);
 							}
@@ -780,7 +804,9 @@ var utils = require('./../public/src/utils.js'),
 							RDB.del('reset:' + code + ':uid');
 							RDB.del('reset:' + code + ':expiry');
 							if (!callback) {
-								socket.emit('user:reset.valid', { valid: false });
+								socket.emit('user:reset.valid', {
+									valid: false
+								});
 							} else {
 								callback(false);
 							}
@@ -788,7 +814,9 @@ var utils = require('./../public/src/utils.js'),
 					});
 				} else {
 					if (!callback) {
-						socket.emit('user:reset.valid', { valid: false });
+						socket.emit('user:reset.valid', {
+							valid: false
+						});
 					} else {
 						callback(false);
 					}
@@ -801,23 +829,25 @@ var utils = require('./../public/src/utils.js'),
 					// Generate a new reset code
 					var reset_code = utils.generateUUID();
 					RDB.set('reset:' + reset_code + ':uid', uid);
-					RDB.set('reset:' + reset_code + ':expiry', (60*60)+new Date()/1000|0);	// Active for one hour
+					RDB.set('reset:' + reset_code + ':expiry', (60 * 60) + new Date() / 1000 | 0); // Active for one hour
 
 					var reset_link = nconf.get('url') + 'reset/' + reset_code,
-						reset_email = global.templates['emails/reset'].parse({'RESET_LINK': reset_link}),
-						reset_email_plaintext = global.templates['emails/reset_plaintext'].parse({ 'RESET_LINK': reset_link });
+						reset_email = global.templates['emails/reset'].parse({
+							'RESET_LINK': reset_link
+						}),
+						reset_email_plaintext = global.templates['emails/reset_plaintext'].parse({
+							'RESET_LINK': reset_link
+						});
 
 					var message = emailjs.message.create({
 						text: reset_email_plaintext,
-						from: meta.config.mailer?meta.config.mailer.from:'localhost@example.org',
+						from: meta.config.mailer ? meta.config.mailer.from : 'localhost@example.org',
 						to: email,
 						subject: 'Password Reset Requested',
-						attachment: [
-							{
+						attachment: [{
 							data: reset_email,
 							alternative: true
-							}
-						]
+						}]
 					});
 
 					emailjsServer.send(message, function(err, success) {
@@ -860,7 +890,9 @@ var utils = require('./../public/src/utils.js'),
 						RDB.del('reset:' + code + ':uid');
 						RDB.del('reset:' + code + ':expiry');
 
-						socket.emit('user:reset.commit', { status: 'ok' });
+						socket.emit('user:reset.commit', {
+							status: 'ok'
+						});
 					});
 				}
 			});
@@ -870,9 +902,11 @@ var utils = require('./../public/src/utils.js'),
 	User.email = {
 		exists: function(socket, email, callback) {
 			User.get_uid_by_email(email, function(exists) {
-				exists = !!exists;
+				exists = !! exists;
 				if (typeof callback !== 'function') {
-					socket.emit('user.email.exists', { exists: exists });
+					socket.emit('user.email.exists', {
+						exists: exists
+					});
 				} else {
 					callback(exists);
 				}
@@ -887,9 +921,13 @@ var utils = require('./../public/src/utils.js'),
 				if (email !== null) {
 					RDB.set('email:' + email + ':confirm', true);
 					RDB.del('confirm:' + code + ':email');
-					callback({ status: 'ok' });
+					callback({
+						status: 'ok'
+					});
 				} else {
-					callback({ status: 'not_ok' });
+					callback({
+						status: 'not_ok'
+					});
 				}
 			});
 		}

src/webserver.js

@@ -31,12 +31,19 @@ var express = require('express'),
 	 *						accepts:	metaTags
 	 */
 	app.build_header = function(options, callback) {
-		var	defaultMetaTags = [
-				{ name: 'viewport', content: 'width=device-width, initial-scale=1.0' },
-				{ name: 'content-type', content: 'text/html; charset=UTF-8' },
-				{ name: 'apple-mobile-web-app-capable', content: 'yes' },
-				{ property: 'og:site_name', content: meta.config.title || 'NodeBB' },
-			],
+		var defaultMetaTags = [{
+			name: 'viewport',
+			content: 'width=device-width, initial-scale=1.0'
+		}, {
+			name: 'content-type',
+			content: 'text/html; charset=UTF-8'
+		}, {
+			name: 'apple-mobile-web-app-capable',
+			content: 'yes'
+		}, {
+			property: 'og:site_name',
+			content: meta.config.title || 'NodeBB'
+		}, ],
 			metaString = utils.buildMetaTags(defaultMetaTags.concat(options.metaTags || [])),
 			templateValues = {
 				cssSrc: meta.config['theme:src'] || nconf.get('relative_path') + '/vendor/bootstrap/css/bootstrap.min.css',
@@ -58,7 +65,10 @@ var express = require('express'),
 
 	// Middlewares
 	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') }));
+	app.use(require('less-middleware')({
+		src: path.join(__dirname, '../', 'public'),
+		prefix: nconf.get('relative_path')
+	}));
 	app.use(nconf.get('relative_path'), express.static(path.join(__dirname, '../', 'public')));
 	app.use(express.bodyParser()); // Puts POST vars in request.body
 
@@ -67,12 +77,12 @@ var express = require('express'),
 	app.use(express.session({
 		store: new RedisStore({
 			client: RDB,
-			ttl: 60*60*24*30
+			ttl: 60 * 60 * 24 * 30
 		}),
 		secret: nconf.get('secret'),
 		key: 'express.sid',
 		cookie: {
-			maxAge: 60*60*24*30*1000	// 30 days
+			maxAge: 60 * 60 * 24 * 30 * 1000 // 30 days
 		}
 	}));
 	app.use(express.csrf());
@@ -92,7 +102,7 @@ var express = require('express'),
 			tailMiddlewares.push(app.stack.pop());
 			tailMiddlewares.push(app.stack.pop());
 			tailMiddlewares.push(app.stack.pop());
-			for(d in plugins.staticDirs) {
+			for (d in plugins.staticDirs) {
 				app.use(nconf.get('relative_path') + '/plugins/' + d, express.static(plugins.staticDirs[d]));
 			}
 
@@ -138,7 +148,9 @@ var express = require('express'),
 
 		// respond with json
 		if (req.accepts('json')) {
-			res.send({ error: 'Not found' });
+			res.send({
+				error: 'Not found'
+			});
 			return;
 		}
 
@@ -155,7 +167,9 @@ var express = require('express'),
 
 		res.status(err.status || 500);
 
-		res.json('500', { error: err.message });
+		res.json('500', {
+			error: err.message
+		});
 	});
 
 
@@ -177,19 +191,22 @@ var express = require('express'),
 		(function() {
 			var routes = ['login', 'register', 'account', 'recent', 'unread', 'popular', 'active', '403', '404'];
 
-			for (var i=0, ii=routes.length; i<ii; i++) {
+			for (var i = 0, ii = routes.length; i < ii; i++) {
 				(function(route) {
 
 					app.get('/' + route, function(req, res) {
-						if ((route === 'login' || route ==='register') && (req.user && req.user.uid > 0)) {
+						if ((route === 'login' || route === 'register') && (req.user && req.user.uid > 0)) {
 
 							user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
-								res.redirect('/users/'+userslug);
+								res.redirect('/users/' + userslug);
 							});
 							return;
 						}
 
-						app.build_header({ req: req, res: res }, function(err, header) {
+						app.build_header({
+							req: req,
+							res: res
+						}, function(err, header) {
 							res.send(header + app.create_route(route) + templates['footer']);
 						});
 					});
@@ -204,12 +221,19 @@ var express = require('express'),
 					app.build_header({
 						req: req,
 						res: res,
-						metaTags: [
-							{ name: "title", content: meta.config.title || 'NodeBB' },
-							{ name: "description", content: meta.config.description || '' },
-							{ property: 'og:title', content: 'Index | ' + (meta.config.title || 'NodeBB') },
-							{ property: "og:type", content: 'website' }
-						]
+						metaTags: [{
+							name: "title",
+							content: meta.config.title || 'NodeBB'
+						}, {
+							name: "description",
+							content: meta.config.description || ''
+						}, {
+							property: 'og:title',
+							content: 'Index | ' + (meta.config.title || 'NodeBB')
+						}, {
+							property: "og:type",
+							content: 'website'
+						}]
 					}, next);
 				},
 				"categories": function(next) {
@@ -235,7 +259,7 @@ var express = require('express'),
 				tid = tid.slice(0, -4);
 				var rssPath = path.join(__dirname, '../', 'feeds/topics', tid + '.rss'),
 					loadFeed = function() {
-						fs.readFile(rssPath, function (err, data) {
+						fs.readFile(rssPath, function(err, data) {
 							if (err) res.type('text').send(404, "Unable to locate an rss feed at this location.");
 							else res.type('xml').set('Content-Length', data.length).send(data);
 						});
@@ -255,8 +279,8 @@ var express = require('express'),
 			async.waterfall([
 				function(next) {
 					topics.getTopicWithPosts(tid, ((req.user) ? req.user.uid : 0), 0, -1, function(err, topicData) {
-						if(topicData) {
-							if(topicData.deleted === '1' && topicData.expose_tools === 0)
+						if (topicData) {
+							if (topicData.deleted === '1' && topicData.expose_tools === 0)
 								return next(new Error('Topic deleted'), null);
 						}
 
@@ -267,7 +291,7 @@ var express = require('express'),
 					var lastMod = 0,
 						timestamp;
 
-					for(var x=0,numPosts=topicData.posts.length;x<numPosts;x++) {
+					for (var x = 0, numPosts = topicData.posts.length; x < numPosts; x++) {
 						timestamp = parseInt(topicData.posts[x].timestamp, 10);
 						if (timestamp > lastMod) lastMod = timestamp;
 					}
@@ -275,16 +299,31 @@ var express = require('express'),
 					app.build_header({
 						req: req,
 						res: res,
-						metaTags: [
-							{ name: "title", content: topicData.topic_name },
-							{ property: 'og:title', content: topicData.topic_name + ' | ' + (meta.config.title || 'NodeBB') },
-							{ property: "og:type", content: 'article' },
-							{ property: "og:url", content: nconf.get('url') + 'topic/' + topicData.slug },
-							{ property: 'og:image', content: topicData.main_posts[0].picture },
-							{ property: "article:published_time", content: new Date(parseInt(topicData.main_posts[0].timestamp, 10)).toISOString() },
-							{ property: 'article:modified_time', content: new Date(lastMod).toISOString() },
-							{ property: 'article:section', content: topicData.category_name }
-						]
+						metaTags: [{
+							name: "title",
+							content: topicData.topic_name
+						}, {
+							property: 'og:title',
+							content: topicData.topic_name + ' | ' + (meta.config.title || 'NodeBB')
+						}, {
+							property: "og:type",
+							content: 'article'
+						}, {
+							property: "og:url",
+							content: nconf.get('url') + 'topic/' + topicData.slug
+						}, {
+							property: 'og:image',
+							content: topicData.main_posts[0].picture
+						}, {
+							property: "article:published_time",
+							content: new Date(parseInt(topicData.main_posts[0].timestamp, 10)).toISOString()
+						}, {
+							property: 'article:modified_time',
+							content: new Date(lastMod).toISOString()
+						}, {
+							property: 'article:section',
+							content: topicData.category_name
+						}]
 					}, function(err, header) {
 						next(err, {
 							header: header,
@@ -312,7 +351,7 @@ var express = require('express'),
 				cid = cid.slice(0, -4);
 				var rssPath = path.join(__dirname, '../', 'feeds/categories', cid + '.rss'),
 					loadFeed = function() {
-						fs.readFile(rssPath, function (err, data) {
+						fs.readFile(rssPath, function(err, data) {
 							if (err) res.type('text').send(404, "Unable to locate an rss feed at this location.");
 							else res.type('xml').set('Content-Length', data.length).send(data);
 						});
@@ -333,8 +372,8 @@ var express = require('express'),
 				function(next) {
 					categories.getCategoryById(cid, 0, function(err, categoryData) {
 
-						if(categoryData) {
-							if(categoryData.disabled === '1')
+						if (categoryData) {
+							if (categoryData.disabled === '1')
 								return next(new Error('Category disabled'), null);
 						}
 						next(err, categoryData);
@@ -344,11 +383,16 @@ var express = require('express'),
 					app.build_header({
 						req: req,
 						res: res,
-						metaTags: [
-							{ name: 'title', content: categoryData.category_name },
-							{ name: 'description', content: categoryData.category_description },
-							{ property: "og:type", content: 'website' }
-						]
+						metaTags: [{
+							name: 'title',
+							content: categoryData.category_name
+						}, {
+							name: 'description',
+							content: categoryData.category_description
+						}, {
+							property: "og:type",
+							content: 'website'
+						}]
 					}, function(err, header) {
 						next(err, {
 							header: header,
@@ -357,7 +401,7 @@ var express = require('express'),
 					});
 				}
 			], function(err, data) {
-				if(err) return res.redirect('404');
+				if (err) return res.redirect('404');
 				var category_url = cid + (req.params.slug ? '/' + req.params.slug : '');
 
 				res.send(
@@ -370,7 +414,10 @@ var express = require('express'),
 		});
 
 		app.get('/confirm/:code', function(req, res) {
-			app.build_header({ req: req, res: res }, function(err, header) {
+			app.build_header({
+				req: req,
+				res: res
+			}, function(err, header) {
 				res.send(header + '<script>templates.ready(function(){ajaxify.go("confirm/' + req.params.code + '");});</script>' + templates['footer']);
 			});
 		});
@@ -385,7 +432,7 @@ var express = require('express'),
 
 		app.get('/robots.txt', function(req, res) {
 			res.set('Content-Type', 'text/plain');
-			res.send(	"User-agent: *\n" +
+			res.send("User-agent: *\n" +
 				"Disallow: \n" +
 				"Disallow: /admin/\n" +
 				"Sitemap: " + nconf.get('url') + "sitemap.xml");
@@ -393,7 +440,7 @@ var express = require('express'),
 
 		app.get('/cid/:cid', function(req, res) {
 			categories.getCategoryData(req.params.cid, function(err, data) {
-				if(data)
+				if (data)
 					res.send(data);
 				else
 					res.send(404, "Category doesn't exist!");
@@ -401,8 +448,8 @@ var express = require('express'),
 		});
 
 		app.get('/tid/:tid', function(req, res) {
-			topics.getTopicData(req.params.tid, function(data){
-				if(data)
+			topics.getTopicData(req.params.tid, function(data) {
+				if (data)
 					res.send(data);
 				else
 					res.send(404, "Topic doesn't exist!");
@@ -410,8 +457,8 @@ var express = require('express'),
 		});
 
 		app.get('/pid/:pid', function(req, res) {
-			posts.getPostData(req.params.pid, function(data){
-				if(data)
+			posts.getPostData(req.params.pid, function(data) {
+				if (data)
 					res.send(data);
 				else
 					res.send(404, "Post doesn't exist!");
@@ -421,7 +468,10 @@ var express = require('express'),
 		app.get('/outgoing', function(req, res) {
 			if (!req.query.url) return res.redirect('/404');
 
-			app.build_header({ req: req, res: res }, function(err, header) {
+			app.build_header({
+				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, null, true);});</script>' +
@@ -431,25 +481,31 @@ var express = require('express'),
 		});
 
 		app.get('/search', function(req, res) {
-			app.build_header({ req: req, res: res }, function(err, header) {
+			app.build_header({
+				req: req,
+				res: res
+			}, function(err, header) {
 				res.send(header + app.create_route("search", null, "search") + templates['footer']);
 			});
 		});
 
 		app.get('/search/:term', function(req, res) {
-			app.build_header({ req: req, res: res }, function(err, header) {
-				res.send(header + app.create_route("search/"+req.params.term, null, "search") + templates['footer']);
+			app.build_header({
+				req: req,
+				res: res
+			}, function(err, header) {
+				res.send(header + app.create_route("search/" + req.params.term, null, "search") + templates['footer']);
 			});
 		});
 
 		app.get('/reindex', function(req, res) {
 			topics.reIndexAll(function(err) {
-				if(err) {
+				if (err) {
 					return res.json(err);
 				}
 
 				user.reIndexAll(function(err) {
-					if(err) {
+					if (err) {
 						return res.json(err);
 					} else {
 						res.send('Topics and users reindexed');

src/websockets.js

@@ -1,8 +1,7 @@
-
 var SocketIO = require('socket.io').listen(global.server, {
 	log: false,
 	transports: ['websocket', 'xhr-polling', 'jsonp-polling', 'flashsocket']
-	}),
+}),
 	cookie = require('cookie'),
 	express = require('express'),
 	user = require('./user.js'),
@@ -22,7 +21,7 @@ var SocketIO = require('socket.io').listen(global.server, {
 	RDB = require('./redis'),
 	RedisStore = new RedisStoreLib({
 		client: RDB,
-		ttl: 60*60*24*14
+		ttl: 60 * 60 * 24 * 14
 	}),
 	socketCookieParser = express.cookieParser(nconf.get('secret')),
 	admin = {
@@ -53,12 +52,16 @@ var SocketIO = require('socket.io').listen(global.server, {
 				userSockets[uid] = userSockets[uid] || [];
 				userSockets[uid].push(socket);
 
-				if(uid) {
+				if (uid) {
 					socket.join('uid_' + uid);
-					io.sockets.in('global').emit('api:user.isOnline', isUserOnline(uid));
+					io.sockets. in ('global').emit('api:user.isOnline', isUserOnline(uid));
 
 					user.getUserField(uid, 'username', function(err, username) {
-						socket.emit('event:connect', {status: 1, username:username, uid:uid});
+						socket.emit('event:connect', {
+							status: 1,
+							username: username,
+							uid: uid
+						});
 					});
 				}
 			});
@@ -69,25 +72,25 @@ var SocketIO = require('socket.io').listen(global.server, {
 		socket.on('disconnect', function() {
 
 			var index = userSockets[uid].indexOf(socket);
-			if(index !== -1) {
+			if (index !== -1) {
 				userSockets[uid].splice(index, 1);
 			}
 
-			if(userSockets[uid].length === 0) {
+			if (userSockets[uid].length === 0) {
 				delete users[sessionID];
 				delete userSockets[uid];
-				if(uid) {
-					io.sockets.in('global').emit('api:user.isOnline', isUserOnline(uid));
+				if (uid) {
+					io.sockets. in ('global').emit('api:user.isOnline', isUserOnline(uid));
 				}
 			}
 
 			emitOnlineUserCount();
 
-			for(var roomName in rooms) {
+			for (var roomName in rooms) {
 
 				socket.leave(roomName);
 
-				if(rooms[roomName][socket.id]) {
+				if (rooms[roomName][socket.id]) {
 					delete rooms[roomName][socket.id];
 				}
 
@@ -103,8 +106,8 @@ var SocketIO = require('socket.io').listen(global.server, {
 
 			function getUidsInRoom(room) {
 				var uids = [];
-				for(var socketId in room) {
-					if(uids.indexOf(room[socketId]) === -1)
+				for (var socketId in room) {
+					if (uids.indexOf(room[socketId]) === -1)
 						uids.push(room[socketId]);
 				}
 				return uids;
@@ -114,10 +117,10 @@ var SocketIO = require('socket.io').listen(global.server, {
 				var clients = io.sockets.clients(roomName);
 				var anonCount = 0;
 
-				for(var i=0; i<clients.length; ++i) {
+				for (var i = 0; i < clients.length; ++i) {
 					var hs = clients[i].handshake;
 
-					if(hs && !users[sessionID]) {
+					if (hs && !users[sessionID]) {
 						++anonCount;
 					}
 				}
@@ -131,8 +134,8 @@ var SocketIO = require('socket.io').listen(global.server, {
 			function userList(users, anonymousCount, userCount) {
 				var usernames = [];
 
-				for (var i = 0, ii=users.length; i<ii; ++i) {
-					usernames[i] = '<strong>' + '<a href="/users/'+users[i].userslug+'">' + users[i].username + '</a></strong>';
+				for (var i = 0, ii = users.length; i < ii; ++i) {
+					usernames[i] = '<strong>' + '<a href="/users/' + users[i].userslug + '">' + users[i].username + '</a></strong>';
 				}
 
 				var joiner = anonymousCount + userCount == 1 ? 'is' : 'are',
@@ -144,11 +147,11 @@ var SocketIO = require('socket.io').listen(global.server, {
 
 
 			if (uids.length === 0) {
-				io.sockets.in(roomName).emit('api:get_users_in_room', userList([], anonymousCount, 0));
+				io.sockets. in (roomName).emit('api:get_users_in_room', userList([], anonymousCount, 0));
 			} else {
 				user.getMultipleUserFields(uids, ['username', 'userslug'], function(err, users) {
-					if(!err)
-						io.sockets.in(roomName).emit('api:get_users_in_room', userList(users, anonymousCount, users.length));
+					if (!err)
+						io.sockets. in (roomName).emit('api:get_users_in_room', userList(users, anonymousCount, users.length));
 				});
 			}
 		}
@@ -171,42 +174,45 @@ var SocketIO = require('socket.io').listen(global.server, {
 				}
 			}
 
-			if(data.leave)
+			if (data.leave)
 				updateRoomBrowsingText(data.leave);
 
 			updateRoomBrowsingText(data.enter);
 
 			if (data.enter != 'admin')
-				io.sockets.in('admin').emit('api:get_all_rooms', io.sockets.manager.rooms);
+				io.sockets. in ('admin').emit('api:get_all_rooms', io.sockets.manager.rooms);
 
 		});
 
 		// BEGIN: API calls (todo: organize)
 
 		socket.on('api:updateHeader', function(data) {
-			if(uid) {
+			if (uid) {
 				user.getUserFields(uid, data.fields, function(err, fields) {
-					if(!err && fields) {
+					if (!err && fields) {
 						fields.uid = uid;
 						socket.emit('api:updateHeader', fields);
 					}
 				});
-			}
-			else {
+			} else {
 				socket.emit('api:updateHeader', {
-					uid:0,
+					uid: 0,
 					username: "Anonymous User",
 					email: '',
-					picture: require('gravatar').url('', {s:'24'}, https=nconf.get('https'))
+					picture: require('gravatar').url('', {
+						s: '24'
+					}, https = nconf.get('https'))
 				});
 			}
 
 		});
 
 		socket.on('user.exists', function(data) {
-			if(data.username) {
-				user.exists(utils.slugify(data.username), function(exists){
-					socket.emit('user.exists', {exists: exists});
+			if (data.username) {
+				user.exists(utils.slugify(data.username), function(exists) {
+					socket.emit('user.exists', {
+						exists: exists
+					});
 				});
 			}
 		});
@@ -246,9 +252,9 @@ var SocketIO = require('socket.io').listen(global.server, {
 		socket.on('api:user.get_online_users', function(data) {
 			var returnData = [];
 
-			for(var i=0; i<data.length; ++i) {
+			for (var i = 0; i < data.length; ++i) {
 				var uid = data[i];
-				if(isUserOnline(uid))
+				if (isUserOnline(uid))
 					returnData.push(uid);
 				else
 					returnData.push(0);
@@ -257,7 +263,10 @@ var SocketIO = require('socket.io').listen(global.server, {
 		});
 
 		socket.on('api:user.isOnline', function(uid, callback) {
-			callback({online:isUserOnline(uid), timestamp:Date.now()});
+			callback({
+				online: isUserOnline(uid),
+				timestamp: Date.now()
+			});
 		});
 
 		socket.on('api:user.changePassword', function(data, callback) {
@@ -274,7 +283,7 @@ var SocketIO = require('socket.io').listen(global.server, {
 
 			function updateHeader() {
 				user.getUserFields(uid, ['picture'], function(err, fields) {
-					if(!err && fields) {
+					if (!err && fields) {
 						fields.uid = uid;
 						socket.emit('api:updateHeader', fields);
 						callback(true);
@@ -284,12 +293,12 @@ var SocketIO = require('socket.io').listen(global.server, {
 				});
 			}
 
-			if(type === 'gravatar') {
+			if (type === 'gravatar') {
 				user.getUserField(uid, 'gravatarpicture', function(err, gravatar) {
 					user.setUserField(uid, 'picture', gravatar);
 					updateHeader();
 				});
-			} else if(type === 'uploaded') {
+			} else if (type === 'uploaded') {
 				user.getUserField(uid, 'uploadedpicture', function(err, uploadedpicture) {
 					user.setUserField(uid, 'picture', uploadedpicture);
 					updateHeader();
@@ -300,21 +309,21 @@ var SocketIO = require('socket.io').listen(global.server, {
 		});
 
 		socket.on('api:user.follow', function(data, callback) {
-			if(uid) {
+			if (uid) {
 				user.follow(uid, data.uid, callback);
 			}
 		});
 
 		socket.on('api:user.unfollow', function(data, callback) {
-			if(uid) {
+			if (uid) {
 				user.unfollow(uid, data.uid, callback);
 			}
 		});
 
 		socket.on('api:user.saveSettings', function(data, callback) {
-			if(uid) {
+			if (uid) {
 				user.setUserFields(uid, {
-					showemail:data.showemail
+					showemail: data.showemail
 				});
 				callback(true);
 			}
@@ -322,7 +331,7 @@ var SocketIO = require('socket.io').listen(global.server, {
 
 		socket.on('api:topics.post', function(data) {
 
-			topics.post(uid, data.title, data.content, data.category_id, data.images, function(err, result) {
+			topics.post(uid, data.title, data.content, data.category_id, function(err, result) {
 				if(err) {
 					if(err.message === 'not-logged-in') {
 						socket.emit('event:alert', {
@@ -334,9 +343,9 @@ var SocketIO = require('socket.io').listen(global.server, {
 								ajaxify.go('register');
 							}
 						});
-					} else if(err.message === 'title-too-short') {
+					} else if (err.message === 'title-too-short') {
 						topics.emitTitleTooShortAlert(socket);
-					} else if(err.message === 'content-too-short') {
+					} else if (err.message === 'content-too-short') {
 						posts.emitContentTooShortAlert(socket);
 					} else if (err.message === 'too-many-posts') {
 						posts.emitTooManyPostsAlert(socket);
@@ -344,7 +353,7 @@ var SocketIO = require('socket.io').listen(global.server, {
 					return;
 				}
 
-				if(result) {
+				if (result) {
 					posts.getTopicPostStats(socket);
 
 					socket.emit('event:alert', {
@@ -360,7 +369,7 @@ var SocketIO = require('socket.io').listen(global.server, {
 
 		socket.on('api:topics.markAllRead', function(data, callback) {
 			topics.markAllRead(uid, function(err, success) {
-				if(!err && success)	{
+				if (!err && success) {
 					callback(true);
 				} else {
 					callback(false);
@@ -369,7 +378,7 @@ var SocketIO = require('socket.io').listen(global.server, {
 		});
 
 		socket.on('api:posts.reply', function(data) {
-			if(uid < 1) {
+			if (uid < 1) {
 				socket.emit('event:alert', {
 					title: 'Reply Unsuccessful',
 					message: 'You don&apos;t seem to be logged in, so you cannot reply.',
@@ -379,13 +388,13 @@ var SocketIO = require('socket.io').listen(global.server, {
 				return;
 			}
 
-			posts.reply(data.topic_id, uid, data.content, data.images, function(err, result) {
+			posts.reply(data.topic_id, uid, data.content, function(err, result) {
 				if(err) {
 					if(err.message === 'content-too-short') {
 						posts.emitContentTooShortAlert(socket);
-					} else if(err.message === 'too-many-posts') {
+					} else if (err.message === 'too-many-posts') {
 						posts.emitTooManyPostsAlert(socket);
-					} else if(err.message === 'reply-error') {
+					} else if (err.message === 'reply-error') {
 						socket.emit('event:alert', {
 							title: 'Reply Unsuccessful',
 							message: 'Your reply could not be posted at this time. Please try again later.',
@@ -396,7 +405,7 @@ var SocketIO = require('socket.io').listen(global.server, {
 					return;
 				}
 
-				if(result) {
+				if (result) {
 
 					posts.getTopicPostStats(socket);
 
@@ -415,7 +424,7 @@ var SocketIO = require('socket.io').listen(global.server, {
 		function emitOnlineUserCount() {
 			var anon = userSockets[0] ? userSockets[0].length : 0;
 			var registered = Object.keys(userSockets).length;
-			if(anon)
+			if (anon)
 				registered = registered - 1;
 
 			var returnObj = {
@@ -477,14 +486,20 @@ var SocketIO = require('socket.io').listen(global.server, {
 			});
 		});
 
+		socket.on('api:posts.uploadImage', function(data, callback) {
+			posts.uploadPostImage(data, callback);
+		});
+
 		socket.on('api:posts.getRawPost', function(data) {
 			posts.getPostField(data.pid, 'content', function(raw) {
-				socket.emit('api:posts.getRawPost', { post: raw });
+				socket.emit('api:posts.getRawPost', {
+					post: raw
+				});
 			});
 		});
 
 		socket.on('api:posts.edit', function(data) {
-			if(!data.title || data.title.length < topics.minimumTitleLength) {
+			if (!data.title || data.title.length < topics.minimumTitleLength) {
 				topics.emitTitleTooShortAlert(socket);
 				return;
 			} else if (!data.content || data.content.length < require('../public/config.json').minimumPostLength) {
@@ -527,7 +542,7 @@ var SocketIO = require('socket.io').listen(global.server, {
 		socket.on('getChatMessages', function(data, callback) {
 			var touid = data.touid;
 			require('./messaging').getMessages(uid, touid, function(err, messages) {
-				if(err)
+				if (err)
 					return callback(null);
 
 				callback(messages);
@@ -537,7 +552,7 @@ var SocketIO = require('socket.io').listen(global.server, {
 		socket.on('sendChatMessage', function(data) {
 
 			var touid = data.touid;
-			if(touid === uid || uid === 0) {
+			if (touid === uid || uid === 0) {
 				return;
 			}
 
@@ -547,8 +562,8 @@ var SocketIO = require('socket.io').listen(global.server, {
 				var finalMessage = username + ' : ' + msg,
 					notifText = 'New message from <strong>' + username + '</strong>';
 
-				if(!isUserOnline(touid)) {
-					notifications.create(notifText, 5, 'javascript:app.openChat(&apos;'+username+'&apos;, '+uid+');', 'notification_' + uid + '_' + touid, function(nid) {
+				if (!isUserOnline(touid)) {
+					notifications.create(notifText, 5, 'javascript:app.openChat(&apos;' + username + '&apos;, ' + uid + ');', 'notification_' + uid + '_' + touid, function(nid) {
 						notifications.push(nid, [touid], function(success) {
 
 						});
@@ -558,20 +573,30 @@ var SocketIO = require('socket.io').listen(global.server, {
 				require('./messaging').addMessage(uid, touid, msg, function(err, message) {
 					var numSockets = 0;
 
-					if(userSockets[touid]) {
+					if (userSockets[touid]) {
 						numSockets = userSockets[touid].length;
 
-						for(var x=0; x<numSockets; ++x) {
-							userSockets[touid][x].emit('chatMessage', {fromuid:uid, username:username, message: finalMessage, timestamp: Date.now()});
+						for (var x = 0; x < numSockets; ++x) {
+							userSockets[touid][x].emit('chatMessage', {
+								fromuid: uid,
+								username: username,
+								message: finalMessage,
+								timestamp: Date.now()
+							});
 						}
 					}
 
-					if(userSockets[uid]) {
+					if (userSockets[uid]) {
 
 						numSockets = userSockets[uid].length;
 
-						for(var x=0; x<numSockets; ++x) {
-							userSockets[uid][x].emit('chatMessage', {fromuid:touid, username:username, message:'You : ' + msg, timestamp: Date.now()});
+						for (var x = 0; x < numSockets; ++x) {
+							userSockets[uid][x].emit('chatMessage', {
+								fromuid: touid,
+								username: username,
+								message: 'You : ' + msg,
+								timestamp: Date.now()
+							});
 						}
 					}
 				});
@@ -586,7 +611,9 @@ var SocketIO = require('socket.io').listen(global.server, {
 
 		socket.on('api:config.set', function(data) {
 			meta.configs.set(data.key, data.value, function(err) {
-				if (!err) socket.emit('api:config.set', { status: 'ok' });
+				if (!err) socket.emit('api:config.set', {
+					status: 'ok'
+				});
 			});
 		});
 
@@ -609,7 +636,7 @@ var SocketIO = require('socket.io').listen(global.server, {
 					});
 				} else if (parseInt(data.cid) > 0) {
 					user.getUserFields(uid, ['username', 'picture'], function(err, userData) {
-						if(!err && userData) {
+						if (!err && userData) {
 							socket.emit('api:composer.push', {
 								tid: 0,
 								cid: data.cid,
@@ -623,14 +650,7 @@ var SocketIO = require('socket.io').listen(global.server, {
 
 					async.parallel([
 						function(next) {
-							posts.getPostFields(data.pid, ['content', 'uploadedImages'], function(raw) {
-								try {
-									raw.uploadedImages = JSON.parse(raw.uploadedImages);
-								} catch(e) {
-									winston.err(e);
-									raw.uploadedImages = [];
-								}
-
+							posts.getPostFields(data.pid, ['content'], function(raw) {
 								next(null, raw);
 							});
 						},
@@ -643,8 +663,7 @@ var SocketIO = require('socket.io').listen(global.server, {
 						socket.emit('api:composer.push', {
 							title: results[1],
 							pid: data.pid,
-							body: results[0].content,
-							uploadedImages: results[0].uploadedImages
+							body: results[0].content
 						});
 					});
 				}
@@ -696,7 +715,9 @@ var SocketIO = require('socket.io').listen(global.server, {
 				end = start + 9;
 
 			topics.getTopicPosts(data.tid, start, end, uid, function(posts) {
-				callback({posts:posts});
+				callback({
+					posts: posts
+				});
 			});
 		});
 
@@ -705,7 +726,9 @@ var SocketIO = require('socket.io').listen(global.server, {
 				end = start + 9;
 
 			categories.getCategoryTopics(data.cid, start, end, uid, function(topics) {
-				callback({topics:topics});
+				callback({
+					topics: topics
+				});
 			});
 		});
 
@@ -732,10 +755,12 @@ var SocketIO = require('socket.io').listen(global.server, {
 				end = start + 19;
 
 			user.getUsers(data.set, start, end, function(err, data) {
-				if(err) {
+				if (err) {
 					winston.err(err);
 				} else {
-					callback({users:data});
+					callback({
+						users: data
+					});
 				}
 			});
 		});
@@ -757,37 +782,37 @@ var SocketIO = require('socket.io').listen(global.server, {
 		});
 
 		socket.on('api:admin.user.makeAdmin', function(theirid) {
-			if(uid && uid > 0) {
+			if (uid && uid > 0) {
 				admin.user.makeAdmin(uid, theirid, socket);
 			}
 		});
 
 		socket.on('api:admin.user.removeAdmin', function(theirid) {
-			if(uid && uid > 0) {
+			if (uid && uid > 0) {
 				admin.user.removeAdmin(uid, theirid, socket);
 			}
 		});
 
 		socket.on('api:admin.user.deleteUser', function(theirid) {
-			if(uid && uid > 0) {
+			if (uid && uid > 0) {
 				admin.user.deleteUser(uid, theirid, socket);
 			}
 		});
 
 		socket.on('api:admin.user.banUser', function(theirid) {
-			if(uid && uid > 0) {
+			if (uid && uid > 0) {
 				admin.user.banUser(uid, theirid, socket);
 			}
 		});
 
 		socket.on('api:admin.user.unbanUser', function(theirid) {
-			if(uid && uid > 0) {
+			if (uid && uid > 0) {
 				admin.user.unbanUser(uid, theirid, socket);
 			}
 		});
 
 		socket.on('api:admin.user.search', function(username, callback) {
-			if(uid && uid > 0) {
+			if (uid && uid > 0) {
 				user.search(username, function(data) {
 					if (!callback) socket.emit('api:admin.user.search', data);
 					else callback(null, data);