Software /
code /
prosody
Diff
core/usermanager.lua @ 5377:898454038524
core.*: Complete removal of all traces of the "core" section and section-related code.
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Sat, 23 Mar 2013 02:33:15 +0100 |
parent | 5157:0e1686f334b8 |
child | 5776:bd0ff8ae98a8 |
line wrap: on
line diff
--- a/core/usermanager.lua Sat Mar 23 02:24:11 2013 +0100 +++ b/core/usermanager.lua Sat Mar 23 02:33:15 2013 +0100 @@ -42,8 +42,8 @@ host_session.events.add_handler("item-added/auth-provider", function (event) local provider = event.item; - local auth_provider = config.get(host, "core", "authentication") or default_provider; - if config.get(host, "core", "anonymous_login") then + local auth_provider = config.get(host, "authentication") or default_provider; + if config.get(host, "anonymous_login") then log("error", "Deprecated config option 'anonymous_login'. Use authentication = 'anonymous' instead."); auth_provider = "anonymous"; end -- COMPAT 0.7 @@ -61,8 +61,8 @@ end end); host_session.users = new_null_provider(); -- Start with the default usermanager provider - local auth_provider = config.get(host, "core", "authentication") or default_provider; - if config.get(host, "core", "anonymous_login") then auth_provider = "anonymous"; end -- COMPAT 0.7 + local auth_provider = config.get(host, "authentication") or default_provider; + if config.get(host, "anonymous_login") then auth_provider = "anonymous"; end -- COMPAT 0.7 if auth_provider ~= "null" then modulemanager.load(host, "auth_"..auth_provider); end @@ -116,8 +116,8 @@ jid = jid_bare(jid); host = host or "*"; - local host_admins = config.get(host, "core", "admins"); - local global_admins = config.get("*", "core", "admins"); + local host_admins = config.get(host, "admins"); + local global_admins = config.get("*", "admins"); if host_admins and host_admins ~= global_admins then if type(host_admins) == "table" then