X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FMail.pm;h=e4c8bf7da825e53ce64b3f0849079237e07745fa;hb=466f7faff129a5699c7674f59900a92aa256175d;hp=e9cb46e250e513d5993ee24fa21e02c0d3a278dd;hpb=b11165fffd765926da3c558caac71fc664276487;p=debbugs.git diff --git a/Debbugs/Mail.pm b/Debbugs/Mail.pm index e9cb46e..e4c8bf7 100644 --- a/Debbugs/Mail.pm +++ b/Debbugs/Mail.pm @@ -39,15 +39,17 @@ END 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 Time::HiRes qw(usleep); +use Time::HiRes qw(usleep gettimeofday); use Mail::Address (); use Debbugs::MIME qw(encode_rfc1522); 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 convert_to_utf8); use Debbugs::Packages; @@ -59,6 +61,7 @@ BEGIN{ %EXPORT_TAGS = (addresses => [qw(get_addresses)], misc => [qw(rfc822_date)], mail => [qw(send_mail_message encode_headers default_headers)], + reply => [qw(reply_headers)], ); @EXPORT_OK = (); Exporter::export_ok_tags(keys %EXPORT_TAGS); @@ -162,20 +165,19 @@ passed through. sub default_headers { my %param = validate_with(params => \@_, - spec => {queue_file => {type => SCALAR, + spec => {queue_file => {type => SCALAR|UNDEF, optional => 1, }, data => {type => HASHREF, optional => 1, }, - msgid => {type => SCALAR, + msgid => {type => SCALAR|UNDEF, optional => 1, }, - msgtype => {type => SCALAR, + msgtype => {type => SCALAR|UNDEF, default => 'misc', - optional => 1, }, - pr_msg => {type => SCALAR, + pr_msg => {type => SCALAR|UNDEF, default => 'misc', }, headers => {type => ARRAYREF, @@ -185,6 +187,17 @@ sub default_headers { ); my @header_order = (qw(X-Loop From To subject), qw(Message-ID In-Reply-To References)); + # handle various things being undefined + if (not exists $param{queue_file} or + not defined $param{queue_file}) { + $param{queue_file} = join('',gettimeofday()) + } + for (qw(msgtype pr_msg)) { + if (not exists $param{$_} or + not defined $param{$_}) { + $param{$_} = 'misc'; + } + } my %header_order; @header_order{map {lc $_} @header_order} = 0..$#header_order; my %set_headers; @@ -250,7 +263,7 @@ sub default_headers { ($header,$default_header{$header}); } else { - push @other_headers,($header,$header_order{lc($header)}); + push @other_headers,($header,$default_header{$header}); } } my @headers; @@ -310,7 +323,7 @@ using warn. sub send_mail_message{ my %param = validate_with(params => \@_, spec => {sendmail_arguments => {type => ARRAYREF, - default => [$config{sendmail_arguments}], + default => $config{sendmail_arguments}, }, parse_for_recipients => {type => BOOLEAN, default => 0, @@ -321,7 +334,7 @@ sub send_mail_message{ message => {type => SCALAR, }, envelope_from => {type => SCALAR, - optional => 1, + default => $config{envelope_from}, }, recipients => {type => ARRAYREF|UNDEF, optional => 1, @@ -329,7 +342,10 @@ sub send_mail_message{ }, ); 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 @@ -387,7 +403,7 @@ sub encode_headers{ my ($header,$body) = split /\n\n/, $message, 2; $header = encode_rfc1522($header); - return $header . qq(\n\n). $body; + return $header . qq(\n\n). encode_utf8_safely($body); } =head2 rfc822_date @@ -402,6 +418,82 @@ sub rfc822_date{ return scalar strftime "%a, %d %h %Y %T +0000", gmtime; } +=head2 reply_headers + + reply_headers(MIME::Parser->new()->parse_data(\$data)); + +Generates suggested headers and a body for replies. Primarily useful +for use in RFC2368 mailto: entries. + +=cut + +sub reply_headers{ + my ($entity) = @_; + + my $head = $entity->head; + # build reply link + my %r_l; + $r_l{subject} = $head->get('Subject'); + $r_l{subject} //= 'Your mail'; + $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'; + $who =~ s/(?:^\s*|\s*$)//g; + + 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; + while (defined(my $part = shift @parts)) { + if ($part->parts) { + push @parts,$part->parts; + } + if (defined $part->bodyhandle and + $part->effective_type =~ /text/) { + 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; + } + } + } + if (defined $b_h) { + eval { + my $IO = $b_h->open("r"); + while (defined($_ = $IO->getline)) { + $i--; + last if $i < 0; + $body .= '> '. convert_to_utf8($_,$charset); + } + $IO->close(); + }; + } + $r_l{body} = $body; + return \%r_l; +} + =head1 PRIVATE FUNCTIONS =head2 _send_message