util.stanza: Export xml_escape (missed during removal of module() calls)

[prosody.git] / util / stanza.lua

diff --git a/util/stanza.lua b/util/stanza.lua
index 82601e630986fc4376f22c714144bba267b27212..90422a0622659eec9f9e81611884c9c6dfa07d47 100644 (file)
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -35,13 +35,12 @@ end
 
 local xmlns_stanzas = "urn:ietf:params:xml:ns:xmpp-stanzas";
 
-module "stanza"
+local _ENV = nil;
 
-stanza_mt = { __type = "stanza" };
+local stanza_mt = { __type = "stanza" };
 stanza_mt.__index = stanza_mt;
-local stanza_mt = stanza_mt;
 
-function stanza(name, attr)
+local function stanza(name, attr)
        local stanza = { name = name, attr = attr or {}, tags = {} };
        return setmetatable(stanza, stanza_mt);
 end
@@ -200,12 +199,8 @@ function stanza_mt:find(path)
 end
 
 
-local xml_escape
-do
-       local escape_table = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
-       function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
-       _M.xml_escape = xml_escape;
-end
+local escape_table = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
+local function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
 
 local function _dostring(t, buf, self, xml_escape, parentns)
        local nsid = 0;
@@ -280,15 +275,13 @@ function stanza_mt.get_error(stanza)
        return type, condition or "undefined-condition", text;
 end
 
-do
-       local id = 0;
-       function new_id()
-               id = id + 1;
-               return "lx"..id;
-       end
+local id = 0;
+local function new_id()
+       id = id + 1;
+       return "lx"..id;
 end
 
-function preserialize(stanza)
+local function preserialize(stanza)
        local s = { name = stanza.name, attr = stanza.attr };
        for _, child in ipairs(stanza) do
                if type(child) == "table" then
@@ -300,7 +293,7 @@ function preserialize(stanza)
        return s;
 end
 
-function deserialize(stanza)
+local function deserialize(stanza)
        -- Set metatable
        if stanza then
                local attr = stanza.attr;
@@ -337,51 +330,48 @@ function deserialize(stanza)
        return stanza;
 end
 
-local function _clone(stanza)
+local function clone(stanza)
        local attr, tags = {}, {};
        for k,v in pairs(stanza.attr) do attr[k] = v; end
        local new = { name = stanza.name, attr = attr, tags = tags };
        for i=1,#stanza do
                local child = stanza[i];
                if child.name then
-                       child = _clone(child);
+                       child = clone(child);
                        t_insert(tags, child);
                end
                t_insert(new, child);
        end
        return setmetatable(new, stanza_mt);
 end
-clone = _clone;
 
-function message(attr, body)
+local function message(attr, body)
        if not body then
                return stanza("message", attr);
        else
                return stanza("message", attr):tag("body"):text(body):up();
        end
 end
-function iq(attr)
+local function iq(attr)
        if attr and not attr.id then attr.id = new_id(); end
        return stanza("iq", attr or { id = new_id() });
 end
 
-function reply(orig)
+local 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
 
-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
+local xmpp_stanzas_attr = { xmlns = xmlns_stanzas };
+local 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
 
-function presence(attr)
+local function presence(attr)
        return stanza("presence", attr);
 end
 
@@ -425,4 +415,17 @@ else
        stanza_mt.pretty_top_tag = stanza_mt.top_tag;
 end
 
-return _M;
+return {
+       stanza_mt = stanza_mt;
+       stanza = stanza;
+       new_id = new_id;
+       preserialize = preserialize;
+       deserialize = deserialize;
+       clone = clone;
+       message = message;
+       iq = iq;
+       reply = reply;
+       error_reply = error_reply;
+       presence = presence;
+       xml_escape = xml_escape;
+};