Merge branch 'master' into develop

src/controllers/404.js

@@ -0,0 +1,47 @@
+'use strict';
+
+var nconf = require('nconf');
+var winston = require('winston');
+var validator = require('validator');
+
+var meta = require('../meta');
+var plugins = require('../plugins');
+
+exports.handle404 = function (req, res) {
+	var relativePath = nconf.get('relative_path');
+	var isClientScript = new RegExp('^' + relativePath + '\\/assets\\/src\\/.+\\.js');
+
+	if (plugins.hasListeners('action:meta.override404')) {
+		return plugins.fireHook('action:meta.override404', {
+			req: req,
+			res: res,
+			error: {},
+		});
+	}
+
+	if (isClientScript.test(req.url)) {
+		res.type('text/javascript').status(200).send('');
+	} else if (req.path.startsWith(relativePath + '/assets/uploads') || (req.get('accept') && req.get('accept').indexOf('text/html') === -1) || req.path === '/favicon.ico') {
+		meta.errors.log404(req.path || '');
+		res.sendStatus(404);
+	} else if (req.accepts('html')) {
+		if (process.env.NODE_ENV === 'development') {
+			winston.warn('Route requested but not found: ' + req.url);
+		}
+
+		meta.errors.log404(req.path.replace(/^\/api/, '') || '');
+		res.status(404);
+
+		var path = String(req.path || '');
+
+		if (res.locals.isAPI) {
+			return res.json({ path: validator.escape(path.replace(/^\/api/, '')), title: '[[global:404.title]]' });
+		}
+		var middleware = require('../middleware');
+		middleware.buildHeader(req, res, function () {
+			res.render('404', { path: validator.escape(path), title: '[[global:404.title]]' });
+		});
+	} else {
+		res.status(404).type('txt').send('Not found');
+	}
+};

src/controllers/api.js

@@ -13,9 +13,8 @@ var privileges = require('../privileges');
 var plugins = require('../plugins');
 var widgets = require('../widgets');
 var translator = require('../../public/src/modules/translator');
-var accountHelpers = require('../controllers/accounts/helpers');
 
-var apiController = {};
+var apiController = module.exports;
 
 apiController.getConfig = function (req, res, next) {
 	var config = {};
@@ -62,7 +61,7 @@ apiController.getConfig = function (req, res, next) {
 	config.categoryTopicSort = meta.config.categoryTopicSort || 'newest_to_oldest';
 	config.csrf_token = req.csrfToken();
 	config.searchEnabled = plugins.hasListeners('filter:search.query');
-	config.bootswatchSkin = 'default';
+	config.bootswatchSkin = meta.config.bootswatchSkin || 'default';
 
 	var timeagoCutoff = meta.config.timeagoCutoff === undefined ? 30 : meta.config.timeagoCutoff;
 	config.timeagoCutoff = timeagoCutoff !== '' ? Math.max(0, parseInt(timeagoCutoff, 10)) : timeagoCutoff;
@@ -220,92 +219,6 @@ apiController.getObject = function (req, res, next) {
 	});
 };
 
-apiController.getCurrentUser = function (req, res, next) {
-	if (!req.uid) {
-		return res.status(401).json('not-authorized');
-	}
-	async.waterfall([
-		function (next) {
-			user.getUserField(req.uid, 'userslug', next);
-		},
-		function (userslug, next) {
-			accountHelpers.getUserDataByUserSlug(userslug, req.uid, next);
-		},
-	], function (err, userData) {
-		if (err) {
-			return next(err);
-		}
-		res.json(userData);
-	});
-};
-
-apiController.getUserByUID = function (req, res, next) {
-	byType('uid', req, res, next);
-};
-
-apiController.getUserByUsername = function (req, res, next) {
-	byType('username', req, res, next);
-};
-
-apiController.getUserByEmail = function (req, res, next) {
-	byType('email', req, res, next);
-};
-
-function byType(type, req, res, next) {
-	apiController.getUserDataByField(req.uid, type, req.params[type], function (err, data) {
-		if (err || !data) {
-			return next(err);
-		}
-		res.json(data);
-	});
-}
-
-apiController.getUserDataByField = function (callerUid, field, fieldValue, callback) {
-	async.waterfall([
-		function (next) {
-			if (field === 'uid') {
-				next(null, fieldValue);
-			} else if (field === 'username') {
-				user.getUidByUsername(fieldValue, next);
-			} else if (field === 'email') {
-				user.getUidByEmail(fieldValue, next);
-			} else {
-				next();
-			}
-		},
-		function (uid, next) {
-			if (!uid) {
-				return next();
-			}
-			apiController.getUserDataByUID(callerUid, uid, next);
-		},
-	], callback);
-};
-
-apiController.getUserDataByUID = function (callerUid, uid, callback) {
-	if (!parseInt(callerUid, 10) && parseInt(meta.config.privateUserInfo, 10) === 1) {
-		return callback(new Error('[[error:no-privileges]]'));
-	}
-
-	if (!parseInt(uid, 10)) {
-		return callback(new Error('[[error:no-user]]'));
-	}
-
-	async.parallel({
-		userData: async.apply(user.getUserData, uid),
-		settings: async.apply(user.getSettings, uid),
-	}, function (err, results) {
-		if (err || !results.userData) {
-			return callback(err || new Error('[[error:no-user]]'));
-		}
-
-		results.userData.email = results.settings.showemail ? results.userData.email : undefined;
-		results.userData.fullname = results.settings.showfullname ? results.userData.fullname : undefined;
-
-		callback(null, results.userData);
-	});
-};
-
 apiController.getModerators = function (req, res, next) {
 	categories.getModerators(req.params.cid, function (err, moderators) {
 		if (err) {
@@ -314,16 +227,3 @@ apiController.getModerators = function (req, res, next) {
 		res.json({ moderators: moderators });
 	});
 };
-
-
-apiController.getRecentPosts = function (req, res, next) {
-	posts.getRecentPosts(req.uid, 0, 19, req.params.term, function (err, data) {
-		if (err) {
-			return next(err);
-		}
-
-		res.json(data);
-	});
-};
-
-module.exports = apiController;

src/controllers/categories.js

@@ -13,9 +13,6 @@ categoriesController.list = function (req, res, next) {
 	res.locals.metaTags = [{
 		name: 'title',
 		content: String(meta.config.title || 'NodeBB'),
-	}, {
-		name: 'description',
-		content: String(meta.config.description || ''),
 	}, {
 		property: 'og:title',
 		content: '[[pages:categories]]',

src/controllers/errors.js

@@ -0,0 +1,63 @@
+'use strict';
+
+var nconf = require('nconf');
+var winston = require('winston');
+var validator = require('validator');
+
+exports.handleURIErrors = function (err, req, res, next) {
+	// Handle cases where malformed URIs are passed in
+	if (err instanceof URIError) {
+		var tidMatch = req.path.match(/^\/topic\/(\d+)\//);
+		var cidMatch = req.path.match(/^\/category\/(\d+)\//);
+
+		if (tidMatch) {
+			res.redirect(nconf.get('relative_path') + tidMatch[0]);
+		} else if (cidMatch) {
+			res.redirect(nconf.get('relative_path') + cidMatch[0]);
+		} else {
+			winston.warn('[controller] Bad request: ' + req.path);
+			if (res.locals.isAPI) {
+				res.status(400).json({
+					error: '[[global:400.title]]',
+				});
+			} else {
+				var middleware = require('../middleware');
+				middleware.buildHeader(req, res, function () {
+					res.render('400', { error: validator.escape(String(err.message)) });
+				});
+			}
+		}
+	} else {
+		next(err);
+	}
+};
+
+// this needs to have four arguments or express treats it as `(req, res, next)`
+// don't remove `next`!
+exports.handleErrors = function (err, req, res, next) { // eslint-disable-line no-unused-vars
+	switch (err.code) {
+	case 'EBADCSRFTOKEN':
+		winston.error(req.path + '\n', err.message);
+		return res.sendStatus(403);
+	case 'blacklisted-ip':
+		return res.status(403).type('text/plain').send(err.message);
+	}
+
+	if (parseInt(err.status, 10) === 302 && err.path) {
+		return res.locals.isAPI ? res.status(302).json(err.path) : res.redirect(err.path);
+	}
+
+	winston.error(req.path + '\n', err.stack);
+
+	res.status(err.status || 500);
+
+	var path = String(req.path || '');
+	if (res.locals.isAPI) {
+		res.json({ path: validator.escape(path), error: err.message });
+	} else {
+		var middleware = require('../middleware');
+		middleware.buildHeader(req, res, function () {
+			res.render('500', { path: validator.escape(path), error: validator.escape(String(err.message)) });
+		});
+	}
+};

src/controllers/index.js

@@ -3,34 +3,35 @@
 var async = require('async');
 var nconf = require('nconf');
 var validator = require('validator');
-var winston = require('winston');
 
 var meta = require('../meta');
 var user = require('../user');
 var plugins = require('../plugins');
 var helpers = require('./helpers');
 
-var Controllers = {
-	topics: require('./topics'),
-	posts: require('./posts'),
-	categories: require('./categories'),
-	category: require('./category'),
-	unread: require('./unread'),
-	recent: require('./recent'),
-	popular: require('./popular'),
-	tags: require('./tags'),
-	search: require('./search'),
-	users: require('./users'),
-	groups: require('./groups'),
-	accounts: require('./accounts'),
-	authentication: require('./authentication'),
-	api: require('./api'),
-	admin: require('./admin'),
-	globalMods: require('./globalmods'),
-	mods: require('./mods'),
-	sitemap: require('./sitemap'),
-};
+var Controllers = module.exports;
 
+Controllers.topics = require('./topics');
+Controllers.posts = require('./posts');
+Controllers.categories = require('./categories');
+Controllers.category = require('./category');
+Controllers.unread = require('./unread');
+Controllers.recent = require('./recent');
+Controllers.popular = require('./popular');
+Controllers.tags = require('./tags');
+Controllers.search = require('./search');
+Controllers.user = require('./user');
+Controllers.users = require('./users');
+Controllers.groups = require('./groups');
+Controllers.accounts = require('./accounts');
+Controllers.authentication = require('./authentication');
+Controllers.api = require('./api');
+Controllers.admin = require('./admin');
+Controllers.globalMods = require('./globalmods');
+Controllers.mods = require('./mods');
+Controllers.sitemap = require('./sitemap');
+Controllers['404'] = require('./404');
+Controllers.errors = require('./errors');
 
 Controllers.home = function (req, res, next) {
 	var route = meta.config.homePageRoute || (meta.config.homePageCustom || '').replace(/^\/+/, '') || 'categories';
@@ -321,19 +322,18 @@ Controllers.manifest = function (req, res) {
 	res.status(200).json(manifest);
 };
 
-Controllers.outgoing = function (req, res) {
+Controllers.outgoing = function (req, res, next) {
 	var url = req.query.url || '';
-	var data = {
+
+	if (!url) {
+		return next();
+	}
+
+	res.render('outgoing', {
 		outgoing: validator.escape(String(url)),
 		title: meta.config.title,
 		breadcrumbs: helpers.buildBreadcrumbs([{ text: '[[notifications:outgoing_link]]' }]),
-	};
-
-	if (url) {
-		res.render('outgoing', data);
-	} else {
-		res.status(404).redirect(nconf.get('relative_path') + '/404');
-	}
+	});
 };
 
 Controllers.termsOfUse = function (req, res, next) {
@@ -346,102 +346,3 @@ Controllers.termsOfUse = function (req, res, next) {
 Controllers.ping = function (req, res) {
 	res.status(200).send(req.path === '/sping' ? 'healthy' : '200');
 };
-
-Controllers.handle404 = function (req, res) {
-	var relativePath = nconf.get('relative_path');
-	var isClientScript = new RegExp('^' + relativePath + '\\/assets\\/src\\/.+\\.js');
-
-	if (plugins.hasListeners('action:meta.override404')) {
-		return plugins.fireHook('action:meta.override404', {
-			req: req,
-			res: res,
-			error: {},
-		});
-	}
-
-	if (isClientScript.test(req.url)) {
-		res.type('text/javascript').status(200).send('');
-	} else if (req.path.startsWith(relativePath + '/assets/uploads') || (req.get('accept') && req.get('accept').indexOf('text/html') === -1) || req.path === '/favicon.ico') {
-		meta.errors.log404(req.path || '');
-		res.sendStatus(404);
-	} else if (req.accepts('html')) {
-		if (process.env.NODE_ENV === 'development') {
-			winston.warn('Route requested but not found: ' + req.url);
-		}
-
-		meta.errors.log404(req.path.replace(/^\/api/, '') || '');
-		res.status(404);
-
-		var path = String(req.path || '');
-
-		if (res.locals.isAPI) {
-			return res.json({ path: validator.escape(path.replace(/^\/api/, '')), title: '[[global:404.title]]' });
-		}
-		var middleware = require('../middleware');
-		middleware.buildHeader(req, res, function () {
-			res.render('404', { path: validator.escape(path), title: '[[global:404.title]]' });
-		});
-	} else {
-		res.status(404).type('txt').send('Not found');
-	}
-};
-
-Controllers.handleURIErrors = function (err, req, res, next) {
-	// Handle cases where malformed URIs are passed in
-	if (err instanceof URIError) {
-		var tidMatch = req.path.match(/^\/topic\/(\d+)\//);
-		var cidMatch = req.path.match(/^\/category\/(\d+)\//);
-
-		if (tidMatch) {
-			res.redirect(nconf.get('relative_path') + tidMatch[0]);
-		} else if (cidMatch) {
-			res.redirect(nconf.get('relative_path') + cidMatch[0]);
-		} else {
-			winston.warn('[controller] Bad request: ' + req.path);
-			if (res.locals.isAPI) {
-				res.status(400).json({
-					error: '[[global:400.title]]',
-				});
-			} else {
-				var middleware = require('../middleware');
-				middleware.buildHeader(req, res, function () {
-					res.render('400', { error: validator.escape(String(err.message)) });
-				});
-			}
-		}
-	} else {
-		next(err);
-	}
-};
-
-// this needs to have four arguments or express treats it as `(req, res, next)`
-// don't remove `next`!
-Controllers.handleErrors = function (err, req, res, next) { // eslint-disable-line no-unused-vars
-	switch (err.code) {
-	case 'EBADCSRFTOKEN':
-		winston.error(req.path + '\n', err.message);
-		return res.sendStatus(403);
-	case 'blacklisted-ip':
-		return res.status(403).type('text/plain').send(err.message);
-	}
-
-	if (parseInt(err.status, 10) === 302 && err.path) {
-		return res.locals.isAPI ? res.status(302).json(err.path) : res.redirect(err.path);
-	}
-
-	winston.error(req.path + '\n', err.stack);
-
-	res.status(err.status || 500);
-
-	var path = String(req.path || '');
-	if (res.locals.isAPI) {
-		res.json({ path: validator.escape(path), error: err.message });
-	} else {
-		var middleware = require('../middleware');
-		middleware.buildHeader(req, res, function () {
-			res.render('500', { path: validator.escape(path), error: validator.escape(String(err.message)) });
-		});
-	}
-};
-
-module.exports = Controllers;

src/controllers/posts.js

@@ -1,24 +1,38 @@
 'use strict';
 
+var async = require('async');
+
 var posts = require('../posts');
 var helpers = require('./helpers');
 
-var postsController = {};
+var postsController = module.exports;
 
-postsController.redirectToPost = function (req, res, callback) {
+postsController.redirectToPost = function (req, res, next) {
 	var pid = parseInt(req.params.pid, 10);
 	if (!pid) {
-		return callback();
+		return next();
 	}
 
-	posts.generatePostPath(pid, req.uid, function (err, path) {
-		if (err || !path) {
-			return callback(err);
-		}
-
-		helpers.redirect(res, path);
-	});
+	async.waterfall([
+		function (next) {
+			posts.generatePostPath(pid, req.uid, next);
+		},
+		function (path, next) {
+			if (!path) {
+				return next();
+			}
+			helpers.redirect(res, path);
+		},
+	], next);
 };
 
-
-module.exports = postsController;
+postsController.getRecentPosts = function (req, res, next) {
+	async.waterfall([
+		function (next) {
+			posts.getRecentPosts(req.uid, 0, 19, req.params.term, next);
+		},
+		function (data) {
+			res.json(data);
+		},
+	], next);
+};

src/controllers/sitemap.js

@@ -1,68 +1,57 @@
 'use strict';
 
+var async = require('async');
+
 var sitemap = require('../sitemap');
 var meta = require('../meta');
 
-var sitemapController = {};
-sitemapController.render = function (req, res, next) {
-	sitemap.render(function (err, tplData) {
-		if (err) {
-			return next(err);
-		}
+var sitemapController = module.exports;
 
-		req.app.render('sitemap', tplData, function (err, xml) {
-			if (err) {
-				return next(err);
-			}
+sitemapController.render = function (req, res, next) {
+	async.waterfall([
+		function (next) {
+			sitemap.render(next);
+		},
+		function (tplData, next) {
+			req.app.render('sitemap', tplData, next);
+		},
+		function (xml) {
 			res.header('Content-Type', 'application/xml');
 			res.send(xml);
-		});
-	});
+		},
+	], next);
 };
 
 sitemapController.getPages = function (req, res, next) {
-	if (parseInt(meta.config['feeds:disableSitemap'], 10) === 1) {
-		return next();
-	}
-
-	sitemap.getPages(function (err, xml) {
-		if (err) {
-			return next(err);
-		}
-		res.header('Content-Type', 'application/xml');
-		res.send(xml);
-	});
+	sendSitemap(sitemap.getPages, res, next);
 };
 
 sitemapController.getCategories = function (req, res, next) {
-	if (parseInt(meta.config['feeds:disableSitemap'], 10) === 1) {
-		return next();
-	}
-
-	sitemap.getCategories(function (err, xml) {
-		if (err) {
-			return next(err);
-		}
-		res.header('Content-Type', 'application/xml');
-		res.send(xml);
-	});
+	sendSitemap(sitemap.getCategories, res, next);
 };
 
 sitemapController.getTopicPage = function (req, res, next) {
-	if (parseInt(meta.config['feeds:disableSitemap'], 10) === 1) {
-		return next();
-	}
-
-	sitemap.getTopicPage(parseInt(req.params[0], 10), function (err, xml) {
-		if (err) {
-			return next(err);
-		} else if (!xml) {
-			return next();
-		}
-
-		res.header('Content-Type', 'application/xml');
-		res.send(xml);
-	});
+	sendSitemap(function (callback) {
+		sitemap.getTopicPage(parseInt(req.params[0], 10), callback);
+	}, res, next);
 };
 
-module.exports = sitemapController;
+function sendSitemap(method, res, callback) {
+	if (parseInt(meta.config['feeds:disableSitemap'], 10) === 1) {
+		return callback();
+	}
+	async.waterfall([
+		function (next) {
+			method(next);
+		},
+		function (xml) {
+			if (!xml) {
+				return callback();
+			}
+
+			res.header('Content-Type', 'application/xml');
+			res.send(xml);
+		},
+	], callback);
+}
+

src/controllers/uploads.js

@@ -66,7 +66,7 @@ function uploadAsImage(req, uploadedFile, callback) {
 			file.isFileTypeAllowed(uploadedFile.path, next);
 		},
 		function (next) {
-			uploadFile(req.uid, uploadedFile, next);
+			uploadsController.uploadFile(req.uid, uploadedFile, next);
 		},
 		function (fileObj, next) {
 			if (parseInt(meta.config.maximumImageWidth, 10) === 0) {
@@ -90,7 +90,7 @@ function uploadAsFile(req, uploadedFile, callback) {
 			if (parseInt(meta.config.allowFileUploads, 10) !== 1) {
 				return next(new Error('[[error:uploads-are-disabled]]'));
 			}
-			uploadFile(req.uid, uploadedFile, next);
+			uploadsController.uploadFile(req.uid, uploadedFile, next);
 		},
 	], callback);
 }
@@ -161,7 +161,7 @@ uploadsController.uploadThumb = function (req, res, next) {
 					}, next);
 				}
 
-				uploadFile(req.uid, uploadedFile, next);
+				uploadsController.uploadFile(req.uid, uploadedFile, next);
 			},
 		], next);
 	}, next);
@@ -192,7 +192,7 @@ uploadsController.uploadGroupCover = function (uid, uploadedFile, callback) {
 	], callback);
 };
 
-function uploadFile(uid, uploadedFile, callback) {
+uploadsController.uploadFile = function (uid, uploadedFile, callback) {
 	if (plugins.hasListeners('filter:uploadFile')) {
 		return plugins.fireHook('filter:uploadFile', {
 			file: uploadedFile,
@@ -217,7 +217,7 @@ function uploadFile(uid, uploadedFile, callback) {
 	}
 
 	saveFileToLocal(uploadedFile, callback);
-}
+};
 
 function saveFileToLocal(uploadedFile, callback) {
 	var extension = file.typeToExtension(uploadedFile.type);

src/controllers/user.js

@@ -0,0 +1,99 @@
+'use strict';
+
+var async = require('async');
+
+var user = require('../user');
+var meta = require('../meta');
+var accountHelpers = require('./accounts/helpers');
+
+var userController = module.exports;
+
+userController.getCurrentUser = function (req, res, next) {
+	if (!req.uid) {
+		return res.status(401).json('not-authorized');
+	}
+	async.waterfall([
+		function (next) {
+			user.getUserField(req.uid, 'userslug', next);
+		},
+		function (userslug, next) {
+			accountHelpers.getUserDataByUserSlug(userslug, req.uid, next);
+		},
+		function (userData) {
+			res.json(userData);
+		},
+	], next);
+};
+
+
+userController.getUserByUID = function (req, res, next) {
+	byType('uid', req, res, next);
+};
+
+userController.getUserByUsername = function (req, res, next) {
+	byType('username', req, res, next);
+};
+
+userController.getUserByEmail = function (req, res, next) {
+	byType('email', req, res, next);
+};
+
+function byType(type, req, res, next) {
+	async.waterfall([
+		function (next) {
+			userController.getUserDataByField(req.uid, type, req.params[type], next);
+		},
+		function (data, next) {
+			if (!data) {
+				return next();
+			}
+			res.json(data);
+		},
+	], next);
+}
+
+userController.getUserDataByField = function (callerUid, field, fieldValue, callback) {
+	async.waterfall([
+		function (next) {
+			if (field === 'uid') {
+				next(null, fieldValue);
+			} else if (field === 'username') {
+				user.getUidByUsername(fieldValue, next);
+			} else if (field === 'email') {
+				user.getUidByEmail(fieldValue, next);
+			} else {
+				next(null, null);
+			}
+		},
+		function (uid, next) {
+			if (!uid) {
+				return next(null, null);
+			}
+			userController.getUserDataByUID(callerUid, uid, next);
+		},
+	], callback);
+};
+
+userController.getUserDataByUID = function (callerUid, uid, callback) {
+	if (!parseInt(callerUid, 10) && parseInt(meta.config.privateUserInfo, 10) === 1) {
+		return callback(new Error('[[error:no-privileges]]'));
+	}
+
+	if (!parseInt(uid, 10)) {
+		return callback(new Error('[[error:no-user]]'));
+	}
+
+	async.parallel({
+		userData: async.apply(user.getUserData, uid),
+		settings: async.apply(user.getSettings, uid),
+	}, function (err, results) {
+		if (err || !results.userData) {
+			return callback(err || new Error('[[error:no-user]]'));
+		}
+
+		results.userData.email = results.settings.showemail ? results.userData.email : undefined;
+		results.userData.fullname = results.settings.showfullname ? results.userData.fullname : undefined;
+
+		callback(null, results.userData);
+	});
+};

src/controllers/users.js

@@ -8,9 +8,7 @@ var pagination = require('../pagination');
 var db = require('../database');
 var helpers = require('./helpers');
 
-
-var usersController = {};
-
+var usersController = module.exports;
 
 usersController.index = function (req, res, next) {
 	var section = req.query.section || 'joindate';
@@ -33,62 +31,65 @@ usersController.index = function (req, res, next) {
 };
 
 usersController.search = function (req, res, next) {
-	async.parallel({
-		search: function (next) {
-			user.search({
-				query: req.query.term,
-				searchBy: req.query.searchBy || 'username',
-				page: req.query.page || 1,
-				sortBy: req.query.sortBy,
-				onlineOnly: req.query.onlineOnly === 'true',
-				bannedOnly: req.query.bannedOnly === 'true',
-				flaggedOnly: req.query.flaggedOnly === 'true',
+	async.waterfall([
+		function (next) {
+			async.parallel({
+				search: function (next) {
+					user.search({
+						query: req.query.term,
+						searchBy: req.query.searchBy || 'username',
+						page: req.query.page || 1,
+						sortBy: req.query.sortBy,
+						onlineOnly: req.query.onlineOnly === 'true',
+						bannedOnly: req.query.bannedOnly === 'true',
+						flaggedOnly: req.query.flaggedOnly === 'true',
+					}, next);
+				},
+				isAdminOrGlobalMod: function (next) {
+					user.isAdminOrGlobalMod(req.uid, next);
+				},
 			}, next);
 		},
-		isAdminOrGlobalMod: function (next) {
-			user.isAdminOrGlobalMod(req.uid, next);
+		function (results, next) {
+			var section = req.query.section || 'joindate';
+
+			results.search.isAdminOrGlobalMod = results.isAdminOrGlobalMod;
+			results.search.pagination = pagination.create(req.query.page, results.search.pageCount, req.query);
+			results.search['section_' + section] = true;
+			render(req, res, results.search, next);
 		},
-	}, function (err, results) {
-		if (err) {
-			return next(err);
-		}
-
-		var section = req.query.section || 'joindate';
-
-		results.search.isAdminOrGlobalMod = results.isAdminOrGlobalMod;
-		results.search.pagination = pagination.create(req.query.page, results.search.pageCount, req.query);
-		results.search['section_' + section] = true;
-		render(req, res, results.search, next);
-	});
+	], next);
 };
 
 usersController.getOnlineUsers = function (req, res, next) {
-	async.parallel({
-		users: function (next) {
-			usersController.getUsers('users:online', req.uid, req.query, next);
+	async.waterfall([
+		function (next) {
+			async.parallel({
+				users: function (next) {
+					usersController.getUsers('users:online', req.uid, req.query, next);
+				},
+				guests: function (next) {
+					require('../socket.io/admin/rooms').getTotalGuestCount(next);
+				},
+			}, next);
 		},
-		guests: function (next) {
-			require('../socket.io/admin/rooms').getTotalGuestCount(next);
+		function (results, next) {
+			var userData = results.users;
+			var hiddenCount = 0;
+			if (!userData.isAdminOrGlobalMod) {
+				userData.users = userData.users.filter(function (user) {
+					if (user && user.status === 'offline') {
+						hiddenCount += 1;
+					}
+					return user && user.status !== 'offline';
+				});
+			}
+
+			userData.anonymousUserCount = results.guests + hiddenCount;
+
+			render(req, res, userData, next);
 		},
-	}, function (err, results) {
-		if (err) {
-			return next(err);
-		}
-		var userData = results.users;
-		var hiddenCount = 0;
-		if (!userData.isAdminOrGlobalMod) {
-			userData.users = userData.users.filter(function (user) {
-				if (user && user.status === 'offline') {
-					hiddenCount += 1;
-				}
-				return user && user.status !== 'offline';
-			});
-		}
-
-		userData.anonymousUserCount = results.guests + hiddenCount;
-
-		render(req, res, userData, next);
-	});
+	], next);
 };
 
 usersController.getUsersSortedByPosts = function (req, res, next) {
@@ -107,41 +108,36 @@ usersController.getUsersSortedByJoinDate = function (req, res, next) {
 };
 
 usersController.getBannedUsers = function (req, res, next) {
-	usersController.getUsers('users:banned', req.uid, req.query, function (err, userData) {
-		if (err) {
-			return next(err);
-		}
-
-		if (!userData.isAdminOrGlobalMod) {
-			return next();
-		}
-
-		render(req, res, userData, next);
-	});
+	renderIfAdminOrGlobalMod('users:banned', req, res, next);
 };
 
 usersController.getFlaggedUsers = function (req, res, next) {
-	usersController.getUsers('users:flags', req.uid, req.query, function (err, userData) {
-		if (err) {
-			return next(err);
-		}
-
-		if (!userData.isAdminOrGlobalMod) {
-			return next();
-		}
-
-		render(req, res, userData, next);
-	});
+	renderIfAdminOrGlobalMod('users:flags', req, res, next);
 };
 
-usersController.renderUsersPage = function (set, req, res, next) {
-	usersController.getUsers(set, req.uid, req.query, function (err, userData) {
-		if (err) {
-			return next(err);
-		}
+function renderIfAdminOrGlobalMod(set, req, res, next) {
+	async.waterfall([
+		function (next) {
+			user.isAdminOrGlobalMod(req.uid, next);
+		},
+		function (isAdminOrGlobalMod, next) {
+			if (!isAdminOrGlobalMod) {
+				return helpers.notAllowed(req, res);
+			}
+			usersController.renderUsersPage(set, req, res, next);
+		},
+	], next);
+}
 
-		render(req, res, userData, next);
-	});
+usersController.renderUsersPage = function (set, req, res, next) {
+	async.waterfall([
+		function (next) {
+			usersController.getUsers(set, req.uid, req.query, next);
+		},
+		function (userData, next) {
+			render(req, res, userData, next);
+		},
+	], next);
 };
 
 usersController.getUsers = function (set, uid, query, callback) {
@@ -169,59 +165,62 @@ usersController.getUsers = function (set, uid, query, callback) {
 	var start = Math.max(0, page - 1) * resultsPerPage;
 	var stop = start + resultsPerPage - 1;
 
-	async.parallel({
-		isAdminOrGlobalMod: function (next) {
-			user.isAdminOrGlobalMod(uid, next);
+	async.waterfall([
+		function (next) {
+			async.parallel({
+				isAdminOrGlobalMod: function (next) {
+					user.isAdminOrGlobalMod(uid, next);
+				},
+				usersData: function (next) {
+					usersController.getUsersAndCount(set, uid, start, stop, next);
+				},
+			}, next);
 		},
-		usersData: function (next) {
-			usersController.getUsersAndCount(set, uid, start, stop, next);
+		function (results, next) {
+			var pageCount = Math.ceil(results.usersData.count / resultsPerPage);
+			var userData = {
+				users: results.usersData.users,
+				pagination: pagination.create(page, pageCount, query),
+				userCount: results.usersData.count,
+				title: setToData[set].title || '[[pages:users/latest]]',
+				breadcrumbs: helpers.buildBreadcrumbs(breadcrumbs),
+				isAdminOrGlobalMod: results.isAdminOrGlobalMod,
+			};
+			userData['section_' + (query.section || 'joindate')] = true;
+			next(null, userData);
 		},
-	}, function (err, results) {
-		if (err) {
-			return callback(err);
-		}
-
-		var pageCount = Math.ceil(results.usersData.count / resultsPerPage);
-		var userData = {
-			users: results.usersData.users,
-			pagination: pagination.create(page, pageCount, query),
-			userCount: results.usersData.count,
-			title: setToData[set].title || '[[pages:users/latest]]',
-			breadcrumbs: helpers.buildBreadcrumbs(breadcrumbs),
-			isAdminOrGlobalMod: results.isAdminOrGlobalMod,
-		};
-		userData['section_' + (query.section || 'joindate')] = true;
-		callback(null, userData);
-	});
+	], callback);
 };
 
 usersController.getUsersAndCount = function (set, uid, start, stop, callback) {
-	async.parallel({
-		users: function (next) {
-			user.getUsersFromSet(set, uid, start, stop, next);
+	async.waterfall([
+		function (next) {
+			async.parallel({
+				users: function (next) {
+					user.getUsersFromSet(set, uid, start, stop, next);
+				},
+				count: function (next) {
+					if (set === 'users:online') {
+						var now = Date.now();
+						db.sortedSetCount('users:online', now - 300000, '+inf', next);
+					} else if (set === 'users:banned') {
+						db.sortedSetCard('users:banned', next);
+					} else if (set === 'users:flags') {
+						db.sortedSetCard('users:flags', next);
+					} else {
+						db.getObjectField('global', 'userCount', next);
+					}
+				},
+			}, next);
 		},
-		count: function (next) {
-			if (set === 'users:online') {
-				var now = Date.now();
-				db.sortedSetCount('users:online', now - 300000, '+inf', next);
-			} else if (set === 'users:banned') {
-				db.sortedSetCard('users:banned', next);
-			} else if (set === 'users:flags') {
-				db.sortedSetCard('users:flags', next);
-			} else {
-				db.getObjectField('global', 'userCount', next);
-			}
-		},
-	}, function (err, results) {
-		if (err) {
-			return callback(err);
-		}
-		results.users = results.users.filter(function (user) {
-			return user && parseInt(user.uid, 10);
-		});
+		function (results, next) {
+			results.users = results.users.filter(function (user) {
+				return user && parseInt(user.uid, 10);
+			});
 
-		callback(null, results);
-	});
+			next(null, results);
+		},
+	], callback);
 };
 
 function render(req, res, data, next) {
@@ -232,16 +231,15 @@ function render(req, res, data, next) {
 	data.adminInviteOnly = registrationType === 'admin-invite-only';
 	data['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1;
 
-	user.getInvitesNumber(req.uid, function (err, numInvites) {
-		if (err) {
-			return next(err);
-		}
+	async.waterfall([
+		function (next) {
+			user.getInvitesNumber(req.uid, next);
+		},
+		function (numInvites) {
+			res.append('X-Total-Count', data.userCount);
+			data.invites = numInvites;
 
-		res.append('X-Total-Count', data.userCount);
-		data.invites = numInvites;
-
-		res.render('users', data);
-	});
+			res.render('users', data);
+		},
+	], next);
 }
-
-module.exports = usersController;