Changeset 2886

Timestamp:

2001-12-04T16:02:17+13:00 (22 years ago)

Author:

jrm21

Message:

Fixed some encoding issues - need to convert to utf-8 after un-base64ing
or un-quoted-printabling.

File:

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

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -266 +266 @@
     if ($value) {
         # assume subject, etc headers have no special HTML meaning.
-        $value =~ s@&@&amp\;@g;
-        $value =~ s/</&lt;/g; $value =~ s/>/&gt;/g;
         $value = &text_into_html($value);
         # escape [] so it isn't re-interpreted as metadata
@@ -295 +293 @@
     $transfer_encoding=$1;
     }
-    if ($mimetype ne "text/plain") {
+    if ($mimetype eq "text/html") {
+    $$textref= $self->text_from_part("$Headers\n$$textref");
+    } elsif ($mimetype ne "text/plain") {
     $$textref= $self->text_from_mime_message($mimetype,$mimeinfo,$$textref,
                          $outhandle);
     } elsif ($transfer_encoding =~ /quoted\-printable/) {
     $$textref=qp_decode($$textref);
+    $self->convert2unicode($charset, $textref);
     } elsif ($transfer_encoding =~ /base64/) {
     $$textref=base64_decode($$textref);
+    $self->convert2unicode($charset, $textref);
     } else {
-      $self->convert2unicode($charset, $textref);
+    $self->convert2unicode($charset, $textref);
     }
     
@@ -309 +311 @@
     # Add "All headers" metadata
     $Headers = &text_into_html($Headers);
-    $Headers =~ s/&([lg])t\;/&amp\;$1t\;/g;
 
     $Headers = "No headers" unless ($Headers =~ /\w/);
@@ -567 +568 @@
         # the RFC also mentions "parallel".
     }
-    } # end of multipart
+    } # end of ($mimetype !~ multipart)
+    else {
+    # we don't do any processing of the content.
+    }
+
     return $text;
 }
@@ -637 +642 @@
     # keep in any newline characters.
     foreach my $line (@lines) {
-    if ($line =~ s/=\s*$//) {}
-    else {$line.="\n";}
+    if ($line !~ s/=\s*$//) {$line.="\n";}
 
     if ($line =~ /=[0-9A-Fa-f]{2}/) { # it contains an escaped char