Mailer Information
- - - --
-
-
-
-
\ No newline at end of file
diff --git a/public/templates/install/privileges.tpl b/public/templates/install/privileges.tpl
deleted file mode 100644
index c54f7cf7f7..0000000000
--- a/public/templates/install/privileges.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-User Privilege Thresholds
- - - --
-
-
-
-
-
-
-
diff --git a/public/templates/install/redis.tpl b/public/templates/install/redis.tpl
deleted file mode 100644
index 5fa4d2a828..0000000000
--- a/public/templates/install/redis.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-
-Step 1 – Establish Redis Connection
- -- Thanks for choosing to install NodeBB! We'll need some information to set up your installation - configuration... -
-- Please enter the details of your Redis server here. If redis is hosted on the same - server as NodeBB, you can leave the default values as-is. -
- - - --
-
-
-
-
diff --git a/public/templates/install/social.tpl b/public/templates/install/social.tpl
deleted file mode 100644
index 6179ca1f35..0000000000
--- a/public/templates/install/social.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-
-Social Media Logins
- - - --
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/admin/user.js b/src/admin/user.js
index 8e754ab1a4..1c9453b9fb 100644
--- a/src/admin/user.js
+++ b/src/admin/user.js
@@ -72,6 +72,7 @@ var utils = require('../../public/src/utils'),
user.ban(theirid, function(err, result) {
callback(true);
socket.emit('event:alert', {
+ alert_id: 'ban_user',
title: 'User Banned',
message: 'This user is banned!',
type: 'success',
@@ -88,6 +89,7 @@ var utils = require('../../public/src/utils'),
if (amIAdmin) {
user.unban(theirid, function(err, result) {
socket.emit('event:alert', {
+ alert_id: 'ban_user',
title: 'User Unbanned',
message: 'This user is unbanned!',
type: 'success',
diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index a814d743bf..5723465c25 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -150,7 +150,8 @@ Sockets.init = function() {
uid: uid,
socket: socket,
rooms: rooms,
- server: io
+ server: io,
+ userSockets: userSockets
},
socketArgs = [];
diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js
index d774a02a18..732dc072ff 100644
--- a/src/socket.io/meta.js
+++ b/src/socket.io/meta.js
@@ -1,6 +1,9 @@
var meta = require('../meta'),
user = require('../user'),
+ logger = require('../logger'),
+ plugins = require('../plugins'),
+ nconf = require('nconf'),
gravatar = require('gravatar'),
SocketMeta = {};
@@ -69,6 +72,43 @@ SocketMeta.rooms.enter = function(data, sessionData) {
}
};
+SocketMeta.rooms.getAll = function(callback, sessionData) {
+ callback(sessionData.server.sockets.manager.rooms);
+};
+
+/* Config */
+
+SocketMeta.config = {};
+
+SocketMeta.config.get = function(callback, sessionData) {
+ meta.configs.list(function(err, config) {
+ if (!err) {
+ callback(config);
+ }
+ });
+};
+
+SocketMeta.config.set = function(data, callback, sessionData) {
+ meta.configs.set(data.key, data.value, function(err) {
+ if (!err) {
+ callback({
+ status: 'ok'
+ });
+
+ plugins.fireHook('action:config.set', {
+ key: data.key,
+ value: data.value
+ });
+ }
+
+ logger.monitorConfig({io: sessionData.server}, data);
+ });
+};
+
+SocketMeta.config.remove = function(key) {
+ meta.configs.remove(key);
+};
+
/* Exports */
module.exports = SocketMeta;
\ No newline at end of file
diff --git a/src/websockets.js b/src/websockets.js
index 1f0fe0fcc6..a7f8e82025 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -35,9 +35,7 @@ var cookie = require('cookie'),
websockets.init = function(io) {
- socket.on('api:get_all_rooms', function(data) {
- socket.emit('api:get_all_rooms', io.sockets.manager.rooms);
- });
+
@@ -299,32 +297,7 @@ websockets.init = function(io) {
});
});
- socket.on('api:config.get', function(data) {
- meta.configs.list(function(err, config) {
- if (!err) socket.emit('api:config.get', config);
- });
- });
-
- socket.on('api:config.set', function(data) {
- meta.configs.set(data.key, data.value, function(err) {
- if (!err) {
- socket.emit('api:config.set', {
- status: 'ok'
- });
-
- plugins.fireHook('action:config.set', {
- key: data.key,
- value: data.value
- });
- }
- logger.monitorConfig({io: io}, data);
- });
- });
-
- socket.on('api:config.remove', function(key) {
- meta.configs.remove(key);
- });
socket.on('api:composer.push', function(data, callback) {
@@ -389,193 +362,7 @@ websockets.init = function(io) {
});
});
- socket.on('api:admin.topics.getMore', function(data, callback) {
- topics.getAllTopics(data.limit, data.after, function(err, topics) {
- callback(JSON.stringify(topics));
- });
- });
-
- socket.on('api:admin.categories.create', function(data, callback) {
- categories.create(data, function(err, data) {
- callback(err, data);
- });
- });
-
- socket.on('api:admin.categories.update', function(data) {
- admin.categories.update(data, socket);
- });
-
- socket.on('api:admin.user.makeAdmin', function(theirid) {
- if (uid && uid > 0) {
- admin.user.makeAdmin(uid, theirid, socket);
- }
- });
-
- socket.on('api:admin.user.removeAdmin', function(theirid) {
- if (uid && uid > 0) {
- admin.user.removeAdmin(uid, theirid, socket);
- }
- });
-
- socket.on('api:admin.user.createUser', function(user, callback) {
- if (uid && uid > 0) {
- admin.user.createUser(uid, user, callback);
- }
- });
-
- socket.on('api:admin.user.banUser', function(theirid) {
- if (uid && uid > 0) {
- admin.user.banUser(uid, theirid, socket, function(isBanned) {
- if(isBanned) {
- if(userSockets[theirid]) {
- for(var i=0; i