summaryrefslogtreecommitdiff
path: root/src/mod_configure.erl
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2014-03-26 16:01:37 +0100
committerBadlop <badlop@process-one.net>2014-03-26 16:01:37 +0100
commitac0e199d368c9cbe308c3e64cc925b03e42f3806 (patch)
treede8cbc54cc2c623278848aa19177b3d5f966f7ac /src/mod_configure.erl
parentFix service_info options processing (diff)
Provide meaningful text to user when admin kicks session (EJAB-1455)
Diffstat (limited to '')
-rw-r--r--src/mod_configure.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mod_configure.erl b/src/mod_configure.erl
index c8a8ebdd..d9c825b5 100644
--- a/src/mod_configure.erl
+++ b/src/mod_configure.erl
@@ -1846,13 +1846,14 @@ set_form(From, Host, ?NS_ADMINL(<<"delete-user">>),
|| {User, Server} <- ASL2],
{result, []};
set_form(From, Host, ?NS_ADMINL(<<"end-user-session">>),
- _Lang, XData) ->
+ Lang, XData) ->
AccountString = get_value(<<"accountjid">>, XData),
JID = jlib:string_to_jid(AccountString),
LUser = JID#jid.luser,
LServer = JID#jid.lserver,
true = LServer == Host orelse
get_permission_level(From) == global,
+ Xmlelement = ?SERRT_POLICY_VIOLATION(Lang, <<"has been kicked">>),
case JID#jid.lresource of
<<>> ->
SIDs = mnesia:dirty_select(session,
@@ -1860,14 +1861,14 @@ set_form(From, Host, ?NS_ADMINL(<<"end-user-session">>),
usr = {LUser, LServer, '_'},
_ = '_'},
[], ['$1']}]),
- [Pid ! replaced || {_, Pid} <- SIDs];
+ [Pid ! {kick, kicked_by_admin, Xmlelement} || {_, Pid} <- SIDs];
R ->
[{_, Pid}] = mnesia:dirty_select(session,
[{#session{sid = '$1',
usr = {LUser, LServer, R},
_ = '_'},
[], ['$1']}]),
- Pid ! replaced
+ Pid ! {kick, kicked_by_admin, Xmlelement}
end,
{result, []};
set_form(From, Host,