search in categories and children

src/controllers/search.js

@@ -5,6 +5,7 @@ var searchController = {},
 	validator = require('validator'),
 	plugins = require('../plugins'),
 	search = require('../search'),
+	categories = require('../categories'),
 	helpers = require('./helpers');
 
 
@@ -12,35 +13,46 @@ searchController.search = function(req, res, next) {
 	if (!plugins.hasListeners('filter:search.query')) {
 		return helpers.notFound(req, res);
 	}
-	var breadcrumbs = helpers.buildBreadcrumbs([{text: '[[global:search]]'}]);
-	if (!req.params.term) {
-		return res.render('search', {
-			time: 0,
-			search_query: '',
-			posts: [],
-			topics: [],
-			users: [],
-			tags: [],
-			breadcrumbs: breadcrumbs
-		});
-	}
 
 	var uid = req.user ? req.user.uid : 0;
+	var breadcrumbs = helpers.buildBreadcrumbs([{text: '[[global:search]]'}]);
 
-	req.params.term = validator.escape(req.params.term);
-
-	search.search({
-		query: req.params.term,
-		searchIn: req.query.in,
-		postedBy: req.query.by,
-		uid: uid
-	}, function(err, results) {
+	categories.getCategoriesByPrivilege(uid, 'read', function(err, categories) {
 		if (err) {
 			return next(err);
 		}
 
-		results.breadcrumbs = breadcrumbs;
-		res.render('search', results);
+		if (!req.params.term) {
+			return res.render('search', {
+				time: 0,
+				search_query: '',
+				posts: [],
+				topics: [],
+				users: [],
+				tags: [],
+				categories: categories,
+				breadcrumbs: breadcrumbs
+			});
+		}
+
+		req.params.term = validator.escape(req.params.term);
+
+		search.search({
+			query: req.params.term,
+			searchIn: req.query.in,
+			postedBy: req.query.by,
+			categories: req.query.categories,
+			searchChildren: req.query.searchChildren,
+			uid: uid
+		}, function(err, results) {
+			if (err) {
+				return next(err);
+			}
+
+			results.breadcrumbs = breadcrumbs;
+			results.categories = categories;
+			res.render('search', results);
+		});
 	});
 };