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

Improve previous commit (EJAB-1639)

This commit is contained in:
Badlop 2013-05-30 14:31:27 +02:00
parent bc8264b2ac
commit e85f7566dd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod_muc/mod_muc_log.erl
View File

@ -52,6 +52,7 @@
-define(PROCNAME, ejabberd_mod_muc_log). -define(PROCNAME, ejabberd_mod_muc_log).
-record(room, {jid, title, subject, subject_author, config}). -record(room, {jid, title, subject, subject_author, config}).
-define(PLAINTEXT_CO, "ZZCZZ").
-define(PLAINTEXT_IN, "ZZIZZ"). -define(PLAINTEXT_IN, "ZZIZZ").
-define(PLAINTEXT_OUT, "ZZOZZ"). -define(PLAINTEXT_OUT, "ZZOZZ").
@ -680,7 +681,8 @@ fw(F, S, O, FileFormat) ->
html -> html ->
S1; S1;
plaintext -> plaintext ->
S1x = ejabberd_regexp:greplace(S1, "<[^<^>]*>", ""), S1a = ejabberd_regexp:greplace(S1, "<[^<^>]*>", ""),
S1x = ejabberd_regexp:greplace(S1a, ?PLAINTEXT_CO, "~~"),
S1y = ejabberd_regexp:greplace(S1x, ?PLAINTEXT_IN, "<"), S1y = ejabberd_regexp:greplace(S1x, ?PLAINTEXT_IN, "<"),
ejabberd_regexp:greplace(S1y, ?PLAINTEXT_OUT, ">") ejabberd_regexp:greplace(S1y, ?PLAINTEXT_OUT, ">")
end, end,
@ -787,14 +789,14 @@ htmlize(S1) ->
htmlize(S1, html). htmlize(S1, html).
htmlize(S1, plaintext) -> htmlize(S1, plaintext) ->
ejabberd_regexp:replace(S1, "~", "~~"); ejabberd_regexp:greplace(S1, "~", ?PLAINTEXT_CO);
htmlize(S1, FileFormat) -> htmlize(S1, FileFormat) ->
htmlize(S1, false, FileFormat). htmlize(S1, false, FileFormat).
%% The NoFollow parameter tell if the spam prevention should be applied to the link found %% The NoFollow parameter tell if the spam prevention should be applied to the link found
%% true means 'apply nofollow on links'. %% true means 'apply nofollow on links'.
htmlize(S0, _NoFollow, plaintext) -> htmlize(S0, _NoFollow, plaintext) ->
S1 = ejabberd_regexp:replace(S0, "~", "~~"), S1 = ejabberd_regexp:greplace(S0, "~", ?PLAINTEXT_CO),
S1x = ejabberd_regexp:replace(S1, "<", ?PLAINTEXT_IN), S1x = ejabberd_regexp:replace(S1, "<", ?PLAINTEXT_IN),
ejabberd_regexp:replace(S1x, ">", ?PLAINTEXT_OUT); ejabberd_regexp:replace(S1x, ">", ?PLAINTEXT_OUT);
htmlize(S1, NoFollow, _FileFormat) -> htmlize(S1, NoFollow, _FileFormat) ->