X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=d8bfa89d447646d45a790cb452e46e242a872d57;hp=3f9d7a1509cdeca488765020bb533e22d703e1e1;hb=48fe12fba37afba9f9d490cf78ce439c21fe6b70;hpb=7ade6a3495cd5c74c964df5ed794e110e770ed9d

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index 3f9d7a1..d8bfa89 100755
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -118,6 +118,7 @@ profile(
       {nick, Pseudo},
       {email, Email},
       {css, Css},
+      {chat_order, Chat_order_str},
       {nick_format, Nick_format_str},
       {view_times, View_times},
       {view_tooltips, View_tooltips},
@@ -127,7 +128,7 @@ profile(
 ) ->
    % décomposition de la strucure JSON
    Conversations = lists:foldr(
-      fun({struc, [{root, Racine}, {minimized, Reduit}]}, A) ->
+      fun({struct, [{root, Racine}, {minimized, Reduit}]}, A) ->
          % virage des messages qui n'existent pas
          Message_exite = euphorik_bd:message_existe(Racine),
          if Message_exite ->
@@ -147,6 +148,7 @@ profile(
          Pseudo,
          Email,
          Css,
+         list_to_atom(Chat_order_str),
          list_to_atom(Nick_format_str),
          View_times,
          View_tooltips,
@@ -269,7 +271,7 @@ wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id
                         fun({Racine, {Conv, Plus}}) ->
                            {struct, [
                               {last_page, not Plus},
-                              {first, 
+                              {first, % le premier message de la conversation
                                  if Racine =:= undefined orelse Conv =:= [] ->
                                        null;
                                     true ->
@@ -281,7 +283,7 @@ wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id
                                              null
                                        end
                                  end
-                              }, % le premier message de la conversation, peut correspondre
+                              },
                               {messages, {array,
                                  lists:map(
                                     fun({Mess, Repond_a}) ->
@@ -672,6 +674,7 @@ json_reponse_login_ok(User) ->
          {login, User#user.login},
          {email, User#user.email},
          {css, User#user.css},
+         {chat_order, atom_to_list(User#user.chat_order)},
          {nick_format, atom_to_list(User#user.nick_format)},
          {view_times, User#user.view_times},
          {view_tooltips, User#user.view_tooltips},