diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/muc.lua | 4 | ||||
| -rw-r--r-- | util/pluginloader.lua | 2 | ||||
| -rw-r--r-- | util/stanza.lua | 31 |
3 files changed, 22 insertions, 15 deletions
diff --git a/util/muc.lua b/util/muc.lua index 2bb1311a..87eba130 100644 --- a/util/muc.lua +++ b/util/muc.lua @@ -165,7 +165,7 @@ end local function room_get_disco_info(self, stanza) end local function room_get_disco_items(self, stanza) end -local function room_set_subject(room, current_nick, room, subject) +local function room_set_subject(room, current_nick, subject) -- TODO check nick's authority if subject == "" then subject = nil; end room._data['subject'] = subject; @@ -315,7 +315,7 @@ local function room_handle_to_room(self, origin, stanza) -- presence changes and local current_nick = self._jid_nick[stanza.attr.from]; if current_nick then stanza.attr.to = current_nick; - room_handle_to_occupant(origin, stanza); + room_handle_to_occupant(self, origin, stanza); stanza.attr.to = to; elseif type ~= "error" and type ~= "result" then origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); diff --git a/util/pluginloader.lua b/util/pluginloader.lua index 86075c90..861fe6a9 100644 --- a/util/pluginloader.lua +++ b/util/pluginloader.lua @@ -27,7 +27,7 @@ end function load_code(plugin, resource) local content, err = load_resource(plugin, resource); if not content then return content, err; end - return loadstring(content, err); + return loadstring(content, "@"..err); end return _M; diff --git a/util/stanza.lua b/util/stanza.lua index eb9f3922..35d600ed 100644 --- a/util/stanza.lua +++ b/util/stanza.lua @@ -24,6 +24,7 @@ local print = print; local unpack = unpack; local s_gsub = string.gsub; local s_char = string.char; +local s_find = string.find; local os = os; local do_pretty_printing = not os.getenv("WINDIR"); @@ -122,27 +123,33 @@ local xml_escape = (function() return function(str) return (s_gsub(str, "['&<>\"]", escape_table)); end end)(); local function _dostring(t, buf, self, xml_escape) - local nsid, ns, attrk = 0; - t_insert(buf, "<"..t.name); + local nsid = 0; + local name = t.name + t_insert(buf, "<"..name); for k, v in pairs(t.attr) do - ns, attrk = s_match(k, "^([^|]+)|(.+)$"); - if ns then + if s_find(k, "|", 1, true) then + local ns, attrk = s_match(k, "^([^|]+)|(.+)$"); nsid = nsid + 1; t_insert(buf, " xmlns:ns"..nsid.."='"..xml_escape(ns).."' ".."ns"..nsid..":"..attrk.."='"..xml_escape(v).."'"); else t_insert(buf, " "..k.."='"..xml_escape(v).."'"); end end - t_insert(buf, ">"); - for n=1,#t do - local child = t[n]; - if child.name then - self(child, buf, self, xml_escape); - else - t_insert(buf, xml_escape(child)); + local len = #t; + if len == 0 then + t_insert(buf, "/>"); + else + t_insert(buf, ">"); + for n=1,len do + local child = t[n]; + if child.name then + self(child, buf, self, xml_escape); + else + t_insert(buf, xml_escape(child)); + end end + t_insert(buf, "</"..name..">"); end - t_insert(buf, "</"..t.name..">"); end function stanza_mt.__tostring(t) local buf = {}; |