diff options
| author | Badlop <badlop@process-one.net> | 2014-05-07 18:44:48 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2015-03-26 14:00:28 +0100 |
| commit | 46b33b51b45413ab3735e8415cfbe2e7550d0ff5 (patch) | |
| tree | 610f95bec600c18ab7017e97855a861884bb58dc /src | |
| parent | Binary conversions (diff) | |
Update kick_session to work with ejabberd master
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_admin_extra.erl | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl index 543a14af0..71222badc 100644 --- a/src/mod_admin_extra.erl +++ b/src/mod_admin_extra.erl @@ -778,14 +778,11 @@ set_password_auth(User, Server, Password) -> ok = ejabberd_auth:set_password(User, Server, Password). prepare_reason([]) -> - "Kicked by administrator"; + <<"Kicked by administrator">>; prepare_reason([Reason]) -> Reason; -prepare_reason(Reason) when is_list(Reason) -> - Reason; -prepare_reason(StringList) -> - string:join(StringList, "_"). - +prepare_reason(Reason) when is_binary(Reason) -> + Reason. %%% %%% Sessions @@ -811,7 +808,7 @@ kick_this_session(User, Server, Resource, Reason) -> ejabberd_router:route( jlib:make_jid(<<>>, <<>>, <<>>), jlib:make_jid(User, Server, Resource), - {xmlel, <<"broadcast">>, [], [{exit, Reason}]}). + {broadcast, {exit, Reason}}). status_num(Host, Status) -> |