Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-02 21:17:12 +02:00
Code Releases Activity

* src/web/ejabberd_web.erl (make_xhtml/2): Allow to include

Browse Source 
elements in the HTTP header

SVN Revision: 1344
This commit is contained in:
Badlop 2008-05-31 18:21:43 +00:00
parent 110a4b4518
commit 1e345eb0fc
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2008-05-31 Badlop <badlop@process-one.net> 2008-05-31 Badlop <badlop@process-one.net>
* src/web/ejabberd_web.erl (make_xhtml/2): Allow to include
elements in the HTTP header
* src/odbc/odbc_queries.erl (del_user_return_password): Return * src/odbc/odbc_queries.erl (del_user_return_password): Return
password (thanks to Oleg Palij) password (thanks to Oleg Palij)

8
src/web/ejabberd_web.erl
View File

@ -28,7 +28,7 @@
-author('alexey@process-one.net'). -author('alexey@process-one.net').
%% External exports %% External exports
-export([make_xhtml/1, -export([make_xhtml/1, make_xhtml/2,
error/1]). error/1]).
-include("ejabberd.hrl"). -include("ejabberd.hrl").
@ -42,12 +42,16 @@
%% that third parties can use ejabberd_web as an "utility" library. %% that third parties can use ejabberd_web as an "utility" library.
make_xhtml(Els) -> make_xhtml(Els) ->
make_xhtml([], Els).
make_xhtml(HeadEls, Els) ->
{xmlelement, "html", [{"xmlns", "http://www.w3.org/1999/xhtml"}, {xmlelement, "html", [{"xmlns", "http://www.w3.org/1999/xhtml"},
{"xml:lang", "en"}, {"xml:lang", "en"},
{"lang", "en"}], {"lang", "en"}],
[{xmlelement, "head", [], [{xmlelement, "head", [],
[{xmlelement, "meta", [{"http-equiv", "Content-Type"}, [{xmlelement, "meta", [{"http-equiv", "Content-Type"},
{"content", "text/html; charset=utf-8"}], []}]}, {"content", "text/html; charset=utf-8"}], []}
| HeadEls]},
{xmlelement, "body", [], Els} {xmlelement, "body", [], Els}
]}. ]}.