]> granicus.if.org Git - ejabberd/commitdiff
Update kick_session to work with ejabberd master
authorBadlop <badlop@process-one.net>
Wed, 7 May 2014 16:44:48 +0000 (18:44 +0200)
committerBadlop <badlop@process-one.net>
Thu, 26 Mar 2015 13:00:28 +0000 (14:00 +0100)
src/mod_admin_extra.erl

index 543a14af01d01486ea7ba3e2687a22a1d3b378de..71222badc5579037d11dfe5a68dcfbd08b2f7f45 100644 (file)
@@ -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) ->