X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=59f8def0c83766e4b2900e4cc4b043242de9ff5d;hb=d9d05b6a2a13c2da190dd68d4409381d093679b2;hp=c2cb9846b537865c4faec2cd79644060b46a5af4;hpb=2faefc542de20cfcc0220b5c7fd7982dd0fbbfd4;p=euphorik.git

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index c2cb984..59f8def 100755
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -5,7 +5,7 @@
 
 -module(euphorik_protocole).
 -export([
-   register/1,
+   register/2,
    login/1,
    logout/1,
    profile/1,
@@ -20,18 +20,32 @@
 
 
 % Une utilisateur s'enregistre avec un tuple {Login, Password}.
-register([{login, Login}, {password, Password}]) ->
-   case euphorik_minichat:user_by_login(Login) of
-      {ok, _} ->
-         erreur("Login déjà existant");
-      _ ->
-         User = euphorik_minichat:nouveau_user(Login, Password, generer_cookie()),
-         json_reponse_login_ok(User)
+register([{login, Login}, {password, Password}], IP) ->
+   Can_register = euphorik_minichat:can_register(IP),
+   if Can_register ->
+         case euphorik_minichat:user_by_login(Login) of
+            {ok, _} ->
+               erreur("Login déjà existant");
+            _ ->
+               User = euphorik_minichat:nouveau_user(Login, Password, generer_cookie()),
+               json_reponse_login_ok(User)
+         end;
+      true ->
+         erreur_register_flood()
    end;
 % Enregistrement sans {Login, Password}
-register([]) ->   
-   User = euphorik_minichat:nouveau_user("<nick>", generer_cookie()),
-   json_reponse_login_ok(User).
+register([], IP) ->   
+   Can_register = euphorik_minichat:can_register(IP),
+   if Can_register ->
+         User = euphorik_minichat:nouveau_user("<nick>", generer_cookie()),
+         json_reponse_login_ok(User);
+      true ->
+         erreur_register_flood()
+   end.
+   
+erreur_register_flood() ->
+   erreur("Trop de register (flood)").
+   
    
 
 % Un utilisateur se logge (avec un couple {login, mot de passe})
@@ -109,7 +123,13 @@ wait_event(Data) ->
    {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}]}) -> {Racine, Page} end, Conversations_json),
+   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_minichat:user_by_cookie(Cookie) of
       {ok, U} -> U;
       _ -> inconnu