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

Rename disconnect_user/2 command 

The mod_admin_extra module provides a kick_session/4 command.  Rename
the disconnect_user/2 command to kick_user/2 for consistency.
This commit is contained in:
Holger Weiss 2014-05-12 12:44:40 +02:00
parent 5d22159e9a
commit 9121ca14de
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ejabberd_c2s.erl
View File

@ -1364,7 +1364,7 @@ handle_info(replaced, StateName, StateData) ->
Lang = StateData#state.lang, Lang = StateData#state.lang,
Xmlelement = ?SERRT_CONFLICT(Lang, <<"Replaced by new connection">>), Xmlelement = ?SERRT_CONFLICT(Lang, <<"Replaced by new connection">>),
handle_info({kick, replaced, Xmlelement}, StateName, StateData); handle_info({kick, replaced, Xmlelement}, StateName, StateData);
handle_info(disconnect, StateName, StateData) -> handle_info(kick, StateName, StateData) ->
Lang = StateData#state.lang, Lang = StateData#state.lang,
Xmlelement = ?SERRT_POLICY_VIOLATION(Lang, <<"has been kicked">>), Xmlelement = ?SERRT_POLICY_VIOLATION(Lang, <<"has been kicked">>),
handle_info({kick, kicked_by_admin, Xmlelement}, StateName, StateData); handle_info({kick, kicked_by_admin, Xmlelement}, StateName, StateData);

8
src/ejabberd_sm.erl
View File

@ -54,7 +54,7 @@
connected_users/0, connected_users/0,
connected_users_number/0, connected_users_number/0,
user_resources/2, user_resources/2,
disconnect_user/2, kick_user/2,
get_session_pid/3, get_session_pid/3,
get_user_info/3, get_user_info/3,
get_user_ip/3, get_user_ip/3,
@ -822,10 +822,10 @@ commands() ->
module = ?MODULE, function = user_resources, module = ?MODULE, function = user_resources,
args = [{user, binary}, {host, binary}], args = [{user, binary}, {host, binary}],
result = {resources, {list, {resource, string}}}}, result = {resources, {list, {resource, string}}}},
#ejabberd_commands{name = disconnect_user, #ejabberd_commands{name = kick_user,
tags = [session], tags = [session],
desc = "Disconnect user's active sessions", desc = "Disconnect user's active sessions",
module = ?MODULE, function = disconnect_user, module = ?MODULE, function = kick_user,
args = [{user, binary}, {host, binary}], args = [{user, binary}, {host, binary}],
result = {num_resources, integer}}]. result = {num_resources, integer}}].
@ -844,7 +844,7 @@ user_resources(User, Server) ->
Resources = get_user_resources(User, Server), Resources = get_user_resources(User, Server),
lists:sort(Resources). lists:sort(Resources).
disconnect_user(User, Server) -> kick_user(User, Server) ->
Resources = get_user_resources(User, Server), Resources = get_user_resources(User, Server),
lists:foreach( lists:foreach(
fun(Resource) -> fun(Resource) ->