Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

jlib:make_jid/3 does not exist anymore. I think I replaced it correctly by exmpp_jid:make/3

Browse Source 
SVN Revision: 2872
This commit is contained in:
Mickaël Rémond 2010-01-09 16:44:33 +00:00
parent 7ed6614ad4
commit b431a9099e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mod_offline_odbc.erl
View File

@ -98,7 +98,7 @@ loop(Host, AccessMaxOfflineMsgs) ->
Len + count_offline_messages(User, Host); Len + count_offline_messages(User, Host);
true -> 0 true -> 0
end, end,
if if
Count > MaxOfflineMsgs -> Count > MaxOfflineMsgs ->
discard_warn_sender(Msgs); discard_warn_sender(Msgs);
true -> true ->
@ -119,7 +119,7 @@ loop(Host, AccessMaxOfflineMsgs) ->
calendar:now_to_universal_time( calendar:now_to_universal_time(
M#offline_msg.timestamp), M#offline_msg.timestamp),
utc, utc,
jlib:make_jid("", Host, ""), exmpp_jid:make("", Host, ""),
"Offline Storage"), "Offline Storage"),
%% TODO: Delete the next three lines once XEP-0091 is Obsolete %% TODO: Delete the next three lines once XEP-0091 is Obsolete
jlib:timestamp_to_xml( jlib:timestamp_to_xml(
@ -296,7 +296,7 @@ find_x_expire(TimeStamp, [_ | Els]) ->
find_x_expire(TimeStamp, Els). find_x_expire(TimeStamp, Els).
pop_offline_messages(Ls, User, Server) pop_offline_messages(Ls, User, Server)
when is_binary(User), is_binary(Server) -> when is_binary(User), is_binary(Server) ->
try try
LUser = binary_to_list(User), LUser = binary_to_list(User),
@ -307,8 +307,8 @@ pop_offline_messages(Ls, User, Server)
Ls ++ lists:flatmap( Ls ++ lists:flatmap(
fun({_, XML}) -> fun({_, XML}) ->
try try
[El] = exmpp_xml:parse_document(XML, [El] = exmpp_xml:parse_document(XML,
[names_as_atom, {check_elems, xmpp}, [names_as_atom, {check_elems, xmpp},
{check_nss,xmpp}, {check_attrs,xmpp}]), {check_nss,xmpp}, {check_attrs,xmpp}]),
To = exmpp_jid:parse( To = exmpp_jid:parse(
exmpp_stanza:get_recipient(El)), exmpp_stanza:get_recipient(El)),
@ -329,7 +329,7 @@ pop_offline_messages(Ls, User, Server)
end. end.
remove_user(User, Server) remove_user(User, Server)
when is_binary(User), is_binary(Server) -> when is_binary(User), is_binary(Server) ->
try try
LUser = binary_to_list(exmpp_stringprep:nodeprep(User)), LUser = binary_to_list(exmpp_stringprep:nodeprep(User)),
@ -386,8 +386,8 @@ user_queue(User, Server, Query, Lang) ->
{selected, ["username", "xml"], Rs} -> {selected, ["username", "xml"], Rs} ->
lists:flatmap( lists:flatmap(
fun({_, XML}) -> fun({_, XML}) ->
try exmpp_xml:parse_document(XML, try exmpp_xml:parse_document(XML,
[names_as_atom, {check_elems, xmpp}, [names_as_atom, {check_elems, xmpp},
{check_nss,xmpp}, {check_attrs,xmpp}]) of {check_nss,xmpp}, {check_attrs,xmpp}]) of
[El] -> [El] ->
[El] [El]
@ -455,8 +455,8 @@ user_queue_parse_query(Username, LServer, Query) ->
{selected, ["xml", "seq"], Rs} -> {selected, ["xml", "seq"], Rs} ->
lists:flatmap( lists:flatmap(
fun({XML, Seq}) -> fun({XML, Seq}) ->
try exmpp_xml:parse_document(XML, try exmpp_xml:parse_document(XML,
[names_as_atom, {check_elems, xmpp}, [names_as_atom, {check_elems, xmpp},
{check_nss,xmpp}, {check_attrs,xmpp}]) of {check_nss,xmpp}, {check_attrs,xmpp}]) of
[El] -> [El] ->
[{El, Seq}] [{El, Seq}]