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