# HG changeset patch # User Matthew Wild # Date 1336768502 -3600 # Node ID 33458e1d84c8dd51b1e2715c6156fd7a358fda74 # Parent 52b6901cabb0d49c17578b8ec329761a6b4522fb Backed out changeset 52b6901cabb0 (to be replaced) diff -r 52b6901cabb0 -r 33458e1d84c8 plugins/adhoc/adhoc.lib.lua --- a/plugins/adhoc/adhoc.lib.lua Fri Apr 13 00:39:00 2012 +0200 +++ b/plugins/adhoc/adhoc.lib.lua Fri May 11 21:35:02 2012 +0100 @@ -25,7 +25,6 @@ end function _M.handle_cmd(command, origin, stanza) - local cmdtag, actions; local sessionid = stanza.tags[1].attr.sessionid or uuid.generate(); local dataIn = {}; dataIn.to = stanza.attr.to; @@ -59,7 +58,7 @@ elseif name == "error" then cmdtag:tag("note", {type="error"}):text(content.message):up(); elseif name =="actions" then - actions = st.stanza("actions"); + local actions = st.stanza("actions"); for _, action in ipairs(content) do if (action == "prev") or (action == "next") or (action == "complete") then actions:tag(action):up(); @@ -68,6 +67,7 @@ '" at node "'..command.node..'" provided an invalid action "'..action..'"'); end end + cmdtag:add_child(actions); elseif name == "form" then cmdtag:add_child((content.layout or content):form(content.values)); elseif name == "result" then @@ -76,13 +76,6 @@ cmdtag:add_child(content); end end - - if not actions then - actions = st.stanza("actions"); - actions:tag("complete"):up(); - end - cmdtag:add_child(actions); - stanza:add_child(cmdtag); origin.send(stanza);