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

package.json

@@ -47,7 +47,7 @@
     "morgan": "^1.3.2",
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "4.0.8",
+    "nodebb-plugin-composer-default": "4.0.9",
     "nodebb-plugin-dbsearch": "1.0.2",
     "nodebb-plugin-emoji-extended": "1.1.0",
     "nodebb-plugin-emoji-one": "1.1.5",

public/src/app.js

@@ -15,10 +15,6 @@ app.cacheBuster = null;
 
 	app.cacheBuster = config['cache-buster'];
 
-	require(['csrf'], function(csrf) {
-		csrf.set(config.csrf_token);
-	});
-
 	bootbox.setDefaults({
 		locale: config.userLang
 	});
@@ -88,16 +84,14 @@ app.cacheBuster = null;
 	};
 
 	app.logout = function() {
-		require(['csrf'], function(csrf) {
-			$.ajax(config.relative_path + '/logout', {
-				type: 'POST',
-				headers: {
-					'x-csrf-token': csrf.get()
-				},
-				success: function() {
-					window.location.href = config.relative_path + '/';
-				}
-			});
+		$.ajax(config.relative_path + '/logout', {
+			type: 'POST',
+			headers: {
+				'x-csrf-token': config.csrf_token
+			},
+			success: function() {
+				window.location.href = config.relative_path + '/';
+			}
 		});
 	};
 

public/src/client/account/settings.js

@@ -2,7 +2,7 @@
 
 /*global define, socket, app, ajaxify, config*/
 
-define('forum/account/settings', ['forum/account/header', 'components', 'csrf'], function(header, components, csrf) {
+define('forum/account/settings', ['forum/account/header', 'components'], function(header, components) {
 	var	AccountSettings = {};
 
 	AccountSettings.init = function() {
@@ -99,7 +99,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'csrf'],
 					url: config.relative_path + '/user/' + ajaxify.data.userslug + '/session/' + uuid,
 					method: 'delete',
 					headers: {
-						'x-csrf-token': csrf.get()
+						'x-csrf-token': config.csrf_token
 					}
 				}).done(function() {
 					parentEl.remove();

public/src/client/login.js

@@ -1,7 +1,7 @@
 "use strict";
 /* global define, app, config, RELATIVE_PATH */
 
-define('forum/login', ['csrf', 'translator'], function(csrf, translator) {
+define('forum/login', ['translator'], function(translator) {
 	var	Login = {};
 
 	Login.init = function() {
@@ -25,7 +25,7 @@ define('forum/login', ['csrf', 'translator'], function(csrf, translator) {
 				submitEl.addClass('disabled');
 				formEl.ajaxSubmit({
 					headers: {
-						'x-csrf-token': csrf.get()
+						'x-csrf-token': config.csrf_token
 					},
 					success: function(data, status) {
 						window.location.href = data + '?loggedin';

public/src/client/register.js

@@ -3,7 +3,7 @@
 /* globals define, app, utils, socket, config, ajaxify, bootbox */
 
 
-define('forum/register', ['csrf', 'translator'], function(csrf, translator) {
+define('forum/register', ['translator'], function(translator) {
 	var Register = {},
 		validationError = false,
 		successIcon = '<i class="fa fa-check"></i>';
@@ -78,7 +78,7 @@ define('forum/register', ['csrf', 'translator'], function(csrf, translator) {
 
 				registerBtn.parents('form').ajaxSubmit({
 					headers: {
-						'x-csrf-token': csrf.get()
+						'x-csrf-token': config.csrf_token
 					},
 					success: function(data) {
 						registerBtn.removeClass('disabled');

public/src/modules/csrf.js

@@ -1,17 +0,0 @@
-"use strict";
-/*globals define*/
-
-define('csrf', function() {
-	var csrf = {},
-		_data = {};
-
-	csrf.get = function() {
-		return _data.token;
-	};
-
-	csrf.set = function(token) {
-		_data.token = token;
-	};
-
-	return csrf;
-});

public/src/modules/uploader.js

@@ -2,7 +2,7 @@
 
 /* globals define, templates */
 
-define('uploader', ['csrf', 'translator'], function(csrf, translator) {
+define('uploader', ['translator'], function(translator) {
 
 	var module = {};
 
@@ -76,7 +76,7 @@ define('uploader', ['csrf', 'translator'], function(csrf, translator) {
 
 		uploadModal.find('#uploadForm').ajaxSubmit({
 			headers: {
-				'x-csrf-token': csrf.get()
+				'x-csrf-token': config.csrf_token
 			},
 			error: function(xhr) {
 				xhr = maybeParse(xhr);

src/meta/js.js

@@ -61,7 +61,6 @@ module.exports = function(Meta) {
 				'public/src/client/category.js',
 				'public/src/client/categoryTools.js',
 
-				'public/src/modules/csrf.js',
 				'public/src/modules/translator.js',
 				'public/src/modules/notifications.js',
 				'public/src/modules/chat.js',
@@ -93,7 +92,7 @@ module.exports = function(Meta) {
 		var numBridged = 0,
 			addRoute = function(relPath) {
 				var relativePath = nconf.get('relative_path');
-				
+
 				app.get(relativePath + '/src/modules/' + relPath, function(req, res) {
 					return res.sendFile(path.join(__dirname, '../../', Meta.js.scripts.modules[relPath]), {
 						maxAge: app.enabled('cache') ? 5184000000 : 0