diff options
author | John McLear <john@mclear.co.uk> | 2014-11-18 14:08:44 +0000 |
---|---|---|
committer | John McLear <john@mclear.co.uk> | 2014-11-18 14:08:44 +0000 |
commit | 020b636b1f6ffecfd6cf5563e0867ce4c401aebe (patch) | |
tree | aabd716ff367c1ce293b68a54cd8c4947480f208 /src/node/hooks/express/adminplugins.js | |
parent | 135aa3e8feeed8d77b8d753a18a8164f6084e692 (diff) | |
download | etherpad-lite-020b636b1f6ffecfd6cf5563e0867ce4c401aebe.zip |
template of a semi-fix
Diffstat (limited to 'src/node/hooks/express/adminplugins.js')
-rw-r--r-- | src/node/hooks/express/adminplugins.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js index d8f19bba..b348c023 100644 --- a/src/node/hooks/express/adminplugins.js +++ b/src/node/hooks/express/adminplugins.js @@ -14,7 +14,6 @@ exports.expressCreateServer = function (hook_name, args, cb) { search_results: {}, errors: [], }; - res.send( eejs.require("ep_etherpad-lite/templates/admin/plugins.html", render_args) ); }); args.app.get('/admin/plugins/info', function(req, res) { @@ -25,7 +24,8 @@ exports.expressCreateServer = function (hook_name, args, cb) { exports.socketio = function (hook_name, args, cb) { var io = args.io.of("/pluginfw/installer"); io.on('connection', function (socket) { - if (!socket.handshake.session.user || !socket.handshake.session.user.is_admin) return; + console.warn("THIS IS BROKEN", socket.handshake); + if (!socket.handshake.session || !socket.handshake.session.user || !socket.handshake.session.user.is_admin) return; socket.on("getInstalled", function (query) { // send currently installed plugins @@ -107,4 +107,4 @@ function sortPluginList(plugins, property, /*ASC?*/dir) { // a must be equal to b return 0; }) -}
\ No newline at end of file +} |