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

In mod_last*:get_last_iq/4, check for user resources first to return 0 seconds if there is one

Browse Source 
Fixes problem 2 of EJAB-1158.
This commit is contained in:
Andreas Köhler 2010-11-05 18:38:42 +01:00 committed by Badlop
parent 6b46b8f794
commit f4507a088a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod_last.erl
View File

@ -180,6 +180,16 @@ get_last(LUser, LServer) ->
end. end.
get_last_iq(IQ_Rec, LUser, LServer) -> get_last_iq(IQ_Rec, LUser, LServer) ->
case ejabberd_sm:get_user_resources(LUser, LServer) of
[] ->
get_last_iq_disconnected(IQ_Rec, LUser, LServer);
_ ->
Sec = 0,
#xmlel{ns = ?NS_LAST_ACTIVITY, name = 'query',
attrs = [?XMLATTR('seconds', Sec)]}
end.
get_last_iq_disconnected(IQ_Rec, LUser, LServer) ->
case get_last(LUser, LServer) of case get_last(LUser, LServer) of
{error, _Reason} -> {error, _Reason} ->
exmpp_iq:error(IQ_Rec, 'internal-server-error'); exmpp_iq:error(IQ_Rec, 'internal-server-error');