Changeset 4224

Timestamp:

2003-05-05T12:07:08+12:00 (21 years ago)

Author:

jrm21

Message:

fixed regexp for when we have a content type without a charset

File:

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

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -584 +584 @@
             $part_content_type="message/rfc822";
         }
-        if ($part_header =~ m@^content\-type:\s*([\w\.\-/]+)\s*\;?\s*(.*?)\s*$@mi) {
+        if ($part_header =~ m@^content\-type:\s*([\w\.\-/]+)\s*(\;.*)?$@mi) {
             $part_content_type=$1; $part_content_type =~ tr/A-Z/a-z/;
             $part_content_info=$2;
+            if (!defined($part_content_info)) {
+            $part_content_info="";
+            } else {
+            $part_content_info =~ s/^\;\s*//;
+            $part_content_info =~ s/\s*$//;
+            }
         }
         my $filename="";
@@ -626 +632 @@
             my $rfc822_formatted_body=""; # put result in here
             if ($message_part_headers =~
-            /^content\-type:\s*([\w\.\-\/]+)\s*\;?\s*(.*?)\s*$/ims)
+            /^content\-type:\s*([\w\.\-\/]+)\s*(\;.*)?$/ims)
             {
             # The message header uses MIME flags
@@ -633 +639 @@
             if (!defined($message_content_info)) {
                 $message_content_info="";
+            } else {
+                $message_content_info =~ s/^\;\s*//;
+                $message_content_info =~ s/\s*$//;
             }
             $message_content_type =~ tr/A-Z/a-z/;