diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-06 15:31:21 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-06 15:31:21 +0100 |
| commit | 12b74e9dde7fbabe26e3bcca7d0249621344476a (patch) | |
| tree | 12c170f5c451cd6de06f1b842d220909e39f46e9 /plugins/adhoc | |
| parent | 0e71fac1d18b0de0e9203cb6b71c971d55c8c70c (diff) | |
| parent | a889b0287767bd9e7ab5f213607f453acac448f9 (diff) | |
| download | prosody-12b74e9dde7fbabe26e3bcca7d0249621344476a.tar.gz prosody-12b74e9dde7fbabe26e3bcca7d0249621344476a.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/adhoc')
| -rw-r--r-- | plugins/adhoc/adhoc.lib.lua | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/adhoc/adhoc.lib.lua b/plugins/adhoc/adhoc.lib.lua index 5c90c91b..87415636 100644 --- a/plugins/adhoc/adhoc.lib.lua +++ b/plugins/adhoc/adhoc.lib.lua @@ -27,11 +27,12 @@ end function _M.handle_cmd(command, origin, stanza) local cmdtag = stanza.tags[1] local sessionid = cmdtag.attr.sessionid or uuid.generate(); - local dataIn = {}; - dataIn.to = stanza.attr.to; - dataIn.from = stanza.attr.from; - dataIn.action = cmdtag.attr.action or "execute"; - dataIn.form = cmdtag:get_child("x", "jabber:x:data"); + local dataIn = { + to = stanza.attr.to; + from = stanza.attr.from; + action = cmdtag.attr.action or "execute"; + form = cmdtag:get_child("x", "jabber:x:data"); + }; local data, state = command:handler(dataIn, states[sessionid]); states[sessionid] = state; |