From 9ae1282854d8fa0e5b417d198c2c4a165ba1ce7d Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 12 Mar 2008 22:29:53 +0000 Subject: [PATCH] * src/web/ejabberd_web_admin.erl (term_to_string): Show Erlang terms in one line in Erlang R12 (EJAB-503) SVN Revision: 1227 --- ChangeLog | 5 +++++ src/web/ejabberd_web_admin.erl | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 625841fb7..d9c945ad5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-12 Badlop + + * src/web/ejabberd_web_admin.erl (term_to_string): Show Erlang + terms in one line in Erlang R12 (EJAB-503) + 2008-03-11 Badlop * 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 e2474920b..25ea9d237 100644 --- 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))).