util.pposix: Compatibility with Solaris systems (thanks Filip)

[prosody.git] / core / modulemanager.lua

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index ff31271b3fb4dfc2473ea86c4a1706a1640155da..6bc8e28565ba3a2fcad9ff0013199070ef2a9f17 100644 (file)
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -6,13 +6,10 @@
 -- COPYING file in the source package for more information.
 --
 
-
-
 local plugin_dir = CFG_PLUGINDIR or "./plugins/";
 
 local logger = require "util.logger";
 local log = logger.init("modulemanager");
-local addDiscoInfoHandler = require "core.discomanager".addDiscoInfoHandler;
 local eventmanager = require "core.eventmanager";
 local config = require "core.configmanager";
 local multitable_new = require "util.multitable".new;
@@ -50,8 +47,6 @@ local handler_info = {};
 
 local modulehelpers = setmetatable({}, { __index = _G });
 
-local features_table = multitable_new();
-local identities_table = multitable_new();
 local handler_table = multitable_new();
 local hooked = multitable_new();
 local hooks = multitable_new();
@@ -171,8 +166,6 @@ function unload(host, name, ...)
                end
        end
        modulemap[host][name] = nil;
-       features_table:remove(host, name);
-       identities_table:remove(host, name);
        local params = handler_table:get(host, name); -- , {module.host, origin_type, tag, xmlns}
        for _, param in pairs(params or NULL) do
                local handlers = stanza_handlers:get(param[1], param[2], param[3], param[4]);
@@ -235,7 +228,7 @@ function reload(host, name, ...)
 end
 
 function handle_stanza(host, origin, stanza)
-       local name, xmlns, origin_type = stanza.name, stanza.attr.xmlns, origin.type;
+       local name, xmlns, origin_type = stanza.name, stanza.attr.xmlns or "jabber:client", origin.type;
        if name == "iq" and xmlns == "jabber:client" then
                if stanza.attr.type == "get" or stanza.attr.type == "set" then
                        xmlns = stanza.tags[1].attr.xmlns or "jabber:client";
@@ -328,52 +321,11 @@ function api:add_iq_handler(origin_type, xmlns, handler)
        self:add_handler(origin_type, "iq", xmlns, handler);
 end
 
-addDiscoInfoHandler("*host", function(reply, to, from, node)
-       if #node == 0 then
-               local done = {};
-               for module, identities in pairs(identities_table:get(to) or NULL) do -- for each module
-                       for identity, attr in pairs(identities) do
-                               if not done[identity] then
-                                       reply:tag("identity", attr):up(); -- TODO cache
-                                       done[identity] = true;
-                               end
-                       end
-               end
-               for module, identities in pairs(identities_table:get("*") or NULL) do -- for each module
-                       for identity, attr in pairs(identities) do
-                               if not done[identity] then
-                                       reply:tag("identity", attr):up(); -- TODO cache
-                                       done[identity] = true;
-                               end
-                       end
-               end
-               for module, features in pairs(features_table:get(to) or NULL) do -- for each module
-                       for feature in pairs(features) do
-                               if not done[feature] then
-                                       reply:tag("feature", {var = feature}):up(); -- TODO cache
-                                       done[feature] = true;
-                               end
-                       end
-               end
-               for module, features in pairs(features_table:get("*") or NULL) do -- for each module
-                       for feature in pairs(features) do
-                               if not done[feature] then
-                                       reply:tag("feature", {var = feature}):up(); -- TODO cache
-                                       done[feature] = true;
-                               end
-                       end
-               end
-               return next(done) ~= nil;
-       end
-end);
-
 function api:add_feature(xmlns)
        self:add_item("feature", xmlns);
-       features_table:set(self.host, self.name, xmlns, true);
 end
 function api:add_identity(category, type, name)
        self:add_item("identity", {category = category, type = type, name = name});
-       identities_table:set(self.host, self.name, category.."\0"..type, {category = category, type = type, name = name});
 end
 
 local event_hook = function(host, mod_name, event_name, ...)
@@ -443,6 +395,19 @@ function api:remove_item(key, value)
        end
 end
 
+function api:get_host_items(key)
+       local result = {};
+       for mod_name, module in pairs(modulemap[self.host]) do
+               module = module.module;
+               if module.items then
+                       for _, item in ipairs(module.items[key] or NULL) do
+                               t_insert(result, item);
+                       end
+               end
+       end
+       return result;
+end
+
 --------------------------------------------------------------------
 
 local actions = {};