caps_stream_features(Acc, MyHost) ->
case make_my_disco_hash(MyHost) of
- "" ->
+ <<"">> ->
Acc;
Hash ->
[#xmlel{name = c,
end, Features),
make_disco_hash(Identities ++ Info ++ Feats, sha1);
_Err ->
- ""
+ <<"">>
end.
-ifdef(HAVE_MD2).
Concat = [concat_identities(DiscoEls),
concat_features(DiscoEls),
concat_info(DiscoEls)],
- base64:encode_to_string(
+ base64:encode(
if Algo == md2 ->
sha:md2(Concat);
Algo == md5 ->
Concat = [concat_identities(DiscoEls),
concat_features(DiscoEls),
concat_info(DiscoEls)],
- base64:encode_to_string(
+ base64:encode(
if Algo == md5 ->
crypto:md5(Concat);
Algo == sha1 ->
webadmin_page(Acc, _, _) -> Acc.
user_queue(User, Server, Query, Lang) ->
+ ServerB = list_to_binary(Server),
US0 = {
exmpp_stringprep:nodeprep(list_to_binary(User)),
exmpp_stringprep:nameprep(list_to_binary(Server))
US0,
user_queue_parse_query(US0, Query),
lists:keysort(#offline_msg.timestamp,
- gen_storage:dirty_read(Server, {offline_msg, US0}))
+ gen_storage:dirty_read(ServerB, {offline_msg, US0}))
}
catch
_ ->
- {{"invalid", "invalid"}, [], nothing}
+ {{"invalid", "invalid"}, [], []}
end,
Msgs = get_messages_subset(User, Server, MsgsAll),
FMsgs =