diff options
| -rw-r--r-- | core/modulemanager.lua | 20 | ||||
| -rw-r--r-- | plugins/mod_vcard.lua | 2 | ||||
| -rw-r--r-- | util/hashes.lua | 2 |
3 files changed, 18 insertions, 6 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index b65494e7..bf5d4c2f 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -18,17 +18,27 @@ local handlers = {}; local modulehelpers = setmetatable({}, { __index = _G }); -function modulehelpers.add_iq_handler(origin_type, xmlns, handler) - if not (origin_type and handler and xmlns) then return false; end +local function _add_iq_handler(module, origin_type, xmlns, handler) handlers[origin_type] = handlers[origin_type] or {}; handlers[origin_type].iq = handlers[origin_type].iq or {}; if not handlers[origin_type].iq[xmlns] then handlers[origin_type].iq[xmlns]= handler; - handler_info[handler] = getfenv(2).module; - log("debug", "mod_%s now handles tag 'iq' with query namespace '%s'", getfenv(2).module.name, xmlns); + handler_info[handler] = module; + log("debug", "mod_%s now handles tag 'iq' with query namespace '%s'", module.name, xmlns); else - log("warning", "mod_%s wants to handle tag 'iq' with query namespace '%s' but mod_%s already handles that", getfenv(2).module.name, xmlns, handler_info[handlers[origin_type].iq[xmlns]].module.name); + log("warning", "mod_%s wants to handle tag 'iq' with query namespace '%s' but mod_%s already handles that", module.name, xmlns, handler_info[handlers[origin_type].iq[xmlns]].module.name); + end +end + +function modulehelpers.add_iq_handler(origin_type, xmlns, handler) + if not (origin_type and handler and xmlns) then return false; end + if type(origin_type) == "table" then + for _, origin_type in ipairs(origin_type) do + _add_iq_handler(getfenv(2).module, origin_type, xmlns, handler); + end + return; end + _add_iq_handler(getfenv(2).module, origin_type, xmlns, handler); end local function _add_handler(module, origin_type, tag, xmlns, handler) diff --git a/plugins/mod_vcard.lua b/plugins/mod_vcard.lua index 78d35fda..67c8309a 100644 --- a/plugins/mod_vcard.lua +++ b/plugins/mod_vcard.lua @@ -9,7 +9,7 @@ local t_concat, t_insert = table.concat, table.insert; require "util.jid" local jid_split = jid.split; -add_iq_handler("c2s", "vcard-temp", +add_iq_handler({"c2s", "s2sin"}, "vcard-temp", function (session, stanza) if stanza.tags[1].name == "vCard" then local to = stanza.attr.to; diff --git a/util/hashes.lua b/util/hashes.lua index 8273fcf9..5ed9d3ac 100644 --- a/util/hashes.lua +++ b/util/hashes.lua @@ -23,6 +23,8 @@ if md5 then else error("md5 library found, but unrecognised... no hash functions will be available", 0); end +else + error("No md5 library found. Install md5 using luarocks, for example", 0); end return _M; |