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

closes #5082

Browse Source
v1.18.x
barisusakli 9 years ago
parent f1e6ccdbfc
commit 98fff29869
3 changed files with 105 additions and 103 deletions
Show Stats Download Patch File Download Diff File

17
src/middleware/admin.js
Unescape Escape View File

@ -32,20 +32,12 @@ module.exports = function(middleware) {
middleware.admin.buildHeader = function(req, res, next) { middleware.admin.buildHeader = function(req, res, next) {
res.locals.renderAdminHeader = true; res.locals.renderAdminHeader = true;
async.parallel({ controllers.api.getConfig(req, res, function(err, config) {
config: function(next) {
controllers.api.getConfig(req, res, next);
},
footer: function(next) {
req.app.render('admin/footer', {}, next);
}
}, function(err, results) {
if (err) { if (err) {
return next(err); return next(err);
} }
res.locals.config = results.config; res.locals.config = config;
res.locals.adminFooter = results.footer;
next(); next();
}); });
}; };
@ -122,4 +114,9 @@ module.exports = function(middleware) {
}); });
}); });
}; };
middleware.admin.renderFooter = function(req, res, data, next) {
req.app.render('admin/footer', data, next);
};
}; };

55
src/middleware/header.js
Unescape Escape View File

@ -2,14 +2,12 @@
var async = require('async'); var async = require('async');
var nconf = require('nconf'); var nconf = require('nconf');
var validator = require('validator');
var db = require('../database'); var db = require('../database');
var user = require('../user'); var user = require('../user');
var meta = require('../meta'); var meta = require('../meta');
var plugins = require('../plugins'); var plugins = require('../plugins');
var navigation = require('../navigation'); var navigation = require('../navigation');
var translator = require('../../public/src/modules/translator');
var controllers = { var controllers = {
api: require('../controllers/api'), api: require('../controllers/api'),
@ -21,34 +19,25 @@ module.exports = function(middleware) {
middleware.buildHeader = function(req, res, next) { middleware.buildHeader = function(req, res, next) {
res.locals.renderHeader = true; res.locals.renderHeader = true;
res.locals.isAPI = false; res.locals.isAPI = false;
async.waterfall([
middleware.applyCSRF(req, res, function() { function(next) {
async.parallel({ middleware.applyCSRF(req, res, next);
config: function(next) { },
controllers.api.getConfig(req, res, next); function(next) {
}, async.parallel({
footer: function(next) { config: function(next) {
req.app.render('footer', { controllers.api.getConfig(req, res, next);
loggedIn: !!req.uid, },
title: validator.escape(String(meta.config.title || meta.config.browserTitle || 'NodeBB')) plugins: function(next) {
}, next); plugins.fireHook('filter:middleware.buildHeader', {req: req, locals: res.locals}, next);
}, }
plugins: function(next) { }, next);
plugins.fireHook('filter:middleware.buildHeader', {req: req, locals: res.locals}, next); },
} function(results, next) {
}, function(err, results) {
if (err) {
return next(err);
}
res.locals.config = results.config; res.locals.config = results.config;
next();
translator.translate(results.footer, results.config.defaultLang, function(parsedTemplate) { }
res.locals.footer = parsedTemplate; ], next);
next();
});
});
});
}; };
middleware.renderHeader = function(req, res, data, callback) { middleware.renderHeader = function(req, res, data, callback) {
@ -166,6 +155,14 @@ module.exports = function(middleware) {
}); });
}; };
middleware.renderFooter = function(req, res, data, callback) {
plugins.fireHook('filter:middleware.renderFooter', {templateValues: data, req: req, res: res}, function(err, data) {
if (err) {
return callback(err);
}
req.app.render('footer', data.templateValues, callback);
});
};
function modifyTitle(obj) { function modifyTitle(obj) {
var title = controllers.helpers.buildTitle('[[pages:home]]'); var title = controllers.helpers.buildTitle('[[pages:home]]');

136
src/middleware/render.js
Unescape Escape View File

@ -1,5 +1,6 @@
'use strict'; 'use strict';
var async = require('async');
var nconf = require('nconf'); var nconf = require('nconf');
var validator = require('validator'); var validator = require('validator');
@ -18,7 +19,6 @@ module.exports = function(middleware) {
if (err) { if (err) {
return next(err); return next(err);
} }
self.send(str); self.send(str);
}; };
@ -27,78 +27,86 @@ module.exports = function(middleware) {
fn = options; fn = options;
options = {}; options = {};
} }
if ('function' !== typeof fn) {
fn = defaultFn;
}
plugins.fireHook('filter:' + template + '.build', {req: req, res: res, templateData: options}, function(err, data) { var ajaxifyData;
if (err) { async.waterfall([
return next(err); function(next) {
} plugins.fireHook('filter:' + template + '.build', {req: req, res: res, templateData: options}, next);
},
options = data.templateData; function(data, next) {
options = data.templateData;
options.loggedIn = !!req.uid;
options.relative_path = nconf.get('relative_path'); options.loggedIn = !!req.uid;
options.template = {name: template}; options.relative_path = nconf.get('relative_path');
options.template[template] = true; options.template = {name: template};
options.url = (req.baseUrl + req.path).replace(/^\/api/, ''); options.template[template] = true;
options.bodyClass = buildBodyClass(req); options.url = (req.baseUrl + req.path).replace(/^\/api/, '');
options.bodyClass = buildBodyClass(req);
res.locals.template = template;
options._locals = undefined; res.locals.template = template;
options._locals = undefined;
if (res.locals.isAPI) {
if (req.route && req.route.path === '/api/') { if (res.locals.isAPI) {
options.title = '[[pages:home]]'; if (req.route && req.route.path === '/api/') {
options.title = '[[pages:home]]';
}
return res.json(options);
} }
return res.json(options); ajaxifyData = JSON.stringify(options).replace(/<\//g, '<\\/');
async.parallel({
header: function(next) {
renderHeaderFooter('renderHeader', req, res, options, next);
},
content: function(next) {
render.call(self, template, options, next);
},
footer: function(next) {
renderHeaderFooter('renderFooter', req, res, options, next);
}
}, next);
},
function(results, next) {
var str = results.header +
(res.locals.postHeader || '') +
results.content +
(res.locals.preFooter || '') +
results.footer;
translate(str, req, res, next);
},
function(translated, next) {
next(null, translated + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>');
} }
], fn);
if ('function' !== typeof fn) {
fn = defaultFn;
}
var ajaxifyData = JSON.stringify(options);
ajaxifyData = ajaxifyData.replace(/<\//g, '<\\/');
render.call(self, template, options, function(err, str) {
if (err) {
return fn(err);
}
str = (res.locals.postHeader ? res.locals.postHeader : '') + str + (res.locals.preFooter ? res.locals.preFooter : '');
if (res.locals.footer) {
str = str + res.locals.footer;
} else if (res.locals.adminFooter) {
str = str + res.locals.adminFooter;
}
if (res.locals.renderHeader || res.locals.renderAdminHeader) {
var method = res.locals.renderHeader ? middleware.renderHeader : middleware.admin.renderHeader;
method(req, res, options, function(err, template) {
if (err) {
return fn(err);
}
str = template + str;
var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB';
language = req.query.lang ? validator.escape(String(req.query.lang)) : language;
translator.translate(str, language, function(translated) {
translated = translator.unescape(translated);
translated = translated + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
fn(err, translated);
});
});
} else {
str = str + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
fn(err, str);
}
});
});
}; };
next(); next();
}; };
function renderHeaderFooter(method, req, res, options, next) {
if (res.locals.renderHeader) {
middleware[method](req, res, options, next);
} else if (res.locals.renderAdminHeader) {
middleware.admin[method](req, res, options, next);
} else {
next(null, '');
}
}
function translate(str, req, res, next) {
var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB';
language = req.query.lang ? validator.escape(String(req.query.lang)) : language;
translator.translate(str, language, function(translated) {
next(null, translator.unescape(translated));
});
}
function buildBodyClass(req) { function buildBodyClass(req) {
var clean = req.path.replace(/^\/api/, '').replace(/^\/|\/$/g, ''); var clean = req.path.replace(/^\/api/, '').replace(/^\/|\/$/g, '');
var parts = clean.split('/').slice(0, 3); var parts = clean.split('/').slice(0, 3);

Write Preview
Loading…
Cancel
Save