projects
/
euphorik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ADD l'affichage des users (euphorik_bd:print_users/0) affiche les ip maintenant
[euphorik.git]
/
modules
/
erl
/
euphorik_protocole.erl
diff --git
a/modules/erl/euphorik_protocole.erl
b/modules/erl/euphorik_protocole.erl
index
d99e4cc
..
ae79d84
100755
(executable)
--- a/
modules/erl/euphorik_protocole.erl
+++ b/
modules/erl/euphorik_protocole.erl
@@
-555,7
+555,7
@@
unban_ip(
) ->
case euphorik_bd:user_by_cookie(Cookie) of
{ok, #user{ek_master = true}} ->
) ->
case euphorik_bd:user_by_cookie(Cookie) of
{ok, #user{ek_master = true}} ->
- euphorik_bd:deban(unserialize_ip(IP)),
+ euphorik_bd:deban(
euphorik_common:
unserialize_ip(IP)),
json_reponse_ok();
_ ->
erreur("Seul les ekMaster peuvent connaitre la liste des ips bannies")
json_reponse_ok();
_ ->
erreur("Seul les ekMaster peuvent connaitre la liste des ips bannies")
@@
-577,7
+577,7
@@
list_banned_ips(
fun({IP, T, Users}) ->
{struct,
[
fun({IP, T, Users}) ->
{struct,
[
- {ip, serialize_ip(IP)},
+ {ip,
euphorik_common:
serialize_ip(IP)},
{remaining_time, format_minutes(T)},
{users, {array, lists:map(
fun({Pseudo, Login}) ->
{remaining_time, format_minutes(T)},
{users, {array, lists:map(
fun({Pseudo, Login}) ->
@@
-611,17
+611,6
@@
erreur(Message) ->
]
}.
]
}.
-
-serialize_ip(IP) ->
- lists:flatten(io_lib:format("~w.~w.~w.~w", tuple_to_list(IP))).
-
-
-unserialize_ip(IP) ->
- case io_lib:fread("~d.~d.~d.~d", IP) of
- {ok, [A, B, C, D], []} -> {A, B, C, D};
- _ -> erreur
- end.
-
% Formatage de minutes.
% par exemple : "1min", "45min", "1h23min", "1jour 2h34min"
% Formatage de minutes.
% par exemple : "1min", "45min", "1h23min", "1jour 2h34min"