# HG changeset patch # User Matthew Wild # Date 1301404200 -3600 # Node ID 23b68616b6d826f2ea3fda95c3cab7bfb66338f3 # Parent f15b4e9ba68842c8976afe78a2a9d9b709c5c76c sessionmanager: Fire pre-resource-unbind to allow plugins (such as mod_smacks) to hook and prevent/override session destruction diff -r f15b4e9ba688 -r 23b68616b6d8 core/sessionmanager.lua --- a/core/sessionmanager.lua Mon Mar 21 19:39:04 2011 +0000 +++ b/core/sessionmanager.lua Tue Mar 29 14:10:00 2011 +0100 @@ -108,16 +108,23 @@ -- Remove session/resource from user's session list if session.full_jid then - hosts[session.host].sessions[session.username].sessions[session.resource] = nil; + local host_session = hosts[session.host]; + + -- Allow plugins to prevent session destruction + if host_session.events.fire_event("pre-resource-unbind", {session=session, error=err}) then + return; + end + + host_session.sessions[session.username].sessions[session.resource] = nil; full_sessions[session.full_jid] = nil; - if not next(hosts[session.host].sessions[session.username].sessions) then + if not next(host_session.sessions[session.username].sessions) then log("debug", "All resources of %s are now offline", session.username); - hosts[session.host].sessions[session.username] = nil; + host_session.sessions[session.username] = nil; bare_sessions[session.username..'@'..session.host] = nil; end - hosts[session.host].events.fire_event("resource-unbind", {session=session, error=err}); + host_session.events.fire_event("resource-unbind", {session=session, error=err}); end retire_session(session);