diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2017-04-11 12:13:58 +0200 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2017-04-11 12:13:58 +0200 |
| commit | b1acd1183f1ce176a4703528d7d25b9dd3ee89f4 (patch) | |
| tree | 9339705c26123538d94ad1fc62011b02517e6e98 /src/prosody2ejabberd.erl | |
| parent | Use p1_utils 1.0.8 (diff) | |
Rename aux.erl as misc.erl17.04
Thanks Microsoft Windows to not support some filenames
Diffstat (limited to 'src/prosody2ejabberd.erl')
| -rw-r--r-- | src/prosody2ejabberd.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl index d4ee0fc3f..17bbc1d0a 100644 --- a/src/prosody2ejabberd.erl +++ b/src/prosody2ejabberd.erl @@ -113,9 +113,9 @@ maybe_get_scram_auth(Data) -> case proplists:get_value(<<"iteration_count">>, Data, no_ic) of IC when is_float(IC) -> %% A float like 4096.0 is read #scram{ - storedkey = aux:hex_to_base64(proplists:get_value(<<"stored_key">>, Data, <<"">>)), - serverkey = aux:hex_to_base64(proplists:get_value(<<"server_key">>, Data, <<"">>)), - salt = aux:hex_to_base64(proplists:get_value(<<"salt">>, Data, <<"">>)), + storedkey = misc:hex_to_base64(proplists:get_value(<<"stored_key">>, Data, <<"">>)), + serverkey = misc:hex_to_base64(proplists:get_value(<<"server_key">>, Data, <<"">>)), + salt = misc:hex_to_base64(proplists:get_value(<<"salt">>, Data, <<"">>)), iterationcount = round(IC) }; _ -> <<"">> @@ -247,7 +247,7 @@ convert_roster_item(LUser, LServer, JIDstring, LuaList) -> end, Val), R#roster{groups = Gs}; ({<<"subscription">>, Sub}, R) -> - R#roster{subscription = aux:binary_to_atom(Sub)}; + R#roster{subscription = misc:binary_to_atom(Sub)}; ({<<"ask">>, <<"subscribe">>}, R) -> R#roster{ask = out}; ({<<"name">>, Name}, R) -> @@ -263,7 +263,7 @@ convert_room_affiliations(Data) -> fun({J, Aff}) -> try jid:decode(J) of #jid{luser = U, lserver = S} -> - [{{U, S, <<>>}, aux:binary_to_atom(Aff)}] + [{{U, S, <<>>}, misc:binary_to_atom(Aff)}] catch _:{bad_jid, _} -> [] end @@ -301,7 +301,7 @@ convert_room_config(Data) -> convert_privacy_item({_, Item}) -> Action = proplists:get_value(<<"action">>, Item, <<"allow">>), Order = proplists:get_value(<<"order">>, Item, 0), - T = aux:binary_to_atom(proplists:get_value(<<"type">>, Item, <<"none">>)), + T = misc:binary_to_atom(proplists:get_value(<<"type">>, Item, <<"none">>)), V = proplists:get_value(<<"value">>, Item, <<"">>), MatchIQ = proplists:get_bool(<<"iq">>, Item), MatchMsg = proplists:get_bool(<<"message">>, Item), @@ -317,14 +317,14 @@ convert_privacy_item({_, Item}) -> none -> {T, none}; group -> {T, V}; jid -> {T, jid:tolower(jid:decode(V))}; - subscription -> {T, aux:binary_to_atom(V)} + subscription -> {T, misc:binary_to_atom(V)} end catch _:_ -> {none, none} end, #listitem{type = Type, value = Value, - action = aux:binary_to_atom(Action), + action = misc:binary_to_atom(Action), order = erlang:trunc(Order), match_all = MatchAll, match_iq = MatchIQ, |