closes #4884

src/socket.io/admin.js

@@ -1,41 +1,39 @@
 "use strict";
 
-var	async = require('async'),
+var async = require('async');
-	winston = require('winston'),
+var winston = require('winston');
-
+var nconf = require('nconf');
-
+
-	meta = require('../meta'),
+var meta = require('../meta');
-	plugins = require('../plugins'),
+var plugins = require('../plugins');
-	widgets = require('../widgets'),
+var widgets = require('../widgets');
-	user = require('../user'),
+var user = require('../user');
-
+var logger = require('../logger');
-	logger = require('../logger'),
+var events = require('../events');
-	events = require('../events'),
+var emailer = require('../emailer');
-	emailer = require('../emailer'),
+var db = require('../database');
-	db = require('../database'),
+var analytics = require('../analytics');
-	analytics = require('../analytics'),
+var index = require('./index');
-	index = require('./index'),
+
-
+var SocketAdmin = {
-
+	user: require('./admin/user'),
-	SocketAdmin = {
+	categories: require('./admin/categories'),
-		user: require('./admin/user'),
+	groups: require('./admin/groups'),
-		categories: require('./admin/categories'),
+	tags: require('./admin/tags'),
-		groups: require('./admin/groups'),
+	rewards: require('./admin/rewards'),
-		tags: require('./admin/tags'),
+	navigation: require('./admin/navigation'),
-		rewards: require('./admin/rewards'),
+	rooms: require('./admin/rooms'),
-		navigation: require('./admin/navigation'),
+	social: require('./admin/social'),
-		rooms: require('./admin/rooms'),
+	themes: {},
-		social: require('./admin/social'),
+	plugins: {},
-		themes: {},
+	widgets: {},
-		plugins: {},
+	config: {},
-		widgets: {},
+	settings: {},
-		config: {},
+	email: {},
-		settings: {},
+	analytics: {},
-		email: {},
+	logs: {},
-		analytics: {},
+	errors: {}
-		logs: {},
+};
-		errors: {}
-	};
 
 SocketAdmin.before = function(socket, method, data, next) {
 	if (!socket.uid) {
@@ -92,6 +90,9 @@ SocketAdmin.themes.set = function(socket, data, callback) {
 	}
 
 	var wrappedCallback = function(err) {
+		if (err) {
+			return callback(err);
+		}
 		meta.themes.set(data, callback);
 	};
 	if (data.type === 'bootswatch') {
@@ -205,7 +206,8 @@ SocketAdmin.email.test = function(socket, data, callback) {
 	var site_title = meta.config.title || 'NodeBB';
 	emailer.send(data.template, socket.uid, {
 		subject: '[' + site_title + '] Test Email',
-		site_title: site_title
+		site_title: site_title,
+		url: nconf.get('url')
 	}, callback);
 };