X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_iq.lua;h=c6d62e859dbbc526bd17168376907b42299bc7b8;hb=762427887bb2315dcd34e1e0528d366a10b38e93;hp=484a1f8fe24b490f8e2b6f612d93a64b7b40e2f8;hpb=8ee0370603ca03f15e7d3ea7242c6f1d9b9ef3a0;p=prosody.git

diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua
index 484a1f8f..c6d62e85 100644
--- a/plugins/mod_iq.lua
+++ b/plugins/mod_iq.lua
@@ -1,17 +1,15 @@
 -- Prosody IM
 -- 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.
 --
 
 
 local st = require "util.stanza";
-local jid_split = require "util.jid".split;
 
-local full_sessions = full_sessions;
-local bare_sessions = bare_sessions;
+local full_sessions = prosody.full_sessions;
 
 if module:get_host_type() == "local" then
 	module:hook("iq/full", function(data)
@@ -19,10 +17,7 @@ if module:get_host_type() == "local" then
 		local origin, stanza = data.origin, data.stanza;
 
 		local session = full_sessions[stanza.attr.to];
-		if session then
-			-- TODO fire post processing event
-			session.send(stanza);
-		else -- resource not online
+		if not (session and session.send(stanza)) then
 			if stanza.attr.type == "get" or stanza.attr.type == "set" then
 				origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
 			end
@@ -33,15 +28,16 @@ end
 
 module:hook("iq/bare", function(data)
 	-- IQ to bare JID recieved
-	local origin, stanza = data.origin, data.stanza;
+	local stanza = data.stanza;
 	local type = stanza.attr.type;
 
 	-- TODO fire post processing events
 	if type == "get" or type == "set" then
 		local child = stanza.tags[1];
-		local ret = module:fire_event("iq/bare/"..child.attr.xmlns..":"..child.name, data);
+		local xmlns = child.attr.xmlns or "jabber:client";
+		local ret = module:fire_event("iq/bare/"..xmlns..":"..child.name, data);
 		if ret ~= nil then return ret; end
-		return module:fire_event("iq-"..type.."/bare/"..child.attr.xmlns..":"..child.name, data);
+		return module:fire_event("iq-"..type.."/bare/"..xmlns..":"..child.name, data);
 	else
 		return module:fire_event("iq-"..type.."/bare/"..stanza.attr.id, data);
 	end
@@ -49,14 +45,15 @@ end);
 
 module:hook("iq/self", function(data)
 	-- IQ to self JID recieved
-	local origin, stanza = data.origin, data.stanza;
+	local stanza = data.stanza;
 	local type = stanza.attr.type;
 
 	if type == "get" or type == "set" then
 		local child = stanza.tags[1];
-		local ret = module:fire_event("iq/self/"..child.attr.xmlns..":"..child.name, data);
+		local xmlns = child.attr.xmlns or "jabber:client";
+		local ret = module:fire_event("iq/self/"..xmlns..":"..child.name, data);
 		if ret ~= nil then return ret; end
-		return module:fire_event("iq-"..type.."/self/"..child.attr.xmlns..":"..child.name, data);
+		return module:fire_event("iq-"..type.."/self/"..xmlns..":"..child.name, data);
 	else
 		return module:fire_event("iq-"..type.."/self/"..stanza.attr.id, data);
 	end
@@ -64,14 +61,15 @@ end);
 
 module:hook("iq/host", function(data)
 	-- IQ to a local host recieved
-	local origin, stanza = data.origin, data.stanza;
+	local stanza = data.stanza;
 	local type = stanza.attr.type;
 
 	if type == "get" or type == "set" then
 		local child = stanza.tags[1];
-		local ret = module:fire_event("iq/host/"..child.attr.xmlns..":"..child.name, data);
+		local xmlns = child.attr.xmlns or "jabber:client";
+		local ret = module:fire_event("iq/host/"..xmlns..":"..child.name, data);
 		if ret ~= nil then return ret; end
-		return module:fire_event("iq-"..type.."/host/"..child.attr.xmlns..":"..child.name, data);
+		return module:fire_event("iq-"..type.."/host/"..xmlns..":"..child.name, data);
 	else
 		return module:fire_event("iq-"..type.."/host/"..stanza.attr.id, data);
 	end