25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-20 17:27:00 +01:00

* src/mod_offline.erl: Code clean-up.

SVN Revision: 832
This commit is contained in:
Mickaël Rémond 2007-07-26 10:08:41 +00:00
parent 8d9e093788
commit 59fa698967
2 changed files with 12 additions and 14 deletions

View File

@ -1,5 +1,7 @@
2007-07-26 Mickael Remond <mickael.remond@process-one.net> 2007-07-26 Mickael Remond <mickael.remond@process-one.net>
* src/mod_offline.erl: Code clean-up.
* src/gen_mod.erl: Throw error more cleanly. * src/gen_mod.erl: Throw error more cleanly.
* src/mod_configure.erl: One ACL call was not virtual host * src/mod_configure.erl: One ACL call was not virtual host

View File

@ -171,20 +171,16 @@ find_x_expire(TimeStamp, [{xmlcdata, _} | Els]) ->
find_x_expire(TimeStamp, [El | Els]) -> find_x_expire(TimeStamp, [El | Els]) ->
case xml:get_tag_attr_s("xmlns", El) of case xml:get_tag_attr_s("xmlns", El) of
?NS_EXPIRE -> ?NS_EXPIRE ->
case xml:get_tag_attr_s("seconds", El) of Val = xml:get_tag_attr_s("seconds", El),
Val -> case catch list_to_integer(Val) of
case catch list_to_integer(Val) of {'EXIT', _} ->
{'EXIT', _} -> never;
never; Int when Int > 0 ->
Int when Int > 0 -> {MegaSecs, Secs, MicroSecs} = TimeStamp,
{MegaSecs, Secs, MicroSecs} = TimeStamp, S = MegaSecs * 1000000 + Secs + Int,
S = MegaSecs * 1000000 + Secs + Int, MegaSecs1 = S div 1000000,
MegaSecs1 = S div 1000000, Secs1 = S rem 1000000,
Secs1 = S rem 1000000, {MegaSecs1, Secs1, MicroSecs};
{MegaSecs1, Secs1, MicroSecs};
_ ->
never
end;
_ -> _ ->
never never
end; end;