diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_c2s.erl | 4 | ||||
| -rw-r--r-- | src/ejabberd_sm.erl | 8 | ||||
| -rw-r--r-- | src/mod_muc_log.erl | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 9ce66d043..85a696c7f 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -1364,7 +1364,7 @@ handle_info(replaced, StateName, StateData) -> Lang = StateData#state.lang, Xmlelement = ?SERRT_CONFLICT(Lang, <<"Replaced by new connection">>), handle_info({kick, replaced, Xmlelement}, StateName, StateData); -handle_info(disconnect, StateName, StateData) -> +handle_info(kick, StateName, StateData) -> Lang = StateData#state.lang, Xmlelement = ?SERRT_POLICY_VIOLATION(Lang, <<"has been kicked">>), handle_info({kick, kicked_by_admin, Xmlelement}, StateName, StateData); @@ -1663,7 +1663,7 @@ handle_info({route, From, To, jlib:replace_from_to_attrs(jlib:jid_to_string(From), jlib:jid_to_string(To), NewAttrs), FixedPacket = #xmlel{name = Name, attrs = Attrs2, children = Els}, - SentStateData = send_stanza(StateData, FixedPacket), + SentStateData = send_stanza(NewState, FixedPacket), ejabberd_hooks:run(user_receive_packet, SentStateData#state.server, [SentStateData#state.jid, From, To, FixedPacket]), diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl index 72aeda952..3e37f4692 100644 --- a/src/ejabberd_sm.erl +++ b/src/ejabberd_sm.erl @@ -54,7 +54,7 @@ connected_users/0, connected_users_number/0, user_resources/2, - disconnect_user/2, + kick_user/2, get_session_pid/3, get_user_info/3, get_user_ip/3, @@ -822,10 +822,10 @@ commands() -> module = ?MODULE, function = user_resources, args = [{user, binary}, {host, binary}], result = {resources, {list, {resource, string}}}}, - #ejabberd_commands{name = disconnect_user, + #ejabberd_commands{name = kick_user, tags = [session], desc = "Disconnect user's active sessions", - module = ?MODULE, function = disconnect_user, + module = ?MODULE, function = kick_user, args = [{user, binary}, {host, binary}], result = {num_resources, integer}}]. @@ -844,7 +844,7 @@ user_resources(User, Server) -> Resources = get_user_resources(User, Server), lists:sort(Resources). -disconnect_user(User, Server) -> +kick_user(User, Server) -> Resources = get_user_resources(User, Server), lists:foreach( fun(Resource) -> diff --git a/src/mod_muc_log.erl b/src/mod_muc_log.erl index fbb08f3ae..ac6bea4fa 100644 --- a/src/mod_muc_log.erl +++ b/src/mod_muc_log.erl @@ -785,7 +785,7 @@ fw(F, S, O, FileFormat) -> S1y = ejabberd_regexp:greplace(S1x, ?PLAINTEXT_IN, <<"<">>), ejabberd_regexp:greplace(S1y, ?PLAINTEXT_OUT, <<">">>) end, - io:format(F, S2, []). + file:write(F, S2). put_header(_, _, _, _, _, _, _, _, _, plaintext) -> ok; put_header(F, Room, Date, CSSFile, Lang, Hour_offset, @@ -1022,7 +1022,9 @@ htmlize2(S1, NoFollow) -> <<"\\ \\ ">>), S7 = ejabberd_regexp:greplace(S6, <<"\\t">>, <<"\\ \\ \\ \\ ">>), - ejabberd_regexp:greplace(S7, <<226, 128, 174>>, + S8 = ejabberd_regexp:greplace(S7, <<"~">>, + <<"~~">>), + ejabberd_regexp:greplace(S8, <<226, 128, 174>>, <<"[RLO]">>). link_regexp(false) -> <<"<a href=\"&\">&</a>">>; @@ -1246,5 +1248,6 @@ calc_hour_offset(TimeHere) -> 3600, TimeHereHour - TimeZeroHour. +fjoin([]) -> <<"/">>; fjoin(FileList) -> list_to_binary(filename:join([binary_to_list(File) || File <- FileList])). |