Changeset 2732 for trunk/gsdl

Timestamp:

2001-09-04T16:43:57+12:00 (23 years ago)

Author:

jrm21

Message:

needed <pre> tags when using the text/plain part of a multipart message.

File:

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

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -372 +372 @@
     if ($mimetype =~ /multipart/) {
     $boundary="";
-    if ($mimeinfo =~ /boundary=\"?([^"]+)\"?\s*$/im) {
+    if ($mimeinfo =~ m@boundary=(\"[^\"]+\"|[^\s]+)\s*$@im) {
         $boundary=$1;
+        if ($boundary =~ m@^\"@) {
+        $boundary =~ s@^\"@@; $boundary =~ s@\"$@@;
+        }
+    } else {
+        print $outhandle "EMAILPlug: (warning) couldn't parse MIME boundary\n";
     }
     # parts start with "--$boundary"
@@ -413 +418 @@
             # Use the plain version
             $part_text=text_from_part($message_part);
+            if ($part_text =~/[^\s]/) {
+                $part_text="<pre>".$part_text."</pre>";
+            }
             $mimetype="text/plain";
             last;