X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FCGI%2FBugreport.pm;h=888a1b37b11fd16bb27139b991d86c7eea8cee2f;hb=9ba3b5ba7379ac06399d7b296e7796b65fad6149;hp=f080986a4389df895ee600e882ff862c6b27e6f8;hpb=0c66c0bcc10e6ae9c6f2de25e3e332b466641c1f;p=debbugs.git

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index f080986..888a1b3 100644
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -28,7 +28,7 @@ None known.
 use warnings;
 use strict;
 use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT);
-use base qw(Exporter);
+use Exporter qw(import);
 
 use IO::Scalar;
 use Params::Validate qw(validate_with :types);
@@ -39,6 +39,7 @@ use Debbugs::CGI qw(:url :html :util);
 use Debbugs::Common qw(globify_scalar english_join);
 use Debbugs::UTF8;
 use Debbugs::Config qw(:config);
+use Debbugs::Log qw(:read);
 use POSIX qw(strftime);
 use Encode qw(decode_utf8 encode_utf8);
 use URI::Escape qw(uri_escape_utf8);
@@ -125,7 +126,6 @@ sub display_entity {
     my $output = globify_scalar($param{output});
     my $entity = $param{entity};
     my $ref = $param{bug_num};
-    my $top = $param{outer};
     my $xmessage = $param{msg_num};
     my $attachments = $param{attachments};
 
@@ -313,20 +313,26 @@ appropriate.
 =cut
 
 sub handle_email_message{
-     my ($email,%param) = @_;
+     my ($record,%param) = @_;
 
      my $output;
      my $output_fh = globify_scalar(\$output);
      my $entity;
-     if (not blessed $email) {
+     my $tempdir;
+     if (not blessed $record) {
          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);
+         # this will be cleaned up once it goes out of scope
+         $tempdir = File::Temp->newdir();
+         $parser->output_under($tempdir->dirname());
+         if ($record->{inner_file}) {
+             $entity = $parser->parse($record->{fh}) or
+                 die "Unable to parse entity";
+         } else {
+             $entity = $parser->parse_data($record->{text}) or
+                 die "Unable to parse entity";
+         }
      } else {
-         $entity = $email
+         $entity = $record;
      }
      my @attachments = ();
      my $raw_output =
@@ -364,7 +370,7 @@ sub handle_record{
      local $_ = $record->{type};
      if (/html/) {
 	 # $record->{text} is not in perl's internal encoding; convert it
-	 my $text = decode_rfc1522(decode_utf8($record->{text}));
+	 my $text = decode_rfc1522(decode_utf8(record_text($record)));
 	  my ($time) = $text =~ /<!--\s+time:(\d+)\s+-->/;
 	  my $class = $text =~ /^<strong>(?:Acknowledgement|Reply|Information|Report|Notification)/m ? 'infmessage':'msgreceived';
 	  $output .= $text;
@@ -388,10 +394,10 @@ sub handle_record{
 		      {$1.$2.(bug_links(bug=>$3)).$4.
 			   english_join([map {bug_links(bug=>$_)} (split /\,?\s+(?:and\s+)?/, $5)])}eo;
 	  # Add links to reassigned packages
-	  $output =~ s{(Bug\sreassigned\sfrom\spackage\s(?:[\`']|\&\#39;))([^']+?)((?:'|\&\#39;|\&quot\;)
+	  $output =~ s{($config{bug}\sreassigned\sfrom\spackage\s(?:[\`']|\&\#39;))([^']+?)((?:'|\&\#39;|\&quot\;)
                                \sto\s(?:[\`']|\&\#39;|\&quot\;))([^']+?)((?:'|\&\#39;|\&quot\;))}
-	  {$1.q(<a href=").html_escape(package_links(package=>$2)).qq(">$2</a>).$3.
-               q(<a href=").html_escape(package_links(package=>$4)).qq(">$4</a>).$5}exo;
+	  {$1.package_links(package=>$2).$3.
+               package_links(package=>$4).$5}exo;
 	  if (defined $time) {
 	       $output .= ' ('.strftime('%a, %d %b %Y %T GMT',gmtime($time)).') ';
 	  }
@@ -410,8 +416,8 @@ sub handle_record{
 	  $output = qq(<div class="$class"><hr>\n<a name="$msg_number"></a>\n) . $output . "</div>\n";
      }
      elsif (/recips/) {
-	  my ($msg_id) = $record->{text} =~ /^Message-Id:\s+<(.+)>/im;
-	  if (defined $msg_id and exists $$seen_msg_ids{$msg_id}) {
+         my ($msg_id) = record_regex($record,qr/^Message-Id:\s+<(.+)>/i);
+         if (defined $msg_id and exists $$seen_msg_ids{$msg_id}) {
 	       return ();
 	  }
 	  elsif (defined $msg_id) {
@@ -419,7 +425,7 @@ sub handle_record{
 	  }
 	  $output .= qq(<hr><p class="msgreceived"><a name="$msg_number"></a>\n);
 	  $output .= 'View this message in <a href="' . html_escape(bug_links(bug=>$bug_number, links_only => 1, options=>{msg=>$msg_number, mbox=>'yes'})) . '">rfc822 format</a></p>';
-	  $output .= handle_email_message($record->{text},
+	  $output .= handle_email_message($record,
 					  ref     => $bug_number,
 					  msg_num => $msg_number,
                                           %param,
@@ -429,7 +435,7 @@ sub handle_record{
 	  # Do nothing
      }
      elsif (/incoming-recv/) {
-	  my ($msg_id) = $record->{text} =~ /^Message-Id:\s+<(.+)>/im;
+         my ($msg_id) = record_regex($record,qr/^Message-Id:\s+<(.+)>/i);
 	  if (defined $msg_id and exists $$seen_msg_ids{$msg_id}) {
 	       return ();
 	  }
@@ -437,7 +443,7 @@ sub handle_record{
 	       $$seen_msg_ids{$msg_id} = 1;
 	  }
 	  # Incomming Mail Message
-	  my ($received,$hostname) = $record->{text} =~ m/Received: \(at (\S+)\) by (\S+)\;/;
+	  my ($received,$hostname) = record_regex($record,qr/Received: \(at (\S+)\) by (\S+)\;/o);
 	  $output .= qq|<hr><p class="msgreceived"><a name="$msg_number"></a><a name="msg$msg_number"></a><a href="#$msg_number">Message #$msg_number</a> received at |.
 	       html_escape("$received\@$hostname") .
 		    q| (<a href="| . html_escape(bug_links(bug => $bug_number, links_only => 1, options => {msg=>$msg_number})) . '">full text</a>'.
@@ -452,7 +458,12 @@ sub handle_record{
           # this will be cleaned up once it goes out of scope
           my $tempdir = File::Temp->newdir();
           $parser->output_under($tempdir->dirname());
-          my $entity = $parser->parse_data($record->{text});
+         my $entity;
+         if ($record->{inner_file}) {
+             $entity = $parser->parse($record->{fh});
+         } else {
+             $entity = $parser->parse_data($record->{text});
+         }
           my $r_l = reply_headers($entity);
           $output .= q(<a href=").
               html_escape('mailto:'.$bug_number.'@'.$config{email_domain}.'?'.