X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fxmlhandlers.lua;h=82c2d0b8d02361e95350d1f7c662225baf9d9149;hb=23c6f9b64369d6ac527c8e03bea3ad81d31fbe80;hp=5611591743994a9953011b59416c516f59808a10;hpb=85906e5b4240828ab3d973eff893bbc76978806e;p=prosody.git

diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua
index 56115917..82c2d0b8 100644
--- a/core/xmlhandlers.lua
+++ b/core/xmlhandlers.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.3
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -14,15 +14,8 @@ local st = stanza;
 local tostring = tostring;
 local pairs = pairs;
 local ipairs = ipairs;
-local type = type;
-local print = print;
-local format = string.format;
-local m_random = math.random;
 local t_insert = table.insert;
-local t_remove = table.remove;
 local t_concat = table.concat;
-local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end
-local sm_destroy_session = import("core.sessionmanager", "destroy_session");
 
 local default_log = require "util.logger".init("xmlhandlers");
 
@@ -36,7 +29,6 @@ local ns_prefixes = {
 
 function init_xmlhandlers(session, stream_callbacks)
 		local ns_stack = { "" };
-		local curr_ns, name = "";
 		local curr_tag;
 		local chardata = {};
 		local xml_handlers = {};
@@ -48,6 +40,7 @@ function init_xmlhandlers(session, stream_callbacks)
 		local cb_handlestanza = stream_callbacks.handlestanza;
 		
 		local stream_tag = stream_callbacks.stream_tag;
+		local stream_default_ns = stream_callbacks.default_ns;
 		
 		local stanza
 		function xml_handlers:StartElement(tagname, attr)
@@ -56,22 +49,25 @@ function init_xmlhandlers(session, stream_callbacks)
 				stanza:text(t_concat(chardata));
 				chardata = {};
 			end
-			local curr_ns,name = tagname:match("^(.+)|([%w%-]+)$");
-			if curr_ns ~= "jabber:server" then
+			local curr_ns,name = tagname:match("^([^\1]*)\1?(.*)$");
+			if name == "" then
+				curr_ns, name = "", curr_ns;
+			end
+
+			if curr_ns ~= stream_default_ns then
 				attr.xmlns = curr_ns;
 			end
 			
 			-- FIXME !!!!!
-			for i, k in ipairs(attr) do
-				if type(k) == "string" then
-					local ns, nm = k:match("^([^|]+)|?([^|]-)$")
-					if ns and nm then
-						ns = ns_prefixes[ns]; 
-						if ns then 
-							attr[ns..":"..nm] = attr[k];
-							attr[i] = ns..":"..nm;
-							attr[k] = nil;
-						end
+			for i=1,#attr do
+				local k = attr[i];
+				attr[i] = nil;
+				local ns, nm = k:match("^([^\1]*)\1?(.*)$");
+				if nm ~= "" then
+					ns = ns_prefixes[ns]; 
+					if ns then 
+						attr[ns..":"..nm] = attr[k];
+						attr[k] = nil;
 					end
 				end
 			end
@@ -96,7 +92,7 @@ function init_xmlhandlers(session, stream_callbacks)
 				curr_tag = stanza;
 			else -- we are inside a stanza, so add a tag
 				attr.xmlns = nil;
-				if curr_ns ~= "jabber:server" and curr_ns ~= "jabber:client" then
+				if curr_ns ~= stream_default_ns then
 					attr.xmlns = curr_ns;
 				end
 				stanza:tag(name, attr);
@@ -108,32 +104,34 @@ function init_xmlhandlers(session, stream_callbacks)
 			end
 		end
 		function xml_handlers:EndElement(tagname)
-			curr_ns,name = tagname:match("^(.+)|([%w%-]+)$");
+			local curr_ns,name = tagname:match("^([^\1]*)\1?(.*)$");
+			if name == "" then
+				curr_ns, name = "", curr_ns;
+			end
 			if (not stanza) or (#stanza.last_add > 0 and name ~= stanza.last_add[#stanza.last_add].name) then 
 				if tagname == stream_tag then
 					if cb_streamclosed then
 						cb_streamclosed(session);
 					end
-					return;
 				elseif name == "error" then
 					cb_error(session, "stream-error", stanza);
 				else
 					cb_error(session, "parse-error", "unexpected-element-close", name);
 				end
+				stanza, chardata = nil, {};
+				return;
 			end
-			if stanza then
-				if stanza and #chardata > 0 then
-					-- We have some character data in the buffer
-					stanza:text(t_concat(chardata));
-					chardata = {};
-				end
-				-- Complete stanza
-				if #stanza.last_add == 0 then
-					cb_handlestanza(session, stanza);
-					stanza = nil;
-				else
-					stanza:up();
-				end
+			if #chardata > 0 then
+				-- We have some character data in the buffer
+				stanza:text(t_concat(chardata));
+				chardata = {};
+			end
+			-- Complete stanza
+			if #stanza.last_add == 0 then
+				cb_handlestanza(session, stanza);
+				stanza = nil;
+			else
+				stanza:up();
 			end
 		end
 	return xml_handlers;