Changeset 2681 for trunk/gsdl/perllib/plugins/EMAILPlug.pm

Timestamp:

2001-07-31T15:14:42+12:00 (23 years ago)

Author:

jrm21

Message:

fixed a few more minor MIME header parsing cases.

File:

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

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -327 +327 @@
     # RFC says boundary is <70 chars, [A-Za-z'()+_,-./:=?], so escape any
     # that perl might want to interpolate. Also allows spaces...
-
     $boundary=~s/\\/\\\\/g;
     $boundary=~s/([\?\+\.\(\)\:\/\'])/\\$1/g;
-    my @message_parts = split("\r?\n\-\-$boundary", $text);
+    my @message_parts = split("\r?\n\-\-$boundary", "\n$text");
     # remove first "part" and last "part" (final --)
     shift @message_parts;
@@ -382 +381 @@
         my $part_header=$message_part;
         my $part_body;
-        if ($part_header=~s/\r?\n\r?\n(.*)$//sg) {
-            $part_body=$1;
-        } else {
+        if ($message_part=~ /^\s*\n/) {
             # no header... use defaults
             $part_body=$message_part;
             $part_header="Content-type: text/plain; charset=us-ascii";
-        }
+        } elsif ($part_header=~s/\r?\n\r?\n(.*)$//sg) {
+            $part_body=$1;
+        } else {
+            # something's gone wrong...
+            $part_header="";
+            $part_body=$message_part;
+        }
+        
         $part_header =~ s/\r?\n[\t\ ]+/ /gs; #unfold
         my $part_content_type="";
@@ -506 +510 @@
     my $text=shift;
     my $part_header=$text;
-    $part_header =~ s/\r?\n\r?\n(.*)$//s;
-    $text=$1; if (!defined($text)) {$text="";}
+    # check for empty part header (leading blank line)
+    if ($text =~ /^\s*\r?\n/) {
+    $part_header="Content-type: text/plain; charset=us-ascii";
+    } else {
+    $part_header =~ s/\r?\n\r?\n(.*)$//s;
+    $text=$1; if (!defined($text)) {$text="";}
+    }
     $part_header =~ s/\r?\n[\t ]+/ /gs; #unfold
     $part_header =~ /content\-type:\s*([\w\/]+)/is;