|
From: <ssc...@us...> - 2003-03-11 08:08:10
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv22115
Modified Files:
Tag: v0/18/1
MailParse.pm
Log Message:
fix colorized display of quoted-printable HTML (699098)
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.91
retrieving revision 1.91.2.1
diff -C2 -d -r1.91 -r1.91.2.1
*** MailParse.pm 27 Feb 2003 09:49:38 -0000 1.91
--- MailParse.pm 11 Mar 2003 08:08:00 -0000 1.91.2.1
***************
*** 799,805 ****
--- 799,814 ----
$self->{ut} = '';
}
+
+ #Escape some HTML characters to ensure display in HTML UI
$splitline =~ s/</</g;
$splitline =~ s/>/>/g;
+
+ if ( $encoding =~ /quoted\-printable/i ) {
+ $splitline =~ s/=3C/</g;
+ $splitline =~ s/=3E/>/g;
+ }
+
+
$splitline =~ s/\t/ /g;
$self->{ut} .= $splitline;
***************
*** 1057,1061 ****
$colorized =~ s/(\r\n\r\n|\r\r|\n\n)/__BREAK____BREAK__/g;
$colorized =~ s/[\r\n]+/__BREAK__/g;
! $colorized =~ s/__BREAK__/<br \/>/g;
return $colorized;
--- 1066,1070 ----
$colorized =~ s/(\r\n\r\n|\r\r|\n\n)/__BREAK____BREAK__/g;
$colorized =~ s/[\r\n]+/__BREAK__/g;
! $colorized =~ s/__BREAK__/<br \/>\r\n/g;
return $colorized;
|