* src/web/ejabberd_web_admin.erl (term_to_string): Show Erlang

terms in one line in Erlang R12 (EJAB-503)

SVN Revision: 1227

diff --git a/ChangeLog b/ChangeLog
index 7bc84b0f86d2e102a877e29efaacd279d117788e..9cc195209e5ad828b4526a6ce4e30bf88589a49c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-12  Badlop  <badlop@process-one.net>
+
+       * src/web/ejabberd_web_admin.erl (term_to_string): Show Erlang
+       terms in one line in Erlang R12 (EJAB-503)
+
 2008-03-11  Badlop  <badlop@process-one.net>
 
        * src/ejabberd_s2s_in.erl (get_cert_domains): When compiling with

diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl
index e2474920b18ddb335e7bfeb826828735804d2c17..25ea9d237fa4a00fc87f3dfef447e2715db85d85 100644 (file)
--- a/src/web/ejabberd_web_admin.erl
+++ b/src/web/ejabberd_web_admin.erl
@@ -1067,7 +1067,10 @@ acl_spec_select(ID, Opt) ->
 
 
 term_to_string(T) ->
-    lists:flatten(io_lib:format("~1000000p", [T])).
+    StringParagraph = lists:flatten(io_lib:format("~1000000p", [T])),
+    %% Remove from the string all the carriage returns characters
+    {ok, StringLine, _} = regexp:gsub(StringParagraph, "\\n ", ""),
+    StringLine.
 
 term_to_id(T) ->
     jlib:encode_base64(binary_to_list(term_to_binary(T))).