diff options
Diffstat (limited to 'src/mod_carboncopy.erl')
| -rw-r--r-- | src/mod_carboncopy.erl | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl index 72c098570..634d02be9 100644 --- a/src/mod_carboncopy.erl +++ b/src/mod_carboncopy.erl @@ -36,7 +36,7 @@ -export([user_send_packet/1, user_receive_packet/1, iq_handler/1, disco_features/5, - is_carbon_copy/1, mod_opt_type/1, depends/2, + is_carbon_copy/1, depends/2, mod_options/1]). -export([c2s_copy_session/2, c2s_session_opened/1, c2s_session_resumed/1]). %% For debugging purposes @@ -44,6 +44,7 @@ -include("logger.hrl"). -include("xmpp.hrl"). +-include("translate.hrl"). -type direction() :: sent | received. -type c2s_state() :: ejabberd_c2s:state(). @@ -102,14 +103,14 @@ iq_handler(#iq{type = set, lang = Lang, from = From, ok -> xmpp:make_iq_result(IQ); {error, _} -> - Txt = <<"Database failure">>, + Txt = ?T("Database failure"), xmpp:make_error(IQ, xmpp:err_internal_server_error(Txt, Lang)) end; iq_handler(#iq{type = set, lang = Lang} = IQ) -> - Txt = <<"Only <enable/> or <disable/> tags are allowed">>, + Txt = ?T("Only <enable/> or <disable/> tags are allowed"), xmpp:make_error(IQ, xmpp:err_bad_request(Txt, Lang)); iq_handler(#iq{type = get, lang = Lang} = IQ)-> - Txt = <<"Value 'get' of 'type' attribute is not allowed">>, + Txt = ?T("Value 'get' of 'type' attribute is not allowed"), xmpp:make_error(IQ, xmpp:err_not_allowed(Txt, Lang)). -spec user_send_packet({stanza(), ejabberd_c2s:state()}) @@ -219,15 +220,14 @@ send_copies(JID, To, Packet, Direction)-> %TargetJIDs = lists:delete(JID, [ jid:make({U, S, CCRes}) || CCRes <- list(U, S) ]), end, - lists:map(fun({Dest, _Version}) -> - {_, _, Resource} = jid:tolower(Dest), - ?DEBUG("Sending: ~p =/= ~p", [R, Resource]), - Sender = jid:make({U, S, <<>>}), - %{xmlelement, N, A, C} = Packet, - New = build_forward_packet(JID, Packet, Sender, Dest, Direction), - ejabberd_router:route(xmpp:set_from_to(New, Sender, Dest)) - end, TargetJIDs), - ok. + lists:foreach( + fun({Dest, _Version}) -> + {_, _, Resource} = jid:tolower(Dest), + ?DEBUG("Sending: ~p =/= ~p", [R, Resource]), + Sender = jid:make({U, S, <<>>}), + New = build_forward_packet(JID, Packet, Sender, Dest, Direction), + ejabberd_router:route(xmpp:set_from_to(New, Sender, Dest)) + end, TargetJIDs). -spec build_forward_packet(jid(), message(), jid(), jid(), direction()) -> message(). build_forward_packet(JID, #message{type = T} = Msg, Sender, Dest, Direction) -> @@ -299,19 +299,5 @@ list(User, Server) -> depends(_Host, _Opts) -> []. -mod_opt_type(O) when O == cache_size; O == cache_life_time; - O == use_cache; O == cache_missed; - O == ram_db_type -> - fun(deprecated) -> deprecated; - (_) -> - ?WARNING_MSG("Option ~s of ~s has no effect anymore " - "and will be ingored", [O, ?MODULE]), - deprecated - end. - mod_options(_) -> - [{ram_db_type, deprecated}, - {use_cache, deprecated}, - {cache_size, deprecated}, - {cache_missed, deprecated}, - {cache_life_time, deprecated}]. + []. |