Changeset 2733 for trunk/gsdl

Timestamp:

2001-09-05T11:30:41+12:00 (23 years ago)

Author:

jrm21

Message:

minor regex fixes/improvements.

File:

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

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -169 +169 @@
         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) {
         my ($charset, $encoding, $data)=($2,$3,$4);
@@ -177 +179 @@
         $encoding =~ tr/BQ/bq/;
         if ($encoding eq "q") { # quoted printable
+            $data =~ s/_/\ /g;  # from rfc2047 (sec 4.2.2)
             $decoded_data=qp_decode($data);
         } else { # base 64
@@ -188 +191 @@
             $charset=~s/ks_c_5601_1987/korean/;
         } else {$charset="ascii";}
-        if ($charset eq "ascii" || $charset eq "us-ascii") {
+        if ($charset eq "ascii" || $charset eq "us_ascii") {
             # technically possible to have this explicitly...
             $value.=$decoded_data;
@@ -303 +306 @@
     # Add "All headers" metadata
     $Headers = &text_into_html($Headers);
+    $Headers =~ s/&([lg])t\;/&amp\;$1t\;/g;
+print "Headers:\"$Headers\"\n";#
     $Headers = "No headers" unless ($Headers =~ /\w/);
     $Headers =~ s/@/&#64\;/g;