Merge 0.9->trunk

[prosody.git] / plugins / adhoc / adhoc.lib.lua

diff --git a/plugins/adhoc/adhoc.lib.lua b/plugins/adhoc/adhoc.lib.lua
index 6193cafd227ddf8ccbe7450a2337e95978c3c82d..b544ddc8e4ac8ecee986adf2a9a2b94b1748daf0 100644 (file)
--- a/plugins/adhoc/adhoc.lib.lua
+++ b/plugins/adhoc/adhoc.lib.lua
@@ -1,3 +1,9 @@
+-- Copyright (C) 2009-2010 Florian Zeitz
+--
+-- This file is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 local st, uuid = require "util.stanza", require "util.uuid";
 
 local xmlns_cmd = "http://jabber.org/protocol/commands";
@@ -6,7 +12,7 @@ local states = {}
 
 local _M = {};
 
-function _cmdtag(desc, status, sessionid, action)
+local function _cmdtag(desc, status, sessionid, action)
        local cmd = st.stanza("command", { xmlns = xmlns_cmd, node = desc.node, status = status });
        if sessionid then cmd.attr.sessionid = sessionid; end
        if action then cmd.attr.action = action; end
@@ -28,7 +34,7 @@ function _M.handle_cmd(command, origin, stanza)
 
        local data, state = command:handler(dataIn, states[sessionid]);
        states[sessionid] = state;
-       local stanza = st.reply(stanza);
+       local cmdtag;
        if data.status == "completed" then
                states[sessionid] = nil;
                cmdtag = command:cmdtag("completed", sessionid);
@@ -37,10 +43,12 @@ function _M.handle_cmd(command, origin, stanza)
                cmdtag = command:cmdtag("canceled", sessionid);
        elseif data.status == "error" then
                states[sessionid] = nil;
-               stanza = st.error_reply(stanza, data.error.type, data.error.condition, data.error.message);
-               cmdtag = command:cmdtag("canceled", sessionid);
-       else 
+               local reply = st.error_reply(stanza, data.error.type, data.error.condition, data.error.message);
+               origin.send(reply);
+               return true;
+       else
                cmdtag = command:cmdtag("executing", sessionid);
+               data.actions = data.actions or { "complete" };
        end
 
        for name, content in pairs(data) do
@@ -50,27 +58,28 @@ function _M.handle_cmd(command, origin, stanza)
                        cmdtag:tag("note", {type="warn"}):text(content):up();
                elseif name == "error" then
                        cmdtag:tag("note", {type="error"}):text(content.message):up();
-               elseif name =="actions" then
-                       local actions = st.stanza("actions");
+               elseif name == "actions" then
+                       local actions = st.stanza("actions", { execute = content.default });
                        for _, action in ipairs(content) do
                                if (action == "prev") or (action == "next") or (action == "complete") then
                                        actions:tag(action):up();
                                else
-                                       module:log("error", 'Command "'..command.name..
-                                               '" at node "'..command.node..'" provided an invalid action "'..action..'"');
+                                       module:log("error", "Command %q at node %q provided an invalid action %q",
+                                               command.name, command.node, action);
                                end
                        end
                        cmdtag:add_child(actions);
                elseif name == "form" then
-                       cmdtag:add_child(content:form());
+                       cmdtag:add_child((content.layout or content):form(content.values));
                elseif name == "result" then
-                       cmdtag:add_child(content.layout:form(content.data, "result"));
+                       cmdtag:add_child((content.layout or content):form(content.values, "result"));
                elseif name == "other" then
                        cmdtag:add_child(content);
                end
        end
-       stanza:add_child(cmdtag);
-       origin.send(stanza);
+       local reply = st.reply(stanza);
+       reply:add_child(cmdtag);
+       origin.send(reply);
 
        return true;
 end