X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_bd.erl;h=6b10f4b69968ee7455911594178665d7062793e1;hp=0933645725e4ae8d7d0220ff6784519d4c869480;hb=5d9992368bb386d2e606ae037c5478fe10ac70e8;hpb=4a6c575807a90370c0069b688026b10102e1ce10

diff --git a/modules/erl/euphorik_bd.erl b/modules/erl/euphorik_bd.erl
index 0933645..6b10f4b 100755
--- a/modules/erl/euphorik_bd.erl
+++ b/modules/erl/euphorik_bd.erl
@@ -96,7 +96,7 @@ get_texte(Id, _Lang = fr) ->
 nouveau_user(Cookie, Profile) ->
    F = fun() ->
       Id = nouvel_id(user),
-      User = #user{id = Id, cookie = Cookie, date_creation = now(), date_derniere_connexion = now(), profile = Profile},
+      User = #user{id = Id, cookie = Cookie, date_creation = erlang:timestamp(), date_derniere_connexion = erlang:timestamp(), profile = Profile},
       mnesia:write(User),
       User
    end,
@@ -107,7 +107,7 @@ nouveau_user(Cookie, Profile) ->
 nouveau_user(Login, Password, Cookie, Profile) ->
    F = fun() ->
       Id = nouvel_id(user),
-      User = #user{id = Id, cookie = Cookie, login = Login, password = Password, date_creation = now(), date_derniere_connexion = now(), profile = Profile#profile{pseudo = Login}},
+      User = #user{id = Id, cookie = Cookie, login = Login, password = Password, date_creation = erlang:timestamp(), date_derniere_connexion = erlang:timestamp(), profile = Profile#profile{pseudo = Login}},
       mnesia:write(User),
       User
    end,
@@ -145,7 +145,7 @@ update_date_derniere_connexion(User_id) ->
       fun() ->
          case mnesia:wread({user, User_id}) of
             [User] ->
-               mnesia:write(User#user{date_derniere_connexion = now()});
+               mnesia:write(User#user{date_derniere_connexion = erlang:timestamp()});
             _ ->
                mnesia:abort("update_date_derniere_connexion: User inconnu")
           end
@@ -298,7 +298,7 @@ nouveau_message(Mess, Auteur_id, Repond_A_ids) ->
                   case mnesia:wread({user, Auteur_id}) of
                      [#user{profile = Profile} = Auteur] ->
                         % comparaison entre la date du dernier poste et maintenant (gestion du flood)
-                        Now = now(),
+                        Now = erlang:timestamp(),
                         Delta = euphorik_common:delta_date_ms(Auteur#user.date_derniere_connexion, Now),
                         Nouvel_indice_flood = Auteur#user.indice_flood + if Delta =< ?DUREE_SPAM -> 2; true -> -1 end,
                         Auteur_maj = Auteur#user{
@@ -348,7 +348,7 @@ nouveau_message_sys(Mess) ->
    resultat_transaction(mnesia:transaction(
       fun() ->
          Id = nouvel_id(minichat),
-         mnesia:write(#minichat{id = Id, auteur_id = 0, date = now(), pseudo = Profile#profile.pseudo, contenu = Mess, racine_id = Id}),
+         mnesia:write(#minichat{id = Id, auteur_id = 0, date = erlang:timestamp(), pseudo = Profile#profile.pseudo, contenu = Mess, racine_id = Id}),
          Id
       end
    )).
@@ -550,7 +550,7 @@ possede_message(Id_user, Id_mess) ->
 list_ban() ->
    resultat_transaction(mnesia:transaction(
       fun() ->
-         Now = now(),
+         Now = erlang:timestamp(),
          e(qlc:keysort(1, q([
             {
                IP#ip_table.ip,
@@ -570,9 +570,9 @@ ban(IP, Duration) ->
       fun() ->
          case mnesia:wread({ip_table, IP}) of
             [IP_tuple] ->
-               mnesia:write(IP_tuple#ip_table{ban = now(), ban_duration = Duration});
+               mnesia:write(IP_tuple#ip_table{ban = erlang:timestamp(), ban_duration = Duration});
             _ ->
-               mnesia:write(#ip_table{ip = IP, ban = now(), ban_duration = Duration})
+               mnesia:write(#ip_table{ip = IP, ban = erlang:timestamp(), ban_duration = Duration})
           end
       end
    ).
@@ -597,7 +597,7 @@ est_banni(User_id) ->
          ]), [{tmpdir, ?KEY_SORT_TEMP_DIR}]) of
             [{Ban, Ban_duration}] ->
                Echeance = date_plus_minutes(Ban, Ban_duration),
-               Now = now(),
+               Now = erlang:timestamp(),
                if Echeance < Now -> % l'échéance est passée
                      false;
                   true ->
@@ -610,7 +610,7 @@ est_banni(User_id) ->
    )).
 
 
-% Ban est une date tel que retourner par now().
+% Ban est une date tel que retourner par erlang:timestamp().
 % Ban_duration est un temps en minutes.
 % retourne une date.
 date_plus_minutes(Ban, Ban_duration) ->
@@ -627,16 +627,16 @@ can_register(IP) ->
       fun() ->
          case e(q([I || I <- mnesia:table(ip_table), I#ip_table.ip =:= IP]), [{tmpdir, ?KEY_SORT_TEMP_DIR}]) of
             [] ->
-               mnesia:write(#ip_table{ip = IP, date_last_try_register = now()}),
+               mnesia:write(#ip_table{ip = IP, date_last_try_register = erlang:timestamp()}),
                true;
             [T] ->
-               Delta = euphorik_common:delta_date_ms(T#ip_table.date_last_try_register, now()),
+               Delta = euphorik_common:delta_date_ms(T#ip_table.date_last_try_register, erlang:timestamp()),
                if T#ip_table.nb_try_register =:= ?NB_MAX_FLOOD_REGISTER, Delta < ?TEMPS_BAN_FLOOD_REGISTER ->
                      false;
                   true ->
                      mnesia:write(T#ip_table{
                         ip = IP,
-                        date_last_try_register = now(),
+                        date_last_try_register = erlang:timestamp(),
                         nb_try_register = T#ip_table.nb_try_register + if Delta < ?TEMPS_FLOOD_REGISTER -> 1; T#ip_table.nb_try_register > 0 -> -1; true -> 0 end
                      }),
                      true