X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fusermanager.lua;h=4ac288a479deeba93cdf7a2fcd3989168d7b00ef;hb=c05bf279c97accb6fc719d7490e5519f073d08d9;hp=efc15b7ce60c209455d340866002ddff29ab59ba;hpb=57176ca6d5b7a8813959816d7c3125f7b94b1cc4;p=prosody.git

diff --git a/core/usermanager.lua b/core/usermanager.lua
index efc15b7c..4ac288a4 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -10,7 +10,6 @@ local modulemanager = require "core.modulemanager";
 local log = require "util.logger".init("usermanager");
 local type = type;
 local ipairs = ipairs;
-local pairs = pairs;
 local jid_bare = require "util.jid".bare;
 local jid_prep = require "util.jid".prep;
 local config = require "core.configmanager";
@@ -39,11 +38,11 @@ local provider_mt = { __index = new_null_provider() };
 function initialize_host(host)
 	local host_session = hosts[host];
 	if host_session.type ~= "local" then return; end
-	
+
 	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 +60,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
@@ -90,15 +89,14 @@ function create_user(username, password, host)
 end
 
 function delete_user(username, host)
-	local user = hosts[host].sessions[username];
-	if user and user.sessions then
-		for jid, session in pairs(user.sessions) do
-			session:close{ condition = "not-authorized", text = "Account deleted" };
-		end
-	end
 	local ok, err = hosts[host].users.delete_user(username);
 	if not ok then return nil, err; end
-	return storagemanager.get_driver(host):purge(username);
+	prosody.events.fire_event("user-deleted", { username = username, host = host });
+	return storagemanager.purge(username, host);
+end
+
+function users(host)
+	return hosts[host].users.users();
 end
 
 function get_sasl_handler(host, session)
@@ -116,10 +114,10 @@ function is_admin(jid, host)
 	local is_admin;
 	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
 			for _,admin in ipairs(host_admins) do
@@ -132,7 +130,7 @@ function is_admin(jid, host)
 			log("error", "Option 'admins' for host '%s' is not a list", host);
 		end
 	end
-	
+
 	if not is_admin and global_admins then
 		if type(global_admins) == "table" then
 			for _,admin in ipairs(global_admins) do
@@ -145,7 +143,7 @@ function is_admin(jid, host)
 			log("error", "Global option 'admins' is not a list");
 		end
 	end
-	
+
 	-- Still not an admin, check with auth provider
 	if not is_admin and host ~= "*" and hosts[host].users and hosts[host].users.is_admin then
 		is_admin = hosts[host].users.is_admin(jid);