Merge 0.9->trunk

[prosody.git] / plugins / mod_announce.lua

diff --git a/plugins/mod_announce.lua b/plugins/mod_announce.lua
index 77555bec73b6aec191bc8dd1a8d594b66948aa06..0872bd216462e8e799128326ac8c1062e4d74439 100644 (file)
--- a/plugins/mod_announce.lua
+++ b/plugins/mod_announce.lua
@@ -25,7 +25,7 @@ function send_to_online(message, host)
                        for username in pairs(host_session.sessions) do
                                c = c + 1;
                                message.attr.to = username.."@"..hostname;
-                               core_post_stanza(host_session, message);
+                               module:send(message);
                        end
                end
        end
@@ -88,7 +88,7 @@ function announce_handler(self, data, state)
                module:log("info", "Announcement sent to %d online users", count);
                return { status = "completed", info = ("Announcement sent to %d online users"):format(count) };
        else
-               return { status = "executing", form = announce_layout }, "executing";
+               return { status = "executing", actions = {"next", "complete", default = "complete"}, form = announce_layout }, "executing";
        end
 
        return true;
@@ -96,5 +96,5 @@ end
 
 local adhoc_new = module:require "adhoc".new;
 local announce_desc = adhoc_new("Send Announcement to Online Users", "http://jabber.org/protocol/admin#announce", announce_handler, "admin");
-module:add_item("adhoc", announce_desc);
+module:provides("adhoc", announce_desc);