Changeset 3215

Timestamp:

2002-07-05T11:24:42+12:00 (22 years ago)

Author:

jrm21

Message:

Fixed up some regexs for mime header encodings - eg people with accents in
their first names was not always displayed properly.

File:

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

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -192 +192 @@
         my $encoded=$value;
         $value="";
-        # this isn't quite right yet regarding spaces between encoded-texts
-        # (see examples, section 8. of rfc).
-        while ($encoded =~ s/(.*?)=\?([^\?]*)\?([bq])\?([^\?]+)\?=\s*//i) {
+        # we should ignore spaces between consecutive encoded-texts
+        $encoded =~ s@\?=\s+=\?@\?==\?@g;
+        while ($encoded =~ s/(.*?)=\?([^\?]*)\?([bq])\?([^\?]+)\?=//i) {
         my ($charset, $encoding, $data)=($2,$3,$4);
         my ($decoded_data);
@@ -204 +204 @@
             $data =~ s/_/\ /g;  # from rfc2047 (sec 4.2.2)
             $decoded_data=qp_decode($data);
+            # qp_decode adds \n, which is default for body text
+            chomp($decoded_data);
         } else { # base 64
             $decoded_data=base64_decode($data);
@@ -255 +257 @@
 
     if (defined($fromnamemeta)) {
-    $fromnamemeta =~ s/\"//g;
+    $fromnamemeta =~ s/\"//g;  # remove quotes
+    $fromnamemeta =~ s/\s+$//; # remove trailing whitespace
     }
     else {