use warnings;
use strict;
use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT);
-use base qw(Exporter);
+use Exporter qw(import);
use IPC::Open3;
use POSIX qw(:sys_wait_h strftime);
use Debbugs::Config qw(:config);
use Params::Validate qw(:types validate_with);
use Encode qw(encode is_utf8);
-use Debbugs::UTF8 qw(encode_utf8_safely);
+use Debbugs::UTF8 qw(encode_utf8_safely convert_to_utf8);
use Debbugs::Packages;
message => {type => SCALAR,
},
envelope_from => {type => SCALAR,
- optional => 1,
+ default => $config{envelope_from},
},
recipients => {type => ARRAYREF|UNDEF,
optional => 1,
},
);
my @sendmail_arguments = @{$param{sendmail_arguments}};
- push @sendmail_arguments, '-f', $param{envelope_from} if exists $param{envelope_from};
+ push @sendmail_arguments, '-f', $param{envelope_from} if
+ exists $param{envelope_from} and
+ defined $param{envelope_from} and
+ length $param{envelope_from};
my @recipients;
@recipients = @{$param{recipients}} if defined $param{recipients} and
$r_l{subject} = 'Re: '. $r_l{subject} unless $r_l{subject} =~ /(?:^|\s)Re:\s+/;
$r_l{subject} =~ s/(?:^\s*|\s*$)//g;
$r_l{'In-Reply-To'} = $head->get('Message-Id');
+ $r_l{'In-Reply-To'} =~ s/(?:^\s*|\s*$)//g if defined $r_l{'In-Reply-To'};
delete $r_l{'In-Reply-To'} unless defined $r_l{'In-Reply-To'};
$r_l{References} = ($head->get('References')//''). ' '.($head->get('Message-Id')//'');
+ $r_l{References} =~ s/(?:^\s*|\s*$)//g;
my $date = $head->get('Date') // 'some date';
$date =~ s/(?:^\s*|\s*$)//g;
my $who = $head->get('From') // $head->get('Reply-To') // 'someone';
my $body = "On $date $who wrote:\n";
my $i = 60;
my $b_h;
+ # Default to UTF-8.
+ my $charset="utf-8";
## find the first part which has a defined body handle and appears
## to be text
if (defined $entity->bodyhandle) {
+ my $this_charset =
+ $entity->head->mime_attr("content-type.charset");
+ $charset = $this_charset if
+ defined $this_charset and
+ length $this_charset;
$b_h = $entity->bodyhandle;
} elsif ($entity->parts) {
my @parts = $entity->parts;
}
if (defined $part->bodyhandle and
$part->effective_type =~ /text/) {
- print STDERR $part->effective_type."\n";
+ my $this_charset =
+ $part->head->mime_attr("content-type.charset");
+ $charset = $this_charset if
+ defined $this_charset and
+ length $this_charset;
$b_h = $part->bodyhandle;
last;
}
while (defined($_ = $IO->getline)) {
$i--;
last if $i < 0;
- $body .= '> '. $_;
+ $body .= '> '. convert_to_utf8($_,$charset);
}
$IO->close();
};