Merge 0.7->trunk

[prosody.git] / plugins / mod_announce.lua

diff --git a/plugins/mod_announce.lua b/plugins/mod_announce.lua
index 2adb6253ac36e2e0c7d23d50c8b947eaf78a7bf6..77555bec73b6aec191bc8dd1a8d594b66948aa06 100644 (file)
--- a/plugins/mod_announce.lua
+++ b/plugins/mod_announce.lua
@@ -6,15 +6,14 @@
 -- COPYING file in the source package for more information.
 --
 
-local st, jid, set = require "util.stanza", require "util.jid", require "util.set";
+local st, jid = require "util.stanza", require "util.jid";
 
 local is_admin = require "core.usermanager".is_admin;
-local admins = set.new(config.get(module:get_host(), "core", "admins"));
 
-function send_to_online(message, server)
+function send_to_online(message, host)
        local sessions;
-       if server then
-               sessions = { [server] = hosts[server] };
+       if host then
+               sessions = { [host] = hosts[host] };
        else
                sessions = hosts;
        end
@@ -36,9 +35,9 @@ end
 
 
 -- Old <message>-based jabberd-style announcement sending
-function handle_announcement(data)
-       local origin, stanza = data.origin, data.stanza;
-       local host, resource = select(2, jid.split(stanza.attr.to));
+function handle_announcement(event)
+       local origin, stanza = event.origin, event.stanza;
+       local node, host, resource = jid.split(stanza.attr.to);
        
        if resource ~= "announce/online" then
                return; -- Not an announcement
@@ -46,12 +45,11 @@ function handle_announcement(data)
        
        if not is_admin(stanza.attr.from) then
                -- Not an admin? Not allowed!
-               module:log("warn", "Non-admin %s tried to send server announcement", tostring(jid.bare(stanza.attr.from)));
+               module:log("warn", "Non-admin '%s' tried to send server announcement", stanza.attr.from);
                return;
        end
        
        module:log("info", "Sending server announcement to all online users");
-       local host_session = hosts[host];
        local message = st.clone(stanza);
        message.attr.type = "headline";
        message.attr.from = host;