diff options
| author | Badlop <badlop@process-one.net> | 2008-05-31 18:21:43 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2008-05-31 18:21:43 +0000 |
| commit | 1e345eb0fcd362ea1a680e353e613e6ffa7b3dae (patch) | |
| tree | 61bcbff38aa501f456aa8f19eaff9965a0a2d19b | |
| parent | * src/odbc/odbc_queries.erl (del_user_return_password): Return (diff) | |
* src/web/ejabberd_web.erl (make_xhtml/2): Allow to include
elements in the HTTP header
SVN Revision: 1344
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/web/ejabberd_web.erl | 8 |
2 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,8 @@ 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 password (thanks to Oleg Palij) diff --git a/src/web/ejabberd_web.erl b/src/web/ejabberd_web.erl index 852fdf4d7..56f65a0b9 100644 --- a/src/web/ejabberd_web.erl +++ b/src/web/ejabberd_web.erl @@ -28,7 +28,7 @@ -author('alexey@process-one.net'). %% External exports --export([make_xhtml/1, +-export([make_xhtml/1, make_xhtml/2, error/1]). -include("ejabberd.hrl"). @@ -42,12 +42,16 @@ %% that third parties can use ejabberd_web as an "utility" library. make_xhtml(Els) -> + make_xhtml([], Els). + +make_xhtml(HeadEls, Els) -> {xmlelement, "html", [{"xmlns", "http://www.w3.org/1999/xhtml"}, {"xml:lang", "en"}, {"lang", "en"}], [{xmlelement, "head", [], [{xmlelement, "meta", [{"http-equiv", "Content-Type"}, - {"content", "text/html; charset=utf-8"}], []}]}, + {"content", "text/html; charset=utf-8"}], []} + | HeadEls]}, {xmlelement, "body", [], Els} ]}. |