From: Badlop <badlop@process-one.net>
Date: Fri, 31 May 2013 11:21:16 +0000 (+0200)
Subject: Handle multiple < and > in mod_muc_log plaintext mode (EJAB-1640)
X-Git-Tag: v2.1.13~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b96b745bf4146dca3c3709765945fc97679465f;p=ejabberd

Handle multiple < and > in mod_muc_log plaintext mode (EJAB-1640)
---

diff --git a/src/mod_muc/mod_muc_log.erl b/src/mod_muc/mod_muc_log.erl
index e66355891..e4b355924 100644
--- a/src/mod_muc/mod_muc_log.erl
+++ b/src/mod_muc/mod_muc_log.erl
@@ -796,9 +796,9 @@ htmlize(S1, FileFormat) ->
 %% The NoFollow parameter tell if the spam prevention should be applied to the link found
 %% true means 'apply nofollow on links'.
 htmlize(S0, _NoFollow, plaintext) ->
-    S1 = ejabberd_regexp:greplace(S0, "~", ?PLAINTEXT_CO),
-    S1x = ejabberd_regexp:replace(S1, "<", ?PLAINTEXT_IN),
-    ejabberd_regexp:replace(S1x, ">", ?PLAINTEXT_OUT);
+    S1  = ejabberd_regexp:greplace(S0, "~", ?PLAINTEXT_CO),
+    S1x = ejabberd_regexp:greplace(S1, "<", ?PLAINTEXT_IN),
+    ejabberd_regexp:greplace(S1x, ">", ?PLAINTEXT_OUT);
 htmlize(S1, NoFollow, _FileFormat) ->
     S2_list = string:tokens(S1, "\n"),
     lists:foldl(