mod_http: Use hostname from the correct context (thanks gryffus)

[prosody.git] / core / usermanager.lua

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 2ca0aef16a5057aa746f19d65b50aad48eed8e8d..08343bee3c580233e45ab4ccb4eb87fd61f3e577 100644 (file)
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -42,8 +42,8 @@ function initialize_host(host)
        
        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 @@ function initialize_host(host)
                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
@@ -93,7 +93,11 @@ function delete_user(username, host)
        local ok, err = hosts[host].users.delete_user(username);
        if not ok then return nil, err; end
        prosody.events.fire_event("user-deleted", { username = username, host = host });
-       return storagemanager.get_driver(host):purge(username);
+       return storagemanager.purge(username, host);
+end
+
+function users(host)
+       return hosts[host].users.users();
 end
 
 function get_sasl_handler(host, session)
@@ -112,8 +116,8 @@ function is_admin(jid, host)
        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