Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

* src/web/ejabberd_http.erl: Bugfix 

SVN Revision: 269
This commit is contained in:
Alexey Shchepin 2004-09-29 14:09:02 +00:00
parent f17f0dac12
commit 0e2af703bd
2 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2004-09-29 Alexey Shchepin <alexey@sevcom.net>
* src/web/ejabberd_http.erl: Bugfix
2004-09-27 Alexey Shchepin <alexey@sevcom.net>
* src/Makefile.in: Updated (thanks to Badlop)

85
src/web/ejabberd_http.erl
View File

@ -200,25 +200,29 @@ process_request(#state{request_method = 'GET',
{'EXIT', _} ->
process_request(false);
{NPath, Query} ->
LQuery = parse_urlencoded(Query),
LPath = string:tokens(NPath, "/"),
Request = #request{method = 'GET',
path = LPath,
q = LQuery,
user = User,
lang = Lang},
case ejabberd_web:process_get({UseHTTPPoll, UseWebAdmin},
Request) of
El when element(1, El) == xmlelement ->
make_xhtml_output(200, [], El);
{Status, Headers, El} when
element(1, El) == xmlelement ->
make_xhtml_output(Status, Headers, El);
Text when is_list(Text) ->
make_text_output(200, [], Text);
{Status, Headers, Text} when
is_list(Text) ->
make_text_output(Status, Headers, Text)
case (catch parse_urlencoded(Query)) of
{'EXIT', _Reason} ->
process_request(false);
LQuery ->
LPath = string:tokens(NPath, "/"),
Request = #request{method = 'GET',
path = LPath,
q = LQuery,
user = User,
lang = Lang},
case ejabberd_web:process_get({UseHTTPPoll, UseWebAdmin},
Request) of
El when element(1, El) == xmlelement ->
make_xhtml_output(200, [], El);
{Status, Headers, El} when
element(1, El) == xmlelement ->
make_xhtml_output(Status, Headers, El);
Text when is_list(Text) ->
make_text_output(200, [], Text);
{Status, Headers, Text} when
is_list(Text) ->
make_text_output(Status, Headers, Text)
end
end
end
end;
@ -265,30 +269,33 @@ process_request(#state{request_method = 'POST',
process_request(false);
{NPath, Query} ->
LPath = string:tokens(NPath, "/"),
LQuery = parse_urlencoded(Data),
Request = #request{method = 'POST',
path = LPath,
q = LQuery,
user = User,
data = Data,
lang = Lang},
case ejabberd_web:process_get({UseHTTPPoll, UseWebAdmin},
Request) of
El when element(1, El) == xmlelement ->
make_xhtml_output(200, [], El);
{Status, Headers, El} when
element(1, El) == xmlelement ->
make_xhtml_output(Status, Headers, El);
Text when is_list(Text) ->
make_text_output(200, [], Text);
{Status, Headers, Text} when
is_list(Text) ->
make_text_output(Status, Headers, Text)
case (catch parse_urlencoded(Data)) of
{'EXIT', _Reason} ->
process_request(false);
LQuery ->
Request = #request{method = 'POST',
path = LPath,
q = LQuery,
user = User,
data = Data,
lang = Lang},
case ejabberd_web:process_get({UseHTTPPoll, UseWebAdmin},
Request) of
El when element(1, El) == xmlelement ->
make_xhtml_output(200, [], El);
{Status, Headers, El} when
element(1, El) == xmlelement ->
make_xhtml_output(Status, Headers, El);
Text when is_list(Text) ->
make_text_output(200, [], Text);
{Status, Headers, Text} when is_list(Text) ->
make_text_output(Status, Headers, Text)
end
end
end
end;
process_request(State) ->
process_request(_) ->
make_xhtml_output(
400,
[],