Changeset 3721

Timestamp:

2003-02-03T11:02:04+13:00 (21 years ago)

Author:

jrm21

Message:

bug where some text/plain messages weren't having < > & properly escaped.
Also some minor code formatting changes for consistency.

File:

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

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -537 +537 @@
             $part_text= $self->text_from_part($message_part);
             if ($part_text =~/[^\s]/) {
-                $part_text="<pre>".$part_text."</pre>";
+                $part_text = text_into_html($part_text);
             }
             $mimetype="text/plain";
@@ -544 +544 @@
         }
         }
-        if ($part_text eq "") { # use first part
-        $part_text= $self->text_from_part(shift @message_parts);
+        if ($part_text eq "") { #use first part (no html/text part found)
+        $part_text = $self->text_from_part(shift @message_parts);
+        $part_text = text_into_html($part_text);
         }
         if ($part_text eq "") { # we couldn't get anything!!!
@@ -552 +553 @@
         print $outhandle "EMAILPlug: no text - empty body?\n";
         } else {
-        $text=$part_text;
+        $text = $part_text;
         }
     } elsif ($mimetype =~ m@multipart/(mixed|digest|related|signed)@) {
-        $text="";
+        $text = "";
         # signed is for PGP/GPG messages... the last part is a hash
         if ($mimetype =~ m@multipart/signed@) {
@@ -609 +610 @@
             my $part_text= $self->text_from_part($message_part);
             if ($part_content_type !~ m@text/(ht|x)ml@) {
-            $part_text=text_into_html($part_text);
+            $part_text = text_into_html($part_text);
             }
             if ($part_text eq "") {
-            $part_text='&lt;&lt;empty message&gt;&gt;';
+            $part_text = '&lt;&lt;empty message&gt;&gt;';
             }
-            $text.=$part_text;
+            $text .= $part_text;
         } elsif ($part_content_type =~ m@message/rfc822@) {
             # This is a forwarded message
@@ -699 +700 @@
             open (SAVE, ">$tmpdir/$save_filename") ||
                 warn "EMAILPlug: Can't save attachment as $tmpdir/$save_filename: $!";
-            $part_text=$message_part;
+            $part_text = $message_part;
             $part_text =~ s/(.*?)\r?\n\r?\n//s; # remove header
             if ($encoding eq "base64") {