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

elements in the HTTP header

SVN Revision: 1344

diff --git a/ChangeLog b/ChangeLog
index 03fe110b3ca7bf3182fe28417e548070203e6f53..09de064427e1c15c5e59f0d601fafaa9efed57d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 852fdf4d7bb6d362aab10ef76d8ea5265e7bbf54..56f65a0b94a6f77cb7eb0832fdbd8561c6dbae5c 100644 (file)
--- 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}
      ]}.