hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes #2477

Browse Source
v1.18.x
barisusakli 10 years ago
parent 9023060008
commit be11577aa4
17 changed files with 176 additions and 187 deletions
Show Stats Download Patch File Download Diff File

85
public/src/ajaxify.js
Unescape Escape View File

@ -24,17 +24,18 @@ $(document).ready(function() {
function onAjaxError(err, url, callback, quiet) { function onAjaxError(err, url, callback, quiet) {
var data = err.data, textStatus = err.textStatus; var data = err.data,
textStatus = err.textStatus;
$('#content, #footer').removeClass('ajaxifying');
if (data) { if (data) {
if (data.status === 404) { if (data.status === 404 || data.status === 500) {
return ajaxify.go('404'); $('#footer, #content').removeClass('hide').addClass('ajaxifying');
return renderTemplate(url, data.status.toString(), data.responseJSON, (new Date()).getTime(), callback);
} else if (data.status === 401) { } else if (data.status === 401) {
app.alertError('[[global:please_log_in]]'); app.alertError('[[global:please_log_in]]');
return ajaxify.go('login'); return ajaxify.go('login');
} else if (data.status === 403) { } else if (data.status === 403) {
$('#content, #footer').removeClass('ajaxifying');
app.alertError('[[error:no-privileges]]'); app.alertError('[[error:no-privileges]]');
} else if (data.status === 302) { } else if (data.status === 302) {
return ajaxify.go(data.responseJSON.slice(1), callback, quiet); return ajaxify.go(data.responseJSON.slice(1), callback, quiet);
@ -56,10 +57,8 @@ $(document).ready(function() {
apiXHR.abort(); apiXHR.abort();
} }
// Remove trailing slash // Remove relative path and trailing slash
url = url.replace(/\/$/, ""); url = ajaxify.removeRelativePath(url.replace(/\/$/, ''));
url = ajaxify.removeRelativePath(url);
var tpl_url = ajaxify.getTemplateMapping(url); var tpl_url = ajaxify.getTemplateMapping(url);
@ -80,8 +79,8 @@ $(document).ready(function() {
translator.load(config.defaultLang, tpl_url); translator.load(config.defaultLang, tpl_url);
$('#footer, #content').removeClass('hide').addClass('ajaxifying'); $('#footer, #content').removeClass('hide').addClass('ajaxifying');
var animationDuration = parseFloat($('#content').css('transition-duration')) || 0.2,
startTime = (new Date()).getTime(); var startTime = (new Date()).getTime();
ajaxify.variables.flush(); ajaxify.variables.flush();
ajaxify.loadData(url, function(err, data) { ajaxify.loadData(url, function(err, data) {
@ -89,48 +88,54 @@ $(document).ready(function() {
return onAjaxError(err, url, callback, quiet); return onAjaxError(err, url, callback, quiet);
} }
$(window).trigger('action:ajaxify.loadingTemplates', {}); renderTemplate(url, tpl_url, data, startTime, callback);
templates.parse(tpl_url, data, function(template) { require(['search'], function(search) {
translator.translate(template, function(translatedTemplate) { search.topicDOM.end();
setTimeout(function() { });
$('#content').html(translatedTemplate); });
ajaxify.variables.parse(); return true;
}
ajaxify.widgets.render(tpl_url, url, function() { return false;
$(window).trigger('action:ajaxify.end', {url: url}); };
});
$(window).trigger('action:ajaxify.contentLoaded', {url: url}); function renderTemplate(url, tpl_url, data, startTime, callback) {
var animationDuration = parseFloat($('#content').css('transition-duration')) || 0.2;
$(window).trigger('action:ajaxify.loadingTemplates', {});
ajaxify.loadScript(tpl_url); templates.parse(tpl_url, data, function(template) {
translator.translate(template, function(translatedTemplate) {
setTimeout(function() {
$('#content').html(translatedTemplate);
if (typeof callback === 'function') { ajaxify.variables.parse();
callback();
}
app.processPage(); ajaxify.widgets.render(tpl_url, url, function() {
$(window).trigger('action:ajaxify.end', {url: url});
});
$('#content, #footer').removeClass('ajaxifying'); $(window).trigger('action:ajaxify.contentLoaded', {url: url});
ajaxify.initialLoad = false;
app.refreshTitle(url); ajaxify.loadScript(tpl_url);
}, animationDuration * 1000 - ((new Date()).getTime() - startTime));
}); if (typeof callback === 'function') {
}); callback();
}
require(['search'], function(search) { app.processPage();
search.topicDOM.end();
});
});
return true; $('#content, #footer').removeClass('ajaxifying');
} ajaxify.initialLoad = false;
return false; app.refreshTitle(url);
}; }, animationDuration * 1000 - ((new Date()).getTime() - startTime));
});
});
}
ajaxify.removeRelativePath = function(url) { ajaxify.removeRelativePath = function(url) {
if (url.indexOf(RELATIVE_PATH.slice(1)) === 0) { if (url.indexOf(RELATIVE_PATH.slice(1)) === 0) {

16
src/controllers/accounts.js
Unescape Escape View File

@ -140,7 +140,7 @@ accountsController.getAccount = function(req, res, next) {
} }
if (!userData) { if (!userData) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
async.parallel({ async.parallel({
@ -198,7 +198,7 @@ function getFollow(route, name, req, res, next) {
function(data, next) { function(data, next) {
userData = data; userData = data;
if (!userData) { if (!userData) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
var method = name === 'following' ? 'getFollowing' : 'getFollowers'; var method = name === 'following' ? 'getFollowing' : 'getFollowers';
user[method](userData.uid, next); user[method](userData.uid, next);
@ -223,7 +223,7 @@ accountsController.getFavourites = function(req, res, next) {
} }
if (!userData) { if (!userData) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
if (parseInt(userData.uid, 10) !== callerUID) { if (parseInt(userData.uid, 10) !== callerUID) {
@ -252,7 +252,7 @@ accountsController.getPosts = function(req, res, next) {
} }
if (!userData) { if (!userData) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
posts.getPostsFromSet('uid:' + userData.uid + ':posts', callerUID, 0, 19, function(err, userPosts) { posts.getPostsFromSet('uid:' + userData.uid + ':posts', callerUID, 0, 19, function(err, userPosts) {
if (err) { if (err) {
@ -276,7 +276,7 @@ accountsController.getTopics = function(req, res, next) {
} }
if (!userData) { if (!userData) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
var set = 'uid:' + userData.uid + ':topics'; var set = 'uid:' + userData.uid + ':topics';
@ -359,7 +359,7 @@ accountsController.accountSettings = function(req, res, next) {
} }
if (!userData) { if (!userData) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
async.parallel({ async.parallel({
@ -502,7 +502,7 @@ accountsController.getNotifications = function(req, res, next) {
accountsController.getChats = function(req, res, next) { accountsController.getChats = function(req, res, next) {
if (parseInt(meta.config.disableChat) === 1) { if (parseInt(meta.config.disableChat) === 1) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
async.parallel({ async.parallel({
contacts: async.apply(user.getFollowing, req.user.uid), contacts: async.apply(user.getFollowing, req.user.uid),
@ -536,7 +536,7 @@ accountsController.getChats = function(req, res, next) {
async.apply(user.getUidByUserslug, req.params.userslug), async.apply(user.getUidByUserslug, req.params.userslug),
function(toUid, next) { function(toUid, next) {
if (!toUid) { if (!toUid) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
async.parallel({ async.parallel({
toUser: async.apply(user.getUserFields, toUid, ['uid', 'username']), toUser: async.apply(user.getUserFields, toUid, ['uid', 'username']),

6
src/controllers/categories.js
Unescape Escape View File

@ -102,7 +102,7 @@ categoriesController.get = function(req, res, next) {
userPrivileges; userPrivileges;
if (req.params.topic_index && !utils.isNumber(req.params.topic_index)) { if (req.params.topic_index && !utils.isNumber(req.params.topic_index)) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
async.waterfall([ async.waterfall([
@ -124,11 +124,11 @@ categoriesController.get = function(req, res, next) {
}, },
function(results, next) { function(results, next) {
if (!results.exists || (results.categoryData && parseInt(results.categoryData.disabled, 10) === 1)) { if (!results.exists || (results.categoryData && parseInt(results.categoryData.disabled, 10) === 1)) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
if (cid + '/' + req.params.slug !== results.categoryData.slug) { if (cid + '/' + req.params.slug !== results.categoryData.slug) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
if (!results.privileges.read) { if (!results.privileges.read) {

15
src/controllers/groups.js
Unescape Escape View File

@ -3,6 +3,7 @@
var groups = require('../groups'), var groups = require('../groups'),
async = require('async'), async = require('async'),
nconf = require('nconf'), nconf = require('nconf'),
helpers = require('./helpers'),
groupsController = {}; groupsController = {};
groupsController.list = function(req, res, next) { groupsController.list = function(req, res, next) {
@ -19,7 +20,7 @@ groupsController.list = function(req, res, next) {
}); });
}; };
groupsController.details = function(req, res) { groupsController.details = function(req, res, next) {
var uid = req.user ? parseInt(req.user.uid, 10) : 0; var uid = req.user ? parseInt(req.user.uid, 10) : 0;
async.parallel({ async.parallel({
group: function(next) { group: function(next) {
@ -31,11 +32,15 @@ groupsController.details = function(req, res) {
groups.getLatestMemberPosts(req.params.name, 10, uid, next); groups.getLatestMemberPosts(req.params.name, 10, uid, next);
} }
}, function(err, results) { }, function(err, results) {
if (!err) { if (err) {
res.render('groups/details', results); return next(err);
} else {
res.redirect(nconf.get('relative_path') + '/404');
} }
if (!results.group) {
return helpers.notFound(req, res);
}
res.render('groups/details', results);
}); });
}; };

6
src/controllers/helpers.js
Unescape Escape View File

@ -4,11 +4,11 @@ var nconf = require('nconf');
var helpers = {}; var helpers = {};
helpers.notFound = function(res) { helpers.notFound = function(req, res, error) {
if (res.locals.isAPI) { if (res.locals.isAPI) {
res.status(404).json('not-found'); res.status(404).json({path: req.path.replace(/^\/api/, ''), error: error});
} else { } else {
res.status(404).render('404'); res.status(404).render('404', {path: req.path, error: error});
} }
}; };

14
src/controllers/index.js
Unescape Escape View File

@ -104,6 +104,10 @@ Controllers.home = function(req, res, next) {
}; };
Controllers.search = function(req, res, next) { Controllers.search = function(req, res, next) {
if (!plugins.hasListeners('filter:search.query')) {
return helpers.notFound(req, res);
}
if (!req.params.term) { if (!req.params.term) {
return res.render('search', { return res.render('search', {
time: 0, time: 0,
@ -115,10 +119,6 @@ Controllers.search = function(req, res, next) {
var uid = req.user ? req.user.uid : 0; var uid = req.user ? req.user.uid : 0;
if (!plugins.hasListeners('filter:search.query')) {
return res.redirect('/404');
}
req.params.term = validator.escape(req.params.term); req.params.term = validator.escape(req.params.term);
search.search(req.params.term, uid, function(err, results) { search.search(req.params.term, uid, function(err, results) {
@ -198,8 +198,8 @@ Controllers.confirmEmail = function(req, res, next) {
}; };
Controllers.sitemap = function(req, res, next) { Controllers.sitemap = function(req, res, next) {
if (meta.config['feeds:disableSitemap'] === '1') { if (parseInt(meta.config['feeds:disableSitemap'], 10) === 1) {
return res.redirect(nconf.get('relative_path') + '/404'); return helpers.notFound(req, res);
} }
var sitemap = require('../sitemap.js'); var sitemap = require('../sitemap.js');
@ -238,7 +238,7 @@ Controllers.outgoing = function(req, res, next) {
Controllers.termsOfUse = function(req, res, next) { Controllers.termsOfUse = function(req, res, next) {
if (!meta.config.termsOfUse) { if (!meta.config.termsOfUse) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
res.render('tos', {termsOfUse: meta.config.termsOfUse}); res.render('tos', {termsOfUse: meta.config.termsOfUse});
}; };

20
src/controllers/topics.js
Unescape Escape View File

@ -22,7 +22,7 @@ topicsController.get = function(req, res, next) {
userPrivileges; userPrivileges;
if (req.params.post_index && !utils.isNumber(req.params.post_index)) { if (req.params.post_index && !utils.isNumber(req.params.post_index)) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
async.waterfall([ async.waterfall([
@ -42,19 +42,11 @@ topicsController.get = function(req, res, next) {
function (results, next) { function (results, next) {
userPrivileges = results.privileges; userPrivileges = results.privileges;
if (userPrivileges.disabled) { if (userPrivileges.disabled || tid + '/' + req.params.slug !== results.topic.slug) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
if (tid + '/' + req.params.slug !== results.topic.slug) { if (!userPrivileges.read || (parseInt(results.topic.deleted, 10) && !userPrivileges.view_deleted)) {
return helpers.notFound(res);
}
if (!userPrivileges.read) {
return helpers.notAllowed(req, res);
}
if (parseInt(results.topic.deleted, 10) && !userPrivileges.view_deleted) {
return helpers.notAllowed(req, res); return helpers.notAllowed(req, res);
} }
@ -71,7 +63,7 @@ topicsController.get = function(req, res, next) {
} }
if (settings.usePagination && (req.query.page < 1 || req.query.page > pageCount)) { if (settings.usePagination && (req.query.page < 1 || req.query.page > pageCount)) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
var set = 'tid:' + tid + ':posts', var set = 'tid:' + tid + ':posts',
@ -114,7 +106,7 @@ topicsController.get = function(req, res, next) {
topics.getTopicWithPosts(tid, set, uid, start, end, reverse, function (err, topicData) { topics.getTopicWithPosts(tid, set, uid, start, end, reverse, function (err, topicData) {
if (err && err.message === '[[error:no-topic]]' && !topicData) { if (err && err.message === '[[error:no-topic]]' && !topicData) {
return helpers.notFound(res); return helpers.notFound(req, res);
} }
if (err && !topicData) { if (err && !topicData) {

14
src/groups.js
Unescape Escape View File

@ -85,15 +85,7 @@ var async = require('async'),
async.parallel({ async.parallel({
base: function (next) { base: function (next) {
if (ephemeralGroups.indexOf(groupName) === -1) { if (ephemeralGroups.indexOf(groupName) === -1) {
db.getObject('group:' + groupName, function(err, groupObj) { db.getObject('group:' + groupName, next);
if (err) {
next(err);
} else if (!groupObj) {
next('group-not-found');
} else {
next(err, groupObj);
}
});
} else { } else {
internals.getEphemeralGroup(groupName, options, next); internals.getEphemeralGroup(groupName, options, next);
} }
@ -120,7 +112,7 @@ var async = require('async'),
}); });
} }
}, function (err, results) { }, function (err, results) {
if (err) { if (err || !results.base) {
return callback(err); return callback(err);
} }
@ -498,7 +490,7 @@ var async = require('async'),
// If this is a hidden group, and it is now empty, delete it // If this is a hidden group, and it is now empty, delete it
Groups.get(groupName, {}, function(err, group) { Groups.get(groupName, {}, function(err, group) {
if (err) { if (err || !group) {
return callback(err); return callback(err);
} }

6
src/install.js
Unescape Escape View File

@ -261,7 +261,11 @@ function enableDefaultTheme(next) {
function createAdministrator(next) { function createAdministrator(next) {
var Groups = require('./groups'); var Groups = require('./groups');
Groups.get('administrators', {}, function (err, groupObj) { Groups.get('administrators', {}, function (err, groupObj) {
if (!err && groupObj && groupObj.memberCount > 0) { if (err) {
return next(err);
}
if (groupObj && groupObj.memberCount > 0) {
winston.info('Administrator found, skipping Admin setup'); winston.info('Administrator found, skipping Admin setup');
next(); next();
} else { } else {

47
src/middleware/middleware.js
Unescape Escape View File

@ -22,19 +22,16 @@ var app,
ensureLoggedIn = require('connect-ensure-login'), ensureLoggedIn = require('connect-ensure-login'),
controllers = { controllers = {
api: require('./../controllers/api') api: require('./../controllers/api'),
helpers: require('../controllers/helpers')
}; };
middleware.authenticate = function(req, res, next) { middleware.authenticate = function(req, res, next) {
if(!req.user) { if (req.user) {
if (res.locals.isAPI) { return next();
return res.status(403).json('not-allowed');
} else {
return res.redirect(nconf.get('url') + '/403');
}
} else {
next();
} }
helpers.notAllowed(req, res);
}; };
middleware.applyCSRF = csrf(); middleware.applyCSRF = csrf();
@ -135,23 +132,16 @@ middleware.prepareAPI = function(req, res, next) {
}; };
middleware.guestSearchingAllowed = function(req, res, next) { middleware.guestSearchingAllowed = function(req, res, next) {
if (!req.user && meta.config.allowGuestSearching !== '1') { if (!req.user && parseInt(meta.config.allowGuestSearching, 10) !== 1) {
return res.redirect('/403'); return controllers.helpers.notAllowed(req, res);
} }
next(); next();
}; };
middleware.checkGlobalPrivacySettings = function(req, res, next) { middleware.checkGlobalPrivacySettings = function(req, res, next) {
var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; if (!req.user && !!parseInt(meta.config.privateUserInfo, 10)) {
return controllers.helpers.notAllowed(req, res);
if (!callerUID && !!parseInt(meta.config.privateUserInfo, 10)) {
if (res.locals.isAPI) {
return res.status(403).json('not-allowed');
} else {
req.session.returnTo = req.url;
return res.redirect('/login');
}
} }
next(); next();
@ -162,8 +152,7 @@ middleware.checkAccountPermissions = function(req, res, next) {
var callerUID = req.user ? parseInt(req.user.uid, 10) : 0; var callerUID = req.user ? parseInt(req.user.uid, 10) : 0;
if (callerUID === 0) { if (callerUID === 0) {
req.session.returnTo = req.url; return controllers.helpers.notAllowed(req, res);
return res.redirect('/login');
} }
user.getUidByUserslug(req.params.userslug, function (err, uid) { user.getUidByUserslug(req.params.userslug, function (err, uid) {
@ -172,7 +161,7 @@ middleware.checkAccountPermissions = function(req, res, next) {
} }
if (!uid) { if (!uid) {
return res.locals.isAPI ? res.status(404).json('not-found') : res.redirect(nconf.get('relative_path') + '/404'); return controllers.helpers.notFound(req, res);
} }
if (parseInt(uid, 10) === callerUID) { if (parseInt(uid, 10) === callerUID) {
@ -180,19 +169,11 @@ middleware.checkAccountPermissions = function(req, res, next) {
} }
user.isAdministrator(callerUID, function(err, isAdmin) { user.isAdministrator(callerUID, function(err, isAdmin) {
if(err) { if (err || isAdmin) {
return next(err); return next(err);
} }
if(isAdmin) { controllers.helpers.notAllowed(req, res);
return next();
}
if (res.locals.isAPI) {
res.status(403).json('not-allowed');
} else {
res.redirect(nconf.get('relative_path') + '/403');
}
}); });
}); });
}; };

9
src/routes/feeds.js
Unescape Escape View File

@ -8,6 +8,7 @@ var async = require('async'),
topics = require('../topics'), topics = require('../topics'),
categories = require('../categories'), categories = require('../categories'),
meta = require('../meta'), meta = require('../meta'),
helpers = require('../controllers/helpers'),
privileges = require('../privileges'); privileges = require('../privileges');
function hasTopicPrivileges(req, res, next) { function hasTopicPrivileges(req, res, next) {
@ -31,7 +32,7 @@ function hasPrivileges(method, id, req, res, next) {
} }
if (!canRead) { if (!canRead) {
return res.redirect(nconf.get('relative_path') + '/403'); return helpers.notAllowed(req, res);
} }
return next(); return next();
@ -53,7 +54,7 @@ function generateForTopic(req, res, next) {
} }
if (topicData.deleted && !userPrivileges.view_deleted) { if (topicData.deleted && !userPrivileges.view_deleted) {
return res.redirect(nconf.get('relative_path') + '/404'); return helpers.notFound(req, res);
} }
var description = topicData.posts.length ? topicData.posts[0].content : ''; var description = topicData.posts.length ? topicData.posts[0].content : '';
@ -137,8 +138,8 @@ function generateForPopular(req, res, next) {
} }
function disabledRSS(req, res, next) { function disabledRSS(req, res, next) {
if (meta.config['feeds:disableRSS'] === '1') { if (parseInt(meta.config['feeds:disableRSS'], 10) === 1) {
return res.redirect(nconf.get('relative_path') + '/404'); return helpers.notFound(req, res);
} }
next(); next();

89
src/routes/index.js
Unescape Escape View File

@ -164,59 +164,62 @@ module.exports = function(app, middleware) {
maxAge: app.enabled('cache') ? 5184000000 : 0 maxAge: app.enabled('cache') ? 5184000000 : 0
})); }));
app.use(catch404); handle404(app, middleware);
app.use(handleErrors); handleErrors(app, middleware);
// Add plugin routes // Add plugin routes
plugins.init(app, middleware); plugins.init(app, middleware);
authRoutes.reloadRoutes(); authRoutes.reloadRoutes();
}; };
function handleErrors(err, req, res, next) { function handle404(app, middleware) {
// we may use properties of the error object app.use(function(req, res, next) {
// here and next(err) appropriately, or if var relativePath = nconf.get('relative_path');
// we possibly recovered from the error, simply next(). var isLanguage = new RegExp('^' + relativePath + '/language/[\\w]{2,}/.*.json'),
//console.error(err.stack, req.path); isClientScript = new RegExp('^' + relativePath + '\\/src\\/.+\\.js');
winston.error(req.path + '\n', err.stack);
if (isClientScript.test(req.url)) {
if (err.code === 'EBADCSRFTOKEN') { res.type('text/javascript').status(200).send('');
return res.sendStatus(403); } else if (isLanguage.test(req.url)) {
} res.status(200).json({});
} else if (req.accepts('html')) {
var status = err.status || 500; if (process.env.NODE_ENV === 'development') {
res.status(status); winston.warn('Route requested but not found: ' + req.url);
}
req.flash('errorMessage', err.message);
res.status(404);
res.redirect(nconf.get('relative_path') + '/500');
if (res.locals.isAPI) {
return res.json({path: req.path, error: 'not-found'});
}
middleware.buildHeader(req, res, function() {
res.render('404', {path: req.path});
});
} else {
res.status(404).type('txt').send('Not found');
}
});
} }
function catch404(req, res, next) { function handleErrors(app, middleware) {
var relativePath = nconf.get('relative_path'); app.use(function(err, req, res, next) {
var isLanguage = new RegExp('^' + relativePath + '/language/[\\w]{2,}/.*.json'), winston.error(req.path + '\n', err.stack);
isClientScript = new RegExp('^' + relativePath + '\\/src\\/.+\\.js');
res.status(404);
if (isClientScript.test(req.url)) { if (err.code === 'EBADCSRFTOKEN') {
res.type('text/javascript').status(200).send(''); return res.sendStatus(403);
} else if (isLanguage.test(req.url)) {
res.status(200).json({});
} else if (req.accepts('html')) {
if (process.env.NODE_ENV === 'development') {
winston.warn('Route requested but not found: ' + req.url);
} }
res.redirect(relativePath + '/404'); res.status(err.status || 500);
} else if (req.accepts('json')) {
if (process.env.NODE_ENV === 'development') {
winston.warn('Route requested but not found: ' + req.url);
}
res.json({ if (res.locals.isAPI) {
error: 'Not found' return res.json({path: req.path, error: err.message});
}); } else {
} else { middleware.buildHeader(req, res, function() {
res.type('txt').send('Not found'); res.render('500', {path: req.path, error: err.message});
} });
}
});
} }

17
src/routes/plugins.js
Unescape Escape View File

@ -8,12 +8,13 @@ var _ = require('underscore'),
async = require('async'), async = require('async'),
winston = require('winston'), winston = require('winston'),
plugins = require('../plugins'); plugins = require('../plugins'),
helpers = require('../controllers/helpers');
module.exports = function(app, middleware, controllers) { module.exports = function(app, middleware, controllers) {
// Static Assets // Static Assets
app.get('/plugins/:id/*', middleware.addExpiresHeaders, function(req, res) { app.get('/plugins/:id/*', middleware.addExpiresHeaders, function(req, res, next) {
var relPath = req._parsedUrl.pathname.replace('/plugins/', ''), var relPath = req._parsedUrl.pathname.replace('/plugins/', ''),
matches = _.map(plugins.staticDirs, function(realPath, mappedPath) { matches = _.map(plugins.staticDirs, function(realPath, mappedPath) {
if (relPath.match(mappedPath)) { if (relPath.match(mappedPath)) {
@ -35,19 +36,19 @@ module.exports = function(app, middleware, controllers) {
} }
}); });
}, function(err, matches) { }, function(err, matches) {
// Filter out the nulls if (err) {
matches = matches.filter(function(a) { return next(err);
return a; }
}); matches = matches.filter(Boolean);
if (matches.length) { if (matches.length) {
res.sendFile(matches[0]); res.sendFile(matches[0]);
} else { } else {
res.redirect(nconf.get('relative_path') + '/404'); helpers.notFound(req, res);
} }
}); });
} else { } else {
res.redirect(nconf.get('relative_path') + '/404'); helpers.notFound(req, res);
} }
}); });
}; };

9
src/socket.io/admin/categories.js
Unescape Escape View File

@ -67,13 +67,18 @@ Categories.getPrivilegeSettings = function(socket, cid, callback) {
async.reduce(privileges, [], function(members, privilege, next) { async.reduce(privileges, [], function(members, privilege, next) {
groups.get('cid:' + cid + ':privileges:' + privilege, { expand: true }, function(err, groupObj) { groups.get('cid:' + cid + ':privileges:' + privilege, { expand: true }, function(err, groupObj) {
if (!err) { if (err || !groupObj) {
members = members.concat(groupObj.members); return next(err, members);
} }
members = members.concat(groupObj.members);
next(null, members); next(null, members);
}); });
}, function(err, members) { }, function(err, members) {
if (err) {
return callback(err);
}
// Remove duplicates // Remove duplicates
var present = [], var present = [],
x = members.length, x = members.length,

4
src/socket.io/admin/groups.js
Unescape Escape View File

@ -20,9 +20,7 @@ Groups.delete = function(socket, groupName, callback) {
Groups.get = function(socket, groupName, callback) { Groups.get = function(socket, groupName, callback) {
groups.get(groupName, { groups.get(groupName, {
expand: true expand: true
}, function(err, groupObj) { }, callback);
callback(err, groupObj || undefined);
});
}; };
Groups.join = function(socket, data, callback) { Groups.join = function(socket, data, callback) {

2
src/views/404.tpl
Unescape Escape View File

@ -1,5 +1,5 @@
<div class="alert alert-danger"> <div class="alert alert-danger">
<strong>[[global:404.title]]</strong> <strong>{path} [[global:404.title]]</strong>
<!-- IF error --> <!-- IF error -->
<p>{error}</p> <p>{error}</p>
<!-- ELSE --> <!-- ELSE -->

4
src/views/500.tpl
Unescape Escape View File

@ -1,5 +1,7 @@
<div class="alert alert-danger"> <div class="alert alert-danger">
<strong>[[global:500.title]]</strong> <strong>[[global:500.title]]</strong>
<p>[[global:500.message]]</p> <p>[[global:500.message]]</p>
<!-- IF errorMessage --><p>{errorMessage}</p><!-- ENDIF errorMessage --> <p>{path}<p>
<!-- IF error --><p>{error}</p><!-- ENDIF error -->
</div> </div>
Write Preview
Loading…
Cancel
Save