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

one final push, cleanup + organize + lint; made feeds/meta/plugins routes follow same pattern as other route files

Browse Source
v1.18.x
psychobunny 11 years ago
parent 1dbc47b890
commit c0cd6148f4
9 changed files with 632 additions and 627 deletions
Show Stats Download Patch File Download Diff File

7
src/middleware/index.js
Unescape Escape View File

@ -16,9 +16,7 @@ var templates = require('./../../public/src/templates'),
var middleware = {}; var middleware = {};
/*
* Helper functions
*/
function routeThemeScreenshots(app, themes) { function routeThemeScreenshots(app, themes) {
var screenshotPath; var screenshotPath;
@ -170,6 +168,9 @@ function catch404(req, res, next) {
} }
} }
module.exports = function(app, data) { module.exports = function(app, data) {
middleware = require('./middleware')(app); middleware = require('./middleware')(app);

178
src/routes/admin.js
Unescape Escape View File

@ -22,7 +22,6 @@ var nconf = require('nconf'),
utils = require('./../../public/src/utils'), utils = require('./../../public/src/utils'),
templates = require('./../../public/src/templates'); templates = require('./../../public/src/templates');
var Admin = {};
function uploadImage(filename, req, res) { function uploadImage(filename, req, res) {
function done(err, image) { function done(err, image) {
@ -45,69 +44,7 @@ function uploadImage(filename, req, res) {
} }
} }
module.exports = function(app, middleware, controllers) { function uploadCategoryPicture(req, res, next) {
app.all('/api/admin/*', middleware.admin.isAdmin, middleware.prepareAPI);
app.all('/admin/*', middleware.admin.isAdmin);
app.get('/admin', middleware.admin.isAdmin);
app.get('/admin/', middleware.admin.buildHeader, controllers.admin.home);
app.get('/api/admin/index', controllers.admin.home);
app.get('/admin/users/search', middleware.admin.buildHeader, controllers.admin.users.search);
app.get('/api/admin/users/search', controllers.admin.users.search);
app.get('/admin/users/latest', middleware.admin.buildHeader, controllers.admin.users.latest);
app.get('/api/admin/users/latest', controllers.admin.users.latest);
app.get('/admin/users/sort-posts', middleware.admin.buildHeader, controllers.admin.users.sortByPosts);
app.get('/api/admin/users/sort-posts', controllers.admin.users.sortByPosts);
app.get('/admin/users/sort-reputation', middleware.admin.buildHeader, controllers.admin.users.sortByReputation);
app.get('/api/admin/users/sort-reputation', controllers.admin.users.sortByReputation);
app.get('/admin/users', middleware.admin.buildHeader, controllers.admin.users.sortByJoinDate);
app.get('/api/admin/users', controllers.admin.users.sortByJoinDate);
app.get('/admin/categories/active', middleware.admin.buildHeader, controllers.admin.categories.active);
app.get('/api/admin/categories/active', controllers.admin.categories.active);
app.get('/admin/categories/disabled', middleware.admin.buildHeader, controllers.admin.categories.disabled);
app.get('/api/admin/categories/disabled', controllers.admin.categories.disabled);
app.get('/admin/topics', middleware.admin.buildHeader, controllers.admin.topics.get);
app.get('/api/admin/topics', controllers.admin.topics.get);
app.get('/admin/database', middleware.admin.buildHeader, controllers.admin.database.get);
app.get('/api/admin/database', controllers.admin.database.get);
app.get('/admin/events', middleware.admin.buildHeader, controllers.admin.events.get);
app.get('/api/admin/events', controllers.admin.events.get);
app.get('/admin/plugins', middleware.admin.buildHeader, controllers.admin.plugins.get);
app.get('/api/admin/plugins', controllers.admin.plugins.get);
app.get('/admin/languages', middleware.admin.buildHeader, controllers.admin.languages.get);
app.get('/api/admin/languages', controllers.admin.languages.get);
app.get('/admin/settings', middleware.admin.buildHeader, controllers.admin.settings.get);
app.get('/api/admin/settings', controllers.admin.settings.get);
app.get('/admin/logger', middleware.admin.buildHeader, controllers.admin.logger.get);
app.get('/api/admin/logger', controllers.admin.logger.get);
app.get('/admin/themes', middleware.admin.buildHeader, controllers.admin.themes.get);
app.get('/api/admin/themes', controllers.admin.themes.get);
app.get('/admin/groups', middleware.admin.buildHeader, controllers.admin.groups.get);
app.get('/api/admin/groups', controllers.admin.groups.get);
app.namespace('/admin', function () {
app.post('/category/uploadpicture', function(req, res) {
if (!req.user) { if (!req.user) {
return res.redirect('/403'); return res.redirect('/403');
} }
@ -134,9 +71,9 @@ module.exports = function(app, middleware, controllers) {
var filename = 'category-' + params.cid + path.extname(req.files.userPhoto.name); var filename = 'category-' + params.cid + path.extname(req.files.userPhoto.name);
uploadImage(filename, req, res); uploadImage(filename, req, res);
}); }
app.post('/uploadfavicon', function(req, res) { function uploadFavicon(req, res, next) {
if (!req.user) { if (!req.user) {
return res.redirect('/403'); return res.redirect('/403');
} }
@ -161,10 +98,9 @@ module.exports = function(app, middleware, controllers) {
var rs = {path: image.url}; var rs = {path: image.url};
res.send(req.xhr ? rs : JSON.stringify(rs)); res.send(req.xhr ? rs : JSON.stringify(rs));
}); });
}); }
app.post('/uploadlogo', function(req, res) {
function uploadLogo(req, res, next) {
if (!req.user) { if (!req.user) {
return res.redirect('/403'); return res.redirect('/403');
} }
@ -181,52 +117,80 @@ module.exports = function(app, middleware, controllers) {
var filename = 'site-logo' + path.extname(req.files.userPhoto.name); var filename = 'site-logo' + path.extname(req.files.userPhoto.name);
uploadImage(filename, req, res); uploadImage(filename, req, res);
}); }
app.get('/users/csv', function(req, res) { function getUsersCSV(req, res, next) {
user.getUsersCSV(function(err, data) { user.getUsersCSV(function(err, data) {
res.attachment('users.csv'); res.attachment('users.csv');
res.setHeader('Content-Type', 'text/csv'); res.setHeader('Content-Type', 'text/csv');
res.end(data); res.end(data);
}); });
}); }
});
var custom_routes = { module.exports = function(app, middleware, controllers) {
'routes': [], app.all('/api/admin/*', middleware.admin.isAdmin, middleware.prepareAPI);
'api': [] app.all('/admin/*', middleware.admin.isAdmin);
}; app.get('/admin', middleware.admin.isAdmin);
plugins.ready(function() {
plugins.fireHook('filter:admin.create_routes', custom_routes, function(err, custom_routes) {
var route, routes = custom_routes.routes;
for (route in routes) {
if (routes.hasOwnProperty(route)) {
(function(route) {
app[routes[route].method || 'get']('/admin' + routes[route].route, function(req, res) {
routes[route].options(req, res, function(options) {
Admin.buildHeader(req, res, function (err, header) {
res.send(header + options.content + templates['admin/footer']);
});
});
});
}(route));
}
}
var apiRoutes = custom_routes.api;
for (route in apiRoutes) { app.get('/admin/', middleware.admin.buildHeader, controllers.admin.home);
if (apiRoutes.hasOwnProperty(route)) { app.get('/api/admin/index', controllers.admin.home);
(function(route) {
app[apiRoutes[route].method || 'get']('/api/admin' + apiRoutes[route].route, function(req, res) { app.get('/admin/users/search', middleware.admin.buildHeader, controllers.admin.users.search);
apiRoutes[route].callback(req, res, function(data) { app.get('/api/admin/users/search', controllers.admin.users.search);
res.json(data);
}); app.get('/admin/users/latest', middleware.admin.buildHeader, controllers.admin.users.latest);
}); app.get('/api/admin/users/latest', controllers.admin.users.latest);
}(route));
} app.get('/admin/users/sort-posts', middleware.admin.buildHeader, controllers.admin.users.sortByPosts);
} app.get('/api/admin/users/sort-posts', controllers.admin.users.sortByPosts);
});
app.get('/admin/users/sort-reputation', middleware.admin.buildHeader, controllers.admin.users.sortByReputation);
app.get('/api/admin/users/sort-reputation', controllers.admin.users.sortByReputation);
app.get('/admin/users', middleware.admin.buildHeader, controllers.admin.users.sortByJoinDate);
app.get('/api/admin/users', controllers.admin.users.sortByJoinDate);
app.get('/admin/categories/active', middleware.admin.buildHeader, controllers.admin.categories.active);
app.get('/api/admin/categories/active', controllers.admin.categories.active);
app.get('/admin/categories/disabled', middleware.admin.buildHeader, controllers.admin.categories.disabled);
app.get('/api/admin/categories/disabled', controllers.admin.categories.disabled);
app.get('/admin/topics', middleware.admin.buildHeader, controllers.admin.topics.get);
app.get('/api/admin/topics', controllers.admin.topics.get);
app.get('/admin/database', middleware.admin.buildHeader, controllers.admin.database.get);
app.get('/api/admin/database', controllers.admin.database.get);
app.get('/admin/events', middleware.admin.buildHeader, controllers.admin.events.get);
app.get('/api/admin/events', controllers.admin.events.get);
app.get('/admin/plugins', middleware.admin.buildHeader, controllers.admin.plugins.get);
app.get('/api/admin/plugins', controllers.admin.plugins.get);
app.get('/admin/languages', middleware.admin.buildHeader, controllers.admin.languages.get);
app.get('/api/admin/languages', controllers.admin.languages.get);
app.get('/admin/settings', middleware.admin.buildHeader, controllers.admin.settings.get);
app.get('/api/admin/settings', controllers.admin.settings.get);
app.get('/admin/logger', middleware.admin.buildHeader, controllers.admin.logger.get);
app.get('/api/admin/logger', controllers.admin.logger.get);
app.get('/admin/themes', middleware.admin.buildHeader, controllers.admin.themes.get);
app.get('/api/admin/themes', controllers.admin.themes.get);
app.get('/admin/groups', middleware.admin.buildHeader, controllers.admin.groups.get);
app.get('/api/admin/groups', controllers.admin.groups.get);
app.namespace('/admin', function () {
app.get('/users/csv', getUsersCSV);
app.post('/category/uploadpicture', uploadCategoryPicture);
app.post('/uploadfavicon', uploadFavicon);
app.post('/uploadlogo', uploadLogo);
}); });
}; };

74
src/routes/api.js
Unescape Escape View File

@ -13,31 +13,12 @@ var path = require('path'),
meta = require('./../meta'), meta = require('./../meta'),
plugins = require('./../plugins'), plugins = require('./../plugins'),
utils = require('./../../public/src/utils'), utils = require('./../../public/src/utils'),
pkg = require('./../../package.json'); pkg = require('./../../package.json'),
customTemplates = [];
module.exports = function(app, middleware, controllers) {
app.namespace('/api', function () {
app.all('*', middleware.updateLastOnlineTime, middleware.prepareAPI);
app.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID);
app.get('/get_templates_listing', function (req, res) {
utils.walk(nconf.get('views_dir'), function (err, data) {
data = data.concat(app.get_custom_templates())
.filter(function(value, index, self) {
return self.indexOf(value) === index;
}).map(function(el) {
return el.replace(nconf.get('views_dir') + '/', '');
});
res.json(data); function searchTerm(req, res, next) {
});
});
app.get('/config', controllers.api.getConfig);
app.get('/search/:term', function (req, res, next) {
if (!plugins.hasListeners('filter:search.query')) { if (!plugins.hasListeners('filter:search.query')) {
return res.redirect('/404'); return res.redirect('/404');
} }
@ -93,7 +74,7 @@ module.exports = function(app, middleware, controllers) {
} else { } else {
res.send(403); res.send(403);
} }
}); }
function upload(req, res, filesIterator, next) { function upload(req, res, filesIterator, next) {
if(!req.user) { if(!req.user) {
@ -105,7 +86,6 @@ module.exports = function(app, middleware, controllers) {
return res.json(500, {message: 'invalid files'}); return res.json(500, {message: 'invalid files'});
} }
// multiple files
if(Array.isArray(files[0])) { if(Array.isArray(files[0])) {
files = files[0]; files = files[0];
} }
@ -123,18 +103,13 @@ module.exports = function(app, middleware, controllers) {
return res.send(500, err.message); return res.send(500, err.message);
} }
// if this was not a XMLHttpRequest (hence the req.xhr check http://expressjs.com/api.html#req.xhr) // IE8 - send it as text/html so browser won't trigger a file download for the json response
// then most likely it's submit via the iFrame workaround, via the jquery.form plugin's ajaxSubmit()
// we need to send it as text/html so IE8 won't trigger a file download for the json response
// malsup.com/jquery/form/#file-upload // malsup.com/jquery/form/#file-upload
// Also, req.send is safe for both types, if the response was an object, res.send will automatically submit as application/json
// expressjs.com/api.html#res.send
res.send(200, req.xhr ? images : JSON.stringify(images)); res.send(200, req.xhr ? images : JSON.stringify(images));
}); });
} }
app.post('/post/upload', function(req, res, next) { function uploadPost(req, res, next) {
upload(req, res, function(file, next) { upload(req, res, function(file, next) {
if(file.type.match(/image./)) { if(file.type.match(/image./)) {
posts.uploadPostImage(file, next); posts.uploadPostImage(file, next);
@ -142,9 +117,9 @@ module.exports = function(app, middleware, controllers) {
posts.uploadPostFile(file, next); posts.uploadPostFile(file, next);
} }
}, next); }, next);
}); }
app.post('/topic/thumb/upload', function(req, res, next) { function uploadThumb(req, res, next) {
upload(req, res, function(file, next) { upload(req, res, function(file, next) {
if(file.type.match(/image./)) { if(file.type.match(/image./)) {
topics.uploadTopicThumb(file, next); topics.uploadTopicThumb(file, next);
@ -152,13 +127,42 @@ module.exports = function(app, middleware, controllers) {
res.json(500, {message: 'Invalid File'}); res.json(500, {message: 'Invalid File'});
} }
}, next); }, next);
}); }
app.get('/categories/:cid/moderators', function(req, res) { function getModerators(req, res, next) {
categories.getModerators(req.params.cid, function(err, moderators) { categories.getModerators(req.params.cid, function(err, moderators) {
res.json({moderators: moderators}); res.json({moderators: moderators});
}); });
}
function getTemplatesListing(req, res, next) {
utils.walk(nconf.get('views_dir'), function (err, data) {
data = data.concat(customTemplates)
.filter(function(value, index, self) {
return self.indexOf(value) === index;
}).map(function(el) {
return el.replace(nconf.get('views_dir') + '/', '');
});
res.json(data);
}); });
}
module.exports = function(app, middleware, controllers) {
app.namespace('/api', function () {
app.all('*', middleware.updateLastOnlineTime, middleware.prepareAPI);
customTemplates = app.get_custom_templates();
app.get('/config', controllers.api.getConfig);
app.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID);
app.get('/get_templates_listing', getTemplatesListing);
app.get('/search/:term', searchTerm);
app.get('/categories/:cid/moderators', getModerators);
app.post('/post/upload', uploadPost);
app.post('/topic/thumb/upload', uploadThumb);
}); });
// this should be in the API namespace // this should be in the API namespace

16
src/routes/debug.js
Unescape Escape View File

@ -1,17 +1,16 @@
"use strict";
var user = require('./../user'), var user = require('./../user'),
categories = require('./../categories'), categories = require('./../categories'),
topics = require('./../topics'), topics = require('./../topics'),
posts = require('./../posts'); posts = require('./../posts');
var DebugRoute = function(app) { module.exports = function(app, middleware, controllers) {
app.namespace('/debug', function() { app.namespace('/debug', function() {
app.get('/uid/:uid', function (req, res) { app.get('/uid/:uid', function (req, res) {
if (!req.params.uid) {
if (!req.params.uid)
return res.redirect('/404'); return res.redirect('/404');
}
user.getUserData(req.params.uid, function (err, data) { user.getUserData(req.params.uid, function (err, data) {
if (data) { if (data) {
@ -53,12 +52,5 @@ var DebugRoute = function(app) {
} }
}); });
}); });
app.get('/test', function(req, res) {
res.send(200);
});
}); });
}; };
module.exports = DebugRoute;

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

@ -1,4 +1,5 @@
(function (Feeds) { "use strict";
var posts = require('../posts'), var posts = require('../posts'),
topics = require('../topics'), topics = require('../topics'),
categories = require('../categories'), categories = require('../categories'),
@ -9,14 +10,6 @@
ThreadTools = require('../threadTools'), ThreadTools = require('../threadTools'),
CategoryTools = require('../categoryTools'); CategoryTools = require('../categoryTools');
Feeds.createRoutes = function(app){
app.get('/topic/:topic_id.rss', hasTopicPrivileges, generateForTopic);
app.get('/category/:category_id.rss', hasCategoryPrivileges, generateForCategory);
app.get('/recent.rss', generateForRecent);
app.get('/popular.rss', generateForPopular);
};
function hasTopicPrivileges(req, res, next) { function hasTopicPrivileges(req, res, next) {
var tid = req.params.topic_id; var tid = req.params.topic_id;
var uid = req.user ? req.user.uid || 0 : 0; var uid = req.user ? req.user.uid || 0 : 0;
@ -98,7 +91,7 @@
res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml); res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml);
}); });
}; }
function generateForCategory(req, res, next) { function generateForCategory(req, res, next) {
var cid = req.params.category_id; var cid = req.params.category_id;
@ -117,7 +110,9 @@
}); });
// Add pubDate if category has topics // Add pubDate if category has topics
if (categoryData.topics.length > 0) feed.pubDate = new Date(parseInt(categoryData.topics[0].lastposttime, 10)).toUTCString(); if (categoryData.topics.length > 0) {
feed.pubDate = new Date(parseInt(categoryData.topics[0].lastposttime, 10)).toUTCString();
}
categoryData.topics.forEach(function(topicData) { categoryData.topics.forEach(function(topicData) {
feed.item({ feed.item({
@ -131,7 +126,7 @@
var xml = feed.xml(); var xml = feed.xml();
res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml); res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml);
}); });
}; }
function generateForRecent(req, res, next) { function generateForRecent(req, res, next) {
topics.getLatestTopics(0, 0, 19, 'month', function (err, recentData) { topics.getLatestTopics(0, 0, 19, 'month', function (err, recentData) {
@ -164,7 +159,7 @@
var xml = feed.xml(); var xml = feed.xml();
res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml); res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml);
}); });
}; }
function generateForPopular(req, res, next) { function generateForPopular(req, res, next) {
topics.getTopicsFromSet(0, 'topics:posts', 0, 19, function (err, popularData) { topics.getTopicsFromSet(0, 'topics:posts', 0, 19, function (err, popularData) {
@ -197,5 +192,11 @@
var xml = feed.xml(); var xml = feed.xml();
res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml); res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml);
}); });
}
module.exports = function(app, middleware, controllers){
app.get('/topic/:topic_id.rss', hasTopicPrivileges, generateForTopic);
app.get('/category/:category_id.rss', hasCategoryPrivileges, generateForCategory);
app.get('/recent.rss', generateForRecent);
app.get('/popular.rss', generateForPopular);
}; };
}(exports));

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

@ -5,20 +5,19 @@ var nconf = require('nconf'),
meta = require('./../meta'), meta = require('./../meta'),
plugins = require('./../plugins'), plugins = require('./../plugins'),
metaRoute = require('./meta'), metaRoutes = require('./meta'),
apiRoute = require('./api'), apiRoutes = require('./api'),
admin = require('./admin'), adminRoutes = require('./admin'),
feedsRoute = require('./feeds'); feedRoutes = require('./feeds'),
pluginRoutes = require('./plugins');
module.exports = function(app, middleware) { module.exports = function(app, middleware) {
app.namespace(nconf.get('relative_path'), function() { app.namespace(nconf.get('relative_path'), function() {
//temp adminRoutes(app, middleware, controllers);
metaRoute.createRoutes(app); metaRoutes(app, middleware, controllers);
feedsRoute.createRoutes(app); apiRoutes(app, middleware, controllers);
feedRoutes(app, middleware, controllers);
admin(app, middleware, controllers);
apiRoute(app, middleware, controllers);
/** /**
* Every view has an associated API route. * Every view has an associated API route.
@ -122,83 +121,10 @@ module.exports = function(app, middleware) {
app.get('/users/search', middleware.buildHeader, middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch); app.get('/users/search', middleware.buildHeader, middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch);
app.get('/api/users/search', middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch); app.get('/api/users/search', middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch);
/* Misc */ pluginRoutes(app, middleware, controllers);
app.get('/sitemap.xml', controllers.sitemap);
app.get('/robots.txt', controllers.robots);
// Other routes
require('./plugins')(app);
// Debug routes
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
require('./debug')(app); require('./debug')(app, middleware, controllers);
} }
var custom_routes = {
'routes': [],
'api': [],
'templates': []
};
app.get_custom_templates = function() {
return custom_routes.templates.map(function(tpl) {
return tpl.template;
});
};
plugins.ready(function() {
/*
* TO BE DEPRECATED post 0.4x
*/
plugins.fireHook('filter:server.create_routes', custom_routes, function(err, custom_routes) {
var route,
routes = custom_routes.routes;
for (route in routes) {
if (routes.hasOwnProperty(route)) {
(function(route) {
app[routes[route].method || 'get'](routes[route].route, function(req, res) {
routes[route].options(req, res, function(options) {
app.build_header({
req: options.req || req,
res: options.res || res
}, function (err, header) {
//res.send(header + options.content + templates.footer);
});
});
});
}(route));
}
}
var apiRoutes = custom_routes.api;
for (route in apiRoutes) {
if (apiRoutes.hasOwnProperty(route)) {
(function(route) {
app[apiRoutes[route].method || 'get']('/api' + apiRoutes[route].route, function(req, res) {
apiRoutes[route].callback(req, res, function(data) {
res.json(data);
});
});
}(route));
}
}
var templateRoutes = custom_routes.templates;
for (route in templateRoutes) {
if (templateRoutes.hasOwnProperty(route)) {
(function(route) {
app.get('/templates/' + templateRoutes[route].template, function(req, res) {
res.send(templateRoutes[route].content);
});
}(route));
}
}
});
});
}); });
}; };

61
src/routes/meta.js
Unescape Escape View File

@ -1,14 +1,38 @@
"use strict";
var path = require('path'), var path = require('path'),
nconf = require('nconf'), nconf = require('nconf'),
less = require('less'), less = require('less'),
meta = require('../meta'), meta = require('../meta'),
db = require('../database'), db = require('../database'),
plugins = require('../plugins'); plugins = require('../plugins'),
minificationEnabled = false;
function sendMinifiedJS(req, res, next) {
function sendCached() {
return res.type('text/javascript').send(meta.js.cache);
}
if (meta.js.cache) {
sendCached();
} else {
if (minificationEnabled) {
meta.js.minify(function() {
sendCached();
});
} else {
// Compress only
meta.js.concatenate(function() {
sendCached();
});
}
}
}
(function (Meta) { function sendStylesheet(req, res, next) {
Meta.createRoutes = function(app) {
app.get('/stylesheet.css', function(req, res) {
if (meta.css.cache) { if (meta.css.cache) {
res.type('text/css').send(200, meta.css.cache); res.type('text/css').send(200, meta.css.cache);
return; return;
@ -42,26 +66,13 @@ var path = require('path'),
res.type('text/css').send(200, meta.css.cache); res.type('text/css').send(200, meta.css.cache);
}); });
}); });
});
app.get('/nodebb.min.js', function(req, res) {
var sendCached = function() {
return res.type('text/javascript').send(meta.js.cache);
}
if (meta.js.cache) {
sendCached();
} else {
if (app.enabled('minification')) {
meta.js.minify(function() {
sendCached();
});
} else {
// Compress only
meta.js.concatenate(function() {
sendCached();
});
}
} }
});
module.exports = function(app, middleware, controllers) {
minificationEnabled = app.enabled('minification');
app.get('/stylesheet.css', sendStylesheet);
app.get('/nodebb.min.js', sendMinifiedJS);
app.get('/sitemap.xml', controllers.sitemap);
app.get('/robots.txt', controllers.robots);
}; };
})(exports);

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

@ -6,9 +6,119 @@ var nconf = require('nconf'),
validator = require('validator'), validator = require('validator'),
_ = require('underscore'), _ = require('underscore'),
async = require('async'), async = require('async'),
plugins = require('../plugins'),
PluginRoutes = function(app) { plugins = require('../plugins');
function setupPluginRoutes(app) {
var custom_routes = {
'routes': [],
'api': [],
'templates': []
};
app.get_custom_templates = function() {
return custom_routes.templates.map(function(tpl) {
return tpl.template;
});
};
plugins.ready(function() {
/*
* TO BE DEPRECATED post 0.4x and replaced with something that isn't as complicated as this...
*/
plugins.fireHook('filter:server.create_routes', custom_routes, function(err, custom_routes) {
var route,
routes = custom_routes.routes;
for (route in routes) {
if (routes.hasOwnProperty(route)) {
(function(route) {
app[routes[route].method || 'get'](routes[route].route, function(req, res) {
routes[route].options(req, res, function(options) {
app.build_header({
req: options.req || req,
res: options.res || res
}, function (err, header) {
//res.send(header + options.content + templates.footer);
});
});
});
}(route));
}
}
var apiRoutes = custom_routes.api;
for (route in apiRoutes) {
if (apiRoutes.hasOwnProperty(route)) {
(function(route) {
app[apiRoutes[route].method || 'get']('/api' + apiRoutes[route].route, function(req, res) {
apiRoutes[route].callback(req, res, function(data) {
res.json(data);
});
});
}(route));
}
}
var templateRoutes = custom_routes.templates;
for (route in templateRoutes) {
if (templateRoutes.hasOwnProperty(route)) {
(function(route) {
app.get('/templates/' + templateRoutes[route].template, function(req, res) {
res.send(templateRoutes[route].content);
});
}(route));
}
}
});
});
}
function setupPluginAdminRoutes(app) {
var custom_routes = {
'routes': [],
'api': []
};
plugins.ready(function() {
/*
* TO BE DEPRECATED post 0.4x and replaced with something that isn't as complicated as this...
*/
plugins.fireHook('filter:admin.create_routes', custom_routes, function(err, custom_routes) {
var route, routes = custom_routes.routes;
for (route in routes) {
if (routes.hasOwnProperty(route)) {
(function(route) {
app[routes[route].method || 'get']('/admin' + routes[route].route, function(req, res) {
routes[route].options(req, res, function(options) {
Admin.buildHeader(req, res, function (err, header) {
//res.send(header + options.content + templates['admin/footer']);
});
});
});
}(route));
}
}
var apiRoutes = custom_routes.api;
for (route in apiRoutes) {
if (apiRoutes.hasOwnProperty(route)) {
(function(route) {
app[apiRoutes[route].method || 'get']('/api/admin' + apiRoutes[route].route, function(req, res) {
apiRoutes[route].callback(req, res, function(data) {
res.json(data);
});
});
}(route));
}
}
});
});
}
module.exports = function(app, middleware, controllers) {
/** /**
* GET/PUT /plugins/fireHook to be deprecated after 0.4.x * GET/PUT /plugins/fireHook to be deprecated after 0.4.x
* *
@ -73,6 +183,7 @@ var nconf = require('nconf'),
res.redirect('/404'); res.redirect('/404');
} }
}); });
};
module.exports = PluginRoutes; setupPluginRoutes(app);
setupPluginAdminRoutes(app);
};

7
src/webserver.js
Unescape Escape View File

@ -14,12 +14,7 @@ var path = require('path'),
plugins = require('./plugins'), plugins = require('./plugins'),
logger = require('./logger'), logger = require('./logger'),
middleware = require('./middleware'), middleware = require('./middleware'),
routes = require('./routes'), routes = require('./routes');
admin = require('./routes/admin'),
apiRoute = require('./routes/api'),
feedsRoute = require('./routes/feeds'),
metaRoute = require('./routes/meta');
if(nconf.get('ssl')) { if(nconf.get('ssl')) {
server = require('https').createServer({ server = require('https').createServer({

Write Preview
Loading…
Cancel
Save