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

monkeypatching the 404 route to handle missing languages and client side scripts. Removing "soft 404" in favour of hard 404 due to complaints from google webmaster tools

Browse Source
This commit is contained in:
Julian Lam
2013-10-21 11:09:46 -04:00
parent a41280707e
commit 44d2297546
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/webserver.js
View File

@@ -136,7 +136,9 @@ var express = require('express'),
plugins.ready(function () {
for (d in plugins.staticDirs) {
app.use(nconf.get('relative_path') + '/plugins/' + d, express.static(plugins.staticDirs[d]));
if (process.env.NODE_ENV === 'development') winston.info('Static directory routed for plugin: ' + d);
if (process.env.NODE_ENV === 'development') {
winston.info('Static directory routed for plugin: ' + d);
}
}
next();
@@ -147,7 +149,9 @@ var express = require('express'),
var themeId = (themeData[1] || 'nodebb-theme-vanilla');
if (!themeData[0] || themeData[0] === 'local') {
if (process.env.NODE_ENV === 'development') winston.info('[themes] Using theme ' + themeId);
if (process.env.NODE_ENV === 'development') {
winston.info('[themes] Using theme ' + themeId);
}
app.use(require('less-middleware')({
src: path.join(__dirname, '../node_modules/' + themeId),
@@ -159,7 +163,9 @@ var express = require('express'),
next();
} else {
// If not using a local theme (bootswatch, etc), drop back to vanilla
if (process.env.NODE_ENV === 'development') winston.info('[themes] Using theme ' + themeId);
if (process.env.NODE_ENV === 'development') {
winston.info('[themes] Using theme ' + themeId);
}
app.use(require('less-middleware')({
src: path.join(__dirname, '../node_modules/nodebb-theme-vanilla'),
@@ -183,11 +189,17 @@ var express = require('express'),
// 404 catch-all
app.use(function (req, res, next) {
var isLanguage = /^\/language\/[\w]{2,}\/[\w]+\.json/,
isClientScript = /^\/src\/forum\/[\w]+\.js/;
res.status(404);
if (path.dirname(req.url).slice(0, 10) === '/src/forum') {
if (isClientScript.test(req.url)) {
// Handle missing client-side scripts
res.type('text/javascript').send(200, '');
} else if (isLanguage.test(req.url)) {
// Handle languages by sending an empty object
res.json(200, {});
} else if (req.accepts('html')) {
// respond with html page
if (process.env.NODE_ENV === 'development') winston.warn('Route requested but not found: ' + req.url);
@@ -277,7 +289,7 @@ var express = require('express'),
req: req,
res: res
}, function (err, header) {
res.send(header + app.create_route(route) + templates['footer']);
res.send((isNaN(parseInt(route, 10)) ? 200 : parseInt(route, 10)), header + app.create_route(route) + templates['footer']);
});
});
}(routes[i]));
@@ -627,12 +639,12 @@ var express = require('express'),
res.send(header + options.content + templates['footer']);
});
});
});
});
}
}
});
});
});
});
}(WebServer));