(no commit message)
authorChristian Weiske <cweiske@cweiske.de>
Fri, 14 Feb 2014 13:44:59 +0000 (14:44 +0100)
committerwww-cweiske <www-cweiske@localhost.localdomain>
Fri, 14 Feb 2014 13:44:59 +0000 (14:44 +0100)
mod_post_msg.lua.diff [new file with mode: 0644]
phork1.txt [deleted file]

diff --git a/mod_post_msg.lua.diff b/mod_post_msg.lua.diff
new file mode 100644 (file)
index 0000000..513248a
--- /dev/null
@@ -0,0 +1,24 @@
+diff -r 9700c89f7bf6 mod_post_msg/mod_post_msg.lua\r
+--- a/mod_post_msg/mod_post_msg.lua    Thu Jan 23 20:27:14 2014 +0000\r
++++ b/mod_post_msg/mod_post_msg.lua    Fri Feb 14 14:43:54 2014 +0100\r
+@@ -6,6 +6,7 @@\r
+ local test_password = require "core.usermanager".test_password;\r
+ local b64_decode = require "util.encodings".base64.decode;\r
+ local formdecode = require "net.http".formdecode;\r
++local xml = require"util.xml"\r
\r
+ local function require_valid_user(f)\r
+       return function(event, path)\r
+@@ -46,8 +48,11 @@\r
+               end\r
+       elseif body_type == "application/x-www-form-urlencoded" then\r
+               local post_body = formdecode(request.body);\r
+-                      message = msg({ to = post_body.to or to, from = authed_user,\r
++              message = msg({ to = post_body.to or to, from = authed_user,\r
+                               type = post_body.type or "chat"}, post_body.body);\r
++              if post_body.html then\r
++                 message:tag("html", {xmlns="http://jabber.org/protocol/xhtml-im"}):add_child(xml.parse(post_body.html)):up();\r
++              end\r
+       else\r
+               return 415;\r
+       end\r
diff --git a/phork1.txt b/phork1.txt
deleted file mode 100644 (file)
index a9634b1..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-lua code:\r
-message:tag("html", "http://jabber.org/protocol/xhtml-im"):add_child(xml.parse(post_body.html)):up();\r
-\r
-error log:\r
-Feb 14 14:29:54 http.server     error   Traceback[httpserver]: /usr/lib/prosody/util/stanza.lua:214: bad argument #1 to 'pairs' (table expected, got string)\r
-stack traceback:\r
-        [C]: in function 'pairs'\r
-        /usr/lib/prosody/util/stanza.lua:214: in function 'self'\r
-        /usr/lib/prosody/util/stanza.lua:231: in function '_dostring'\r
-        /usr/lib/prosody/util/stanza.lua:241: in function </usr/lib/prosody/util/stanza.lua:239>\r
-        [C]: in function 'tostring'\r
-        /usr/lib/prosody/modules/mod_post_msg.lua:62: in function </usr/lib/prosody/modules/mod_post_msg.lua:37>\r
-        (tail call): ?\r
-        (tail call): ?\r
-        /usr/lib/prosody/util/events.lua:67: in function 'fire_event'\r
-        /usr/lib/prosody/net/http/server.lua:217: in function </usr/lib/prosody/net/http/server.lua:160>\r
-        ...\r
-        /usr/lib/prosody/net/http/server.lua:108: in function 'process_next'\r
-        /usr/lib/prosody/net/http/server.lua:124: in function 'success_cb'\r
-        /usr/lib/prosody/net/http/parser.lua:150: in function 'feed'\r
-        /usr/lib/prosody/net/http/server.lua:146: in function </usr/lib/prosody/net/http/server.lua:145>\r
-        (tail call): ?\r
-        /usr/lib/prosody/net/server_select.lua:847: in function </usr/lib/prosody/net/server_select.lua:829>\r
-        [C]: in function 'xpcall'\r
-        /usr/bin/prosody:372: in function 'loop'\r
-        /usr/bin/prosody:402: in main chunk\r
-        [C]: ?\r