Merge 0.10->trunk

[prosody.git] / plugins / mod_admin_adhoc.lua

diff --git a/plugins/mod_admin_adhoc.lua b/plugins/mod_admin_adhoc.lua
index 4fab84bca1fb36c68fe921f2d8afcb823e533c7b..392e715e3b8954fd80a22e119811ae9ec56a29a7 100644 (file)
--- a/plugins/mod_admin_adhoc.lua
+++ b/plugins/mod_admin_adhoc.lua
@@ -26,10 +26,11 @@ local st, jid = require "util.stanza", require "util.jid";
 local timer_add_task = require "util.timer".add_task;
 local dataforms_new = require "util.dataforms".new;
 local array = require "util.array";
-local modulemanager = require "modulemanager";
+local modulemanager = require "core.modulemanager";
 local core_post_stanza = prosody.core_post_stanza;
 local adhoc_simple = require "util.adhoc".new_simple_form;
 local adhoc_initial = require "util.adhoc".new_initial_data_form;
+local set = require"util.set";
 
 module:depends("adhoc");
 local adhoc_new = module:require "adhoc".new;
@@ -389,7 +390,7 @@ local function session_flags(session, line)
                flags[#flags+1] = "encrypted";
        end
        if session.compressed then
-               flags[#flags+1] = "compressed)";
+               flags[#flags+1] = "compressed";
        end
        if session.smacks then
                flags[#flags+1] = "sm";
@@ -421,7 +422,7 @@ local function list_s2s_this_handler(self, data, state)
                local sess_lines = { r = remotehost,
                        session_flags(session, { "", direction, remotehost or "?" })};
 
-               if remotehost:match(module_host) or localhost:match(module_host) then
+               if localhost == module_host then
                        s2s_list[#s2s_list+1] = sess_lines;
                end
        end
@@ -613,6 +614,7 @@ end, function(fields, err)
 end);
 
 local function send_to_online(message, server)
+       local sessions;
        if server then
                sessions = { [server] = hosts[server] };
        else