Merge 0.6->0.7

[prosody.git] / util / stanza.lua

diff --git a/util/stanza.lua b/util/stanza.lua
index d223d53f7f6de032779093a78c66c0eac2e41df1..08ef2c9aa1649deac35eca8fd38488e7982a5372 100644 (file)
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -247,14 +247,14 @@ function deserialize(stanza)
                for i=1,#attr do attr[i] = nil; end
                local attrx = {};
                for att in pairs(attr) do
-                       if s_find(att, "|", 1, true) and not s_find(k, "\1", 1, true) then
-                               local ns,na = s_match(k, "^([^|]+)|(.+)$");
+                       if s_find(att, "|", 1, true) and not s_find(att, "\1", 1, true) then
+                               local ns,na = s_match(att, "^([^|]+)|(.+)$");
                                attrx[ns.."\1"..na] = attr[att];
                                attr[att] = nil;
                        end
                end
                for a,v in pairs(attrx) do
-                       attr[x] = v;
+                       attr[a] = v;
                end
                setmetatable(stanza, stanza_mt);
                for _, child in ipairs(stanza) do
@@ -315,13 +315,16 @@ function reply(orig)
        return stanza(orig.name, orig.attr and { to = orig.attr.from, from = orig.attr.to, id = orig.attr.id, type = ((orig.name == "iq" and "result") or orig.attr.type) });
 end
 
-function error_reply(orig, type, condition, message)
-       local t = reply(orig);
-       t.attr.type = "error";
-       t:tag("error", {type = type})
-               :tag(condition, {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
-       if (message) then t:tag("text"):text(message):up(); end
-       return t; -- stanza ready for adding app-specific errors
+do
+       local xmpp_stanzas_attr = { xmlns = xmlns_stanzas };
+       function error_reply(orig, type, condition, message)
+               local t = reply(orig);
+               t.attr.type = "error";
+               t:tag("error", {type = type}) --COMPAT: Some day xmlns:stanzas goes here
+                       :tag(condition, xmpp_stanzas_attr):up();
+               if (message) then t:tag("text", xmpp_stanzas_attr):text(message):up(); end
+               return t; -- stanza ready for adding app-specific errors
+       end
 end
 
 function presence(attr)