Merge 0.6->0.7

[prosody.git] / core / configmanager.lua

diff --git a/core/configmanager.lua b/core/configmanager.lua
index b7ee605fcdb5bfb1cb6328eab5c7aa51b592b7aa..e7677df67e63ff2a4a48b2362cfecf3b14fc02c6 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,8 +9,9 @@
 
 
 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";
 
@@ -67,8 +68,8 @@ function load(filename, format)
 
        if parsers[format] and parsers[format].load then
                local f, err = io.open(filename);
-               if f then 
-                       local ok, err = parsers[format].load(f:read("*a"));
+               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 });
@@ -94,12 +95,21 @@ 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;
        local setfenv, rawget, tostring = _G.setfenv, _G.rawget, _G.tostring;
        parsers.lua = {};
-       function parsers.lua.load(data)
+       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,
@@ -115,6 +125,10 @@ do
                
                rawset(env, "__currenthost", "*") -- Default is global
                function env.Host(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);
@@ -122,6 +136,10 @@ do
                env.host = env.Host;
                
                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);
@@ -139,7 +157,7 @@ do
                        local f, err = io.open(file);
                        if f then
                                local data = f:read("*a");
-                               local ok, err = parsers.lua.load(data);
+                               local ok, err = parsers.lua.load(data, file);
                                if not ok then error(err:gsub("%[string.-%]", file), 0); end
                        end
                        if not f then error("Error loading included "..file..": "..err, 0); end
@@ -147,7 +165,7 @@ do
                end
                env.include = env.Include;
                
-               local chunk, err = loadstring(data);
+               local chunk, err = loadstring(data, "@"..filename);
                
                if not chunk then
                        return nil, err;