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

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index d8bfa89..a321287 100755
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -25,7 +25,6 @@
 -export([
    register/2,
    login/2,
-   logout/1,
    profile/1,
    wait_event/1,
    put_message/1,
@@ -43,14 +42,14 @@
 
 
 % Une utilisateur s'enregistre avec un tuple {Login, Password}.
-register([{login, Login}, {password, Password}], IP) ->
+register([{login, Login}, {password, Password}, {profile, Profile_json}], 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()),
+               User = euphorik_bd:nouveau_user(Login, Password, generer_cookie(), profile_from_json(Profile_json)),
                euphorik_bd:update_ip(User#user.id, IP),
                json_reponse_login_ok(User)
          end;
@@ -58,10 +57,11 @@ register([{login, Login}, {password, Password}], IP) ->
          erreur_register_flood()
    end;
 % Enregistrement sans {Login, Password}
-register([], IP) ->   
+register([{profile, Profile_json}], IP) ->   
    Can_register = euphorik_bd:can_register(IP),
    if Can_register ->
-         User = euphorik_bd:nouveau_user("<nick>", generer_cookie()),
+         Profile = profile_from_json(Profile_json),
+         User = euphorik_bd:nouveau_user(generer_cookie(), Profile#profile{pseudo = "<nick>"}),
          euphorik_bd:update_ip(User#user.id, IP),
          json_reponse_login_ok(User);
       true ->
@@ -91,6 +91,8 @@ login([{cookie, Cookie}], IP) ->
          erreur("Authentification impossible par cookie")
    end.
    
+   
+% L'utilisateur donné se logge avec l'ip donnée.
 loginUser(User, IP) ->
    euphorik_bd:update_ip(User#user.id, IP),
    euphorik_bd:update_date_derniere_connexion(User#user.id),
@@ -104,27 +106,44 @@ generer_cookie() ->
    erlang:integer_to_list(random:uniform(math:pow(10, 32)), 36).
 
 
-% Un utilisateur se délogge.
-logout(_) ->
-   do_nothing.
-
-
 % Modification du profile.
 profile(
    [
       {cookie, Cookie},
       {login, Login},
       {password, Password},
-      {nick, Pseudo},
-      {email, Email},
-      {css, Css},
-      {chat_order, Chat_order_str},
-      {nick_format, Nick_format_str},
-      {view_times, View_times},
-      {view_tooltips, View_tooltips},
-      {conversations, {array, Conversations_json}},
-      {ostentatious_master, Ostentatious_master}
+      {profile, Profile_json}
    ]
+) ->
+   case profile_from_json(Profile_json) of
+      {erreur, E} -> E;
+      Profile ->
+         case euphorik_bd:set_profile(Cookie, Login, Password, Profile) of
+            ok ->
+               json_reponse_ok();
+            login_deja_pris ->
+               erreur("Login déjà pris");
+            _ ->
+               erreur("Impossible de mettre à jour le profile")
+         end
+   end.
+
+
+% Construit un #user à partir des données JSON
+profile_from_json(
+   {struct,
+      [
+         {nick, Pseudo},
+         {email, Email},
+         {css, Css},
+         {chat_order, Chat_order_str},
+         {nick_format, Nick_format_str},
+         {view_times, View_times},
+         {view_tooltips, View_tooltips},
+         {conversations, {array, Conversations_json}},
+         {ostentatious_master, Ostentatious_master_str}
+      ]
+   }
 ) ->
    % décomposition de la strucure JSON
    Conversations = lists:foldr(
@@ -140,30 +159,39 @@ profile(
       [],
       Conversations_json
    ),
-   %  TODO : pas très beau, mieux vaut construire un #user
-   case euphorik_bd:set_profile(
-         Cookie,
-         Login,
-         Password,
-         Pseudo,
-         Email,
-         Css,
-         list_to_atom(Chat_order_str),
-         list_to_atom(Nick_format_str),
-         View_times,
-         View_tooltips,
-         Conversations,
-         list_to_atom(Ostentatious_master)) of
-      ok ->
-         json_reponse_ok();
-      login_deja_pris ->
-         erreur("Login déjà pris");
-      _ ->
-         erreur("Impossible de mettre à jour le profile")
+   % vérification des données JSON
+   Chat_order = list_to_atom(Chat_order_str),
+   Chat_order_valide = lists:any(fun(E) -> E =:= Chat_order end, [reverse, chrono]),
+   if not Chat_order_valide ->
+         {erreur, Chat_order_str ++ " n'est pas une valeur acceptée pour 'chat_order'"};
+      true -> 
+         Nick_format = list_to_atom(Nick_format_str),
+         Nick_format_valide = lists:any(fun(E) -> E =:= Nick_format end, [nick, login, nick_login]),
+         if not Nick_format_valide ->
+               {erreur, Nick_format_str ++ " n'est pas une valeur acceptée pour 'nick_format'"};
+            true -> 
+               Ostentatious_master = list_to_atom(Ostentatious_master_str),
+               Ostentatious_master_valide = lists:any(fun(E) -> E =:= Ostentatious_master end, [invisible, light, heavy]),
+               if not Ostentatious_master_valide ->
+                     {erreur, Ostentatious_master_str ++ " n'est pas une valeur acceptée pour 'ostentatious_master'"};
+                  true ->
+                     #profile{
+                        pseudo = Pseudo,
+                        email = Email,
+                        css = Css,
+                        chat_order = Chat_order,
+                        nick_format = Nick_format,
+                        view_times = View_times,
+                        view_tooltips = View_tooltips,
+                        conversations = Conversations,
+                        ostentatious_master = Ostentatious_master
+                     }
+               end
+         end      
    end.
 
 
-% Renvoie les messages appropriés.
+% Attend un événement pour la page "Chat"
 % last_message id et cookie sont facultatifs
 wait_event([{page, "chat"} | Data]) ->
    % traitement des inputs
@@ -194,6 +222,7 @@ wait_event([{page, "chat"} | Data]) ->
          mnesia:unsubscribe({table, troll, detailed}),
          R
    end;
+% Attend un événement pour la page "Admin"
 wait_event([{page, "admin"}, {last_troll, Last_troll}]) ->
    case wait_event_page_admin(Last_troll) of
       banned_ips_refresh ->
@@ -217,12 +246,12 @@ wait_event([{page, "admin"}, {last_troll, Last_troll}]) ->
                {trolls, {array, 
                   lists:map(
                      fun(T) ->                        
-                        {ok, User} = euphorik_bd:user_by_id(T#troll.id_user),
+                        {ok, #user{profile = Profile} = User} = euphorik_bd:user_by_id(T#troll.id_user),
                         {struct,
                            [
                               {troll_id, T#troll.id},
                               {content, T#troll.content},
-                              {author, User#user.pseudo},
+                              {author, Profile#profile.pseudo},
                               {author_id, User#user.id}
                            ]
                         }
@@ -246,6 +275,7 @@ wait_event(_) ->
    erreur("Page inconnue").
 
 
+% Attend un événement pour la page "Chat" et renvoie soit un troll soit les messages manquants au client.
 wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id, Main_page, Troll_id) ->
    % est-ce que le troll est à jour ?
    case euphorik_bd:current_troll() of
@@ -430,11 +460,11 @@ ban(
             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}} ->
+               {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",
                      [
-                        User2#user.pseudo,
+                        Profile2#profile.pseudo,
                         if User2#user.login =:= [] -> ""; true -> " (" ++ User2#user.login ++ ")" end,
                         if Duration =< 15 -> "kické"; true -> "banni" end,
                         format_minutes(Duration),
@@ -461,21 +491,21 @@ slap(
    ]) ->
       % controle que l'utilisateur est un admin
       case euphorik_bd:user_by_cookie(Cookie) of
-         {ok, User1 = #user{ek_master = true}} ->
+         {ok, User1 = #user{ek_master = true, profile = Profile1}} ->
             case euphorik_bd:user_by_id(User_id) of
                {ok, User1} ->
                   euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("~s s'auto slap~s.", 
                      [
-                        User1#user.pseudo,
+                        Profile1#profile.pseudo,
                         if Reason =/= [] -> " - Raison: " ++ Reason; true -> "" end
                      ]
                   ))),
                   json_reponse_ok();
-               {ok, User2 = #user{ek_master = false}} ->
+               {ok, #user{ek_master = false, profile = Profile2}} ->
                   euphorik_bd:nouveau_message_sys(lists:flatten(io_lib:format("~s se fait slaper par ~s.~s",
                      [
-                        User2#user.pseudo,
-                        User1#user.pseudo,
+                        Profile2#profile.pseudo,
+                        Profile1#profile.pseudo,
                         if Reason =/= [] -> " - Raison: " ++ Reason; true -> "" end ++ "."
                      ]
                   ))),
@@ -663,29 +693,33 @@ json_reponse_ok() ->
    {struct, [{reply, "ok"}]}.
    
    
-json_reponse_login_ok(User) ->
+json_reponse_login_ok(#user{profile = Profile} = 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},
-         {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},
-         {conversations, {array, lists:map(
-            fun({Racine, Reduit}) ->
-               {struct, [{root, Racine}, {minimized, Reduit}]}
-            end,
-            User#user.conversations
-         )}},
          {ek_master, User#user.ek_master},
-         {ostentatious_master, atom_to_list(User#user.ostentatious_master)}
+         {profile, {struct,
+            [
+               {nick, Profile#profile.pseudo},
+               {email, Profile#profile.email},
+               {css, Profile#profile.css},
+               {chat_order, atom_to_list(Profile#profile.chat_order)},
+               {nick_format, atom_to_list(Profile#profile.nick_format)},
+               {view_times, Profile#profile.view_times},
+               {view_tooltips, Profile#profile.view_tooltips},
+               {conversations, {array, lists:map(
+                  fun({Racine, Reduit}) ->
+                     {struct, [{root, Racine}, {minimized, Reduit}]}
+                  end,
+                  Profile#profile.conversations
+               )}},
+               {ostentatious_master, atom_to_list(Profile#profile.ostentatious_master)}
+            ]
+         }}
       ]
    }.
    
@@ -697,7 +731,7 @@ json_message(Mess, Repond_a, User) ->
    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),
+   {ok,  #user{profile = Profile_mess} = User_mess } = euphorik_bd:user_by_id(Mess#minichat.auteur_id),
    {struct, [
       {id, Mess#minichat.id},
       {user_id, User_mess#user.id},
@@ -719,5 +753,5 @@ json_message(Mess, Repond_a, User) ->
          Repond_a
       )}},
       {ek_master, User_mess#user.ek_master},
-      {ostentatious_master, atom_to_list(User_mess#user.ostentatious_master)}
+      {ostentatious_master, atom_to_list(Profile_mess#profile.ostentatious_master)}
    ]}.