X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;ds=inline;f=modules%2Ferl%2Feuphorik_requests.erl;h=28019da95d8be378766e1fd1e5641e45d9ef7656;hb=994f68e1f8a7a43b55d6bd6214b2a0066671ba74;hp=2fb69c0b784a4caae1d71119b55f36a3e2470f14;hpb=e04de9d41e7955b0092fc33b8619b4627af6b3f3;p=euphorik.git
diff --git a/modules/erl/euphorik_requests.erl b/modules/erl/euphorik_requests.erl
index 2fb69c0..28019da 100755
--- a/modules/erl/euphorik_requests.erl
+++ b/modules/erl/euphorik_requests.erl
@@ -1,83 +1,83 @@
% coding: utf-8
+% Copyright 2008 Grégory Burri
+%
+% This file is part of Euphorik.
+%
+% Euphorik is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+%
+% Euphorik is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with Euphorik. If not, see .
+%
% Ce module est fait pour répondre à des requêtes 'AJAX'.
% Il est définit comme 'appmods' pour l'url "request" dans yaws.
% Par exemple http://www.euphorik.ch/request abouti sur la fonction out() de ce module.
% @author G.Burri
+
-module(euphorik_requests).
--export([
- tester/0,
- out/1
-]).
-
+-export([out/1]).
-include_lib("xmerl/include/xmerl.hrl").
-include_lib("yaws/include/yaws_api.hrl").
-
-% Test du module
-tester() ->
-
- %~ {XML2, _} = xmerl_scan:string(
- %~ ""
- %~ " 5DZQ2HCRO7JIX3QCSWRNL"
- %~ ""),
- %~ io:format("Login : ~p~n", [euphorik_protocole:login(XML2)]).
-
- XML =
- "3FSDCH0FD4ML8WEPN2B5T"
- "10"
- "",
- io:format("Messages de la premières page : ~p~n", [traiter_donnees(XML)]).
-
- %~ traiter_xml(""
- %~ "4UDUSY6Z2IZNTQO484S8X"
- %~ "Pifou"
- %~ "test & plop"
- %~ "").
-% il faut catcher toutes les exceptions possibles
-out(A) ->
- %inet:setopts(A#arg.clisock, inet:getopts(A#arg.clisock, [active])),
+out(A) ->
+ %io:format("~p~n", [A]), % utilisé parfois pendant le debug
+ IP = case inet:peername(A#arg.clisock) of
+ {ok, {Adresse, _Port}} -> Adresse;
+ _ -> inconnue
+ end,
+ % passive -> active, permet de recevoir {tcp_closed, _} lorsque le socket se ferme
+ % keepalive -> true, evite que des firewalls coupe la connexion TCP sans prévenir
+ inet:setopts(A#arg.clisock, [{active, true}, {keepalive, true}]),
{value, {_, Contenu}} = lists:keysearch("action", 1, yaws_api:parse_post(A)),
- Ret = traiter_donnees(Contenu),
- {content, "text/xml", Ret}.
+ Ret = traiter_donnees(Contenu, IP),
+ {content, "application/json", Ret}.
-traiter_donnees(Contenu) ->
- case xmerl_scan:string(Contenu) of
- {XML, _} ->
- case XML of
- #xmlElement{name = json, content = [#xmlText{value = J}|_]} ->
- case json:decode_string(J) of
- {ok, {struct, [{action, Action}| Reste]}} ->
- traiter_action(Action, Reste);
- _ ->
- erreur
- end;
- _ ->
- traiter_action(XML#xmlElement.attributes, XML)
- end;
- _ -> erreur
- end.
-
+traiter_donnees(Contenu, IP) ->
+ case json:decode_string(Contenu) of
+ {ok, {struct, [{action, Action}| Reste]}} ->
+ json:encode(traiter_action(Action, Reste, IP));
+ _ ->
+ error
+ end.
-traiter_action("authentification", JSON) ->
- euphorik_protocole:login(JSON);
+
+% authentification d'un client
+traiter_action("authentification", JSON, IP) ->
+ euphorik_protocole:login(JSON, IP);
% un client s'enregistre (pseudo + password)
-traiter_action([#xmlAttribute{value="register"}], XML) ->
- euphorik_protocole:nouveau_user_login(XML);
-% authentification d'un client
-traiter_action([#xmlAttribute{value="login"}], XML) ->
- euphorik_protocole:login(XML);
+traiter_action("register", JSON, IP) ->
+ euphorik_protocole:register(JSON, IP);
% modification du profile
-traiter_action([#xmlAttribute{value="profile"}], XML) ->
- euphorik_protocole:profile(XML);
-% un utilisateur demande les messages
-traiter_action([#xmlAttribute{value="refreshMessages"}], XML) ->
- euphorik_protocole:refreshMessage(XML);
-% un utilisateur envoie un message
-traiter_action([#xmlAttribute{value="message"}], XML) ->
- euphorik_protocole:message(XML).
-
-
-
+traiter_action("set_profile", JSON, _) ->
+ euphorik_protocole:profile(JSON);
+% un utilisateur attend un événement (par exemple l'arrivé d'un nouveau message)
+traiter_action("wait_event", JSON, _) ->
+ euphorik_protocole:wait_event(JSON);
+% un utilisateur envoie un message
+traiter_action("put_message", JSON, _) ->
+ euphorik_protocole:put_message(JSON);
+traiter_action("ban", JSON, _) ->
+ euphorik_protocole:ban(JSON);
+traiter_action("slap", JSON, _) ->
+ euphorik_protocole:slap(JSON);
+traiter_action("put_troll", JSON, _) ->
+ euphorik_protocole:put_troll(JSON);
+traiter_action("mod_troll", JSON, _) ->
+ euphorik_protocole:mod_troll(JSON);
+traiter_action("del_troll", JSON, _) ->
+ euphorik_protocole:del_troll(JSON);
+traiter_action("list_banned_ips", JSON, _) ->
+ euphorik_protocole:list_banned_ips(JSON);
+traiter_action("unban", JSON, _) ->
+ euphorik_protocole:unban_ip(JSON).
+
\ No newline at end of file