Merge 0.9->0.10

[prosody.git] / plugins / mod_admin_adhoc.lua

diff --git a/plugins/mod_admin_adhoc.lua b/plugins/mod_admin_adhoc.lua
index 405980c253e85e62702985ee39b149a7332a9849..fdbdf46290a4c764c9c145babe1856e99ee5de6c 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;
@@ -246,7 +247,7 @@ local get_user_roster_handler = adhoc_simple(get_user_roster_layout, function(fi
 
        local query = st.stanza("query", { xmlns = "jabber:iq:roster" });
        for jid in pairs(roster) do
-               if jid ~= "pending" and jid then
+               if jid then
                        query:tag("item", {
                                jid = jid,
                                subscription = roster[jid].subscription,
@@ -299,7 +300,7 @@ local get_user_stats_handler = adhoc_simple(get_user_stats_layout, function(fiel
        local IPs = "";
        local resources = "";
        for jid in pairs(roster) do
-               if jid ~= "pending" and jid then
+               if jid then
                        rostersize = rostersize + 1;
                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