util.ip: rename variable (i is already defined) [luacheck]

[prosody.git] / util / template.lua

diff --git a/util/template.lua b/util/template.lua
index 5e9b479e2daab4af03fbc37db5ef0a7ef5362000..04ebb93d2285df05563c4678692fa2d682c9e884 100644 (file)
--- a/util/template.lua
+++ b/util/template.lua
@@ -1,6 +1,5 @@
-
-local st = require "util.stanza";
-local lxp = require "lxp";
+-- luacheck: ignore 213/i
+local stanza_mt = require "util.stanza".stanza_mt;
 local setmetatable = setmetatable;
 local pairs = pairs;
 local ipairs = ipairs;
@@ -8,57 +7,9 @@ local error = error;
 local loadstring = loadstring;
 local debug = debug;
 local t_remove = table.remove;
+local parse_xml = require "util.xml".parse;
 
-module("template")
-
-local parse_xml = (function()
-       local ns_prefixes = {
-               ["http://www.w3.org/XML/1998/namespace"] = "xml";
-       };
-       local ns_separator = "\1";
-       local ns_pattern = "^([^"..ns_separator.."]*)"..ns_separator.."?(.*)$";
-       return function(xml)
-               local handler = {};
-               local stanza = st.stanza("root");
-               function handler:StartElement(tagname, attr)
-                       local curr_ns,name = tagname:match(ns_pattern);
-                       if name == "" then
-                               curr_ns, name = "", curr_ns;
-                       end
-                       if curr_ns ~= "" then
-                               attr.xmlns = curr_ns;
-                       end
-                       for i=1,#attr do
-                               local k = attr[i];
-                               attr[i] = nil;
-                               local ns, nm = k:match(ns_pattern);
-                               if nm ~= "" then
-                                       ns = ns_prefixes[ns]; 
-                                       if ns then 
-                                               attr[ns..":"..nm] = attr[k];
-                                               attr[k] = nil;
-                                       end
-                               end
-                       end
-                       stanza:tag(name, attr);
-               end
-               function handler:CharacterData(data)
-                       stanza:text(data);
-               end
-               function handler:EndElement(tagname)
-                       stanza:up();
-               end
-               local parser = lxp.new(handler, "\1");
-               local ok, err, line, col = parser:parse(xml);
-               if ok then ok, err, line, col = parser:parse(); end
-               --parser:close();
-               if ok then
-                       return stanza.tags[1];
-               else
-                       return ok, err.." (line "..line..", col "..col..")";
-               end
-       end;
-end)();
+local _ENV = nil;
 
 local function trim_xml(stanza)
        for i=#stanza,1,-1 do
@@ -113,16 +64,15 @@ local function create_clone_string(stanza, lookup, xmlns)
        end
        return lookup[stanza];
 end
-local stanza_mt = st.stanza_mt;
 local function create_cloner(stanza, chunkname)
        local lookup = {};
        local name = create_clone_string(stanza, lookup, "");
-       local f = "local setmetatable,stanza_mt=...;return function(data)";
+       local src = "local setmetatable,stanza_mt=...;return function(data)";
        for i=1,#lookup do
-               f = f.."local _"..i.."="..lookup[i]..";";
+               src = src.."local _"..i.."="..lookup[i]..";";
        end
-       f = f.."return "..name..";end";
-       local f,err = loadstring(f, chunkname);
+       src = src.."return "..name..";end";
+       local f,err = loadstring(src, chunkname);
        if not f then error(err); end
        return f(setmetatable, stanza_mt);
 end