eventmanager: REMOVE!!!

[prosody.git] / core / configmanager.lua

diff --git a/core/configmanager.lua b/core/configmanager.lua
index 1fbe83b8258aa127cd3afed0f22ae5f8dea220fb..6b181443edf151133d4770bbde291210335d378f 100644 (file)
--- a/core/configmanager.lua
+++ b/core/configmanager.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.
@@ -9,10 +9,11 @@
 
 
 local _G = _G;
-local  setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type = 
-               setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type;
+local  setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table, format =
+               setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table, string.format;
 
-local eventmanager = require "core.eventmanager";
+
+local fire_event = prosody and prosody.events.fire_event or function () end;
 
 module "configmanager"
 
@@ -29,10 +30,11 @@ local host_mt = { __index = global_config };
 -- When key not found in section, check key in global's section
 function section_mt(section_name)
        return { __index =      function (t, k)
-                                                                       local section = rawget(global_config, section_name);
-                                                                       if not section then return nil; end
-                                                                       return section[k];
-                                                       end };
+                                       local section = rawget(global_config, section_name);
+                                       if not section then return nil; end
+                                       return section[k];
+                               end
+       };
 end
 
 function getconfig()
@@ -67,11 +69,11 @@ function load(filename, format)
 
        if parsers[format] and parsers[format].load then
                local f, err = io.open(filename);
-               if f then 
+               if f then
                        local ok, err = parsers[format].load(f:read("*a"), filename);
                        f:close();
                        if ok then
-                               eventmanager.fire_event("config-reloaded", { filename = filename, format = format });
+                               fire_event("config-reloaded", { filename = filename, format = format });
                        end
                        return ok, "parser", err;
                end
@@ -94,6 +96,15 @@ function addparser(format, parser)
        end
 end
 
+-- _M needed to avoid name clash with local 'parsers'
+function _M.parsers()
+       local p = {};
+       for format in pairs(parsers) do
+               table.insert(p, format);
+       end
+       return p;
+end
+
 -- Built-in Lua parser
 do
        local loadstring, pcall, setmetatable = _G.loadstring, _G.pcall, _G.setmetatable;
@@ -102,26 +113,38 @@ do
        function parsers.lua.load(data, filename)
                local env;
                -- The ' = true' are needed so as not to set off __newindex when we assign the functions below
-               env = setmetatable({ Host = true; host = true; Component = true, component = true,
-                                                       Include = true, include = true, RunScript = dofile }, { __index = function (t, k)
-                                                                                               return rawget(_G, k) or
-                                                                                                               function (settings_table)
-                                                                                                                       config[__currenthost or "*"][k] = settings_table;
-                                                                                                               end;
-                                                                               end,
-                                                               __newindex = function (t, k, v)
-                                                                                       set(env.__currenthost or "*", "core", k, v);
-                                                                               end});
+               env = setmetatable({
+                       Host = true, host = true, VirtualHost = true,
+                       Component = true, component = true,
+                       Include = true, include = true, RunScript = dofile }, {
+                               __index = function (t, k)
+                                       return rawget(_G, k) or
+                                               function (settings_table)
+                                                       config[__currenthost or "*"][k] = settings_table;
+                                               end;
+                               end,
+                               __newindex = function (t, k, v)
+                                       set(env.__currenthost or "*", "core", k, v);
+                               end
+               });
                
                rawset(env, "__currenthost", "*") -- Default is global
-               function env.Host(name)
+               function env.VirtualHost(name)
+                       if rawget(config, name) and rawget(config[name].core, "component_module") then
+                               error(format("Host %q clashes with previously defined %s Component %q, for services use a sub-domain like conference.%s",
+                                       name, config[name].core.component_module:gsub("^%a+$", { component = "external", muc = "MUC"}), name, name), 0);
+                       end
                        rawset(env, "__currenthost", name);
                        -- Needs at least one setting to logically exist :)
                        set(name or "*", "core", "defined", true);
                end
-               env.host = env.Host;
+               env.Host, env.host = env.VirtualHost, env.VirtualHost;
                
                function env.Component(name)
+                       if rawget(config, name) and rawget(config[name].core, "defined") and not rawget(config[name].core, "component_module") then
+                               error(format("Component %q clashes with previously defined Host %q, for services use a sub-domain like conference.%s",
+                                       name, name, name), 0);
+                       end
                        set(name, "core", "component_module", "component");
                        -- Don't load the global modules by default
                        set(name, "core", "load_global_modules", false);