Merge branch 'master' of github.com:designcreateplay/NodeBB

app.js

@@ -97,6 +97,8 @@
 					notifications = require('./src/notifications'),
 					upgrade = require('./src/upgrade');
 
+				templates.setGlobal('relative_path', nconf.get('relative_path'));
+
 				upgrade.check(function(schema_ok) {
 					if (schema_ok || nconf.get('check-schema') === false) {
 						websockets.init(SocketIO);

public/src/app.js

@@ -23,7 +23,7 @@ var socket,
 				} else {
 					var max_reconnection_attemps = 5;
 					var reconnection_delay = 200;
-					socket = io.connect(RELATIVE_PATH, {
+					socket = io.connect('', {
 						'max reconnection attempts': max_reconnection_attemps,
 						'reconnection delay': reconnection_delay
 					});
@@ -468,6 +468,8 @@ var socket,
 
 			app.alternatingTitle('');
 		});
+
+		templates.setGlobal('relative_path', RELATIVE_PATH);
 	});
 
 	showWelcomeMessage = location.href.indexOf('loggedin') !== -1;

public/src/templates.js

@@ -6,7 +6,9 @@
 		available_templates = [],
 		parsed_variables = {};
 
-	module.exports = templates = {};
+	module.exports = templates = {
+		"globals": {}
+	};
 
 	try {
 		fs = require('fs');
@@ -242,6 +244,10 @@
 		parsed_variables[key] = value;
 	}
 
+	templates.setGlobal = function(key, value) {
+		templates.globals[key] = value;
+	}
+
 	//modified from https://github.com/psychobunny/dcp.templates
 	var parse = function (data) {
 		var self = this;
@@ -282,6 +288,13 @@
 		var template = this.html,
 			regex, block;
 
+		// registering globals
+		for (var g in templates.globals) {
+			if (templates.globals.hasOwnProperty(g)) {
+				data[g] = data[g] || templates.globals[g];
+			}
+		}
+		
 		return (function parse(data, namespace, template, blockInfo) {
 			if (!data || data.length == 0) {
 				template = '';

src/routes/admin.js

@@ -20,7 +20,7 @@ var nconf = require('nconf'),
 	Admin.isAdmin = function (req, res, next) {
 		user.isAdministrator((req.user && req.user.uid) ? req.user.uid : 0, function (err, isAdmin) {
 			if (!isAdmin) {
-				 res.redirect('/403');
+				 res.redirect(403, '/403');
 			} else {
 				next();
 			}

src/routes/api.js

@@ -18,6 +18,7 @@ var path = require('path'),
 
 (function (Api) {
 	Api.createRoutes = function (app) {
+
 		app.namespace('/api', function () {
 			app.get('/get_templates_listing', function (req, res) {
 				utils.walk(path.join(__dirname, '../../', 'public/templates'), function (err, data) {

src/routes/authentication.js

@@ -126,6 +126,7 @@
 	}
 
 	Auth.createRoutes = function(app) {
+		app.namespace(nconf.get('relative_path'), function () {
 			app.post('/logout', function(req, res) {
 				if (req.user && req.user.uid > 0) {
 					winston.info('[Auth] Session ' + req.sessionID + ' logout (uid: ' + req.user.uid + ')');
@@ -214,5 +215,6 @@
 					}
 				});
 			});
+		});
 	}
 }(exports));

src/webserver.js

@@ -839,8 +839,8 @@ var path = require('path'),
 							app[routes[route].method || 'get'](routes[route].route, function(req, res) {
 								routes[route].options(req, res, function(options) {
 									app.build_header({
-										req: options.req,
-										res: options.res
+										req: options.req || req,
+										res: options.res || res
 									}, function (err, header) {
 										res.send(header + options.content + templates.footer);
 									});