X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fadhoc%2Fadhoc.lib.lua;h=ecddcd1d173ec3e6e9196227ee8b3be90a39c825;hb=3b3be1cac388805970c112d4bad32fe1471edcd2;hp=361f4731f651abd310af9e11520a108a020bec8a;hpb=03543cb53ae0621ecce5edce18bbe91879a1143e;p=prosody.git

diff --git a/plugins/adhoc/adhoc.lib.lua b/plugins/adhoc/adhoc.lib.lua
index 361f4731..ecddcd1d 100644
--- a/plugins/adhoc/adhoc.lib.lua
+++ b/plugins/adhoc/adhoc.lib.lua
@@ -12,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
@@ -35,6 +35,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);
@@ -46,8 +47,9 @@ function _M.handle_cmd(command, origin, stanza)
 		stanza = st.error_reply(stanza, data.error.type, data.error.condition, data.error.message);
 		origin.send(stanza);
 		return true;
-	else 
+	else
 		cmdtag = command:cmdtag("executing", sessionid);
+		data.actions = data.actions or { "complete" };
 	end
 
 	for name, content in pairs(data) do
@@ -57,21 +59,21 @@ 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.layout or content):form(content.data));
+			cmdtag:add_child((content.layout or content):form(content.values));
 		elseif name == "result" then
-			cmdtag:add_child((content.layout or content):form(content.data, "result"));
+			cmdtag:add_child((content.layout or content):form(content.values, "result"));
 		elseif name == "other" then
 			cmdtag:add_child(content);
 		end