added middleware.guestSearchingAllowed to the actual search API call

v1.18.x
psychobunny 11 years ago
parent 542f937589
commit 34552f7fb0

@ -47,31 +47,27 @@ function searchTerm(req, res, next) {
}); });
} }
if ((req.user && req.user.uid) || meta.config.allowGuestSearching === '1') { async.parallel([searchPosts, searchTopics], function (err, results) {
async.parallel([searchPosts, searchTopics], function (err, results) { if (err) {
if (err) { return next(err);
return next(err); }
}
if(!results) { if(!results) {
results = []; results = [];
results[0] = results[1] = []; results[0] = results[1] = [];
} }
return res.json({ return res.json({
show_no_topics: results[1].length ? 'hide' : '', show_no_topics: results[1].length ? 'hide' : '',
show_no_posts: results[0].length ? 'hide' : '', show_no_posts: results[0].length ? 'hide' : '',
show_results: '', show_results: '',
search_query: req.params.term, search_query: req.params.term,
posts: results[0], posts: results[0],
topics: results[1], topics: results[1],
post_matches : results[0].length, post_matches : results[0].length,
topic_matches : results[1].length topic_matches : results[1].length
});
}); });
} else { });
res.send(403);
}
} }
function upload(req, res, filesIterator, next) { function upload(req, res, filesIterator, next) {
@ -166,7 +162,7 @@ module.exports = function(app, middleware, controllers) {
app.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID); app.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID);
app.get('/get_templates_listing', getTemplatesListing); app.get('/get_templates_listing', getTemplatesListing);
app.get('/search/:term', searchTerm); app.get('/search/:term', middleware.guestSearchingAllowed, searchTerm); // todo: look at this, may not belong here.
app.get('/categories/:cid/moderators', getModerators); app.get('/categories/:cid/moderators', getModerators);
app.get('/recent/posts/:term?', getRecentPosts); app.get('/recent/posts/:term?', getRecentPosts);

Loading…
Cancel
Save