Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-24 01:10:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #2368

Browse Source
This commit is contained in:
barisusakli
2014-11-08 18:40:38 -05:00
parent d2735c8558
commit af4cbfb20d
4 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/controllers/categories.js
View File

@@ -9,7 +9,8 @@ var categoriesController = {},
categories = require('../categories'), categories = require('../categories'),
topics = require('../topics'), topics = require('../topics'),
meta = require('../meta'), meta = require('../meta'),
plugins = require('../plugins'); plugins = require('../plugins'),
utils = require('../../public/src/utils');
// todo: This might be better placed somewhere else // todo: This might be better placed somewhere else
var apiToRegular = function(url) { var apiToRegular = function(url) {
@@ -44,7 +45,6 @@ categoriesController.popular = function(req, res, next) {
if (uid === 0) { if (uid === 0) {
if (anonCache[term] && (Date.now() - lastUpdateTime) < 60 * 60 * 1000) { if (anonCache[term] && (Date.now() - lastUpdateTime) < 60 * 60 * 1000) {
console.log('returning from cache');
return res.render('popular', anonCache[term]); return res.render('popular', anonCache[term]);
} }
} }
@@ -105,6 +105,10 @@ categoriesController.get = function(req, res, next) {
uid = req.user ? req.user.uid : 0, uid = req.user ? req.user.uid : 0,
userPrivileges; userPrivileges;
if (req.params.topic_index && !utils.isNumber(req.params.topic_index)) {
return categoriesController.notFound(req, res);
}
async.waterfall([ async.waterfall([
function(next) { function(next) {
async.parallel({ async.parallel({
@@ -112,7 +116,7 @@ categoriesController.get = function(req, res, next) {
categories.exists(cid, next); categories.exists(cid, next);
}, },
categoryData: function(next) { categoryData: function(next) {
categories.getCategoryFields(cid, ['slug', 'disabled'], next); categories.getCategoryFields(cid, ['slug', 'disabled', 'topic_count'], next);
}, },
privileges: function(next) { privileges: function(next) {
privileges.categories.get(cid, uid, next); privileges.categories.get(cid, uid, next);
@@ -135,14 +139,21 @@ categoriesController.get = function(req, res, next) {
return categoriesController.notAllowed(req, res); return categoriesController.notAllowed(req, res);
} }
var topicIndex = utils.isNumber(req.params.topic_index) ? parseInt(req.params.topic_index, 10) : 1;
var topicCount = parseInt(results.categoryData.topic_count, 10) + 1;
if (topicIndex < 1 || topicIndex > topicCount) {
var url = '/category/' + cid + '/' + req.params.slug + (topicIndex > topicCount ? '/' + topicCount : '');
return res.locals.isAPI ? res.status(302).json(url) : res.redirect(url);
}
userPrivileges = results.privileges; userPrivileges = results.privileges;
var settings = results.userSettings; var settings = results.userSettings;
var topicIndex = 0;
if (!settings.usePagination) { if (!settings.usePagination) {
topicIndex = Math.max((req.params.topic_index || 1) - (settings.topicsPerPage - 1), 0); topicIndex = Math.max((topicIndex || 1) - (settings.topicsPerPage - 1), 0);
} else if (!req.query.page) { } else if (!req.query.page) {
var index = Math.max(parseInt((req.params.topic_index || 0), 10), 0); var index = Math.max(parseInt((topicIndex || 0), 10), 0);
page = Math.ceil((index + 1) / settings.topicsPerPage); page = Math.ceil((index + 1) / settings.topicsPerPage);
} }

7
src/controllers/topics.js
View File

@@ -60,11 +60,8 @@ topicsController.get = function(req, res, next) {
if (utils.isNumber(req.params.post_index)) { if (utils.isNumber(req.params.post_index)) {
var url = ''; var url = '';
if (req.params.post_index > postCount) { if (req.params.post_index < 1 || req.params.post_index > postCount) {
url = '/topic/' + req.params.topic_id + '/' + req.params.slug + '/' + postCount; url = '/topic/' + req.params.topic_id + '/' + req.params.slug + (req.params.post_index > postCount ? '/' + postCount : '');
return res.locals.isAPI ? res.status(302).json(url) : res.redirect(url);
} else if (req.params.post_index < 1) {
url = '/topic/' + req.params.topic_id + '/' + req.params.slug;
return res.locals.isAPI ? res.status(302).json(url) : res.redirect(url); return res.locals.isAPI ? res.status(302).json(url) : res.redirect(url);
} }
} }

20
src/middleware/middleware.js
View File

@@ -127,26 +127,6 @@ middleware.addSlug = function(req, res, next) {
next(); next();
}; };
middleware.checkTopicIndex = function(req, res, next) {
categories.getCategoryField(req.params.category_id, 'topic_count', function(err, topicCount) {
if (err) {
return next(err);
}
var topicIndex = parseInt(req.params.topic_index, 10);
topicCount = parseInt(topicCount, 10) + 1;
var url = '';
if (topicIndex > topicCount) {
url = '/category/' + req.params.category_id + '/' + req.params.slug + '/' + topicCount;
return res.locals.isAPI ? res.status(302).json(url) : res.redirect(url);
} else if (topicIndex < 1) {
url = '/category/' + req.params.category_id + '/' + req.params.slug;
return res.locals.isAPI ? res.status(302).json(url) : res.redirect(url);
}
next();
});
};
middleware.prepareAPI = function(req, res, next) { middleware.prepareAPI = function(req, res, next) {
res.locals.isAPI = true; res.locals.isAPI = true;
next(); next();

2
src/routes/index.js
View File

@@ -54,7 +54,7 @@ function categoryRoutes(app, middleware, controllers) {
setupPageRoute(app, '/unread', middleware, [middleware.authenticate], controllers.categories.unread); setupPageRoute(app, '/unread', middleware, [middleware.authenticate], controllers.categories.unread);
app.get('/api/unread/total', middleware.authenticate, controllers.categories.unreadTotal); app.get('/api/unread/total', middleware.authenticate, controllers.categories.unreadTotal);
setupPageRoute(app, '/category/:category_id/:slug/:topic_index', middleware, [middleware.applyCSRF, middleware.checkTopicIndex], controllers.categories.get); setupPageRoute(app, '/category/:category_id/:slug/:topic_index', middleware, [middleware.applyCSRF], controllers.categories.get);
setupPageRoute(app, '/category/:category_id/:slug?', middleware, [middleware.applyCSRF, middleware.addSlug], controllers.categories.get); setupPageRoute(app, '/category/:category_id/:slug?', middleware, [middleware.applyCSRF, middleware.addSlug], controllers.categories.get);
} }