Update to the new library 'json2'

diff --git a/modules/erl/euphorik_bd.erl b/modules/erl/euphorik_bd.erl
index 0933645..6b10f4b 100755 (executable)
--- a/modules/erl/euphorik_bd.erl
+++ b/modules/erl/euphorik_bd.erl
@@ -96,7 +96,7 @@ get_texte(Id, _Lang = fr) ->
 nouveau_user(Cookie, Profile) ->\r
    F = fun() ->\r
       Id = nouvel_id(user),\r
-      User = #user{id = Id, cookie = Cookie, date_creation = now(), date_derniere_connexion = now(), profile = Profile},\r
+      User = #user{id = Id, cookie = Cookie, date_creation = erlang:timestamp(), date_derniere_connexion = erlang:timestamp(), profile = Profile},\r
       mnesia:write(User),\r
       User\r
    end,\r
@@ -107,7 +107,7 @@ nouveau_user(Cookie, Profile) ->
 nouveau_user(Login, Password, Cookie, Profile) ->\r
    F = fun() ->\r
       Id = nouvel_id(user),\r
-      User = #user{id = Id, cookie = Cookie, login = Login, password = Password, date_creation = now(), date_derniere_connexion = now(), profile = Profile#profile{pseudo = Login}},\r
+      User = #user{id = Id, cookie = Cookie, login = Login, password = Password, date_creation = erlang:timestamp(), date_derniere_connexion = erlang:timestamp(), profile = Profile#profile{pseudo = Login}},\r
       mnesia:write(User),\r
       User\r
    end,\r
@@ -145,7 +145,7 @@ update_date_derniere_connexion(User_id) ->
       fun() ->\r
          case mnesia:wread({user, User_id}) of\r
             [User] ->\r
-               mnesia:write(User#user{date_derniere_connexion = now()});\r
+               mnesia:write(User#user{date_derniere_connexion = erlang:timestamp()});\r
             _ ->\r
                mnesia:abort("update_date_derniere_connexion: User inconnu")\r
           end\r
@@ -298,7 +298,7 @@ nouveau_message(Mess, Auteur_id, Repond_A_ids) ->
                   case mnesia:wread({user, Auteur_id}) of\r
                      [#user{profile = Profile} = Auteur] ->\r
                         % comparaison entre la date du dernier poste et maintenant (gestion du flood)\r
-                        Now = now(),\r
+                        Now = erlang:timestamp(),\r
                         Delta = euphorik_common:delta_date_ms(Auteur#user.date_derniere_connexion, Now),\r
                         Nouvel_indice_flood = Auteur#user.indice_flood + if Delta =< ?DUREE_SPAM -> 2; true -> -1 end,\r
                         Auteur_maj = Auteur#user{\r
@@ -348,7 +348,7 @@ nouveau_message_sys(Mess) ->
    resultat_transaction(mnesia:transaction(\r
       fun() ->\r
          Id = nouvel_id(minichat),\r
-         mnesia:write(#minichat{id = Id, auteur_id = 0, date = now(), pseudo = Profile#profile.pseudo, contenu = Mess, racine_id = Id}),\r
+         mnesia:write(#minichat{id = Id, auteur_id = 0, date = erlang:timestamp(), pseudo = Profile#profile.pseudo, contenu = Mess, racine_id = Id}),\r
          Id\r
       end\r
    )).\r
@@ -550,7 +550,7 @@ possede_message(Id_user, Id_mess) ->
 list_ban() ->\r
    resultat_transaction(mnesia:transaction(\r
       fun() ->\r
-         Now = now(),\r
+         Now = erlang:timestamp(),\r
          e(qlc:keysort(1, q([\r
             {\r
                IP#ip_table.ip,\r
@@ -570,9 +570,9 @@ ban(IP, Duration) ->
       fun() ->\r
          case mnesia:wread({ip_table, IP}) of\r
             [IP_tuple] ->\r
-               mnesia:write(IP_tuple#ip_table{ban = now(), ban_duration = Duration});\r
+               mnesia:write(IP_tuple#ip_table{ban = erlang:timestamp(), ban_duration = Duration});\r
             _ ->\r
-               mnesia:write(#ip_table{ip = IP, ban = now(), ban_duration = Duration})\r
+               mnesia:write(#ip_table{ip = IP, ban = erlang:timestamp(), ban_duration = Duration})\r
           end\r
       end\r
    ).\r
@@ -597,7 +597,7 @@ est_banni(User_id) ->
          ]), [{tmpdir, ?KEY_SORT_TEMP_DIR}]) of\r
             [{Ban, Ban_duration}] ->\r
                Echeance = date_plus_minutes(Ban, Ban_duration),\r
-               Now = now(),\r
+               Now = erlang:timestamp(),\r
                if Echeance < Now -> % l'échéance est passée\r
                      false;\r
                   true ->\r
@@ -610,7 +610,7 @@ est_banni(User_id) ->
    )).\r
 \r
 \r
-% Ban est une date tel que retourner par now().\r
+% Ban est une date tel que retourner par erlang:timestamp().\r
 % Ban_duration est un temps en minutes.\r
 % retourne une date.\r
 date_plus_minutes(Ban, Ban_duration) ->\r
@@ -627,16 +627,16 @@ can_register(IP) ->
       fun() ->\r
          case e(q([I || I <- mnesia:table(ip_table), I#ip_table.ip =:= IP]), [{tmpdir, ?KEY_SORT_TEMP_DIR}]) of\r
             [] ->\r
-               mnesia:write(#ip_table{ip = IP, date_last_try_register = now()}),\r
+               mnesia:write(#ip_table{ip = IP, date_last_try_register = erlang:timestamp()}),\r
                true;\r
             [T] ->\r
-               Delta = euphorik_common:delta_date_ms(T#ip_table.date_last_try_register, now()),\r
+               Delta = euphorik_common:delta_date_ms(T#ip_table.date_last_try_register, erlang:timestamp()),\r
                if T#ip_table.nb_try_register =:= ?NB_MAX_FLOOD_REGISTER, Delta < ?TEMPS_BAN_FLOOD_REGISTER ->\r
                      false;\r
                   true ->\r
                      mnesia:write(T#ip_table{\r
                         ip = IP,\r
-                        date_last_try_register = now(),\r
+                        date_last_try_register = erlang:timestamp(),\r
                         nb_try_register = T#ip_table.nb_try_register + if Delta < ?TEMPS_FLOOD_REGISTER -> 1; T#ip_table.nb_try_register > 0 -> -1; true -> 0 end\r
                      }),\r
                      true\r

diff --git a/modules/erl/euphorik_bd_admin.erl b/modules/erl/euphorik_bd_admin.erl
index 132b238..e5c20bc 100644 (file)
--- a/modules/erl/euphorik_bd_admin.erl
+++ b/modules/erl/euphorik_bd_admin.erl
@@ -150,7 +150,7 @@ reset() ->
    % crée l'utilisateur root\r
    mnesia:transaction(fun() ->\r
       mnesia:write(#proprietes{nom = version, valeur = ?VERSION_BD}),\r
-      User = #user{id = 0, profile = #profile{pseudo = "Sys"}, login = "Sys", date_creation = now(), date_derniere_connexion = now(), ek_master = true},\r
+      User = #user{id = 0, profile = #profile{pseudo = "Sys"}, login = "Sys", date_creation = erlang:timestamp(), date_derniere_connexion = erlang:timestamp(), ek_master = true},\r
       mnesia:write(User),\r
       User\r
    end),\r

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index 518d22d..ef37ace 100755 (executable)
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -39,7 +39,7 @@
 \r
 \r
 % Une utilisateur s'enregistre avec un tuple {Login, Password}.\r
-register([{login, Login}, {password, Password}, {profile, Profile_json}], IP) ->\r
+register([{"login", Login}, {"password", Password}, {"profile", Profile_json}], IP) ->\r
    Can_register = euphorik_bd:can_register(IP),\r
    if Can_register ->\r
          case euphorik_bd:user_by_login(Login) of\r
@@ -54,7 +54,7 @@ register([{login, Login}, {password, Password}, {profile, Profile_json}], IP) ->
          erreur_register_flood()\r
    end;\r
 % Enregistrement sans {Login, Password}\r
-register([{profile, Profile_json}], IP) ->\r
+register([{"profile", Profile_json}], IP) ->\r
    Can_register = euphorik_bd:can_register(IP),\r
    if Can_register ->\r
          Profile = profile_from_json(Profile_json),\r
@@ -70,7 +70,7 @@ erreur_register_flood() ->
 \r
 \r
 % Un utilisateur se logge (avec un couple {login, mot de passe})\r
-login([{login, Login}, {password, Password}], IP) ->\r
+login([{"login", Login}, {"password", Password}], IP) ->\r
    case euphorik_bd:user_by_login_password(Login, Password) of\r
       {ok, User} ->\r
          loginUser(User, IP);\r
@@ -79,7 +79,7 @@ login([{login, Login}, {password, Password}], IP) ->
          erreur(30)\r
    end;\r
 % Un utilisateur se logge (avec un cookie)\r
-login([{cookie, Cookie}], IP) ->\r
+login([{"cookie", Cookie}], IP) ->\r
    case euphorik_bd:user_by_cookie(Cookie) of\r
       {ok, User} ->\r
          loginUser(User, IP);\r
@@ -98,7 +98,7 @@ loginUser(User, IP) ->
 \r
 % Renvoie un string() représentant un cookie en base 36. Il y a 10^32 possibillités.\r
 generer_cookie() ->\r
-   {A1, A2, A3} = now(),\r
+   {A1, A2, A3} = erlang:timestamp(),\r
    random:seed(A1, A2, A3),\r
    erlang:integer_to_list(random:uniform(trunc(math:pow(10, 32))), 36).\r
 \r
@@ -106,10 +106,10 @@ generer_cookie() ->
 % Modification du profile.\r
 profile(\r
    [\r
-      {cookie, Cookie},\r
-      {login, Login},\r
-      {password, Password},\r
-      {profile, Profile_json}\r
+      {"cookie", Cookie},\r
+      {"login", Login},\r
+      {"password", Password},\r
+      {"profile", Profile_json}\r
    ]\r
 ) ->\r
    case profile_from_json(Profile_json) of\r
@@ -130,21 +130,21 @@ profile(
 profile_from_json(\r
    {struct,\r
       [\r
-         {nick, Pseudo},\r
-         {email, Email},\r
-         {css, Css},\r
-         {chat_order, Chat_order_str},\r
-         {nick_format, Nick_format_str},\r
-         {view_times, View_times},\r
-         {view_tooltips, View_tooltips},\r
-         {conversations, {array, Conversations_json}},\r
-         {ostentatious_master, Ostentatious_master_str}\r
+         {"nick", Pseudo},\r
+         {"email", Email},\r
+         {"css", Css},\r
+         {"chat_order", Chat_order_str},\r
+         {"nick_format", Nick_format_str},\r
+         {"view_times", View_times},\r
+         {"view_tooltips", View_tooltips},\r
+         {"conversations", {array, Conversations_json}},\r
+         {"ostentatious_master", Ostentatious_master_str}\r
       ]\r
    }\r
 ) ->\r
    % décomposition de la strucure JSON\r
    Conversations = lists:foldr(\r
-      fun({struct, [{root, Racine}, {minimized, Reduit}]}, A) ->\r
+      fun({struct, [{"root", Racine}, {"minimized", Reduit}]}, A) ->\r
          % virage des messages qui n'existent pas\r
          Message_exite = euphorik_bd:message_existe(Racine),\r
          if Message_exite ->\r
@@ -190,16 +190,16 @@ profile_from_json(
 \r
 % Attend un événement pour la page "Chat"\r
 % last_message id et cookie sont facultatifs\r
-wait_event([{page, "chat"} | Data]) ->\r
+wait_event([{"page", "chat"} | Data]) ->\r
    % traitement des inputs\r
-   Cookie = case lists:keysearch(cookie, 1, Data) of {value, {_, C}} -> C; _ -> inconnu end,\r
-   Last_message_id = case lists:keysearch(last_message_id, 1, Data) of {value, {_, Id}} -> Id; _ -> 0 end,\r
-   {value, {_, Message_count}} = lists:keysearch(message_count, 1, Data),\r
-   Main_page = case lists:keysearch(main_page, 1, Data) of {value, {_, P}} -> P; _ -> 1 end,\r
-   {value, {_, {array, Conversations_json}}} = lists:keysearch(conversations, 1, Data),\r
+   Cookie = case lists:keysearch("cookie", 1, Data) of {value, {_, C}} -> C; _ -> inconnu end,\r
+   Last_message_id = case lists:keysearch("last_message_id", 1, Data) of {value, {_, Id}} -> Id; _ -> 0 end,\r
+   {value, {_, Message_count}} = lists:keysearch("message_count", 1, Data),\r
+   Main_page = case lists:keysearch("main_page", 1, Data) of {value, {_, P}} -> P; _ -> 1 end,\r
+   {value, {_, {array, Conversations_json}}} = lists:keysearch("conversations", 1, Data),\r
    Racines_conversations = lists:map(\r
-      fun({struct, [{root, Racine}, {page, Page} | Reste]}) ->\r
-         Last_mess_conv  = case Reste of [{last_message_id, L}] -> L; _ -> 0 end,\r
+      fun({struct, [{"root", Racine}, {"page", Page} | Reste]}) ->\r
+         Last_mess_conv  = case Reste of [{"last_message_id", L}] -> L; _ -> 0 end,\r
          {Racine, Page, Last_mess_conv}\r
       end,\r
       Conversations_json\r
@@ -217,12 +217,12 @@ wait_event([{page, "chat"} | Data]) ->
          R\r
    end;\r
 % Attend un événement pour la page "Admin"\r
-wait_event([{page, "admin"}]) ->\r
+wait_event([{"page", "admin"}]) ->\r
    case wait_event_page_admin() of\r
       banned_ips_refresh ->\r
          {struct,\r
             [\r
-               {reply, "banned_ips_refresh"}\r
+               {"reply", "banned_ips_refresh"}\r
             ]\r
          };\r
       _ ->\r
@@ -242,13 +242,13 @@ wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id
          Conversations ->\r
             % Accrochez-vous ca va siouxer ;).\r
             {struct, [\r
-               {reply, "new_messages"},\r
-               {conversations, {array,\r
+               {"reply", "new_messages"},\r
+               {"conversations", {array,\r
                   lists:map(\r
                      fun({Racine, {Conv, Plus}}) ->\r
                         {struct, [\r
-                           {last_page, not Plus},\r
-                           {first, % le premier message de la conversation\r
+                           {"last_page", not Plus},\r
+                           {"first", % le premier message de la conversation\r
                               if Racine =:= undefined orelse Conv =:= [] ->\r
                                     null;\r
                                  true ->\r
@@ -333,10 +333,10 @@ wait_event_page_admin() ->
 % Answer_to est une liste d'id (int)\r
 put_message(\r
    [\r
-      {cookie, Cookie},\r
-      {nick, Nick},\r
-      {content, Content},\r
-      {answer_to, {array, Answer_to}}\r
+      {"cookie", Cookie},\r
+      {"nick", Nick},\r
+      {"content", Content},\r
+      {"answer_to", {array, Answer_to}}\r
    ]\r
 ) ->\r
    case euphorik_bd:user_by_cookie(Cookie) of\r
@@ -366,10 +366,10 @@ put_message(
 % bannissement d'un utilisateur (son ip est bannie)\r
 ban(\r
    [\r
-      {cookie, Cookie},\r
-      {duration, Duration},\r
-      {user_id, User_id},\r
-      {reason, Reason}\r
+      {"cookie", Cookie},\r
+      {"duration", Duration},\r
+      {"user_id", User_id},\r
+      {"reason", Reason}\r
    ]) ->\r
       % controle que l'utilisateur est un admin\r
       case euphorik_bd:user_by_cookie(Cookie) of\r
@@ -402,9 +402,9 @@ ban(
 % slapage d'un user (avertissement)\r
 slap(\r
    [\r
-      {cookie, Cookie},\r
-      {user_id, User_id},\r
-      {reason, Reason}\r
+      {"cookie", Cookie},\r
+      {"user_id", User_id},\r
+      {"reason", Reason}\r
    ]) ->\r
       % controle que l'utilisateur est un admin\r
       case euphorik_bd:user_by_cookie(Cookie) of\r
@@ -439,8 +439,8 @@ slap(
 \r
 unban_ip(\r
    [\r
-      {cookie, Cookie},\r
-      {ip, IP}\r
+      {"cookie", Cookie},\r
+      {"ip", IP}\r
    ]\r
 ) ->\r
    case euphorik_bd:user_by_cookie(Cookie) of\r
@@ -454,7 +454,7 @@ unban_ip(
 \r
 list_banned_ips(\r
    [\r
-      {cookie, Cookie}\r
+      {"cookie", Cookie}\r
    ]\r
 ) ->\r
    case euphorik_bd:user_by_cookie(Cookie) of\r
@@ -462,19 +462,19 @@ list_banned_ips(
          {\r
             struct,\r
             [\r
-               {reply, "list_banned_ips"},\r
-               {list, {array, lists:map(\r
+               {"reply", "list_banned_ips"},\r
+               {"list", {array, lists:map(\r
                   fun({IP, T, Users}) ->\r
                      {struct,\r
                         [\r
-                           {ip, euphorik_common:serialize_ip(IP)},\r
-                           {remaining_time, format_minutes(T)},\r
-                           {users, {array, lists:map(\r
+                           {"ip", euphorik_common:serialize_ip(IP)},\r
+                           {"remaining_time", format_minutes(T)},\r
+                           {"users", {array, lists:map(\r
                               fun({Pseudo, Login}) ->\r
                                  {struct,\r
                                     [\r
-                                       {nick, Pseudo},\r
-                                       {login, Login}\r
+                                       {"nick", Pseudo},\r
+                                       {"login", Login}\r
                                     ]\r
                                  }\r
                               end,\r
@@ -504,9 +504,9 @@ erreur(Num) ->
 erreur_json(Num, Mess) ->\r
    {\r
       struct, [\r
-         {reply, "error"},\r
-         {no, Num},\r
-         {error_message, Mess}\r
+         {"reply", "error"},\r
+         {"no", Num},\r
+         {"error_message", Mess}\r
       ]\r
    }.\r
 \r
@@ -549,34 +549,34 @@ format_date(Date) ->
 \r
 \r
 json_reponse_ok() ->\r
-   {struct, [{reply, "ok"}]}.\r
+   {struct, [{"reply", "ok"}]}.\r
 \r
 \r
 json_reponse_login_ok(#user{profile = Profile} = User) ->\r
    {\r
       struct, [\r
-         {reply, "login"},\r
-         {status, if (User#user.password =/= []) and (User#user.login =/= []) -> "auth_registered"; true -> "auth_not_registered" end},\r
-         {cookie, User#user.cookie},\r
-         {id, User#user.id},\r
-         {login, User#user.login},\r
-         {ek_master, User#user.ek_master},\r
-         {profile, {struct,\r
+         {"reply", "login"},\r
+         {"status", if (User#user.password =/= []) and (User#user.login =/= []) -> "auth_registered"; true -> "auth_not_registered" end},\r
+         {"cookie", User#user.cookie},\r
+         {"id", User#user.id},\r
+         {"login", User#user.login},\r
+         {"ek_master", User#user.ek_master},\r
+         {"profile", {struct,\r
             [\r
-               {nick, Profile#profile.pseudo},\r
-               {email, Profile#profile.email},\r
-               {css, Profile#profile.css},\r
-               {chat_order, atom_to_list(Profile#profile.chat_order)},\r
-               {nick_format, atom_to_list(Profile#profile.nick_format)},\r
-               {view_times, Profile#profile.view_times},\r
-               {view_tooltips, Profile#profile.view_tooltips},\r
-               {conversations, {array, lists:map(\r
+               {"nick", Profile#profile.pseudo},\r
+               {"email", Profile#profile.email},\r
+               {"css", Profile#profile.css},\r
+               {"chat_order", atom_to_list(Profile#profile.chat_order)},\r
+               {"nick_format", atom_to_list(Profile#profile.nick_format)},\r
+               {"view_times", Profile#profile.view_times},\r
+               {"view_tooltips", Profile#profile.view_tooltips},\r
+               {"conversations", {array, lists:map(\r
                   fun({Racine, Reduit}) ->\r
-                     {struct, [{root, Racine}, {minimized, Reduit}]}\r
+                     {struct, [{"root", Racine}, {"minimized", Reduit}]}\r
                   end,\r
                   Profile#profile.conversations\r
                )}},\r
-               {ostentatious_master, atom_to_list(Profile#profile.ostentatious_master)}\r
+               {"ostentatious_master", atom_to_list(Profile#profile.ostentatious_master)}\r
             ]\r
          }}\r
       ]\r
@@ -592,25 +592,25 @@ json_message(Mess, Repond_a, User) ->
    Est_une_reponse_a_user = User =/= inconnu andalso euphorik_bd:est_une_reponse_a_user(User#user.id, Mess#minichat.id),\r
    {ok,  #user{profile = Profile_mess} = User_mess } = euphorik_bd:user_by_id(Mess#minichat.auteur_id),\r
    {struct, [\r
-      {id, Mess#minichat.id},\r
-      {user_id, User_mess#user.id},\r
-      {date, case Mess#minichat.date of undefined -> "?"; _ -> format_date(Mess#minichat.date) end},\r
-      {system, Mess#minichat.auteur_id =:= 0},\r
-      {owner, Est_proprietaire},\r
-      {answered, A_repondu_a_message},\r
-      {is_a_reply, Est_une_reponse_a_user},\r
-      {nick, Mess#minichat.pseudo},\r
-      {login, User_mess#user.login},\r
-      {content, Mess#minichat.contenu},\r
-      {root, Mess#minichat.racine_id},\r
-      {answer_to, {array, lists:map(\r
+      {"id", Mess#minichat.id},\r
+      {"user_id", User_mess#user.id},\r
+      {"date", case Mess#minichat.date of undefined -> "?"; _ -> format_date(Mess#minichat.date) end},\r
+      {"system", Mess#minichat.auteur_id =:= 0},\r
+      {"owner", Est_proprietaire},\r
+      {"answered", A_repondu_a_message},\r
+      {"is_a_reply", Est_une_reponse_a_user},\r
+      {"nick", Mess#minichat.pseudo},\r
+      {"login", User_mess#user.login},\r
+      {"content", Mess#minichat.contenu},\r
+      {"root", Mess#minichat.racine_id},\r
+      {"answer_to", {array, lists:map(\r
          fun(Id_mess) ->\r
             {ok, M} = euphorik_bd:message_by_id(Id_mess),\r
             {ok, User_reponse} = euphorik_bd:user_by_mess(M#minichat.id),\r
-            {struct, [{id, M#minichat.id}, {nick, M#minichat.pseudo}, {login, User_reponse#user.login}]}\r
+            {struct, [{"id", M#minichat.id}, {"nick", M#minichat.pseudo}, {"login", User_reponse#user.login}]}\r
          end,\r
          Repond_a\r
       )}},\r
-      {ek_master, User_mess#user.ek_master},\r
-      {ostentatious_master, atom_to_list(Profile_mess#profile.ostentatious_master)}\r
+      {"ek_master", User_mess#user.ek_master},\r
+      {"ostentatious_master", atom_to_list(Profile_mess#profile.ostentatious_master)}\r
    ]}.\r

diff --git a/modules/erl/euphorik_requests.erl b/modules/erl/euphorik_requests.erl
index 69a5597..49cbe02 100755 (executable)
--- a/modules/erl/euphorik_requests.erl
+++ b/modules/erl/euphorik_requests.erl
@@ -36,8 +36,10 @@ out(A) ->
    end,\r
    % active: to receive {tcp_closed, _} when the socket is closing.\r
    % keepalive: avoid firewalls to cut the connection.\r
+\r
    inet:setopts(A#arg.clisock, [{active, true}, {keepalive, true}]),\r
    {value, {_, Contenu}} = lists:keysearch("action", 1, yaws_api:parse_post(A)),\r
+\r
    Ret = traiter_message(Contenu, IP),\r
    {content, "application/json", Ret}.\r
 \r
@@ -45,8 +47,9 @@ out(A) ->
 % Décode le message JSON.\r
 traiter_message(Contenu, IP) ->\r
    % extrait l'entête obligatoire des messages JSON\r
-   {ok, {struct, [{header, {struct, [{action, Action}, {version, Version_client}]}} | Reste]}} = json:decode_string(Contenu),\r
-   json:encode(\r
+   {ok, {struct, [{"header", {struct, [{"action", Action}, {"version", Version_client}]}} | Reste]}} = json2:decode_string(Contenu),\r
+\r
+   json2:encode(\r
       if Version_client =:= ?VERSION_PROTOCOLE ->\r
             traiter_action(Action, Reste, IP);\r
          true ->\r

diff --git a/modules/erl/euphorik_test.erl b/modules/erl/euphorik_test.erl
index 7b2d9a1..a166465 100644 (file)
--- a/modules/erl/euphorik_test.erl
+++ b/modules/erl/euphorik_test.erl
@@ -45,7 +45,7 @@ start(N, M) ->
          timer:sleep(100),\r
          spawn(\r
             fun() ->\r
-               {A1, A2, A3} = now(),\r
+               {A1, A2, A3} = erlang:timestamp(),\r
                random:seed(A1, A2, A3),\r
                loop(Id, M)\r
             end\r
@@ -197,7 +197,7 @@ bench_write_minichat(N, Temps) ->
       mnesia:write(#minichat{\r
          id = Id,\r
          auteur_id = random:uniform(10000),\r
-         date = now(),\r
+         date = erlang:timestamp(),\r
          pseudo = "Test",\r
          contenu = "Blabla blabla bla.",\r
          racine_id = random:uniform(10000)\r

diff --git a/tools/yaws.conf b/tools/yaws.conf
index 6c0994d..820f310 100644 (file)
--- a/tools/yaws.conf
+++ b/tools/yaws.conf
@@ -1,4 +1,4 @@
-# Configuration pour euphorik.ch en mode de développement.
+# Configuration pour euphorik.ch en mode de d�veloppement.
 
 logdir = /tmp
 
@@ -15,6 +15,7 @@ include_dir = ../modules/include
     allowed_scripts = yaws
     appmods = <request, euphorik_requests>
     start_mod = euphorik_daemon
+    auth_log = true
     # dir_listings = true
 </server>
 
@@ -27,7 +28,7 @@ trace = false
 
 cache_refresh_secs = 0
 
-# it is possible to have yaws start additional 
+# it is possible to have yaws start additional
 # application specific code at startup
 # runmod = my_app
 
@@ -48,17 +49,16 @@ log_wrap_size = 1000000
 log_resolve_hostname = false
 
 
-# fail completely or not if yaws fails 
+# fail completely or not if yaws fails
 # to bind a listen socket
 fail_on_bind_err = true
 
 
 # If HTTP auth is used, it is possible to have a specific
 # auth log.
-auth_log = true
 
 
-# When we're running multiple yaws systems on the same 
+# When we're running multiple yaws systems on the same
 # host, we need to give each yaws system an individual
 # name. Yaws will write a number of runtime files under
 # /tmp/yaws/${id}
@@ -75,12 +75,3 @@ auth_log = true
 # This is often nice in testing environments but not
 # acceptable in real live hosting scenarios
 pick_first_virthost_on_nomatch = true
-
-# All unices are broken since it's not possible to bind to
-# a privileged port (< 1024) unless uid==0
-# There is a contrib in jungerl which makes it possible by means 
-# of an external setuid root programm called fdsrv to listen to
-# to privileged port.
-# If we use this feature, it requires fdsrv to be properly installed.
-# Doesn't yet work with SSL.
-use_fdsrv = false