util.datetime: Added implementation for function parse().

[prosody.git] / core / modulemanager.lua

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 6440f8b82e389a3f701708b87cbec9ac52ccfa47..8e62aecb8231ee8e6e50b8f2a071b4197b44b33d 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,14 +13,13 @@ 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";
 
 local hosts = hosts;
 local prosody = prosody;
 
-local loadfile, pcall = loadfile, pcall;
+local loadfile, pcall, xpcall = loadfile, pcall, xpcall;
 local setmetatable, setfenv, getfenv = setmetatable, setfenv, getfenv;
 local pairs, ipairs = pairs, ipairs;
 local t_insert, t_concat = table.insert, table.concat;
@@ -30,6 +29,14 @@ local rawget = rawget;
 local error = error;
 local tostring, tonumber = tostring, tonumber;
 
+local debug_traceback = debug.traceback;
+local unpack, select = unpack, select;
+pcall = function(f, ...)
+       local n = select("#", ...);
+       local params = {...};
+       return xpcall(function() f(unpack(params, 1, n)) end, function(e) return tostring(e).."\n"..debug_traceback(); end);
+end
+
 local array, set = require "util.array", require "util.set";
 
 local autoload_modules = {"presence", "message", "iq"};
@@ -128,6 +135,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,7 +166,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[host].events.fire_event("module-loaded", { module = module_name, host = host });
+               (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);
@@ -175,7 +183,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
@@ -200,8 +208,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].events.fire_event("module-unloaded", { module = name, host = host });
+       (hosts[host] or prosody).events.fire_event("module-unloaded", { module = name, host = host });
        return true;
 end
 
@@ -265,7 +282,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"));
@@ -282,7 +299,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
@@ -291,7 +308,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()
@@ -389,7 +406,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
 
@@ -404,8 +421,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);
@@ -523,19 +540,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;