From e54464a1cb68c4d8d72fa8a152195d5e8915df4b Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Mon, 28 Jul 2014 22:38:27 -0700 Subject: [PATCH] Add reply links to individual bug messages with headers (closes: #412815). Thanks to martin krafft, Paul Wise, and Julien Valroff. --- Debbugs/CGI/Bugreport.pm | 40 +++++++++++++++++++++++++++----------- Debbugs/Mail.pm | 42 ++++++++++++++++++++++++++++++++++++++++ debian/changelog | 2 ++ 3 files changed, 73 insertions(+), 11 deletions(-) diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm index 1518712..4793cd6 100644 --- a/Debbugs/CGI/Bugreport.pm +++ b/Debbugs/CGI/Bugreport.pm @@ -33,7 +33,7 @@ use base qw(Exporter); use IO::Scalar; use Params::Validate qw(validate_with :types); use Digest::MD5 qw(md5_hex); -use Debbugs::Mail qw(get_addresses); +use Debbugs::Mail qw(get_addresses :reply); use Debbugs::MIME qw(decode_rfc1522 create_mime_message); use Debbugs::CGI qw(:url :html :util); use Debbugs::Common qw(globify_scalar english_join); @@ -42,6 +42,7 @@ use Debbugs::Config qw(:config); use POSIX qw(strftime); use Encode qw(decode_utf8 encode_utf8); use URI::Escape qw(uri_escape); +use Scalar::Util qw(blessed); BEGIN{ ($VERSION) = q$Revision: 494 $ =~ /^Revision:\s+([^\s+])/; @@ -138,9 +139,8 @@ sub display_entity { if ($param{outer} and not $param{terse} and not exists $param{att}) { - my $header = $entity->head; print {$output} "
\n"; - if ($param{trim_headers}) { + if ($param{trim_headers}) { my @headers; foreach (qw(From To Cc Subject Date)) { my $head_field = $head->get($_); @@ -316,12 +316,17 @@ sub handle_email_message{ my $output; my $output_fh = globify_scalar(\$output); - my $parser = MIME::Parser->new(); - # Because we are using memory, not tempfiles, there's no need to - # clean up here like in Debbugs::MIME - $parser->tmp_to_core(1); - $parser->output_to_core(1); - my $entity = $parser->parse_data( $email); + my $entity; + if (not blessed $email) { + my $parser = MIME::Parser->new(); + # Because we are using memory, not tempfiles, there's no need to + # clean up here like in Debbugs::MIME + $parser->tmp_to_core(1); + $parser->output_to_core(1); + $entity = $parser->parse_data( $email); + } else { + $entity = $email + } my @attachments = (); my $raw_output = display_entity(entity => $entity, @@ -437,8 +442,21 @@ sub handle_record{ options => {msg=>$msg_number, mbox=>'yes'} ) - ) .'">mbox)'.":

\n"; - $output .= handle_email_message($record->{text}, + ) .'">mbox, '; + my $parser = MIME::Parser->new(); + # Because we are using memory, not tempfiles, there's no need to + # clean up here like in Debbugs::MIME + $parser->tmp_to_core(1); + $parser->output_to_core(1); + my $entity = $parser->parse_data($record->{text}); + my $r_l = reply_headers($entity); + $output .= q(reply); + + $output .= ')'.":

\n"; + $output .= handle_email_message($entity, ref => $bug_number, msg_num => $msg_number, %param, diff --git a/Debbugs/Mail.pm b/Debbugs/Mail.pm index 9fa282b..a00b41c 100644 --- a/Debbugs/Mail.pm +++ b/Debbugs/Mail.pm @@ -61,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); @@ -414,6 +415,47 @@ 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'); + delete $r_l{'In-Reply-To'} unless defined $r_l{'In-Reply-To'}; + $r_l{References} = ($head->get('References')//''). ' '.($head->get('Message-Id')//''); + 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 = $entity->bodyhandle; + my $IO = $b_h->open("r"); + while (defined($_ = $IO->getline)) { + $i--; + last if $i < 0; + $body .= '> '. $_; + } + $IO->close(); + $r_l{body} = $body; + return \%r_l; +} + =head1 PRIVATE FUNCTIONS =head2 _send_message diff --git a/debian/changelog b/debian/changelog index 9491723..7bcb599 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ debbugs (2.4.2~exp2) UNRELEASED; urgency=low * Fix title of $gBug (closes: #546383). Thanks to Jakub Wilk. * Support CVEs surrounded by parenthesis (closes: #662228). Thanks to Ari Pollak. + * Add reply links to individual bug messages with headers (closes: + #412815). Thanks to martin krafft, Paul Wise, and Julien Valroff. [Thanks to Arnout Engelen: ] * Add Homepage (closes: #670555). -- 2.39.2