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

page checks #3089

Browse Source
This commit is contained in:
barisusakli
2015-04-24 10:59:00 -04:00
parent 47a2377229
commit dc16a665ae
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/controllers/categories.js
View File

@@ -184,6 +184,8 @@ categoriesController.get = function(req, res, next) {
}, next);
},
function(results, next) {
userPrivileges = results.privileges;
if (!results.exists || (results.categoryData && parseInt(results.categoryData.disabled, 10) === 1)) {
return helpers.notFound(req, res);
}
@@ -196,15 +198,18 @@ categoriesController.get = function(req, res, next) {
return helpers.redirect(res, '/category/' + encodeURI(results.categoryData.slug));
}
var settings = results.userSettings;
var topicIndex = utils.isNumber(req.params.topic_index) ? parseInt(req.params.topic_index, 10) - 1 : 0;
var topicCount = parseInt(results.categoryData.topic_count, 10);
var pageCount = Math.max(1, Math.ceil(topicCount / settings.topicsPerPage));
if (topicIndex < 0 || topicIndex > Math.max(topicCount - 1, 0)) {
return helpers.redirect(res, '/category/' + cid + '/' + req.params.slug + (topicIndex > topicCount ? '/' + topicCount : ''));
}
userPrivileges = results.privileges;
var settings = results.userSettings;
if (settings.usePagination && (page < 1 || page > pageCount)) {
return helpers.notFound(req, res);
}
if (!settings.usePagination) {
topicIndex = Math.max(topicIndex - (settings.topicsPerPage - 1), 0);