Changeset 10839

Timestamp:

2005-11-04T13:20:21+13:00 (18 years ago)

Author:

jrm21

Message:

better match when looking at sub-part types so we don't match content-type
lines further down in the part (eg in a multipart/mixed part)

File:

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

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -544 +544 @@
         my $part_text="";
         foreach my $message_part (@message_parts) {
-        if ($message_part =~ m@\s*content\-type:\s*text/html@mis)
+        if ($message_part =~ m@^content\-type:\s*text/html@i)
         {
             # Use the HTML version
@@ -554 +554 @@
         if ($part_text eq "") { # try getting a text part instead
         foreach my $message_part (@message_parts) {
-            if ($message_part =~ m@^content\-type:\s*text/plain@mis)
+            if ($message_part =~ m@^content\-type:\s*text/plain@i)
             {
             # Use the plain version
-            $part_text= $self->text_from_part($message_part);
+            $part_text = $self->text_from_part($message_part);
             if ($part_text =~/[^\s]/) {
                 $part_text = text_into_html($part_text);