MOD Support des conversations et passage au protocole n°1 (avancement : erl = 50...

[euphorik.git] / modules / erl / euphorik_protocole.erl

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index 66555e0..7b9423a 100755 (executable)
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -39,7 +39,7 @@ nouveau_user_captcha(Action) ->
             C2_crypt = common:crypt(C2),\r
             if C1 =:= C2_crypt ->\r
                   Cookie = generer_cookie(),\r
-                  User = minichat:nouveau_user("Paul", Cookie),\r
+                  User = euphorik_minichat:nouveau_user("Paul", Cookie),\r
                   xml_reponse_login_ok(User);\r
                true ->
                   xml_reponse_login_pas_ok("Captcha incorrect")\r
@@ -52,7 +52,7 @@ nouveau_user_captcha(Action) ->
 nouveau_user_login(Action) ->\r
    {Login, Password, Login_deja_pris} = case {xmerl_xpath:string("login", Action), xmerl_xpath:string("password", Action)} of\r
       {[#xmlElement{content = [#xmlText{value = L}]}], [#xmlElement{content = [#xmlText{value = P}]}]} ->\r
-         {L, P, case minichat:get_user_by_login(L) of {ok, _} -> true; _ -> false end};\r
+         {L, P, case euphorik_minichat:get_user_by_login(L) of {ok, _} -> true; _ -> false end};\r
       _ -> {[], [], false}\r
    end,      
    simple_xml_to_string(\r
@@ -60,7 +60,7 @@ nouveau_user_login(Action) ->
             xml_reponse_login_pas_ok("Login déjà pris");\r
          true ->\r
             Cookie = generer_cookie(),\r
-            User = minichat:nouveau_user(Login, Password, Cookie),\r
+            User = euphorik_minichat:nouveau_user(Login, Password, Cookie),\r
             xml_reponse_login_ok(User)      \r
       end
    ).\r
@@ -70,17 +70,17 @@ nouveau_user_login(Action) ->
 login(Action) ->
    case xmerl_xpath:string("cookie", Action) of
       [#xmlElement{content = [#xmlText{value = Cookie}]}] ->
-         loginUser(minichat:get_user_by_cookie(Cookie));
+         loginUser(euphorik_minichat:get_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(minichat:get_user_by_login_password(Login, Password));
+               loginUser(euphorik_minichat:get_user_by_login_password(Login, Password));
          _ ->
             simple_xml_to_string(xml_reponse_login_pas_ok("XML malformé"))
          end
    end.
 loginUser({ok, User}) ->
-   minichat:update_date_derniere_connexion(User#user.id),
+   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")).
@@ -108,7 +108,7 @@ profile(Action) ->
             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,
-            case minichat:set_profile(Cookie, Login, Password, Pseudo, Email, Css) of
+            case euphorik_minichat:set_profile(Cookie, Login, Password, Pseudo, Email, Css) of
                ok ->
                   xml_reponse_profile_ok();\r
                login_deja_pris ->\r
@@ -141,7 +141,7 @@ refreshMessage(Action) ->
             end,         
             User = case xmerl_xpath:string("cookie", Action) of 
                [#xmlElement{content = [#xmlText{value = Cookie}]}] ->
-                  case minichat:get_user_by_cookie(Cookie) of
+                  case euphorik_minichat:get_user_by_cookie(Cookie) of
                      {ok, U} -> U;
                      _ -> inconnu
                   end;
@@ -151,10 +151,10 @@ refreshMessage(Action) ->
             Mess = lists:map(\r
                fun(Mess) ->\r
                   Est_proprietaire = User =/= inconnu andalso User#user.id =:= Mess#minichat.auteur_id,\r
-                  A_repondu_a_message = User =/= inconnu andalso minichat:a_repondu_a_message(User#user.id, Mess#minichat.id),\r
-                  Est_une_reponse_a_user = User =/= inconnu andalso minichat:est_une_reponse_a_user(User#user.id, Mess#minichat.id),
+                  A_repondu_a_message = User =/= inconnu andalso euphorik_minichat:a_repondu_a_message(User#user.id, Mess#minichat.id),\r
+                  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} = minichat:get_user_by_id(Mess#minichat.auteur_id),
+                     {ok, U2} = euphorik_minichat:get_user_by_id(Mess#minichat.auteur_id),
                      U2
                   end,                  \r
                   {message, [{id, erlang:integer_to_list(Mess#minichat.id, 36)}],\r
@@ -175,7 +175,7 @@ refreshMessage(Action) ->
             ),
             [{reponse, [{name, "refreshMessages"}],\r
                % la fonction get_nb_page DOIT être évalué après get_dernieres_messages (merci les effets de bord)
-               [{nbPage, [], [integer_to_list(minichat:get_nb_page(Nb_message))]} | Mess]
+               [{nbPage, [], [integer_to_list(euphorik_minichat:get_nb_page(Nb_message))]} | Mess]
             }];
          _ ->
             [{reponse, [{name, "refreshMessages"}], [{erreur, [], ["erreur"]}]}]
@@ -183,12 +183,12 @@ refreshMessage(Action) ->
    ).
          
 
-% Renvoie les dernies messages, s'il n'y en a pas on effectue une attente.
+% Renvoie les derniers messages, s'il n'y en a pas on effectue une attente.
 get_dernieres_messages(Dernier_id, Nb_message, Page) ->
-   Messages = minichat:messages(Dernier_id, Nb_message, Page),
+   Messages = euphorik_minichat:messages(Dernier_id, Nb_message, Page),
    if Messages =:= [] ->
-         minichat:attends_nouveau_messages(),
-         minichat:messages(Dernier_id,  Nb_message, Page);
+         euphorik_minichat:attends_nouveau_messages(),
+         euphorik_minichat:messages(Dernier_id,  Nb_message, Page);
       true ->
          Messages
    end.
@@ -212,12 +212,12 @@ message(Action) ->
             [#xmlElement{content = Pseudo_fragments}],
             [#xmlElement{content = Contenu_fragments}]
          } ->                    \r
-            case minichat:get_user_by_cookie(Cookie) of\r
+            case euphorik_minichat:get_user_by_cookie(Cookie) of\r
                {ok, U} ->\r
                   Pseudo = defragmenter(Pseudo_fragments),\r
                   Contenu = defragmenter(Contenu_fragments),\r
                   % met à jour le pseudo du user\r
-                  minichat:update_pseudo_user(U#user.id, Pseudo),\r
+                  euphorik_minichat:update_pseudo_user(U#user.id, Pseudo),\r
                   Reponses = case xmerl_xpath:string("reponses", Action) of\r
                      [#xmlElement{content = C}] ->\r
                         lists:map(\r
@@ -231,7 +231,7 @@ message(Action) ->
                   Contenu_strip = string:strip(Contenu),
                   if Contenu_strip =:= [] -> xml_reponse_message(pas_ok);
                      true ->
-                        case minichat:nouveau_message(Contenu, U#user.id, Reponses) of
+                        case euphorik_minichat:nouveau_message(Contenu, U#user.id, Reponses) of
                            erreur -> xml_reponse_message(pas_ok);
                         _ -> xml_reponse_message(ok)
                         end
@@ -330,10 +330,10 @@ xml_reponse_profile_pas_ok(Message) ->
 xml_repond_a(Mess_id) ->
    lists:map(
       fun(M) ->
-         {ok, User} = minichat:get_user_by_id(M#minichat.auteur_id),
+         {ok, User} = euphorik_minichat:get_user_by_id(M#minichat.auteur_id),
          {id, [{id, erlang:integer_to_list(M#minichat.id, 36)}, {pseudo, M#minichat.pseudo}, {login, User#user.login}], []}
       end,
-      minichat:repond_a(Mess_id)
+      euphorik_minichat:repond_a(Mess_id)
    ).\r
    \r
    \r