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

cleanup

Browse Source
This commit is contained in:
psychobunny
2014-11-19 17:48:43 -05:00
parent 9c1216eb63
commit 9eb8924bf2
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/middleware/index.js
View File

@@ -1,17 +1,12 @@
"use strict"; "use strict";
var utils = require('../../public/src/utils'), var meta = require('../meta'),
meta = require('../meta'),
plugins = require('../plugins'),
db = require('../database'), db = require('../database'),
auth = require('../routes/authentication'), auth = require('../routes/authentication'),
emitter = require('../emitter'),
async = require('async'),
path = require('path'), path = require('path'),
fs = require('fs'), fs = require('fs'),
nconf = require('nconf'), nconf = require('nconf'),
express = require('express'),
winston = require('winston'), winston = require('winston'),
flash = require('connect-flash'), flash = require('connect-flash'),
templates = require('templates.js'), templates = require('templates.js'),
@@ -19,11 +14,7 @@ var utils = require('../../public/src/utils'),
cookieParser = require('cookie-parser'), cookieParser = require('cookie-parser'),
compression = require('compression'), compression = require('compression'),
favicon = require('serve-favicon'), favicon = require('serve-favicon'),
session = require('express-session'), session = require('express-session');
cluster = require('cluster'),
relativePath,
themesPath;
var middleware = {}; var middleware = {};
@@ -32,12 +23,11 @@ function routeCurrentTheme(app, themeId, themesData) {
themeId = (themeId || 'nodebb-theme-vanilla'); themeId = (themeId || 'nodebb-theme-vanilla');
var themeObj = (function(id) { var themeObj = (function(id) {
return themesData.filter(function(themeObj) { return themesData.filter(function(themeObj) {
return themeObj.id === id; return themeObj.id === id;
})[0]; })[0];
})(themeId); })(themeId);
// Detect if a theme has been selected, and handle appropriately
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
winston.info('[themes] Using theme ' + themeId); winston.info('[themes] Using theme ' + themeId);
} }
@@ -53,6 +43,8 @@ function setupFavicon(app) {
} }
module.exports = function(app, data) { module.exports = function(app, data) {
var relativePath, themesPath;
middleware = require('./middleware')(app); middleware = require('./middleware')(app);
relativePath = nconf.get('relative_path'); relativePath = nconf.get('relative_path');
@@ -79,6 +71,7 @@ module.exports = function(app, data) {
var cookie = { var cookie = {
maxAge: 1000 * 60 * 60 * 24 * parseInt(meta.config.loginDays || 14, 10) maxAge: 1000 * 60 * 60 * 24 * parseInt(meta.config.loginDays || 14, 10)
}; };
if(meta.config.cookieDomain) { if(meta.config.cookieDomain) {
cookie.domain = meta.config.cookieDomain; cookie.domain = meta.config.cookieDomain;
} }
@@ -94,8 +87,8 @@ module.exports = function(app, data) {
app.use(function (req, res, next) { app.use(function (req, res, next) {
res.setHeader('X-Powered-By', 'NodeBB'); res.setHeader('X-Powered-By', 'NodeBB');
res.setHeader('X-Frame-Options', 'SAMEORIGIN'); res.setHeader('X-Frame-Options', 'SAMEORIGIN');
if (meta.config['allow-from-uri']) { if (meta.config['allow-from-uri']) {
res.setHeader('ALLOW-FROM', meta.config['allow-from-uri']); res.setHeader('ALLOW-FROM', meta.config['allow-from-uri']);
} }
@@ -104,9 +97,7 @@ module.exports = function(app, data) {
}); });
app.use(middleware.processRender); app.use(middleware.processRender);
auth.initialize(app, middleware); auth.initialize(app, middleware);
routeCurrentTheme(app, data.currentThemeId, data.themesData); routeCurrentTheme(app, data.currentThemeId, data.themesData);
return middleware; return middleware;