ESlint no-plusplus

and no-empty, space-unary-ops
8 years ago · 3361a72725
parent d1101a7fb4
commit 3361a72725
81 changed files with 167 additions and 162 deletions
--- a/.eslintrc
+++ b/.eslintrc
@ -12,7 +12,12 @@
        }],
        "import/no-unresolved": "off",
        "import/no-extraneous-dependencies": "off",
+        "import/no-dynamic-require": "off",
+        "no-bitwise": "off",
        "newline-per-chained-call": "off",
+        "no-console": "off",
+        "no-empty": ["error", { "allowEmptyCatch": true }],
+
        // "linebreak-style": "off",
        // "one-var": "off",
        // "no-undef": "off",
@ -84,7 +89,6 @@
        "no-multi-spaces": "off",
        "quotes": "off",
        "keyword-spacing": "off",
-        "no-plusplus": "off",
        "no-mixed-operators": "off",
        "comma-spacing": "off",
        "global-require": "off",
@ -99,11 +103,9 @@
        "space-in-parens": "off",
        "block-spacing": "off",
        "quote-props": "off",
-        "no-console": "off",
-        "space-unary-ops": "off",
-        "import/no-dynamic-require": "off",
-        "no-bitwise": "off",
-        "no-empty": "off",
+        // "space-unary-ops": "off",
+        // "no-plusplus": "off",
+        // "no-empty": "off",
        // "dot-notation": "off",
        // "func-call-spacing": "off",
        // "array-bracket-spacing": "off",
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -46,9 +46,9 @@ module.exports = function (grunt) {
 			updateWorker.kill('SIGKILL');
 		}
 		updateWorker = fork('app.js', updateArgs, { env: env });
-		++running;
+		running += 1;
 		updateWorker.on('exit', function () {
-			--running;
+			running -= 1;
 			if (running === 0) {
 				worker = fork('app.js', args, { env: env });
 				worker.on('message', function () {
--- a/app.js
+++ b/app.js
@ -155,7 +155,7 @@ function setup() {

 		var separator = '     ';
 		if (process.stdout.columns > 10) {
-			for(var x = 0,cols = process.stdout.columns - 10; x < cols; x++) {
+			for(var x = 0,cols = process.stdout.columns - 10; x < cols; x += 1) {
 				separator += '=';
 			}
 		}
--- a/install/databases.js
+++ b/install/databases.js
@ -74,7 +74,7 @@ function saveDatabaseConfig(config, databaseConfig, callback) {
 	}

 	var allQuestions = questions.redis.concat(questions.mongo);
-	for (var x = 0; x < allQuestions.length; x++) {
+	for (var x = 0; x < allQuestions.length; x += 1) {
 		delete config[allQuestions[x].name];
 	}

--- a/loader.js
+++ b/loader.js
@ -52,7 +52,7 @@ Loader.addWorkerEvents = function (worker) {
 	worker.on('exit', function (code, signal) {
 		if (code !== 0) {
 			if (Loader.timesStarted < numProcs * 3) {
-				Loader.timesStarted++;
+				Loader.timesStarted += 1;
 				if (Loader.crashTimer) {
 					clearTimeout(Loader.crashTimer);
 				}
@ -93,7 +93,7 @@ Loader.start = function (callback) {
 	numProcs = getPorts().length;
 	console.log('Clustering enabled: Spinning up ' + numProcs + ' process(es).\n');

-	for (var x = 0; x < numProcs; ++x) {
+	for (var x = 0; x < numProcs; x += 1) {
 		forkWorker(x, x === 0);
 	}

--- a/public/src/admin/extend/widgets.js
+++ b/public/src/admin/extend/widgets.js
@ -117,7 +117,7 @@ define('admin/extend/widgets', ['jqueryui'], function (jqueryui) {
 					location: location,
 					widgets: widgets,
 				}, function (err) {
-					total--;
+					total -= 1;

 					if (err) {
 						app.alertError(err.message);
@ -209,13 +209,13 @@ define('admin/extend/widgets', ['jqueryui'], function (jqueryui) {
 		$.get(RELATIVE_PATH + '/api/admin/extend/widgets', function (data) {
 			var areas = data.areas;

-			for(var i = 0; i < areas.length; ++i) {
+			for(var i = 0; i < areas.length; i += 1) {
 				var area = areas[i];
 				var widgetArea = $('#widgets .area[data-template="' + area.template + '"][data-location="' + area.location + '"]').find('.widget-area');

 				widgetArea.html('');

-				for (var k = 0; k < area.data.length; ++k) {
+				for (var k = 0; k < area.data.length; k += 1) {
 					var widgetData = area.data[k];
 					var widgetEl = $('.available-widgets [data-widget="' + widgetData.widget + '"]').clone(true).removeClass('hide');

--- a/public/src/admin/general/dashboard.js
+++ b/public/src/admin/general/dashboard.js
@ -387,7 +387,7 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
 		graphs.topics.data.datasets[0].backgroundColor = [];
 		graphs.topics.data.datasets[0].hoverBackgroundColor = [];
 		
-		for (var i = 0, ii = tids.length; i < ii; i++) {
+		for (var i = 0, ii = tids.length; i < ii; i += 1) {
 			graphs.topics.data.labels.push(topics[tids[i]].title);
 			graphs.topics.data.datasets[0].data.push(topics[tids[i]].value);
 			graphs.topics.data.datasets[0].backgroundColor.push(topicColors[i]);
@ -397,7 +397,7 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
 		function buildTopicsLegend() {
 			var legend = $('#topics-legend').html('');

-			for (var i = 0, ii = tids.length; i < ii; i++) {
+			for (var i = 0, ii = tids.length; i < ii; i += 1) {
 				var topic = topics[tids[i]];
 				var	label = topic.value === '0' ? topic.title : '<a title="' + topic.title + '"href="' + RELATIVE_PATH + '/topic/' + tids[i] + '" target="_blank"> ' + topic.title + '</a>';
 			
--- a/public/src/admin/manage/categories.js
+++ b/public/src/admin/manage/categories.js
@ -135,7 +135,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
 			var list = parentCategory.toArray();
 			var len = list.length;

-			for(i; i < len; ++i) {
+			for(i; i < len; i += 1) {
 				modified[list[i]] = {
 					order: (i + 1),
 				};
@ -166,7 +166,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
 				if (category.name !== translated) {
 					category.name = translated;
 				}
-				++count;
+				count += 1;

 				if (count === parent.length) {
 					continueRender();
@ -187,7 +187,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
 					container.append(html);

 					// Handle and children categories in this level have
-					for(var x = 0,numCategories = categories.length; x < numCategories; x++) {
+					for(var x = 0, numCategories = categories.length; x < numCategories; x += 1) {
 						renderList(categories[x].children, $('li[data-cid="' + categories[x].cid + '"]'), categories[x].cid);
 					}

--- a/public/src/admin/manage/category.js
+++ b/public/src/admin/manage/category.js
@ -295,7 +295,7 @@ define('admin/manage/category', [
 				privs.push(el.getAttribute('data-privilege'));
 			}
 		});
-		for(var x = 0,numPrivs = privs.length; x < numPrivs; x++) {
+		for(var x = 0, numPrivs = privs.length; x < numPrivs; x += 1) {
 			var inputs = $('.privilege-table tr[data-group-name]:not([data-group-name="registered-users"],[data-group-name="guests"]) td[data-privilege="' + privs[x] + '"] input');
 			inputs.each(function (idx, el) {
 				if (!el.checked) {
--- a/public/src/admin/manage/group.js
+++ b/public/src/admin/manage/group.js
@ -51,7 +51,7 @@ define('admin/manage/group', [

 						groupDetailsSearchResults.empty();

-						for (x = 0; x < numResults; x++) {
+						for (x = 0; x < numResults; x += 1) {
 							foundUser = $('<li />');
 							foundUser
 								.attr({title: results.users[x].username,
--- a/public/src/admin/settings.js
+++ b/public/src/admin/settings.js
@ -36,7 +36,7 @@ define('admin/settings', ['uploader'], function (uploader) {
 			app.flags._unsaved = true;
 		});

-		for (x = 0; x < numFields; x++) {
+		for (x = 0; x < numFields; x += 1) {
 			field = fields.eq(x);
 			key = field.attr('data-field');
 			inputType = field.attr('type');
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@ -196,7 +196,8 @@ $(document).ready(function () {

 	ajaxify.end = function (url, tpl_url) {
 		function done() {
-			if (--count === 0) {
+			count -= 1;
+			if (count === 0) {
 				$(window).trigger('action:ajaxify.end', {url: url, tpl_url: tpl_url, title: ajaxify.data.title});
 			}
 		}
--- a/public/src/client/category.js
+++ b/public/src/client/category.js
@ -226,7 +226,7 @@ define('forum/category', [
 				}

 				if (numTopics > 0) {
-					for (var x = 0; x < numTopics; x++) {
+					for (var x = 0; x < numTopics; x += 1) {
 						var pinned = $(topics[x]).hasClass('pinned');
 						if (!pinned) {
 							topic.insertBefore(topics[x]);
--- a/public/src/client/category/tools.js
+++ b/public/src/client/category/tools.js
@ -180,7 +180,7 @@ define('forum/category/tools', [
 	}

 	function isAny(method, tids) {
-		for(var i = 0; i < tids.length; ++i) {
+		for(var i = 0; i < tids.length; i += 1) {
 			if(method(tids[i])) {
 				return true;
 			}
@ -189,7 +189,7 @@ define('forum/category/tools', [
 	}

 	function areAll(method, tids) {
-		for(var i = 0; i < tids.length; ++i) {
+		for(var i = 0; i < tids.length; i += 1) {
 			if(!method(tids[i])) {
 				return false;
 			}
--- a/public/src/client/recent.js
+++ b/public/src/client/recent.js
@ -46,13 +46,13 @@ define('forum/recent', ['forum/infinitescroll', 'components'], function (infinit
 			return;
 		}

-		++newTopicCount;
+		newTopicCount += 1;
 		Recent.updateAlertText();
 	}

 	function onNewPost(data) {
 		function showAlert() {
-			++newPostCount;
+			newPostCount += 1;
 			Recent.updateAlertText();
 		}

--- a/public/src/client/search.js
+++ b/public/src/client/search.js
@ -137,7 +137,7 @@ define('forum/search', ['search', 'autocomplete'], function (searchModule, autoc

 			result.html(result.html().replace(regex, '<strong>$1</strong>'));

-			for (var i = 0, ii = nested.length; i < ii; i++) {
+			for (var i = 0, ii = nested.length; i < ii; i += 1) {
 				result.html(result.html().replace('<!-- ' + i + ' -->', nested[i].html()));
 			}
 		});
--- a/public/src/client/topic/events.js
+++ b/public/src/client/topic/events.js
@ -165,7 +165,7 @@ define('forum/topic/events', [
 			return true;
 		}

-		for (var i = 0; i < tags.length; ++i) {
+		for (var i = 0; i < tags.length; i += 1) {
 			if (!$('.tags .tag-item[data-tag="' + tags[i].value + '"]').length) {
 				return true;
 			}
@ -178,7 +178,7 @@ define('forum/topic/events', [
 			$(this).remove();
 			posts.showBottomPostBar();
 		});
-		ajaxify.data.postcount --;
+		ajaxify.data.postcount -= 1;
 		postTools.updatePostCount(ajaxify.data.postcount);
 		require(['forum/topic/replies'], function (replies) {
 			replies.onPostPurged(postData);
--- a/public/src/client/topic/posts.js
+++ b/public/src/client/topic/posts.js
@ -28,7 +28,7 @@ define('forum/topic/posts', [

 		updatePostCounts(data.posts);

-		ajaxify.data.postcount ++;
+		ajaxify.data.postcount += 1;
 		postTools.updatePostCount(ajaxify.data.postcount);

 		if (config.usePagination) {
@ -54,7 +54,7 @@ define('forum/topic/posts', [
 	};

 	function updatePostCounts(posts) {
-		for (var i = 0; i < posts.length; ++i) {
+		for (var i = 0; i < posts.length; i += 1) {
 			var cmp = components.get('user/postcount', posts[i].uid);
 			cmp.html(parseInt(cmp.attr('data-postcount'), 10) + 1);
 			utils.addCommasToNumbers(cmp);
--- a/public/src/client/unread.js
+++ b/public/src/client/unread.js
@ -118,7 +118,7 @@ define('forum/unread', ['forum/recent', 'topicSelect', 'forum/infinitescroll', '
 	}

 	function removeTids(tids) {
-		for(var i = 0; i < tids.length; ++i) {
+		for(var i = 0; i < tids.length; i += 1) {
 			components.get('category/topic', 'tid', tids[i]).remove();
 		}
 	}
--- a/public/src/modules/notifications.js
+++ b/public/src/modules/notifications.js
@ -125,7 +125,7 @@ define('notifications', ['sounds', 'translator', 'components'], function (sound,
 			});

 			translator.toggleTimeagoShorthand();
-			for(var i = 0; i < notifs.length; ++i) {
+			for(var i = 0; i < notifs.length; i += 1) {
 				notifs[i].timeago = $.timeago(new Date(parseInt(notifs[i].datetime, 10)));
 			}
 			translator.toggleTimeagoShorthand();
--- a/public/src/modules/settings.js
+++ b/public/src/modules/settings.js
@ -129,7 +129,7 @@ define('settings', function () {
 			if (!trim && empty) {
 				return array;
 			}
-			for (var i = 0; i < array.length; i++) {
+			for (var i = 0; i < array.length; i += 1) {
 				var value = array[i];
 				if (trim) {
 					value = value === true ? 1 : value === false ? 0 : typeof value.trim === 'function' ? value.trim() : value;
@ -226,7 +226,7 @@ define('settings', function () {
 				if (hook != null) {
 					hook.call(Settings, field);
 				}
-				for (var i = 0; i < keyParts.length; i++) {
+				for (var i = 0; i < keyParts.length; i += 1) {
 					var part = keyParts[i];
 					if (part && value != null) {
 						value = value[part];
@ -254,7 +254,7 @@ define('settings', function () {
 			if (waitingJobs > 0) {
 				waitingJobs -= amount;
 				if (waitingJobs <= 0) {
-					for (var i = 0; i < onReady.length; i++) {
+					for (var i = 0; i < onReady.length; i += 1) {
 						onReady[i]();
 					}
 					onReady = [];
@ -352,7 +352,7 @@ define('settings', function () {
 			if (typeof service.use === 'function') {
 				service.use.call(Settings);
 			}
-			for (var i = 0; i < types.length; i++) {
+			for (var i = 0; i < types.length; i += 1) {
 				var type = types[i].toLowerCase();
 				if (Settings.plugins[type] == null) {
 					Settings.plugins[type] = service;
@ -415,14 +415,14 @@ define('settings', function () {
 			if (notify == null) {
 				notify = true;
 			}
-			for (var i = 0; i < fields.length; i++) {
+			for (var i = 0; i < fields.length; i += 1) {
 				var field = $(fields[i]);
 				var value = helper.readValue(field);
 				var parentCfg = Settings.get();
 				var keyParts = field.data('key').split('.');
 				var lastKey = keyParts[keyParts.length - 1];
 				if (keyParts.length > 1) {
-					for (var j = 0; j < keyParts.length - 1; j++) {
+					for (var j = 0; j < keyParts.length - 1; j += 1) {
 						var part = keyParts[j];
 						if (part && parentCfg != null) {
 							parentCfg = parentCfg[part];
@ -534,7 +534,7 @@ define('settings', function () {

 	helper.registerReadyJobs(1);
 	require(DEFAULT_PLUGINS, function () {
-		for (var i = 0; i < arguments.length; i++) {
+		for (var i = 0; i < arguments.length; i += 1) {
 			Settings.registerPlugin(arguments[i]);
 		}
 		helper.beforeReadyJobsDecreased();
--- a/public/src/modules/settings/array.js
+++ b/public/src/modules/settings/array.js
@ -115,7 +115,7 @@ define('settings/array', function () {
 			if (!(value instanceof Array)) {
 				value = [];
 			}
-			for (var i = 0; i < value.length; i++) {
+			for (var i = 0; i < value.length; i += 1) {
 				addArrayChildElement(element, key, attributes, value[i], separator.clone(), function (el) {
 					element.append(el);
 				});
--- a/public/src/modules/settings/key.js
+++ b/public/src/modules/settings/key.js
@ -131,7 +131,7 @@ define('settings/key', function () {
 		var key = new Key();
 		var sep = /([^CtrlAShifMea#\d]+)(?:#|\d)/.exec(str);
 		var parts = sep != null ? str.split(sep[1]) : [str];
-		for (var i = 0; i < parts.length; i++) {
+		for (var i = 0; i < parts.length; i += 1) {
 			var part = parts[i];
 			switch (part) {
 			case 'C':
--- a/public/src/modules/settings/select.js
+++ b/public/src/modules/settings/select.js
@ -4,7 +4,7 @@ define('settings/select', function () {
 	var SettingsSelect;

 	function addOptions(element, options) {
-		for (var i = 0; i < options.length; i++) {
+		for (var i = 0; i < options.length; i += 1) {
 			var optionData = options[i];
 			var value = optionData.text || optionData.value;
 			delete optionData.text;
--- a/public/src/modules/topicSelect.js
+++ b/public/src/modules/topicSelect.js
@ -70,7 +70,7 @@ define('topicSelect', ['components'], function (components) {
 			end = tmp;
 		}

-		for(var i = start; i <= end; ++i) {
+		for(var i = start; i <= end; i += 1) {
 			var topic = $('[component="category/topic"]').eq(i);
 			toggleSelect(topic.find('[component="topic/select"]'), isSelected);
 		}
--- a/public/src/utils.js
+++ b/public/src/utils.js
@ -58,13 +58,15 @@
 								}

 								results = results.concat(res);
-								if (!--pending) {
+								pending -= 1;
+								if (!pending) {
 									done(null, results);
 								}
 							});
 						} else {
 							results.push(file);
-							if (!--pending) {
+							pending -= 1;
+							if (!pending) {
 								done(null, results);
 							}
 						}
@ -148,10 +150,10 @@
 			var result = {};
 			var obj;
 			var keys;
-			for (var i = 0; i < arguments.length; i++) {
+			for (var i = 0; i < arguments.length; i += 1) {
 				obj = arguments[i] || {};
 				keys = Object.keys(obj);
-				for (var j = 0; j < keys.length; j++) {
+				for (var j = 0; j < keys.length; j += 1) {
 					result[keys[j]] = obj[keys[j]];
 				}
 			}
@ -276,7 +278,7 @@

 			$el.appendTo($('body'));

-			for (var i = envs.length - 1; i >= 0; i--) {
+			for (var i = envs.length - 1; i >= 0; i -= 1) {
 				var env = envs[i];

 				$el.addClass('hidden-' + env);
@ -298,7 +300,7 @@
 			var currentHour = new Date().getHours();
 			var labels = [];

-			for (var i = currentHour, ii = currentHour - 24; i > ii; i--) {
+			for (var i = currentHour, ii = currentHour - 24; i > ii; i -= 1) {
 				var hour = i < 0 ? 24 + i : i;
 				labels.push(hour + ':00');
 			}
@ -312,7 +314,7 @@
 			var labels = [];
 			var tmpDate;

-			for(var x = 29; x >= 0; x--) {
+			for(var x = 29; x >= 0; x -= 1) {
 				tmpDate = new Date(currentDay - (1000 * 60 * 60 * 24 * x));
 				labels.push(months[tmpDate.getMonth()] + ' ' + tmpDate.getDate());
 			}
--- a/public/src/widgets.js
+++ b/public/src/widgets.js
@ -36,12 +36,12 @@
 			cid: ajaxify.data.cid,
 			isMobile: utils.isMobile(),
 		}, function (renderedAreas) {
-			for (var x = 0; x < renderedAreas.length; ++x) {
+			for (var x = 0; x < renderedAreas.length; x += 1) {
 				var renderedWidgets = renderedAreas[x].widgets;
 				var location = renderedAreas[x].location;
 				var html = '';

-				for (var i = 0; i < renderedWidgets.length; ++i) {
+				for (var i = 0; i < renderedWidgets.length; i += 1) {
 					html += templates.parse(renderedWidgets[i].html, {});
 				}

--- a/src/analytics.js
+++ b/src/analytics.js
@ -25,12 +25,12 @@ Analytics.increment = function (keys) {

 	keys.forEach(function (key) {
 		counters[key] = counters[key] || 0;
-		++counters[key];
+		counters[key] += 1;
 	});
 };

 Analytics.pageView = function (payload) {
-	++pageViews;
+	pageViews += 1;

 	if (payload.ip) {
 		db.sortedSetScore('ip:recent', payload.ip, function (err, score) {
@ -38,12 +38,12 @@ Analytics.pageView = function (payload) {
 				return;
 			}
 			if (!score) {
-				++uniqueIPCount;
+				uniqueIPCount += 1;
 			}
 			var today = new Date();
 			today.setHours(today.getHours(), 0, 0, 0);
 			if (!score || score < today.getTime()) {
-				++uniquevisitors;
+				uniquevisitors += 1;
 				db.sortedSetAdd('ip:recent', Date.now(), payload.ip);
 			}
 		});
@ -109,7 +109,7 @@ Analytics.getHourlyStatsForSet = function (set, hour, numHours, callback) {
 	hour = new Date(hour);
 	hour.setHours(hour.getHours(), 0, 0, 0);

-	for (var i = 0, ii = numHours; i < ii; i++) {
+	for (var i = 0, ii = numHours; i < ii; i += 1) {
 		hoursArr.push(hour.getTime());
 		hour.setHours(hour.getHours() - 1, 0, 0, 0);
 	}
@ -142,7 +142,8 @@ Analytics.getDailyStatsForSet = function (set, day, numDays, callback) {
 	day.setHours(0, 0, 0, 0);

 	async.whilst(function () {
-		return numDays--;
+		numDays -= 1;
+		return numDays + 1;
 	}, function (next) {
 		Analytics.getHourlyStatsForSet(set, day.getTime() - (1000 * 60 * 60 * 24 * numDays), 24, function (err, day) {
 			if (err) {
--- a/src/categories.js
+++ b/src/categories.js
@ -298,7 +298,7 @@ var privileges = require('./privileges');
 		var len = categories.length;
 		var category;

-		for (i; i < len; ++i) {
+		for (i; i < len; i += 1) {
 			category = categories[i];
 			if (!category.hasOwnProperty('parentCid') || category.parentCid === null) {
 				category.parentCid = 0;
--- a/src/categories/topics.js
+++ b/src/categories/topics.js
@ -24,7 +24,7 @@ module.exports = function (Categories) {
 					return next(null, {topics: [], uid: data.uid});
 				}

-				for (var i = 0; i < topics.length; ++i) {
+				for (var i = 0; i < topics.length; i += 1) {
 					topics[i].index = data.start + i;
 				}

--- a/src/categories/unread.js
+++ b/src/categories/unread.js
@ -43,7 +43,7 @@ module.exports = function (Categories) {
 	Categories.hasReadCategories = function (cids, uid, callback) {
 		var sets = [];

-		for (var i = 0, ii = cids.length; i < ii; i++) {
+		for (var i = 0, ii = cids.length; i < ii; i += 1) {
 			sets.push('cid:' + cids[i] + ':read_by_uid');
 		}

--- a/src/controllers/admin/plugins.js
+++ b/src/controllers/admin/plugins.js
@ -39,7 +39,7 @@ pluginsController.get = function (req, res, next) {
 			}),
 			upgradeCount: payload.compatible.reduce(function (count, current) {
 				if (current.installed && current.outdated) {
-					++count;
+					count += 1;
 				}
 				return count;
 			}, 0),
--- a/src/controllers/topics.js
+++ b/src/controllers/topics.js
@ -149,7 +149,7 @@ topicsController.get = function (req, res, callback) {
 		},
 		function (topicData, next) {
 			function findPost(index) {
-				for(var i = 0; i < topicData.posts.length; ++i) {
+				for(var i = 0; i < topicData.posts.length; i += 1) {
 					if (parseInt(topicData.posts[i].index, 10) === parseInt(index, 10)) {
 						return topicData.posts[i];
 					}
--- a/src/controllers/users.js
+++ b/src/controllers/users.js
@ -79,7 +79,7 @@ usersController.getOnlineUsers = function (req, res, next) {
 		if (!userData.isAdminOrGlobalMod) {
 			userData.users = userData.users.filter(function (user) {
 				if (user && user.status === 'offline') {
-					hiddenCount ++;
+					hiddenCount += 1;
 				}
 				return user && user.status !== 'offline';
 			});
--- a/src/database/mongo.js
+++ b/src/database/mongo.js
@ -76,7 +76,7 @@
 		var ports = nconf.get('mongo:port').toString().split(',');
 		var servers = [];

-		for (var i = 0; i < hosts.length; i++) {
+		for (var i = 0; i < hosts.length; i += 1) {
 			servers.push(hosts[i] + ':' + ports[i]);
 		}

--- a/src/database/mongo/hash.js
+++ b/src/database/mongo/hash.js
@ -44,7 +44,7 @@ module.exports = function (db, module) {
 			var map = helpers.toMap(data);
 			var returnData = [];

-			for (var i = 0; i < keys.length; ++i) {
+			for (var i = 0; i < keys.length; i += 1) {
 				returnData.push(map[keys[i]]);
 			}

@ -78,7 +78,7 @@ module.exports = function (db, module) {
 			_id: 0,
 		};

-		for(var i = 0; i < fields.length; ++i) {
+		for(var i = 0; i < fields.length; i += 1) {
 			fields[i] = helpers.fieldToString(fields[i]);
 			_fields[fields[i]] = 1;
 		}
@ -88,7 +88,7 @@ module.exports = function (db, module) {
 			}
 			item = item || {};
 			var result = {};
-			for(i = 0; i < fields.length; ++i) {
+			for(i = 0; i < fields.length; i += 1) {
 				result[fields[i]] = item[fields[i]] !== undefined ? item[fields[i]] : null;
 			}
 			callback(null, result);
@ -104,7 +104,7 @@ module.exports = function (db, module) {
 			_key: 1,
 		};

-		for(var i = 0; i < fields.length; ++i) {
+		for(var i = 0; i < fields.length; i += 1) {
 			fields[i] = helpers.fieldToString(fields[i]);
 			_fields[fields[i]] = 1;
 		}
@ -122,10 +122,10 @@ module.exports = function (db, module) {
 			var returnData = [];
 			var item;

-			for (var i = 0; i < keys.length; ++i) {
+			for (var i = 0; i < keys.length; i += 1) {
 				item = map[keys[i]] || {};

-				for (var k = 0; k < fields.length; ++k) {
+				for (var k = 0; k < fields.length; k += 1) {
 					if (item[fields[k]] === undefined) {
 						item[fields[k]] = null;
 					}
--- a/src/database/mongo/helpers.js
+++ b/src/database/mongo/helpers.js
@ -4,7 +4,7 @@ var helpers = {};

 helpers.toMap = function (data) {
 	var map = {};
-	for (var i = 0; i < data.length; ++i) {
+	for (var i = 0; i < data.length; i += 1) {
 		map[data[i]._key] = data[i];
 		data[i]._key = undefined;
 	}
--- a/src/database/mongo/sets.js
+++ b/src/database/mongo/sets.js
@ -46,7 +46,7 @@ module.exports = function (db, module) {

 		var bulk = db.collection('objects').initializeUnorderedBulkOp();

-		for(var i = 0; i < keys.length; ++i) {
+		for(var i = 0; i < keys.length; i += 1) {
 			bulk.find({_key: keys[i]}).upsert().updateOne({	$addToSet: {
 				members: {
 					$each: value,
@ -83,7 +83,7 @@ module.exports = function (db, module) {

 		var bulk = db.collection('objects').initializeUnorderedBulkOp();

-		for(var i = 0; i < keys.length; ++i) {
+		for(var i = 0; i < keys.length; i += 1) {
 			bulk.find({_key: keys[i]}).updateOne({$pull: {
 				members: value,
 			}});
@ -110,7 +110,7 @@ module.exports = function (db, module) {
 			return callback(null, []);
 		}

-		for (var i = 0; i < values.length; ++i) {
+		for (var i = 0; i < values.length; i += 1) {
 			values[i] = helpers.valueToString(values[i]);
 		}

@ -174,7 +174,7 @@ module.exports = function (db, module) {
 			});

 			var returnData = new Array(keys.length);
-			for(var i = 0; i < keys.length; ++i) {
+			for(var i = 0; i < keys.length; i += 1) {
 				returnData[i] = sets[keys[i]] || [];
 			}
 			callback(null, returnData);
--- a/src/database/mongo/sorted.js
+++ b/src/database/mongo/sorted.js
@ -212,7 +212,7 @@ module.exports = function (db, module) {
 			return callback(null, []);
 		}
 		var data = new Array(values.length);
-		for (var i = 0; i < values.length; ++i) {
+		for (var i = 0; i < values.length; i += 1) {
 			data[i] = {key: keys[i], value: values[i]};
 		}

@ -263,7 +263,7 @@ module.exports = function (db, module) {
 			var returnData = [];
 			var item;

-			for(var i = 0; i < keys.length; ++i) {
+			for(var i = 0; i < keys.length; i += 1) {
 				item = map[keys[i]];
 				returnData.push(item ? item.score : null);
 			}
@ -290,7 +290,7 @@ module.exports = function (db, module) {
 			var returnData = new Array(values.length);
 			var score;

-			for(var i = 0; i < values.length; ++i) {
+			for(var i = 0; i < values.length; i += 1) {
 				score = map[values[i]];
 				returnData[i] = utils.isNumber(score) ? score : null;
 			}
@ -367,7 +367,7 @@ module.exports = function (db, module) {
 			});

 			var returnData = new Array(keys.length);
-			for(var i = 0; i < keys.length; ++i) {
+			for(var i = 0; i < keys.length; i += 1) {
 			 	returnData[i] = sets[keys[i]] || [];
 			}
 			callback(null, returnData);
--- a/src/database/mongo/sorted/add.js
+++ b/src/database/mongo/sorted/add.js
@ -35,7 +35,7 @@ module.exports = function (db, module) {

 		var bulk = db.collection('objects').initializeUnorderedBulkOp();

-		for(var i = 0; i < scores.length; ++i) {
+		for(var i = 0; i < scores.length; i += 1) {
 			bulk.find({_key: key, value: values[i]}).upsert().updateOne({$set: {score: parseFloat(scores[i])}});
 		}

@ -53,7 +53,7 @@ module.exports = function (db, module) {

 		var bulk = db.collection('objects').initializeUnorderedBulkOp();

-		for(var i = 0; i < keys.length; ++i) {
+		for(var i = 0; i < keys.length; i += 1) {
 			bulk.find({_key: keys[i], value: value}).upsert().updateOne({$set: {score: parseFloat(score)}});
 		}

--- a/src/database/redis/hash.js
+++ b/src/database/redis/hash.js
@ -52,14 +52,14 @@ module.exports = function (redisClient, module) {
 		}
 		var	multi = redisClient.multi();

-		for(var x = 0; x < keys.length; ++x) {
+		for(var x = 0; x < keys.length; x += 1) {
 			multi.hmget.apply(multi, [keys[x]].concat(fields));
 		}

 		function makeObject(array) {
 			var obj = {};

-			for (var i = 0, ii = fields.length; i < ii; ++i) {
+			for (var i = 0, ii = fields.length; i < ii; i += 1) {
 				obj[fields[i]] = array[i];
 			}
 			return obj;
--- a/src/database/redis/helpers.js
+++ b/src/database/redis/helpers.js
@ -5,7 +5,7 @@ var helpers = {};
 helpers.multiKeys = function (redisClient, command, keys, callback) {
 	callback = callback || function () {};
 	var multi = redisClient.multi();
-	for (var i = 0; i < keys.length; ++i) {
+	for (var i = 0; i < keys.length; i += 1) {
 		multi[command](keys[i]);
 	}
 	multi.exec(callback);
@ -14,7 +14,7 @@ helpers.multiKeys = function (redisClient, command, keys, callback) {
 helpers.multiKeysValue = function (redisClient, command, keys, value, callback) {
 	callback = callback || function () {};
 	var multi = redisClient.multi();
-	for (var i = 0; i < keys.length; ++i) {
+	for (var i = 0; i < keys.length; i += 1) {
 		multi[command](keys[i], value);
 	}
 	multi.exec(callback);
@ -23,14 +23,14 @@ helpers.multiKeysValue = function (redisClient, command, keys, value, callback)
 helpers.multiKeyValues = function (redisClient, command, key, values, callback) {
 	callback = callback || function () {};
 	var multi = redisClient.multi();
-	for (var i = 0; i < values.length; ++i) {
+	for (var i = 0; i < values.length; i += 1) {
 		multi[command](key, values[i]);
 	}
 	multi.exec(callback);
 };

 helpers.resultsToBool = function (results) {
-	for (var i = 0; i < results.length; ++i) {
+	for (var i = 0; i < results.length; i += 1) {
 		results[i] = results[i] === 1;
 	}
 	return results;
--- a/src/database/redis/main.js
+++ b/src/database/redis/main.js
@ -30,7 +30,7 @@ module.exports = function (redisClient, module) {
 	module.deleteAll = function (keys, callback) {
 		callback = callback || function () {};
 		var multi = redisClient.multi();
-		for(var i = 0; i < keys.length; ++i) {
+		for(var i = 0; i < keys.length; i += 1) {
 			multi.del(keys[i]);
 		}
 		multi.exec(function (err, res) {
--- a/src/database/redis/sorted.js
+++ b/src/database/redis/sorted.js
@ -94,7 +94,7 @@ module.exports = function (redisClient, module) {
 			return callback(null, []);
 		}
 		var multi = redisClient.multi();
-		for(var i = 0; i < keys.length; ++i) {
+		for(var i = 0; i < keys.length; i += 1) {
 			multi.zcard(keys[i]);
 		}
 		multi.exec(callback);
@ -106,7 +106,7 @@ module.exports = function (redisClient, module) {

 	module.sortedSetsRanks = function (keys, values, callback) {
 		var multi = redisClient.multi();
-		for(var i = 0; i < values.length; ++i) {
+		for(var i = 0; i < values.length; i += 1) {
 			multi.zrank(keys[i], values[i]);
 		}
 		multi.exec(callback);
@ -114,7 +114,7 @@ module.exports = function (redisClient, module) {

 	module.sortedSetRanks = function (key, values, callback) {
 		var multi = redisClient.multi();
-		for(var i = 0; i < values.length; ++i) {
+		for(var i = 0; i < values.length; i += 1) {
 			multi.zrank(key, values[i]);
 		}
 		multi.exec(callback);
@ -164,7 +164,7 @@ module.exports = function (redisClient, module) {

 	module.getSortedSetsMembers = function (keys, callback) {
 		var multi = redisClient.multi();
-		for (var i = 0; i < keys.length; ++i) {
+		for (var i = 0; i < keys.length; i += 1) {
 			multi.zrange(keys[i], 0, -1);
 		}
 		multi.exec(callback);
--- a/src/database/redis/sorted/add.js
+++ b/src/database/redis/sorted/add.js
@ -23,7 +23,7 @@ module.exports = function (redisClient, module) {

 		var args = [key];

-		for(var i = 0; i < scores.length; ++i) {
+		for(var i = 0; i < scores.length; i += 1) {
 			args.push(scores[i], values[i]);
 		}

@ -36,7 +36,7 @@ module.exports = function (redisClient, module) {
 		callback = callback || function () {};
 		var multi = redisClient.multi();

-		for(var i = 0; i < keys.length; ++i) {
+		for(var i = 0; i < keys.length; i += 1) {
 			multi.zadd(keys[i], score, value);
 		}

--- a/src/database/redis/sorted/remove.js
+++ b/src/database/redis/sorted/remove.js
@ -28,7 +28,7 @@ module.exports = function (redisClient, module) {
 	module.sortedSetsRemoveRangeByScore = function (keys, min, max, callback) {
 		callback = callback || function () {};
 		var multi = redisClient.multi();
-		for(var i = 0; i < keys.length; ++i) {
+		for(var i = 0; i < keys.length; i += 1) {
 			multi.zremrangebyscore(keys[i], min, max);
 		}
 		multi.exec(function (err) {
--- a/src/groups.js
+++ b/src/groups.js
@ -34,8 +34,7 @@ var utils = require('../public/src/utils');
 			};
 		},
 		removeEphemeralGroups: function (groups) {
-			var x = groups.length;
-			while(x--) {
+			for (var x = groups.length; x >= 0; x -= 1) {
 				if (ephemeralGroups.indexOf(groups[x]) !== -1) {
 					groups.splice(x, 1);
 				}
--- a/src/groups/membership.js
+++ b/src/groups/membership.js
@ -471,7 +471,7 @@ module.exports = function (Groups) {
 				});

 				var result = members.map(function (groupNames) {
-					for (var i = 0; i < groupNames.length; ++i) {
+					for (var i = 0; i < groupNames.length; i += 1) {
 						if (map[groupNames[i]]) {
 							return true;
 						}
--- a/src/groups/search.js
+++ b/src/groups/search.js
@ -77,7 +77,7 @@ module.exports = function (Groups) {
 				},
 				function (users, next) {
 					var uids = [];
-					for(var i = 0; i < users.length; ++i) {
+					for(var i = 0; i < users.length; i += 1) {
 						var field = users[i][searchBy];
 						if (field.toLowerCase().startsWith(query)) {
 							uids.push(users[i].uid);
--- a/src/hotswap.js
+++ b/src/hotswap.js
@ -10,7 +10,7 @@ HotSwap.prepare = function (app) {

 HotSwap.find = function (id) {
 	if (stack) {
-		for(var x = 0,numEntries = stack.length; x < numEntries; x++) {
+		for(var x = 0, numEntries = stack.length; x < numEntries; x += 1) {
 			if (stack[x].handle.hotswapId === id) {
 				return x;
 			}
--- a/src/messaging.js
+++ b/src/messaging.js
@ -331,7 +331,7 @@ Messaging.hasPrivateChat = function (uid, withUid, callback) {
 						roomId = roomIds[index];
 						next(null, roomId);
 					} else {
-						++ index;
+						index += 1;
 						next();
 					}
 				});
--- a/src/middleware/ratelimit.js
+++ b/src/middleware/ratelimit.js
@ -13,7 +13,7 @@ ratelimit.isFlooding = function (socket) {
 	socket.elapsedTime = socket.elapsedTime || 0;
 	socket.lastCallTime = socket.lastCallTime || Date.now();

-	++socket.callsPerSecond;
+	socket.callsPerSecond += 1;

 	var now = Date.now();
 	socket.elapsedTime += now - socket.lastCallTime;
--- a/src/pagination.js
+++ b/src/pagination.js
@ -26,7 +26,7 @@ pagination.create = function (currentPage, pageCount, queryObj) {
 	if (startPage > pageCount - 5) {
 		startPage -= 2 - (pageCount - currentPage);
 	}
-	for(var i = 0; i < 5; ++i) {
+	for(var i = 0; i < 5; i += 1) {
 		pagesToShow.push(startPage + i);
 	}

@ -45,7 +45,7 @@ pagination.create = function (currentPage, pageCount, queryObj) {
 		return {page: page, active: page === currentPage, qs: qs.stringify(queryObj)};
 	});

-	for (i = pages.length - 1; i > 0; --i) {
+	for (i = pages.length - 1; i > 0; i -= 1) {
 		if (pages[i].page - 2 === pages[i - 1].page) {
 			pages.splice(i, 0, {page: pages[i].page - 1, active: false, qs: qs.stringify(queryObj)});
 		} else if (pages[i].page - 1 !== pages[i - 1].page) {
--- a/src/plugins.js
+++ b/src/plugins.js
@ -107,7 +107,7 @@ var middleware;
 				if (Plugins.versionWarning.length && nconf.get('isPrimary') === 'true') {
 					process.stdout.write('\n');
 					winston.warn('[plugins/load] The following plugins may not be compatible with your version of NodeBB. This may cause unintended behaviour or crashing. In the event of an unresponsive NodeBB caused by this plugin, run `./nodebb reset -p PLUGINNAME` to disable it.');
-					for(var x = 0,numPlugins = Plugins.versionWarning.length; x < numPlugins; x++) {
+					for(var x = 0, numPlugins = Plugins.versionWarning.length; x < numPlugins; x += 1) {
 						process.stdout.write('  * '.yellow + Plugins.versionWarning[x] + '\n');
 					}
 					process.stdout.write('\n');
@ -252,7 +252,7 @@ var middleware;
 		var pluginMap = {};
 		var dependencies = require(path.join(nconf.get('base_dir'), 'package.json')).dependencies;
 		apiReturn = apiReturn || [];
-		for(var i = 0; i < apiReturn.length; ++i) {
+		for(var i = 0; i < apiReturn.length; i += 1) {
 			apiReturn[i].id = apiReturn[i].name;
 			apiReturn[i].installed = false;
 			apiReturn[i].active = false;
--- a/src/posts.js
+++ b/src/posts.js
@ -44,7 +44,7 @@ var plugins = require('./plugins');

 		var keys = [];

-		for (var x = 0, numPids = pids.length; x < numPids; ++x) {
+		for (var x = 0, numPids = pids.length; x < numPids; x += 1) {
 			keys.push('post:' + pids[x]);
 		}

@ -212,7 +212,7 @@ var plugins = require('./plugins');
 				db[method](sets, pids, next);
 			},
 			function (indices, next) {
-				for (var i = 0; i < indices.length; ++i) {
+				for (var i = 0; i < indices.length; i += 1) {
 					indices[i] = utils.isNumber(indices[i]) ? parseInt(indices[i], 10) + 1 : 0;
 				}

--- a/src/posts/summary.js
+++ b/src/posts/summary.js
@ -136,7 +136,7 @@ module.exports = function (Posts) {

 	function toObject(key, data) {
 		var obj = {};
-		for(var i = 0; i < data.length; ++i) {
+		for(var i = 0; i < data.length; i += 1) {
 			obj[data[i][key]] = data[i];
 		}
 		return obj;
--- a/src/posts/votes.js
+++ b/src/posts/votes.js
@ -84,7 +84,7 @@ module.exports = function (Posts) {
 		var upvoteSets = [];
 		var downvoteSets = [];

-		for (var i = 0; i < pids.length; ++i) {
+		for (var i = 0; i < pids.length; i += 1) {
 			upvoteSets.push('pid:' + pids[i] + ':upvote');
 			downvoteSets.push('pid:' + pids[i] + ':downvote');
 		}
--- a/src/privileges/categories.js
+++ b/src/privileges/categories.js
@ -66,7 +66,7 @@ module.exports = function (privileges) {

 							memberData.forEach(function (member) {
 								member.privileges = {};
-								for(var x = 0,numPrivs = userPrivileges.length; x < numPrivs; x++) {
+								for(var x = 0,numPrivs = userPrivileges.length; x < numPrivs; x += 1) {
 									member.privileges[userPrivileges[x]] = memberSets[x].indexOf(parseInt(member.uid, 10)) !== -1;
 								}
 							});
@ -117,7 +117,7 @@ module.exports = function (privileges) {
 							var memberData = groupNames.map(function (member) {
 								memberPrivs = {};

-								for(var x = 0,numPrivs = groupPrivileges.length; x < numPrivs; x++) {
+								for(var x = 0,numPrivs = groupPrivileges.length; x < numPrivs; x += 1) {
 									memberPrivs[groupPrivileges[x]] = memberSets[x].indexOf(member) !== -1;
 								}
 								return {
--- a/src/privileges/helpers.js
+++ b/src/privileges/helpers.js
@ -33,7 +33,7 @@ function isUserAllowedToCids(privilege, uid, cids, callback) {

 	var userKeys = [];
 	var groupKeys = [];
-	for (var i = 0; i < cids.length; ++i) {
+	for (var i = 0; i < cids.length; i += 1) {
 		userKeys.push('cid:' + cids[i] + ':privileges:' + privilege);
 		groupKeys.push('cid:' + cids[i] + ':privileges:groups:' + privilege);
 	}
@ -51,7 +51,7 @@ function isUserAllowedToCids(privilege, uid, cids, callback) {
 		}

 		var result = [];
-		for (var i = 0; i < cids.length; ++i) {
+		for (var i = 0; i < cids.length; i += 1) {
 			result.push(results.hasUserPrivilege[i] || results.hasGroupPrivilege[i]);
 		}

@ -66,7 +66,7 @@ function isUserAllowedToPrivileges(privileges, uid, cid, callback) {

 	var userKeys = [];
 	var groupKeys = [];
-	for (var i = 0; i < privileges.length; ++i) {
+	for (var i = 0; i < privileges.length; i += 1) {
 		userKeys.push('cid:' + cid + ':privileges:' + privileges[i]);
 		groupKeys.push('cid:' + cid + ':privileges:groups:' + privileges[i]);
 	}
@ -84,7 +84,7 @@ function isUserAllowedToPrivileges(privileges, uid, cid, callback) {
 		}

 		var result = [];
-		for (var i = 0; i < privileges.length; ++i) {
+		for (var i = 0; i < privileges.length; i += 1) {
 			result.push(results.hasUserPrivilege[i] || results.hasGroupPrivilege[i]);
 		}

@ -107,7 +107,7 @@ helpers.isUsersAllowedTo = function (privilege, uids, cid, callback) {
 		}

 		var result = [];
-		for(var i = 0; i < uids.length; ++i) {
+		for(var i = 0; i < uids.length; i += 1) {
 			result.push(results.hasUserPrivilege[i] || results.hasGroupPrivilege[i]);
 		}

@ -117,7 +117,7 @@ helpers.isUsersAllowedTo = function (privilege, uids, cid, callback) {

 function isGuestAllowedToCids(privilege, cids, callback) {
 	var groupKeys = [];
-	for (var i = 0; i < cids.length; ++i) {
+	for (var i = 0; i < cids.length; i += 1) {
 		groupKeys.push('cid:' + cids[i] + ':privileges:groups:' + privilege);
 	}

@ -126,7 +126,7 @@ function isGuestAllowedToCids(privilege, cids, callback) {

 function isGuestAllowedToPrivileges(privileges, cid, callback) {
 	var groupKeys = [];
-	for (var i = 0; i < privileges.length; ++i) {
+	for (var i = 0; i < privileges.length; i += 1) {
 		groupKeys.push('cid:' + cid + ':privileges:groups:' + privileges[i]);
 	}

--- a/src/privileges/posts.js
+++ b/src/privileges/posts.js
@ -40,7 +40,7 @@ module.exports = function (privileges) {

 			var privileges = [];

-			for (var i = 0; i < pids.length; ++i) {
+			for (var i = 0; i < pids.length; i += 1) {
 				var isAdminOrMod = results.isAdmin || results.isModerator[i];
 				var editable = isAdminOrMod || (results.isOwner[i] && results['posts:edit'][i]);

--- a/src/routes/index.js
+++ b/src/routes/index.js
@ -98,7 +98,7 @@ module.exports = function (app, middleware, hotswapIds) {
 	var ensureLoggedIn = require('connect-ensure-login');

 	if (Array.isArray(hotswapIds) && hotswapIds.length) {
-		for(var idx,x = 0; x < hotswapIds.length; x++) {
+		for(var idx,x = 0; x < hotswapIds.length; x += 1) {
 			idx = routers.push(express.Router()) - 1;
 			routers[idx].hotswapId = hotswapIds[x];
 		}
@ -132,7 +132,7 @@ module.exports = function (app, middleware, hotswapIds) {
 	userRoutes(router, middleware, controllers);
 	groupRoutes(router, middleware, controllers);

-	for(var x = 0; x < routers.length; x++) {
+	for(var x = 0; x < routers.length; x += 1) {
 		app.use(relativePath, routers[x]);
 	}

--- a/src/settings.js
+++ b/src/settings.js
@ -134,7 +134,7 @@ Settings.prototype.get = function (key, def) {
 	var obj = this.cfg._;
 	var parts = (key || '').split('.');
 	var part;
-	for (var i = 0; i < parts.length; i++) {
+	for (var i = 0; i < parts.length; i += 1) {
 		part = parts[i];
 		if (part && obj != null) {
 			obj = obj[part];
@ -143,7 +143,7 @@ Settings.prototype.get = function (key, def) {
 	if (obj === void 0) {
 		if (def === void 0) {
 			def = this.defCfg;
-			for (var j = 0; j < parts.length; j++) {
+			for (var j = 0; j < parts.length; j += 1) {
 				part = parts[j];
 				if (part && def != null) {
 					def = def[part];
@ -197,7 +197,7 @@ Settings.prototype.set = function (key, val) {
 	} else {
 		obj = this.cfg._;
 		parts = key.split('.');
-		for (var i = 0, _len = parts.length - 1; i < _len; i++) {
+		for (var i = 0, _len = parts.length - 1; i < _len; i += 1) {
 			if (part = parts[i]) {
 				if (!obj.hasOwnProperty(part)) {
 					obj[part] = {};
--- a/src/sitemap.js
+++ b/src/sitemap.js
@ -38,7 +38,7 @@ sitemap.render = function (callback) {
 			numPages = Math.ceil(tids.length / numTopics);
 		}

-		for(var x = 1; x <= numPages; x++) {
+		for(var x = 1; x <= numPages; x += 1) {
 			returnData.topics.push(x);
 		}

--- a/src/socket.io/admin/rooms.js
+++ b/src/socket.io/admin/rooms.js
@ -123,7 +123,7 @@ SocketRooms.getOnlineUserCount = function (io) {
 	if (io) {
 		for (var key in io.sockets.adapter.rooms) {
 			if (io.sockets.adapter.rooms.hasOwnProperty(key) && key.startsWith('uid_')) {
-				++ count;
+				count += 1;
 			}
 		}
 	}
--- a/src/socket.io/admin/user.js
+++ b/src/socket.io/admin/user.js
@ -22,7 +22,7 @@ User.makeAdmins = function (socket, uids, callback) {
 			return callback(err);
 		}

-		for(var i = 0; i < userData.length; i++) {
+		for(var i = 0; i < userData.length; i += 1) {
 			if (userData[i] && parseInt(userData[i].banned, 10) === 1) {
 				return callback(new Error('[[error:cant-make-banned-users-admin]]'));
 			}
--- a/src/topics.js
+++ b/src/topics.js
@ -138,7 +138,7 @@ var social = require('./social');
 				var users = _.object(uids, results.users);
 				var categories = _.object(cids, results.categories);

-				for (var i = 0; i < topics.length; ++i) {
+				for (var i = 0; i < topics.length; i += 1) {
 					if (topics[i]) {
 						topics[i].category = categories[topics[i].cid];
 						topics[i].user = users[topics[i].uid];
@ -224,9 +224,9 @@ var social = require('./social');
 		async.waterfall([
 			function (next) {
 				if (stop > 0) {
-					stop--;
+					stop -= 1;
 					if (start > 0) {
-						start --;
+						start -= 1;
 					}
 				}

--- a/src/topics/bookmarks.js
+++ b/src/topics/bookmarks.js
@ -63,8 +63,8 @@ module.exports = function (Topics) {
 						var bookmark = data.bookmark;
 						bookmark = bookmark < maxIndex ? bookmark : maxIndex;

-						for (var i = 0; i < postIndices.length && postIndices[i] < data.bookmark; ++i) {
-							--bookmark;
+						for (var i = 0; i < postIndices.length && postIndices[i] < data.bookmark; i += 1) {
+							bookmark -= 1;
 						}

 						if (parseInt(bookmark, 10) !== parseInt(data.bookmark, 10)) {
--- a/src/topics/data.js
+++ b/src/topics/data.js
@ -40,7 +40,7 @@ module.exports = function (Topics) {
 	Topics.getTopicsData = function (tids, callback) {
 		var keys = [];

-		for (var i = 0; i < tids.length; ++i) {
+		for (var i = 0; i < tids.length; i += 1) {
 			keys.push('topic:' + tids[i]);
 		}

--- a/src/topics/posts.js
+++ b/src/topics/posts.js
@ -69,7 +69,7 @@ module.exports = function (Topics) {
 			userData: function (next) {
 				var uids = [];

-				for(var i = 0; i < postData.length; ++i) {
+				for(var i = 0; i < postData.length; i += 1) {
 					if (postData[i] && uids.indexOf(postData[i].uid) === -1) {
 						uids.push(postData[i].uid);
 					}
@ -90,7 +90,7 @@ module.exports = function (Topics) {
 			},
 			editors: function (next) {
 				var editors = [];
-				for(var i = 0; i < postData.length; ++i) {
+				for(var i = 0; i < postData.length; i += 1) {
 					if (postData[i] && postData[i].editor && editors.indexOf(postData[i].editor) === -1) {
 						editors.push(postData[i].editor);
 					}
@ -253,7 +253,7 @@ module.exports = function (Topics) {
 						if (!isDeleted) {
 							latestPid = pids[0];
 						}
-						++index;
+						index += 1;
 						next();
 					});
 				});
--- a/src/topics/tags.js
+++ b/src/topics/tags.js
@ -366,7 +366,7 @@ module.exports = function (Topics) {
 				query = query.toLowerCase();

 				var matches = [];
-				for(var i = 0; i < tags.length; ++i) {
+				for(var i = 0; i < tags.length; i += 1) {
 					if (tags[i].toLowerCase().startsWith(query)) {
 						matches.push(tags[i]);
 						if (matches.length > 19) {
--- a/src/upgrade.js
+++ b/src/upgrade.js
@ -241,14 +241,14 @@ Upgrade.upgrade = function (callback) {
 								async.waterfall([
 									async.apply(db.getObjectField, 'user:' + uid + ':settings', 'userLang'),
 									function (language, next) {
-										++i;
+										i += 1;
 										if (!language) {
 											return setImmediate(next);
 										}

 										newLanguage = language.replace('_', '-').replace('@', '-x-');
 										if (newLanguage !== language) {
-											++j;
+											j += 1;
 											user.setSetting(uid, 'userLang', newLanguage, next);
 										} else {
 											setImmediate(next);
--- a/src/user.js
+++ b/src/user.js
@ -171,7 +171,7 @@ var meta = require('./meta');

 	User.existsBySlug = function (userslug, callback) {
 		User.getUidByUserslug(userslug, function (err, exists) {
-			callback(err, !! exists);
+			callback(err, !!exists);
 		});
 	};

--- a/src/user/data.js
+++ b/src/user/data.js
@ -126,7 +126,7 @@ module.exports = function (User) {
 				user.status = User.getStatus(user);
 			}

-			for(var i = 0; i < fieldsToRemove.length; ++i) {
+			for(var i = 0; i < fieldsToRemove.length; i += 1) {
 				user[fieldsToRemove[i]] = undefined;
 			}

--- a/src/user/jobs.js
+++ b/src/user/jobs.js
@ -27,7 +27,7 @@ module.exports = function (User) {
 				winston.verbose('[user/jobs] Terminating job (' + jobId + ')');
 				jobs[jobId].stop();
 				delete jobs[jobId];
-				++terminated;
+				terminated += 1;
 			}
 		}
 		winston.verbose('[user/jobs] ' + terminated + ' jobs terminated');
@ -37,25 +37,25 @@ module.exports = function (User) {
 			User.digest.execute('day');
 		}, null, true);
 		winston.verbose('[user/jobs] Starting job (digest.daily)');
-		++started;
+		started += 1;

 		jobs['digest.weekly'] = new cronJob('0 ' + digestHour + ' * * 0', function () {
 			winston.verbose('[user/jobs] Digest job (weekly) started.');
 			User.digest.execute('week');
 		}, null, true);
 		winston.verbose('[user/jobs] Starting job (digest.weekly)');
-		++started;
+		started += 1;

 		jobs['digest.monthly'] = new cronJob('0 ' + digestHour + ' 1 * *', function () {
 			winston.verbose('[user/jobs] Digest job (monthly) started.');
 			User.digest.execute('month');
 		}, null, true);
 		winston.verbose('[user/jobs] Starting job (digest.monthly)');
-		++started;
+		started += 1;

 		jobs['reset.clean'] = new cronJob('0 0 * * *', User.reset.clean, null, true);
 		winston.verbose('[user/jobs] Starting job (reset.clean)');
-		++started;
+		started += 1;

 		winston.verbose('[user/jobs] ' + started + ' jobs started');

--- a/src/user/notifications.js
+++ b/src/user/notifications.js
@ -146,7 +146,7 @@ var privileges = require('../privileges');

 			callback(err, mergeIds.reduce(function (count, cur, idx, arr) {
 				if (cur === null || idx === arr.indexOf(cur)) {
-					++count;
+					count += 1;
 				}

 				return count;
--- a/src/user/settings.js
+++ b/src/user/settings.js
@ -36,7 +36,7 @@ module.exports = function (User) {
 				return callback(err);
 			}

-			for (var i = 0; i < settings.length; ++i) {
+			for (var i = 0; i < settings.length; i += 1) {
 				settings[i] = settings[i] || {};
 				settings[i].uid = uids[i];
 			}
--- a/src/widgets/admin.js
+++ b/src/widgets/admin.js
@ -60,7 +60,7 @@ admin.get = function (callback) {
 						areas: [],
 					});

-					index++;
+					index += 1;
 				}

 				templates[list[area.template]].areas.push({
--- a/test/plugins.js
+++ b/test/plugins.js
@ -30,7 +30,7 @@ describe('Plugins', function () {

 	it('should register and fire a filter hook', function (done) {
 		function filterMethod1(data, callback) {
-			data.foo ++;
+			data.foo += 1;
 			callback(null, data);
 		}
 		function filterMethod2(data, callback) {
--- a/test/posts.js
+++ b/test/posts.js
@ -366,7 +366,7 @@ describe('Post\'s', function () {

 		it('should error with too many tags', function (done) {
 			var tags = [];
-			for(var i = 0; i < meta.config.maximumTagsPerTopic + 1; ++i) {
+			for(var i = 0; i < meta.config.maximumTagsPerTopic + 1; i += 1) {
 				tags.push('tag' + i);
 			}
 			socketPosts.edit({uid: voterUid}, {pid: pid, content: 'edited post content', tags: tags}, function (err) {
--- a/test/topics.js
+++ b/test/topics.js
@ -505,7 +505,7 @@ describe('Topic\'s', function () {
 					var topics = results.topics;
 					var topic;
 					var i;
-					for(i = 0; i < topics.length; ++i) {
+					for(i = 0; i < topics.length; i += 1) {
 						if (parseInt(topics[i].tid, 10) === parseInt(newTid, 10)) {
 							assert.equal(false, topics[i].unread, 'ignored topic was marked as unread in recent list');
 							return done();
--- a/test/utils.js
+++ b/test/utils.js
@ -151,10 +151,10 @@ describe('Utility Methods', function () {
 		var currentHour = new Date().getHours();
 		var hours = utils.getHoursArray();
 		var index = hours.length - 1;
-		for (var i = currentHour, ii = currentHour - 24; i > ii; i--) {
+		for (var i = currentHour, ii = currentHour - 24; i > ii; i -= 1) {
 			var hour = i < 0 ? 24 + i : i;
 			assert.equal(hours[index], hour + ':00');
-			-- index;
+			index -= 1;
 		}
 		done();
 	});
@ -164,10 +164,10 @@ describe('Utility Methods', function () {
 		var days = utils.getDaysArray();
 		var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 		var index = 0;
-		for(var x = 29; x >= 0; x--) {
+		for(var x = 29; x >= 0; x -= 1) {
 			var tmpDate = new Date(currentDay - (1000 * 60 * 60 * 24 * x));
 			assert.equal(months[tmpDate.getMonth()]  + ' ' + tmpDate.getDate(), days[index]);
-			++ index;
+			index += 1;
 		}
 		done();
 	});