X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=a34eae63058baf9e4e61e61fa75879e9db7a5423;hp=82a4fce42977d19a82e162290e399479019fa9f3;hb=c6a3cf5c036c651fbe9d4d7c0e0ce34d991d3509;hpb=c219198926b679ef5bc28182b3d05e8c1f447886 diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl index 82a4fce..a34eae6 100755 --- a/modules/erl/euphorik_protocole.erl +++ b/modules/erl/euphorik_protocole.erl @@ -426,7 +426,7 @@ put_message( {ok, User} -> case euphorik_bd:est_banni(User#user.id) of {true, Temps_restant} -> - erreur(80, format_minutes(Temps_restant)); + erreur(80, [format_minutes(Temps_restant)]); _ -> Strip_content = string:strip(Content), if Strip_content =:= [] -> @@ -435,7 +435,7 @@ put_message( % attention : non-atomique (update_pseudo+nouveau_message) euphorik_bd:update_pseudo_user(User#user.id, Nick), case euphorik_bd:nouveau_message(Strip_content, User#user.id, Answer_to) of - {erreur, R} -> erreur(100, R); + {erreur, R} -> erreur(100, [R]); _ -> json_reponse_ok() end @@ -462,7 +462,7 @@ ban( erreur(120); {ok, #user{ek_master = false, profile = Profile2} = User2} -> euphorik_bd:ban(User2#user.last_ip, Duration), - euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("''~s~s'' est ~s pour ~s.~s", + euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("\"~s~s\" est ~s pour ~s.~s", [ Profile2#profile.pseudo, if User2#user.login =:= [] -> ""; true -> " (" ++ User2#user.login ++ ")" end, @@ -531,9 +531,9 @@ put_troll( {ok, User = #user{ek_master = true}} -> case euphorik_bd:put_troll(User#user.id, Content) of max_troll_reached_per_user -> - erreur(180, ?NB_MAX_TROLL_WAITING_BY_USER); + erreur(180, [?NB_MAX_TROLL_WAITING_BY_USER]); max_troll_reached -> - erreur(190, ?NB_MAX_TROLL_WAITING); + erreur(190, [?NB_MAX_TROLL_WAITING]); _Id -> json_reponse_ok() end;