From 4453d055eadf2ad9adf3efad0c50e3f2a23c8b59 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 13 Jan 2014 12:05:13 -0500 Subject: [PATCH] linted socket/admin.js --- public/src/forum/admin/footer.js | 2 +- public/src/forum/admin/settings.js | 4 +-- src/socket.io/admin.js | 51 +++++++++++++++++++++++++++--- src/socket.io/meta.js | 33 ------------------- 4 files changed, 50 insertions(+), 40 deletions(-) diff --git a/public/src/forum/admin/footer.js b/public/src/forum/admin/footer.js index f992abc9c6..8a7008711e 100644 --- a/public/src/forum/admin/footer.js +++ b/public/src/forum/admin/footer.js @@ -15,6 +15,6 @@ jQuery('document').ready(function() { }, false); }); -socket.emit('api:meta.config.get', function(config) { +socket.emit('api:admin.config.get', function(config) { app.config = config; }); diff --git a/public/src/forum/admin/settings.js b/public/src/forum/admin/settings.js index aa2ec727e4..754a4ee70f 100644 --- a/public/src/forum/admin/settings.js +++ b/public/src/forum/admin/settings.js @@ -67,7 +67,7 @@ define(['uploader'], function(uploader) { value = fields[x].value; } - socket.emit('api:meta.config.set', { + socket.emit('api:admin.config.set', { key: key, value: value }, function(data) { @@ -116,7 +116,7 @@ define(['uploader'], function(uploader) { }; Settings.remove = function(key) { - socket.emit('api:meta.config.remove', key); + socket.emit('api:admin.config.remove', key); }; return Settings; diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js index 86d4e46ce5..6c4bc01f09 100644 --- a/src/socket.io/admin.js +++ b/src/socket.io/admin.js @@ -1,9 +1,13 @@ +"use strict"; + var groups = require('../groups'), meta = require('../meta'), plugins = require('../plugins'), user = require('../user'), topics = require('../topics'), + categories = require('../categories'), CategoryTools = require('../categoryTools'), + logger = require('../logger'), admin = { user: require('../admin/user'), categories: require('../admin/categories') @@ -133,13 +137,19 @@ SocketAdmin.categories.search = function(username, cid, callback, sessionData) { next(null, userObj); }); }, function(err, data) { - if (!callback) sessionData.socket.emit('api:admin.categories.search', data); - else callback(null, data); + if (!callback) { + sessionData.socket.emit('api:admin.categories.search', data); + } else { + callback(null, data); + } }); }); } else { - if (!callback) sessionData.socket.emit('api:admin.user.search', null); - else callback(); + if (!callback) { + sessionData.socket.emit('api:admin.user.search', null); + } else { + callback(); + } } }; @@ -232,4 +242,37 @@ SocketAdmin.plugins.toggle = function(plugin_id, sessionData) { }); }; +/* Configs */ + +SocketAdmin.config = {}; + +SocketAdmin.config.get = function(callback, sessionData) { + meta.configs.list(function(err, config) { + if (!err) { + callback(config); + } + }); +}; + +SocketAdmin.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); + }); +}; + +SocketAdmin.config.remove = function(key) { + meta.configs.remove(key); +}; + module.exports = SocketAdmin; \ No newline at end of file diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js index e46de7d83a..dbba311fab 100644 --- a/src/socket.io/meta.js +++ b/src/socket.io/meta.js @@ -96,39 +96,6 @@ 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