* Add configuration variables for spamscan to Debbugs::Config

[debbugs.git] / Debbugs / MIME.pm

diff --git a/Debbugs/MIME.pm b/Debbugs/MIME.pm
index 4f803bc54c6a45d4bfc0f9ff8bcdd5134bc27424..183adc7df072bb732155b1c022639f676cc5c3af 100644 (file)
--- a/Debbugs/MIME.pm
+++ b/Debbugs/MIME.pm
@@ -1,3 +1,13 @@
+# This module is part of debbugs, and is released
+# under the terms of the GPL version 2, or any later
+# version at your option.
+# See the file README and COPYING for more information.
+#
+# [Other people have contributed to this file; their copyrights should
+# go here too.]
+# Copyright 2006 by Don Armstrong <don@donarmstrong.com>.
+
+
 package Debbugs::MIME;
 
 use strict;
@@ -8,7 +18,7 @@ use vars qw($VERSION @EXPORT_OK);
 BEGIN {
     $VERSION = 1.00;
 
-    @EXPORT_OK = qw(parse decode_rfc1522 encode_rfc1522 convert_to_utf8 create_mime_message);
+    @EXPORT_OK = qw(parse decode_rfc1522 encode_rfc1522 convert_to_utf8 create_mime_message getmailbody);
 }
 
 use File::Path;
@@ -21,8 +31,7 @@ use Encode qw(decode encode encode_utf8 decode_utf8 is_utf8);
 # for encode_rfc1522
 use MIME::Words qw();
 
-sub getmailbody ($);
-sub getmailbody ($)
+sub getmailbody
 {
     my $entity = shift;
     my $type = $entity->effective_type;
@@ -130,7 +139,10 @@ sub create_mime_message{
      die "The third argument to create_mime_message must be an arrayref" unless ref($attachments) eq 'ARRAY';
 
      # Build the message
-     my $msg = MIME::Entity->build(@{$headers},
+     # MIME::Entity is stupid, and doesn't rfc1522 encode its headers, so we do it for it.
+     my $msg = MIME::Entity->build('Content-Type' => 'text/plain; charset=utf-8',
+                                  'Encoding'     => 'quoted-printable',
+                                  (map{encode_rfc1522($_)} @{$headers}),
                                   Data    => $body
                                  );
 
@@ -142,20 +154,19 @@ sub create_mime_message{
          else {
               # This is *craptacular*, but because various MTAs
               # (sendmail and exim4, at least) appear to eat From
-              # lines in message/rfc822 attachments, we need to make
-              # sure the From line is the first thing in the
-              # attachement, not the second, so if it gets eaten, the
-              # headers don't collide into the body.
+              # lines in message/rfc822 attachments, we need eat
+              # the entire From line ourselves so the MTA doesn't
+              # leave \n detrius around.
               if (ref($attachment) eq 'ARRAY' and $attachment->[1] =~ /^From /) {
                    # make a copy so that we don't screw up anything
                    # that is expecting this arrayref to stay constant
                    $attachment = [@{$attachment}];
-                   # flip the From and Received lines around
-                   @{$attachment}[qw(1 0)] = @{$attachment}[qw(0 1)];
+                   # remove the from line
+                   splice @$attachment, 1, 1;
               }
               elsif (not ref($attachment)) {
-                   # It's a scalar
-                   $attachment =~ s/^(Received:[^\n]+\n)(From [^\n]+\n)/$2$1/s;
+                   # It's a scalar; remove the from line
+                   $attachment =~ s/^(Received:[^\n]+\n)(From [^\n]+\n)/$1/s;
               }
               $msg->attach(Type => 'message/rfc822',
                            Data => $attachment,
@@ -208,9 +219,13 @@ sub decode_rfc1522 ($)
 {
     my ($string) = @_;
 
+    # this is craptacular, but leading space is hacked off by unmime.
+    # Save it.
+    my $leading_space = '';
+    $leading_space = $1 if $string =~ s/^(\s+)//;
     # unmime calls the default MIME::WordDecoder handler set up at
     # initialization time.
-    return MIME::WordDecoder::unmime($string);
+    return $leading_space . MIME::WordDecoder::unmime($string);
 }
 
 =head2 encode_rfc1522
@@ -228,6 +243,8 @@ MIME::Words::encode_mimeword on distinct words as appropriate.
 sub encode_rfc1522 ($) {
      my ($rawstr) = @_;
 
+     # handle being passed undef properly
+     return undef if not defined $rawstr;
      # We process words in reverse so we can preserve spacing between
      # encoded words. This regex splits on word|nonword boundaries and
      # nonword|nonword boundaries.