Merge 0.9->0.10

[prosody.git] / plugins / mod_iq.lua

diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua
index 55bf59c36f4c4d20d67a96494db4567087719a05..c6d62e859dbbc526bd17168376907b42299bc7b8 100644 (file)
--- a/plugins/mod_iq.lua
+++ b/plugins/mod_iq.lua
@@ -1,7 +1,7 @@
 -- 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.
 --
@@ -9,7 +9,7 @@
 
 local st = require "util.stanza";
 
-local full_sessions = full_sessions;
+local full_sessions = prosody.full_sessions;
 
 if module:get_host_type() == "local" then
        module:hook("iq/full", function(data)
@@ -17,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
@@ -37,9 +34,10 @@ module:hook("iq/bare", function(data)
        -- 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
@@ -52,9 +50,10 @@ module:hook("iq/self", function(data)
 
        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
@@ -67,9 +66,10 @@ module:hook("iq/host", function(data)
 
        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