Software /
code /
prosody
Diff
tools/ejabberd2prosody.lua @ 6000:0f6399c86c10
Merge 0.9->0.10
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Tue, 21 Jan 2014 03:24:40 +0000 |
parent | 5993:ef11b8bab405 |
parent | 5999:e49c0c677c5d |
child | 6007:ff24bc2d41a6 |
line wrap: on
line diff
--- a/tools/ejabberd2prosody.lua Tue Jan 21 01:51:13 2014 +0100 +++ b/tools/ejabberd2prosody.lua Tue Jan 21 03:24:40 2014 +0000 @@ -30,7 +30,7 @@ function build_stanza(tuple, stanza) assert(type(tuple) == "table", "XML node is of unexpected type: "..type(tuple)); - if tuple[1] == "xmlelement" then + if tuple[1] == "xmlelement" or tuple[1] == "xmlel" then assert(type(tuple[2]) == "string", "element name has type: "..type(tuple[2])); assert(type(tuple[3]) == "table", "element attribute array has type: "..type(tuple[3])); assert(type(tuple[4]) == "table", "element children array has type: "..type(tuple[4])); @@ -247,7 +247,7 @@ end muc_room(tuple[2][1], tuple[2][2], properties); end; - config = function(tuple) + --[=[config = function(tuple) if tuple[2] == "hosts" then local output = io.output(); io.output("prosody.cfg.lua"); io.write("-- Configuration imported from ejabberd --\n"); @@ -275,7 +275,7 @@ io.output(output); print("prosody.cfg.lua created"); end - end; + end;]=] }; local arg = ...;