Changeset 8904

Timestamp:

2005-01-17T17:12:58+13:00 (19 years ago)

Author:

jrm21

Message:

need to do qp decoding before doing text_into_html so we don't keep
line breaks that disappear after decoding

File:

• trunk/gsdl/perllib/plugins/EMAILPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -415 +415 @@
     $$textref=$self->text_from_mime_message($mimetype,$mimeinfo,$$textref);
     } else { # mimetype eq text/plain
-    $$textref = &text_into_html($$textref);
-    $$textref =~ s@_@\\_@g; # protect against GS macro language
 
     if ($transfer_encoding =~ /quoted\-printable/) {
@@ -424 +422 @@
     }
     $self->convert2unicode($charset, $textref);
+
+    $$textref = &text_into_html($$textref);
+    $$textref =~ s@_@\\_@g; # protect against GS macro language
+
     }
 
@@ -998 +1000 @@
       $highbytes =~ /^/g; # set pos()
       while ($highbytes =~
-         m!\G (?: [\xc0-\xdf][\x80-\xbf]    | # 2 byte utf-8
+         m!\G (?: [\xc0-\xdf][\x80-\xbf] | # 2 byte utf-8
                [\xe0-\xef][\x80-\xbf]{2} | # 3 byte
-               [\xf0-\xf7][\x80-\xbf]{3}   # 4 byte
-               [\xf8-\xfb][\x80-\xbf]{4}   # 5 byte
+               [\xf0-\xf7][\x80-\xbf]{3} | # 4 byte
+               [\xf8-\xfb][\x80-\xbf]{4} | # 5 byte
                [\xfc-\xfd][\x80-\xbf]{5}   # 6 byte
                )*([\x80-\xff])? !xg