From 8e79e80b41777efc6b2224d7b07e1df46d006da9 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 18 Jan 2014 17:24:10 -0500 Subject: tools/ejabberd2prosody: ?xmlelement? can be ?xmlel? in newer ejabberd (thanks cr). --- tools/ejabberd2prosody.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/ejabberd2prosody.lua') diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index a8bfad0e..8312ebd1 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -30,7 +30,7 @@ dm.set_data_path("data"); 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])); -- cgit v1.2.3 From a9797ae4c7ae33cfb106d576a702df55575c852e Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 18 Jan 2014 17:26:02 -0500 Subject: tools/ejabberd2prosody: Disable generating a config, as the format it generates is completely out of date. --- tools/ejabberd2prosody.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/ejabberd2prosody.lua') diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index 8312ebd1..bc916fb8 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -247,7 +247,7 @@ local filters = { 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 @@ local filters = { io.output(output); print("prosody.cfg.lua created"); end - end; + end;]=] }; local arg = ...; -- cgit v1.2.3