Merge 0.7->trunk

[prosody.git] / core / modulemanager.lua

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index d1f7d413cad3866201419766080e710aaef535ba..5e9eaeddf7231ce942908a20a6de8ae4553e4bdd 100644 (file)
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- 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.
@@ -13,7 +13,6 @@ local log = logger.init("modulemanager");
 local eventmanager = require "core.eventmanager";
 local config = require "core.configmanager";
 local multitable_new = require "util.multitable".new;
-local register_actions = require "core.actions".register;
 local st = require "util.stanza";
 local pluginloader = require "util.pluginloader";
 
@@ -128,6 +127,7 @@ function load(host, module_name, config)
        local api_instance = setmetatable({ name = module_name, host = host, config = config,  _log = _log, log = function (self, ...) return _log(...); end }, { __index = api });
 
        local pluginenv = setmetatable({ module = api_instance }, { __index = _G });
+       api_instance.environment = pluginenv;
        
        setfenv(mod, pluginenv);
        if not hosts[host] then
@@ -158,6 +158,7 @@ function load(host, module_name, config)
                log("error", "Error initializing module '%s' on '%s': %s", module_name, host, err or "nil");
        end
        if success then
+               (hosts[api_instance.host] or prosody).events.fire_event("module-loaded", { module = module_name, host = host });
                return true;
        else -- load failed, unloading
                unload(api_instance.host, module_name);
@@ -174,7 +175,7 @@ function is_loaded(host, name)
 end
 
 function unload(host, name, ...)
-       local mod = get_module(host, name); 
+       local mod = get_module(host, name);
        if not mod then return nil, "module-not-loaded"; end
        
        if module_has_method(mod, "unload") then
@@ -199,7 +200,17 @@ function unload(host, name, ...)
                end
        end
        hooks:remove(host, name);
+       if mod.module.items then -- remove items
+               for key,t in pairs(mod.module.items) do
+                       for i = #t,1,-1 do
+                               local value = t[i];
+                               t[i] = nil;
+                               hosts[host].events.fire_event("item-removed/"..key, {source = self, item = value});
+                       end
+               end
+       end
        modulemap[host][name] = nil;
+       (hosts[host] or prosody).events.fire_event("module-unloaded", { module = name, host = host });
        return true;
 end
 
@@ -263,7 +274,7 @@ function handle_stanza(host, origin, stanza)
                (handlers[1])(origin, stanza);
                return true;
        else
-               if stanza.attr.xmlns == "jabber:client" then
+               if stanza.attr.xmlns == nil then
                        log("debug", "Unhandled %s stanza: %s; xmlns=%s", origin.type, stanza.name, xmlns); -- we didn't handle it
                        if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
                                origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
@@ -280,7 +291,7 @@ function module_has_method(module, method)
 end
 
 function call_module_method(module, method, ...)
-       if module_has_method(module, method) then       
+       if module_has_method(module, method) then
                local f = module.module[method];
                return pcall(f, ...);
        else
@@ -289,7 +300,7 @@ function call_module_method(module, method, ...)
 end
 
 ----- API functions exposed to modules -----------
--- Must all be in api.* 
+-- Must all be in api.*
 
 -- Returns the name of the current module
 function api:get_name()
@@ -387,7 +398,7 @@ function api:require(lib)
                f, n = pluginloader.load_code(lib, lib..".lib.lua");
        end
        if not f then error("Failed to load plugin library '"..lib.."', error: "..n); end -- FIXME better error message
-       setfenv(f, setmetatable({ module = self }, { __index = _G }));
+       setfenv(f, self.environment);
        return f();
 end
 
@@ -402,8 +413,8 @@ function api:get_option(name, default_value)
        return value;
 end
 
-function api:get_option_string(...)
-       local value = self:get_option(...);
+function api:get_option_string(name, default_value)
+       local value = self:get_option(name, default_value);
        if type(value) == "table" then
                if #value > 1 then
                        self:log("error", "Config option '%s' does not take a list, using just the first item", name);
@@ -521,19 +532,4 @@ function api:get_host_items(key)
        return result;
 end
 
---------------------------------------------------------------------
-
-local actions = {};
-
-function actions.load(params)
-       --return true, "Module loaded ("..params.module.." on "..params.host..")";
-       return load(params.host, params.module);
-end
-
-function actions.unload(params)
-       return unload(params.host, params.module);
-end
-
-register_actions("/modules", actions);
-
 return _M;