Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 11:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

search and reset routes, the very last of the views to be refactored :shipit:

Browse Source
This commit is contained in:
psychobunny
2014-03-03 17:16:53 -05:00
parent 8802fc5a33
commit c24c2a5422
3 changed files with 40 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/controllers/index.js
View File

@@ -88,6 +88,34 @@ Controllers.home = function(req, res, next) {
}); });
}; };
Controllers.search = function(req, res, next) {
var data = {
show_no_topics: 'hide',
show_no_posts: 'hide',
show_results: 'hide',
search_query: '',
posts: [],
topics: []
};
if (res.locals.isAPI) {
res.json(data);
} else {
res.render('search', data);
}
};
Controllers.reset = function(req, res, next) {
var data = {
reset_code: req.params.code ? req.params.code : null
}
if (res.locals.isAPI) {
res.json(data);
} else {
res.render('reset', data);
}
};
Controllers.login = function(req, res, next) { Controllers.login = function(req, res, next) {
var data = {}, var data = {},

6
src/middleware/middleware.js
View File

@@ -46,6 +46,12 @@ middleware.prepareAPI = function(req, res, next) {
next(); next();
}; };
middleware.guestSearchingAllowed = function(req, res, next) {
if (!req.user && meta.config.allowGuestSearching !== '1') {
return res.redirect('/403');
}
};
middleware.checkGlobalPrivacySettings = function(req, res, next) { middleware.checkGlobalPrivacySettings = function(req, res, next) {
var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; var callerUID = req.user ? parseInt(req.user.uid, 10) : 0;

65
src/routes/index.js
View File

@@ -40,6 +40,12 @@ module.exports = function(app, middleware) {
app.get('/outgoing', middleware.buildHeader, controllers.outgoing); app.get('/outgoing', middleware.buildHeader, controllers.outgoing);
app.get('/api/outgoing', controllers.outgoing); app.get('/api/outgoing', controllers.outgoing);
app.get('/search/:term?', middleware.buildHeader, middleware.guestSearchingAllowed, controllers.search);
app.get('/api/search/:term?', middleware.guestSearchingAllowed, controllers.search);
app.get('/reset/:code?', middleware.buildHeader, controllers.reset);
app.get('/api/reset/:code?', controllers.reset);
/* Static Pages */ /* Static Pages */
app.get('/404', middleware.buildHeader, controllers.static['404']); app.get('/404', middleware.buildHeader, controllers.static['404']);
app.get('/api/404', controllers.static['404']); app.get('/api/404', controllers.static['404']);
@@ -120,65 +126,6 @@ module.exports = function(app, middleware) {
app.get('/sitemap.xml', controllers.sitemap); app.get('/sitemap.xml', controllers.sitemap);
app.get('/robots.txt', controllers.robots); app.get('/robots.txt', controllers.robots);
app.get('api/search/:term?', function (req, res) {
if ((req.user && req.user.uid) || meta.config.allowGuestSearching === '1') {
return res.json({
show_no_topics: 'hide',
show_no_posts: 'hide',
show_results: 'hide',
search_query: '',
posts: [],
topics: []
});
} else {
res.send(403);
}
});
app.get('/search/:term?', function (req, res) {
if (!req.user && meta.config.allowGuestSearching !== '1') {
return res.redirect('/403');
}
if(!req.params.term) {
req.params.term = '';
}
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('/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.get('api/reset/:code', function (req, res) {
res.json({
reset_code: req.params.code
});
});
app.get('/reset', function(req, res) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route('reset') + templates.footer);
});
});
app.get('api/reset', function (req, res) {
res.json({});
});
// Other routes // Other routes