Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Handle ~ control sequence in text of mod_muc_log (EJAB-1639)

This commit is contained in:
Badlop 2013-05-30 14:08:18 +02:00
parent 371f1f200e
commit bc8264b2ac
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod_muc/mod_muc_log.erl
View File

@ -455,7 +455,7 @@ add_message_to_log(Nick1, Message, RoomJID, Opts, State) ->
STimeUnique = io_lib:format("~s.~w", [STime, Microsecs]),
%% Write message
fw(F, io_lib:format("<a id=\"~s\" name=\"~s\" href=\"#~s\" class=\"ts\">[~s]</a> ",
catch fw(F, io_lib:format("<a id=\"~s\" name=\"~s\" href=\"#~s\" class=\"ts\">[~s]</a> ",
[STimeUnique, STimeUnique, STimeUnique, STime]) ++ Text, FileFormat),
%% Close file
@ -787,13 +787,14 @@ htmlize(S1) ->
htmlize(S1, html).
htmlize(S1, plaintext) ->
S1;
ejabberd_regexp:replace(S1, "~", "~~");
htmlize(S1, FileFormat) ->
htmlize(S1, false, FileFormat).
%% The NoFollow parameter tell if the spam prevention should be applied to the link found
%% true means 'apply nofollow on links'.
htmlize(S1, _NoFollow, plaintext) ->
htmlize(S0, _NoFollow, plaintext) ->
S1 = ejabberd_regexp:replace(S0, "~", "~~"),
S1x = ejabberd_regexp:replace(S1, "<", ?PLAINTEXT_IN),
ejabberd_regexp:replace(S1x, ">", ?PLAINTEXT_OUT);
htmlize(S1, NoFollow, _FileFormat) ->