From 87ee45165df406ee9794cc1ba0d009e4717974dd Mon Sep 17 00:00:00 2001 From: calzoneman Date: Tue, 24 Sep 2013 13:46:41 -0500 Subject: [PATCH] Fix announcements for SSL sockets --- changelog | 4 ++++ lib/acp.js | 2 ++ 2 files changed, 6 insertions(+) diff --git a/changelog b/changelog index 72760976..a484b590 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,7 @@ +Tue Sep 24 13:45 2013 CDT + * lib/acp.js: Emit announcements to SSL sockets in addition to regular + ones. + Tue Sep 24 13:15 2013 CDT * www/assets/js/callbacks.js: Instantiate a new paginator for every search result- prevents buttons being incorrectly added or omitted. diff --git a/lib/acp.js b/lib/acp.js index e318d08a..b0cf59af 100644 --- a/lib/acp.js +++ b/lib/acp.js @@ -21,6 +21,8 @@ module.exports = function (Server) { ActionLog.record(user.ip, user.name, "acp-announce", data); Server.announcement = data; Server.io.sockets.emit("announcement", data); + if (Server.cfg["enable-ssl"]) + Server.sslio.sockets.emit("announcement", data); }); user.socket.on("acp-announce-clear", function() {