X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=dc29bf5d2f8f3e53af8aae28050738c1c7df9021;hb=01922222ac686c2507052c0cc1d755495145d154;hp=dba48e2eafb5d11eccce9a5476656d39f03a8fc6;hpb=ffea71492c07cbf81430883c894b34e1c9408699;p=euphorik.git

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index dba48e2..dc29bf5 100755
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -1,63 +1,71 @@
 % coding: utf-8
-% Ce module gére les différents message envoyé par le client (javascript) via AJAX.
-% Par exemple le client peut demander les derniers messages du minichat.
-% Les messages sont au format XML, la plus part des fonctions accepte un xmlDocument() et renvoie un string()
-% qui est la réponse XML.
-% Example XML : http://www.erlang.org/doc/apps/xmerl/xmerl_ug.html.
+% Ce module gére les différents messages envoyés par le client (javascript) via AJAX.
+% Les messages donnés ainsi que les réponses sont au format JSON.
 % @author G.Burri
 
 -module(euphorik_protocole).
 -export([
-   nouveau_user_login/1,
-   login/1,
+   register/2,
+   login/2,
    logout/1,
    profile/1,
-   refreshMessage/1,
-   message/1
+   wait_event/1,
+   put_message/1,
+   ban/1,
+   erreur/1
 ]).
 
 -include_lib("xmerl/include/xmerl.hrl").
 -include("../include/euphorik_bd.hrl").
 -include("../include/euphorik_defines.hrl").
 
+
+% Une utilisateur s'enregistre avec un tuple {Login, Password}.
+register([{login, Login}, {password, Password}], IP) ->
+   Can_register = euphorik_bd:can_register(IP),
+   if Can_register ->
+         case euphorik_bd:user_by_login(Login) of
+            {ok, _} ->
+               erreur("Login déjà existant");
+            _ ->
+               User = euphorik_bd:nouveau_user(Login, Password, generer_cookie()),
+               euphorik_bd:update_ip(User#user.id, IP),
+               json_reponse_login_ok(User)
+         end;
+      true ->
+         erreur_register_flood()
+   end;
+% Enregistrement sans {Login, Password}
+register([], IP) ->   
+   Can_register = euphorik_bd:can_register(IP),
+   if Can_register ->
+         User = euphorik_bd:nouveau_user("<nick>", generer_cookie()),
+         euphorik_bd:update_ip(User#user.id, IP),
+         json_reponse_login_ok(User);
+      true ->
+         erreur_register_flood()
+   end.
    
-% Une utilisateur s'enregistre avec un tuple {Login, Password}.
-% @spec nouveau_user_login(xmerl:xmlElement()) -> string()
-nouveau_user_login(Action) ->
-   {Login, Password, Login_deja_pris} = case {xmerl_xpath:string("login", Action), xmerl_xpath:string("password", Action)} of
-      {[#xmlElement{content = [#xmlText{value = L}]}], [#xmlElement{content = [#xmlText{value = P}]}]} ->
-         {L, P, case euphorik_minichat:user_by_login(L) of {ok, _} -> true; _ -> false end};
-      _ -> {[], [], false}
-   end,      
-   simple_xml_to_string(
-      if Login_deja_pris-> 
-            xml_reponse_login_pas_ok("Login déjà pris");
-         true ->
-            Cookie = generer_cookie(),
-            User = euphorik_minichat:nouveau_user(Login, Password, Cookie),
-            xml_reponse_login_ok(User)      
-      end
-   ).
+erreur_register_flood() ->
+   erreur("Trop de register (flood)").
    
 
-% Un utilisateur se logge.
-login(Action) ->
-   case xmerl_xpath:string("cookie", Action) of
-      [#xmlElement{content = [#xmlText{value = Cookie}]}] ->
-         loginUser(euphorik_minichat:user_by_cookie(Cookie));
-      _ ->
-         case {xmerl_xpath:string("login", Action), xmerl_xpath:string("password", Action)} of
-            {[#xmlElement{content = [#xmlText{value = Login}]}], [#xmlElement{content = [#xmlText{value = Password}]}]} ->
-               loginUser(euphorik_minichat:user_by_login_password(Login, Password));
-         _ ->
-            simple_xml_to_string(xml_reponse_login_pas_ok("XML malformé"))
-         end
+% Un utilisateur se logge (avec un couple {login, mot de passe})
+login([{login, Login}, {password, Password}], IP) ->
+   loginUser(euphorik_bd:user_by_login_password(Login, Password), IP);
+% Un utilisateur se logge (avec un cookie)
+login([{cookie, Cookie}], IP) ->
+   loginUser(euphorik_bd:user_by_cookie(Cookie), IP).
+   
+loginUser({ok, User}, IP) ->
+   euphorik_bd:update_ip(User#user.id, IP),
+   euphorik_bd:update_date_derniere_connexion(User#user.id),
+   json_reponse_login_ok(User);
+loginUser(_, _) ->
+   % ajoute un délais d'attente (TODO : un autre moyen plus élégant ?)
+   receive after 1000 ->
+      erreur("Erreur login")
    end.
-loginUser({ok, User}) ->
-   euphorik_minichat:update_date_derniere_connexion(User#user.id),
-   simple_xml_to_string(xml_reponse_login_ok(User));   
-loginUser(_) ->
-   simple_xml_to_string(xml_reponse_login_pas_ok("Erreur de login")).
    
    
 % Renvoie un string() représentant un cookie en base 36. Il y a 10^32 possibillités.
@@ -73,171 +81,202 @@ logout(_) ->
 
 
 % Modification du profile.
-profile(Action) ->
-   simple_xml_to_string(
-      case xmerl_xpath:string("cookie", Action) of
-         [#xmlElement{content = [#xmlText{value = Cookie}]}] ->
-            Login = case xmerl_xpath:string("login", Action) of [#xmlElement{content = [#xmlText{value = L}]}] -> L; _ -> undefined end,
-            Password = case xmerl_xpath:string("password", Action) of [#xmlElement{content = [#xmlText{value = P}]}] -> P; _ -> undefined end,
-            Pseudo = case xmerl_xpath:string("pseudo", Action) of [#xmlElement{content = [#xmlText{value = P2}]}] -> P2; _ -> Login end,
-            Email = case xmerl_xpath:string("email", Action) of [#xmlElement{content = [#xmlText{value = E}]}] -> E; _ -> undefined end,
-            Css = case xmerl_xpath:string("css", Action) of [#xmlElement{content = [#xmlText{value = C}]}] -> C; _ -> undefined end,
-            Page_principale = case xmerl_xpath:string("pagePrincipale", Action) of [#xmlElement{content = [#xmlText{value = P3}]}] -> list_to_integer(P3); _ -> undefined end,
-            Conversations = lists:foldl(
-               fun(Conv, Acc) ->
-                  [#xmlElement{content = [#xmlText{value = Id_racine_str}]}] = xmerl_xpath:string("racine", Conv),
-                  [#xmlElement{content = [#xmlText{value = Page_conv_str}]}] = xmerl_xpath:string("page", Conv), 
-                  Message_id = erlang:list_to_integer(Id_racine_str, 36),
-                  % vérification de la validité de l'id
-                  Message_existe = euphorik_minichat:message_existe(Message_id),
-                  if  Message_existe ->
-                        [{Message_id, list_to_integer(Page_conv_str)} | Acc];
-                     true ->
-                        Acc
-                  end
-               end,
-               [],
-               xmerl_xpath:string("conversation", Action)
-            ),
-            case euphorik_minichat:set_profile(Cookie, Login, Password, Pseudo, Email, Css, Page_principale, Conversations) of
-               ok ->
-                  xml_reponse_profile_ok();
-               login_deja_pris ->
-                  xml_reponse_profile_pas_ok("Login déjà pris");
-               _ ->
-                  xml_reponse_profile_pas_ok("Impossible de mettre à jour le profile")
-            end;
-         _ ->
-            xml_reponse_profile_pas_ok("XML malformé")
-      end
-   ).
-   
+profile(
+   [
+      {cookie, Cookie},
+      {login, Login},
+      {password, Password},
+      {nick, Pseudo},
+      {email, Email},
+      {css, Css},
+      {nick_format, Nick_format_str},
+      {main_page, Main_page},
+      {conversations, {array, Conversations_json}}
+   ]
+) ->
+   % est-ce que les messages auquel on répond existent ?
+   Conversations = lists:foldr(
+      fun({struct, [{root, Root}, {page, Page}]}, Acc) ->
+         Message_existe = euphorik_bd:message_existe(Root),
+         if  Message_existe ->
+            [{Root, Page} | Acc];
+            true ->
+               Acc
+         end
+      end,
+      [],
+      Conversations_json
+   ),
+   case euphorik_bd:set_profile(Cookie, Login, Password, Pseudo, Email, Css, list_to_atom(Nick_format_str), Main_page, Conversations) of
+      ok ->
+         json_reponse_ok();
+      login_deja_pris ->
+         erreur("Login déjà pris");
+      _ ->
+         erreur("Impossible de mettre à jour le profile")
+   end.
+
 
 % Renvoie les messages appropriés.
-refreshMessage(Action) ->
-   simple_xml_to_string(
-      case xmerl_xpath:string("nombreMessage", Action) of % le nombre de message qu'affiche le client
-         [#xmlElement{content = [#xmlText{value = Nb_message_str}]}] ->         
-            Nb_message = list_to_integer(Nb_message_str),
-            Dernier_id = case xmerl_xpath:string("dernierMessageId", Action) of % l'id du dernier message que connait le client
-               [#xmlElement{content = [#xmlText{value = D}]}] -> erlang:list_to_integer(D, 36);
-               _ -> 0
-            end,
-            User = case xmerl_xpath:string("cookie", Action) of 
-               [#xmlElement{content = [#xmlText{value = Cookie}]}] ->
-                  case euphorik_minichat:user_by_cookie(Cookie) of
-                     {ok, U} -> U;
-                     _ -> inconnu
-                  end;
-               _ -> inconnu
+% last_message id et cookie sont facultatifs
+wait_event(Data) ->
+   Cookie = case lists:keysearch(cookie, 1, Data) of {value, {_, C}} -> C; _ -> inconnu end,
+   Last_message_id = case lists:keysearch(last_message_id, 1, Data) of {value, {_, Id}} -> Id; _ -> 0 end,
+   {value, {_, Message_count}} = lists:keysearch(message_count, 1, Data),
+   Main_page = case lists:keysearch(main_page, 1, Data) of {value, {_, P}} -> P; _ -> 1 end,
+   {value, {_, {array, Conversations_json}}} = lists:keysearch(conversations, 1, Data),
+   Conversations = lists:map(
+      fun({struct, [{root, Racine}, {page, Page} | Reste]}) ->
+         Last_mess_conv  = case Reste of [{last_message_id, L}] -> L; _ -> 0 end,
+         {Racine, Page, Last_mess_conv}
+      end,
+      Conversations_json
+   ),
+   User = case euphorik_bd:user_by_cookie(Cookie) of
+      {ok, U} -> U;
+      _ -> inconnu
+   end,
+   {struct, [
+      {reply, "new_message"},
+      {conversations, {array,
+         % accrochez-vous ca va siouxer ;)
+         lists:map(
+            fun({Conv, Plus}) ->
+               {struct, [
+                  {last_page, not Plus},
+                  {messages, {array, 
+                     lists:map(
+                        fun({Mess, Repond_a}) ->                                 
+                           Est_proprietaire = User =/= inconnu andalso User#user.id =:= Mess#minichat.auteur_id,
+                           A_repondu_a_message = User =/= inconnu andalso euphorik_bd:a_repondu_a_message(User#user.id, Mess#minichat.id),
+                           Est_une_reponse_a_user = User =/= inconnu andalso euphorik_bd:est_une_reponse_a_user(User#user.id, Mess#minichat.id),
+                           {ok, User_mess } = euphorik_bd:user_by_id(Mess#minichat.auteur_id),
+                           {struct, [
+                              {id, Mess#minichat.id},
+                              {user_id, User_mess#user.id},
+                              {date, format_date(Mess#minichat.date)},
+                              {system, Mess#minichat.auteur_id =:= 0},
+                              {owner, Est_proprietaire},
+                              {answered, A_repondu_a_message},
+                              {is_a_reply, Est_une_reponse_a_user},
+                              {nick, Mess#minichat.pseudo},
+                              {login, User_mess#user.login},
+                              {content, Mess#minichat.contenu},
+                              {answer_to, {array, lists:map(
+                                 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}]}
+                                 end,
+                                 Repond_a
+                              )}},
+                              {ek_master, User_mess#user.ek_master}
+                           ]}
+                        end,
+                        Conv
+                     )
+                  }}
+               ]}
             end,
-            % extraction des conversations en [{id, page}, ..]
-            % Obsolète : obtenu depuis la table 'user'
-            %~ Conversations = lists:map(
-               %~ fun(Conv) ->
-                  %~ [#xmlElement{content = [#xmlText{value = Id_racine_str}]}] = xmerl_xpath:string("racine", Conv),
-                  %~ [#xmlElement{content = [#xmlText{value = Page_conv_str}]}] = xmerl_xpath:string("page", Conv), 
-                  %~ {erlang:list_to_integer(Id_racine_str, 36), erlang:list_to_integer(Page_conv_str)}
-               %~ end,
-               %~ xmerl_xpath:string("conversation", Action)
-            %~ ),
-            % accrochez-vous ca va siouxer ;)
-            [{reponse, [{name, "refreshMessages"}],
-               lists:map(
-                  fun({Conv, Plus}) ->
-                     {conversation, [], 
-                        [{autresPages, [], [atom_to_list(Plus)]} |
-                           lists:map(
-                              fun({Mess, Repond_a}) ->                                 
-                                 Est_proprietaire = User =/= inconnu andalso User#user.id =:= Mess#minichat.auteur_id,
-                                 A_repondu_a_message = User =/= inconnu andalso euphorik_minichat:a_repondu_a_message(User#user.id, Mess#minichat.id),
-                                 Est_une_reponse_a_user = User =/= inconnu andalso euphorik_minichat:est_une_reponse_a_user(User#user.id, Mess#minichat.id),
-                                 User_mess =
-                                    if Mess#minichat.auteur_id =:= 0 ->
-                                          inconnu;
-                                       true ->
-                                          {ok, U2} = euphorik_minichat:user_by_id(Mess#minichat.auteur_id),
-                                          U2
-                                    end,
-                                 {message, [{id, erlang:integer_to_list(Mess#minichat.id, 36)}],
-                                    [
-                                       {date, [], [format_date(Mess#minichat.date)]},
-                                       {systeme, [], [atom_to_list(Mess#minichat.auteur_id =:= 0)]},
-                                       {proprietaire, [], [atom_to_list(Est_proprietaire)]},
-                                       {repondu, [], [atom_to_list(A_repondu_a_message)]},
-                                       {reponse, [], [atom_to_list(Est_une_reponse_a_user)]},
-                                       {pseudo, [], [Mess#minichat.pseudo]},
-                                       {login, [], [if User_mess =:= inconnu -> Mess#minichat.pseudo; true -> User_mess#user.login end]},
-                                       {contenu, [], [Mess#minichat.contenu]},
-                                       {repondA, [], xml_repond_a(Repond_a)}
-                                    ]
-                                 }
-                              end,
-                              Conv
-                           )
-                        ]
-                     }
-                  end,
-                  euphorik_minichat_conversation:conversations(User#user.conversations, Nb_message, Dernier_id, User#user.page_principale)
-               )
-            }];
-         _ ->
-            [{reponse, [{name, "refreshMessages"}], [{erreur, [], ["erreur"]}]}]
-      end
-   ).
+            euphorik_minichat_conversation:conversations(
+               Conversations,
+               Message_count,
+               Last_message_id,
+               Main_page
+            )
+         )
+      }}
+   ]}.
+            
          
-         
-% Prend une liste de xml text node et en resort un string()
-% xmerl : "test &amp; test" devient deux fragments de texte : "test " et "& test", il faut donc rassembler les morceaux...
-defragmenter(Text_nodes) ->
-   lists:foldl(fun(Node, Acc) -> #xmlText{value = V} = Node, Acc ++ V end, [], Text_nodes).
-
-
 % Un utilisateur envoie un message
-message(Action) ->
-   simple_xml_to_string(
-      case {
-            xmerl_xpath:string("cookie", Action),
-            xmerl_xpath:string("pseudo", Action),
-            xmerl_xpath:string("contenu", Action)
-         } of
-         {
-            [#xmlElement{content = [#xmlText{value = Cookie}]}],
-            [#xmlElement{content = Pseudo_fragments}],
-            [#xmlElement{content = Contenu_fragments}]
-         } ->                    
-            case euphorik_minichat:user_by_cookie(Cookie) of
-               {ok, U} ->
-                  Pseudo = defragmenter(Pseudo_fragments),
-                  Contenu = defragmenter(Contenu_fragments),
-                  % met à jour le pseudo du user
-                  euphorik_minichat:update_pseudo_user(U#user.id, Pseudo),
-                  Reponses = case xmerl_xpath:string("reponses", Action) of
-                     [#xmlElement{content = C}] ->
-                        lists:map(
-                           fun (Reponse) ->
-                              #xmlElement{attributes = [#xmlAttribute{name = id, value = Id_reponse}]} = Reponse,
-                              erlang:list_to_integer(Id_reponse, 36)
-                           end
-                        , C);
-                     _ -> []
-                  end,
-                  Contenu_strip = string:strip(Contenu),
-                  if Contenu_strip =:= [] -> xml_reponse_message(pas_ok);
-                     true ->
-                        case euphorik_minichat:nouveau_message(Contenu, U#user.id, Reponses) of
-                           erreur -> xml_reponse_message(pas_ok);
-                        _ -> xml_reponse_message(ok)
-                        end
-                  end;
-               _ -> xml_reponse_message(pas_ok)
-            end;         
+put_message(
+   [
+      {cookie, Cookie},
+      {nick, Nick},
+      {content, Content},
+      {answer_to, {array, Answer_to}}
+   ]
+) ->
+   case euphorik_bd:user_by_cookie(Cookie) of
+      {ok, User} ->
+         case euphorik_bd:est_banni(User#user.id) of
+            {true, Temps_restant} ->
+               erreur("Vous êtes banni pour encore " ++ format_minutes(Temps_restant));
+            _ ->
+               Strip_content = string:strip(Content),
+               if Strip_content =:= [] ->
+                     erreur("Message vide");
+                  true ->
+                     % TODO : 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 -> erreur("Impossible d'ajouter un nouveau message");
+                        _ ->
+                           json_reponse_ok()
+                     end
+               end
+         end;
+   _ ->
+      erreur("Utilisateur inconnu")
+   end.
+   
+   
+% Formatage de minutes.
+% par exemple : "1min", "45min", "1h23min", "1jour 2h34min"
+format_minutes(Min) ->
+   Jours = Min div (60 * 24),
+   Heures = Min rem (60 * 24) div 60,
+   Minutes = Min rem (60),
+   if Jours =/= 0 -> integer_to_list(Jours) ++ "Jour" ++ if Jours > 1 -> "s"; true -> "" end ++ " "; true -> "" end ++
+   if Heures =/= 0 -> integer_to_list(Heures) ++ "h"; true -> "" end ++
+   lists:flatten(io_lib:format(if Jours =:= 0, Heures =:= 0 -> "~w"; true -> "~2.2.0w" end, [Minutes])) ++ "min".
+
+
+% bannissement d'un utilisateur (son ip est bannie)
+ban(
+   [
+      {cookie, Cookie},
+      {duration, Duration},
+      {user_id, User_id}
+   ]) ->
+      % controle que l'utilisateur est un admin
+      case euphorik_bd:user_by_cookie(Cookie) of
+         {ok, User1 = #user{ek_master = true}} ->
+            case euphorik_bd:user_by_id(User_id) of
+               {ok, User1} ->
+                  erreur("Il n'est pas possible de s'auto bannir");
+               {ok, User2 = #user{ek_master = false}} ->
+                  euphorik_bd:ban(User2#user.last_ip, Duration),
+                  euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("~s ~s est ~s pour ~s",
+                     [
+                        User2#user.pseudo,
+                        if User2#user.login =:= [] -> ""; true -> "(" ++ User2#user.login ++ ")" end,
+                        if Duration =< 15 -> "kické"; true -> "banni" end,
+                        format_minutes(Duration)
+                     ]
+                  ))),
+                  json_reponse_ok();
+               {ok, _} ->
+                  erreur("L'utilisateur est lui même un ekMaster");
+               _ ->
+                  erreur("Utilisateur à bannir inconnu")
+            end;
          _ ->
-            xml_reponse_message(pas_ok)
-      end
-   ).
+            erreur("Utilisateur inconnu ou non ek master")
+      end.
+      
 
-
+% Construit une erreur
+erreur(Message) ->
+   {
+      struct, [
+         {reply, "error"},
+         {error_message, Message}
+      ]
+   }.
+   
+   
 % Formatage d'une heure
 % local_time() -> string
 format_date(Date) ->
@@ -246,111 +285,52 @@ format_date(Date) ->
    {{Annee, Mois, Jour}, {Heure, Minute, Seconde}} = DateLocal,
    {{AnneeNow, _, _}, {_, _, _}} = DateNowLocal,
    Hier = calendar:date_to_gregorian_days(element(1, DateLocal)) =:=  calendar:date_to_gregorian_days(element(1, DateNowLocal)) - 1,
-   if element(1, DateLocal) =:= element(1, DateNowLocal) ->
-      "";
-      Hier ->
-         "Hier ";
-      Annee =:= AnneeNow ->
-         io_lib:format("~2.10.0B/~2.10.0B ", [Jour, Mois]);         
-      true ->
-         io_lib:format("~2.10.0B/~2.10.0B/~B ", [Jour, Mois, Annee])
-   end ++
-   io_lib:format("~2.10.0B:~2.10.0B:~2.10.0B", [Heure, Minute, Seconde]).
-
-
-%%%%%%%%% <Réponses XML> %%%%%%%%%
-simple_xml_to_string(XML) ->
-   lists:flatten(xmerl:export_simple(XML, xmerl_xml, [{prolog, ["<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n"]}])).
+   lists:flatten(
+      if element(1, DateLocal) =:= element(1, DateNowLocal) ->
+         "";
+         Hier ->
+            "Hier ";
+         Annee =:= AnneeNow ->
+            io_lib:format("~2.10.0B/~2.10.0B ", [Jour, Mois]);         
+         true ->
+            io_lib:format("~2.10.0B/~2.10.0B/~B ", [Jour, Mois, Annee])
+      end ++
+      io_lib:format("~2.10.0B:~2.10.0B:~2.10.0B", [Heure, Minute, Seconde])
+   ).
 
 
-% Construit une réponse positive à un login
-% si Enregistre vaut true alors cela veut dire que la personne s'est enregistré (elle possède au moins un login et un password)
-xml_reponse_login_ok(User) ->
-   [{reponse, [{name, "login"}],
-      [
-         {statut, [if (User#user.password =/= []) and (User#user.login =/= []) -> "enregistre"; true -> "identifie" end]},
-         {cookie, [User#user.cookie]},
-         {id, [erlang:integer_to_list(User#user.id, 36)]},
-         {pseudo, [User#user.pseudo]},
-         {login, [User#user.login]},
-         {email, [User#user.email]},
-         {css, [User#user.css]},
-         {pagePrincipale, [integer_to_list(User#user.page_principale)]}
-      ] ++ 
-      lists:map(
-         fun(C) -> 
-            {conversation, 
-               [
-                  {racine, [erlang:integer_to_list(element(1, C), 36)]},
-                  {page, [integer_to_list(element(2, C))]}
-               ]
-            }
-         end,
-         User#user.conversations
-      )
-   }].
+json_reponse_ok() ->
+   {struct, [{reply, "ok"}]}.
    
    
-% Construit un réponse négative à un login
-xml_reponse_login_pas_ok(Message) ->
-   [{reponse, [{name, "login"}],
-      [
-         {statut, ["erreur"]},
-         {information, [Message]}
-      ]
-   }].
-
-
-xml_reponse_profile_ok() ->
-   [{reponse, [{name, "profile"}],
-      [
-         {statut, ["ok"]}
-      ]
-   }].
-
-
-xml_reponse_profile_pas_ok(Message) ->
-   [{reponse, [{name, "profile"}],
-      [
-         {statut, ["pas ok"]},
-         {information, [Message]}
+json_reponse_login_ok(User) ->
+   {
+      struct, [
+         {reply, "login"},
+         {status, if (User#user.password =/= []) and (User#user.login =/= []) -> "auth_registered"; true -> "auth_not_registered" end},
+         {cookie, User#user.cookie},
+         {id, User#user.id},
+         {nick, User#user.pseudo},
+         {login, User#user.login},
+         {email, User#user.email},
+         {css, User#user.css},
+         {nick_format, atom_to_list(User#user.nick_format)},
+         {main_page, User#user.page_principale},
+         {conversations, 
+            {array,
+               lists:map(
+                  fun(C) ->
+                     {struct,
+                        [
+                           {root, element(1, C)},
+                           {page, element(2, C)}
+                        ]
+                     }
+                  end,
+                  User#user.conversations
+               )
+            }
+         },
+      {ek_master, User#user.ek_master}
       ]
-   }].
-   
-   
-% Pas utilisé
-%~ xml_conversation(Mess_id, Nb) ->   
-   %~ {Mess_id, Conversation} = minichat:conversation(Mess_id, Nb),
-   %~ xml_conversation(Conversation).
-%~ xml_conversation([]) -> [];
-%~ xml_conversation(Liste_id) ->
-   %~ lists:map(
-      %~ fun({Id, Sous_liste}) ->
-         %~ {id, [{id, erlang:integer_to_list(Id, 36)}], xml_conversation(Sous_liste)}
-      %~ end,
-      %~ Liste_id
-   %~ ).
-
-
-% Renvoie un element XML representant une liste de messages auquel le message M_id repond
-xml_repond_a(Reponses) ->
-   lists:map(
-      fun(Id_mess) ->
-         {ok, M} = euphorik_minichat:message_by_id(Id_mess),
-         {ok, User} = euphorik_minichat:user_by_mess(Id_mess),
-         {id, [{id, erlang:integer_to_list(M#minichat.id, 36)}, {pseudo, M#minichat.pseudo}, {login, User#user.login}], []}
-      end,
-      Reponses
-   ).
-   
-   
-xml_reponse_message(Ok) ->
-   [
-      {reponse, [{name, "message"}],
-         [
-            {statut, [], [case Ok of ok -> "ok"; pas_ok -> "pas ok" end]}
-         ]
-      }
-   ].
-
-%%%%%%%%% </réponses XML> %%%%%%%%%
+   }.