Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Update kick_session to work with ejabberd master

This commit is contained in:
Badlop 2014-05-07 18:44:48 +02:00
parent 3eebf100f9
commit 46b33b51b4
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod_admin_extra.erl
View File

@ -778,14 +778,11 @@ set_password_auth(User, Server, Password) ->
ok = ejabberd_auth:set_password(User, Server, Password). ok = ejabberd_auth:set_password(User, Server, Password).
prepare_reason([]) -> prepare_reason([]) ->
"Kicked by administrator"; <<"Kicked by administrator">>;
prepare_reason([Reason]) -> prepare_reason([Reason]) ->
Reason; Reason;
prepare_reason(Reason) when is_list(Reason) -> prepare_reason(Reason) when is_binary(Reason) ->
Reason; Reason.
prepare_reason(StringList) ->
string:join(StringList, "_").
%%% %%%
%%% Sessions %%% Sessions
@ -811,7 +808,7 @@ kick_this_session(User, Server, Resource, Reason) ->
ejabberd_router:route( ejabberd_router:route(
jlib:make_jid(<<>>, <<>>, <<>>), jlib:make_jid(<<>>, <<>>, <<>>),
jlib:make_jid(User, Server, Resource), jlib:make_jid(User, Server, Resource),
{xmlel, <<"broadcast">>, [], [{exit, Reason}]}). {broadcast, {exit, Reason}}).
status_num(Host, Status) -> status_num(Host, Status) ->