X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=947a18ba25d609b51fa495ae3db7238d121c0a87;hp=a34eae63058baf9e4e61e61fa75879e9db7a5423;hb=afc7c6e84fac05e989a208f72538e6a55daa758f;hpb=c6a3cf5c036c651fbe9d4d7c0e0ce34d991d3509

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index a34eae6..947a18b 100755
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -103,7 +103,7 @@ loginUser(User, IP) ->
 generer_cookie() ->
    {A1, A2, A3} = now(),
    random:seed(A1, A2, A3),
-   erlang:integer_to_list(random:uniform(math:pow(10, 32)), 36).
+   erlang:integer_to_list(random:uniform(trunc(math:pow(10, 32))), 36).
 
 
 % Modification du profile.
@@ -283,7 +283,7 @@ wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id
          {struct, [
             {reply, "new_troll"},
             {troll_id, Current#troll.id},
-            {message_id, euphorik_bd:message_id_associe(Current#troll.id)},
+            {message_id, Current#troll.id_minichat},
             {content, Current#troll.content}
          ]};
       _ ->
@@ -308,7 +308,7 @@ wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id
                                        {Racine_id, _, _} = Racine,
                                        case euphorik_bd:message_by_id(Racine_id) of
                                           {ok, Mess} ->
-                                             json_message(Mess, euphorik_bd:parents(Racine), User);
+                                             json_message(Mess, euphorik_bd:parents_id(Racine_id), User);
                                           _ ->
                                              null
                                        end
@@ -744,7 +744,7 @@ json_message(Mess, Repond_a, User) ->
    {struct, [
       {id, Mess#minichat.id},
       {user_id, User_mess#user.id},
-      {date, format_date(Mess#minichat.date)},
+      {date, case Mess#minichat.date of undefined -> "?"; _ -> format_date(Mess#minichat.date) end},
       {system, Mess#minichat.auteur_id =:= 0},
       {owner, Est_proprietaire},
       {answered, A_repondu_a_message},
@@ -754,7 +754,7 @@ json_message(Mess, Repond_a, User) ->
       {content, Mess#minichat.contenu},
       {root, Mess#minichat.racine_id},
       {answer_to, {array, lists:map(
-         fun(Id_mess) ->                   
+         fun(Id_mess) ->  
             {ok, M} = euphorik_bd:message_by_id(Id_mess),
             {ok, User_reponse} = euphorik_bd:user_by_mess(M#minichat.id),
             {struct, [{id, M#minichat.id}, {nick, M#minichat.pseudo}, {login, User_reponse#user.login}]}