X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fbugreport.cgi;h=4251fed98cbdeb92190b6824735164089150859e;hb=c85e6985055a3adbb0491888b514f8846be2d044;hp=fff927196debf25254b2560af08c0d0078ea5d51;hpb=97d6b5247dcd4351fbf1c6cdd053245d60bf19e6;p=debbugs.git

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index fff9271..4251fed 100755
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -1,57 +1,76 @@
 #!/usr/bin/perl -wT
 
-package debbugs;
-
+use warnings;
 use strict;
 use POSIX qw(strftime tzset);
 use MIME::Parser;
 use MIME::Decoder;
 use IO::Scalar;
-use IO::Lines;
 use IO::File;
 
-#require '/usr/lib/debbugs/errorlib';
-require './common.pl';
-
-require '/etc/debbugs/config';
-require '/etc/debbugs/text';
-
-use vars(qw($gEmailDomain $gHTMLTail $gSpoolDir $gWebDomain));
+use Debbugs::Config qw(:globals :text);
 
 # for read_log_records
-use Debbugs::Log;
-use Debbugs::MIME qw(convert_to_utf8 decode_rfc1522);
+use Debbugs::Log qw(read_log_records);
+use Debbugs::MIME qw(convert_to_utf8 decode_rfc1522 create_mime_message);
+use Debbugs::CGI qw(:url :html :util);
+use Debbugs::Common qw(buglog getmaintainers);
+use Debbugs::Packages qw(getpkgsrc);
+use Debbugs::Status qw(splitpackages get_bug_status isstrongseverity);
 
 use Scalar::Util qw(looks_like_number);
-
-my %param = readparse();
+use CGI::Simple;
+my $q = new CGI::Simple;
+
+my %param = cgi_parameters(query => $q,
+			   single => [qw(bug msg att boring terse),
+				      qw(reverse mbox mime trim),
+				      qw(mboxstat mboxmaint archive),
+				      qw(repeatmerged)
+				     ],
+			   default => {msg       => '',
+				       boring    => 'no',
+				       terse     => 'no',
+				       reverse   => 'no',
+				       mbox      => 'no',
+				       mime      => 'no',
+				       mboxstat  => 'no',
+				       mboxmaint => 'no',
+				       archive   => 'no',
+				       repeatmerged => 'yes',
+				      },
+			  );
+# This is craptacular.
 
 my $tail_html;
 
-my $ref = $param{'bug'} || quitcgi("No bug number");
+my $ref = $param{bug} or quitcgi("No bug number");
 $ref =~ /(\d+)/ or quitcgi("Invalid bug number");
 $ref = $1;
 my $short = "#$ref";
-my $msg = $param{'msg'} || "";
+my $msg = $param{'msg'};
 my $att = $param{'att'};
-my $boring = ($param{'boring'} || 'no') eq 'yes'; 
-my $terse = ($param{'terse'} || 'no') eq 'yes';
-my $reverse = ($param{'reverse'} || 'no') eq 'yes';
-my $mbox = ($param{'mbox'} || 'no') eq 'yes'; 
-my $mime = ($param{'mime'} || 'yes') eq 'yes';
+my $boring = $param{'boring'} eq 'yes';
+my $terse = $param{'terse'} eq 'yes';
+my $reverse = $param{'reverse'} eq 'yes';
+my $mbox = $param{'mbox'} eq 'yes';
+my $mime = $param{'mime'} eq 'yes';
 
 my $trim_headers = ($param{trim} || ($msg?'no':'yes')) eq 'yes';
 
+my $mbox_status_message = $param{mboxstat} eq 'yes';
+my $mbox_maint = $param{mboxmaint} eq 'yes';
+$mbox = 1 if $mbox_status_message or $mbox_maint;
+
+
 # Not used by this script directly, but fetch these so that pkgurl() and
 # friends can propagate them correctly.
-my $archive = ($param{'archive'} || 'no') eq 'yes';
-my $repeatmerged = ($param{'repeatmerged'} || 'yes') eq 'yes';
-set_option('archive', $archive);
-set_option('repeatmerged', $repeatmerged);
+my $archive = $param{'archive'} eq 'yes';
+my $repeatmerged = $param{'repeatmerged'} eq 'yes';
 
 my $buglog = buglog($ref);
 
-if ($ENV{REQUEST_METHOD} eq 'HEAD' and not defined($att) and not $mbox) {
+if (defined $ENV{REQUEST_METHOD} and $ENV{REQUEST_METHOD} eq 'HEAD' and not defined($att) and not $mbox) {
     print "Content-Type: text/html; charset=utf-8\n";
     my @stat = stat $buglog;
     if (@stat) {
@@ -79,44 +98,46 @@ sub display_entity ($$$$\$\@) {
     $filename = '' unless defined $filename;
     $filename = decode_rfc1522($filename);
 
-    if ($top) {
+    if ($top and not $terse) {
 	 my $header = $entity->head;
-	 if ($trim_headers and not $terse) {
+	 $$this .= "<pre class=\"headers\">\n";
+	 if ($trim_headers) {
 	      my @headers;
-	      foreach (qw(From To Subject Date Cc)) {
+	      foreach (qw(From To Cc Subject Date)) {
 		   my $head_field = $head->get($_);
 		   next unless defined $head_field and $head_field ne '';
-		   push @headers, qq($_: ) . htmlsanit(decode_rfc1522($head_field));
+		   push @headers, qq(<b>$_:</b> ) . html_escape(decode_rfc1522($head_field));
 	      }
 	      $$this .= join(qq(), @headers) unless $terse;
-	      $$this .= qq(\n);
-	 }
-	 elsif (not $terse) {
-	      $$this .= htmlsanit(decode_rfc1522($entity->head->stringify));
-	      $$this .= qq(\n);
+	 } else {
+	      $$this .= html_escape(decode_rfc1522($entity->head->stringify));
 	 }
+	 $$this .= "</pre>\n";
     }
 
     unless (($top and $type =~ m[^text(?:/plain)?(?:;|$)]) or
 	    ($type =~ m[^multipart/])) {
 	push @$attachments, $entity;
-	my @dlargs = ($ref, "msg=$xmessage", "att=$#$attachments");
-	push @dlargs, "filename=$filename" if $filename ne '';
+	my @dlargs = ($ref, msg=>$xmessage, att=>$#$attachments);
+	push @dlargs, (filename=>$filename) if $filename ne '';
 	my $printname = $filename;
 	$printname = 'Message part ' . ($#$attachments + 1) if $filename eq '';
-	$$this .= '[<a href="' . dlurl(@dlargs) . qq{">$printname</a> } .
-		  "($type, $disposition)]\n\n";
+	$$this .= '<pre class="mime">[<a href="' . bug_url(@dlargs) . qq{">$printname</a> } .
+		  "($type, $disposition)]</pre>\n";
 
-	if ($msg and defined($att) and $att eq $#$attachments) {
+	if ($msg and defined($att) and $att == $#$attachments) {
 	    my $head = $entity->head;
 	    chomp(my $type = $entity->effective_type);
 	    my $body = $entity->stringify_body;
-	    print "Content-Type: $type\n";
+	    print "Content-Type: $type";
+	    my ($charset) = $head->get('Content-Type:') =~ m/charset\s*=\s*\"?([\w-]+)\"?/i;
+	    print qq(; charset="$charset") if defined $charset;
+	    print "\n";
 	    if ($filename ne '') {
 		my $qf = $filename;
 		$qf =~ s/"/\\"/g;
 		$qf =~ s[.*/][];
-		print qq{Content-Disposition: attachment; filename="$qf"\n};
+		print qq{Content-Disposition: inline; filename="$qf"\n};
 	    }
 	    print "\n";
 	    my $decoder = new MIME::Decoder($head->mime_encoding);
@@ -150,11 +171,23 @@ sub display_entity ($$$$\$\@) {
 	$$this .= "</blockquote>\n";
     } else {
 	 if (not $terse) {
-	      my $content_type = $entity->head->get('Content-Type:');
+	      my $content_type = $entity->head->get('Content-Type:') || "text/html";
 	      my ($charset) = $content_type =~ m/charset\s*=\s*\"?([\w-]+)\"?/i;
 	      my $body = $entity->bodyhandle->as_string;
 	      $body = convert_to_utf8($body,$charset) if defined $charset;
-	      $$this .= htmlsanit($body);
+	      $body = html_escape($body);
+	      # Attempt to deal with format=flowed
+	      if ($content_type =~ m/format\s*=\s*\"?flowed\"?/i) {
+		   $body =~ s{^\ }{}mgo;
+		   # we ignore the other things that you can do with
+		   # flowed e-mails cause they don't really matter.
+	      }
+	      # Add links to URLs
+	      $body =~ s,((ftp|http|https)://[\S~-]+?/?)((\&gt\;)?[)]?[']?[:.\,]?(\s|$)),<a href=\"$1\">$1</a>$3,go;
+	      # Add links to bug closures
+	      $body =~ s[(closes:\s*(?:bug)?\#?\s?\d+(?:,?\s*(?:bug)?\#?\s?\d+)*)
+			][my $temp = $1; $temp =~ s{(\d+)}{qq(<a href=").bug_url($1).qq(">$1</a>)}ge; $temp;]gxie;
+	      $$this .= qq(<pre class="message">$body</pre>\n);
 	 }
     }
 }
@@ -163,30 +196,26 @@ my %maintainer = %{getmaintainers()};
 my %pkgsrc = %{getpkgsrc()};
 
 my $indexentry;
-my $descriptivehead;
 my $showseverity;
 
 my $tpack;
 my $tmain;
 
-$ENV{"TZ"} = 'UTC';
-tzset();
-
-my $dtime = strftime "%a, %e %b %Y %T UTC", localtime;
-$tail_html = $debbugs::gHTMLTail;
+my $dtime = strftime "%a, %e %b %Y %T UTC", gmtime;
+$tail_html = $gHTMLTail;
 $tail_html =~ s/SUBSTITUTE_DTIME/$dtime/;
 
-my %status = %{getbugstatus($ref)};
+my %status = %{get_bug_status(bug=>$ref)};
 unless (%status) {
     print <<EOF;
 Content-Type: text/html; charset=utf-8
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-<head><title>$debbugs::gProject $debbugs::gBug report logs - $short</title></head>
+<head><title>$short - $gProject $gBug report logs</title></head>
 <body>
-<h1>$debbugs::gProject $debbugs::gBug report logs - $short</h1>
-<p>There is no record of $debbugs::gBug $short.
+<h1>$gProject $gBug report logs - $short</h1>
+<p>There is no record of $gBug $short.
 Try the <a href="http://$gWebDomain/">search page</a> instead.</p>
 $tail_html</body></html>
 EOF
@@ -200,37 +229,69 @@ my @tpacks = splitpackages($tpack);
 
 if  ($status{severity} eq 'normal') {
 	$showseverity = '';
-#} elsif (isstrongseverity($status{severity})) {
-#	$showseverity = "<strong>Severity: $status{severity}</strong>;\n";
+} elsif (isstrongseverity($status{severity})) {
+	$showseverity = "Severity: <em class=\"severity\">$status{severity}</em>;\n";
 } else {
-	$showseverity = "Severity: <em>$status{severity}</em>;\n";
+	$showseverity = "Severity: $status{severity};\n";
+}
+
+if (@{$status{found_versions}} or @{$status{fixed_versions}}) {
+     $indexentry.= q(<div style="float:right"><a href=").
+	  version_url($status{package},
+		      $status{found_versions},
+		      $status{fixed_versions},
+		     ).
+	  q("><img alt="version graph" src=").
+	  version_url($status{package},
+		      $status{found_versions},
+		      $status{fixed_versions},
+		      2,
+		      2,
+		     ).qq{"></a></div>};
 }
 
-$indexentry .= "<p>$showseverity";
-$indexentry .= htmlpackagelinks($status{package}, 0) . ";\n";
 
-$indexentry .= htmladdresslinks("Reported by: ", \&submitterurl,
+$indexentry .= "<div class=\"msgreceived\">\n";
+$indexentry .= htmlize_packagelinks($status{package}, 0) . ";\n";
+
+foreach my $pkg (@tpacks) {
+    my $tmaint = defined($maintainer{$pkg}) ? $maintainer{$pkg} : '(unknown)';
+    my $tsrc = defined($pkgsrc{$pkg}) ? $pkgsrc{$pkg} : '(unknown)';
+
+    $indexentry .=
+            htmlize_maintlinks(sub { $_[0] == 1 ? "Maintainer for $pkg is\n"
+                                            : "Maintainers for $pkg are\n" },
+                           $tmaint);
+    $indexentry .= ";\nSource for $pkg is\n".
+            '<a href="'.pkg_url(src=>$tsrc)."\">$tsrc</a>" if ($tsrc ne "(unknown)");
+    $indexentry .= ".\n";
+}
+
+$indexentry .= "<br>";
+$indexentry .= htmlize_addresslinks("Reported by: ", \&submitterurl,
                                 $status{originator}) . ";\n";
+$indexentry .= sprintf "Date: %s.\n",
+		(strftime "%a, %e %b %Y %T UTC", localtime($status{date}));
 
-$indexentry .= "Owned by: " . htmlsanit($status{owner}) . ";\n"
+$indexentry .= "<br>Owned by: " . html_escape($status{owner}) . ".\n"
               if length $status{owner};
 
-my $dummy = strftime "%a, %e %b %Y %T UTC", localtime($status{date});
-$indexentry .= "Date: ".$dummy.";\n<br>";
+$indexentry .= "</div>\n";
 
 my @descstates;
 
-push @descstates, "Tags: <strong>"
-		. htmlsanit(join(", ", sort(split(/\s+/, $status{tags}))))
-		. "</strong>"
+$indexentry .= "<h3>$showseverity";
+$indexentry .= sprintf "Tags: %s;\n", 
+		html_escape(join(", ", sort(split(/\s+/, $status{tags}))))
 			if length($status{tags});
+$indexentry .= "<br>" if (length($showseverity) or length($status{tags}));
 
 my @merged= split(/ /,$status{mergedwith});
 if (@merged) {
-	my $descmerged = 'merged with ';
+	my $descmerged = 'Merged with ';
 	my $mseparator = '';
 	for my $m (@merged) {
-		$descmerged .= $mseparator."<a href=\"" . bugurl($m) . "\">#$m</a>";
+		$descmerged .= $mseparator."<a href=\"" . bug_url($m) . "\">#$m</a>";
 		$mseparator= ",\n";
 	}
 	push @descstates, $descmerged;
@@ -239,40 +300,63 @@ if (@merged) {
 if (@{$status{found_versions}}) {
     my $foundtext = 'Found in ';
     $foundtext .= (@{$status{found_versions}} == 1) ? 'version ' : 'versions ';
-    $foundtext .= join ', ', map htmlsanit($_), @{$status{found_versions}};
+    $foundtext .= join ', ', map html_escape($_), @{$status{found_versions}};
     push @descstates, $foundtext;
 }
-
 if (@{$status{fixed_versions}}) {
     my $fixedtext = '<strong>Fixed</strong> in ';
     $fixedtext .= (@{$status{fixed_versions}} == 1) ? 'version ' : 'versions ';
-    $fixedtext .= join ', ', map htmlsanit($_), @{$status{fixed_versions}};
+    $fixedtext .= join ', ', map html_escape($_), @{$status{fixed_versions}};
     if (length($status{done})) {
-	$fixedtext .= ' by ' . htmlsanit(decode_rfc1522($status{done}));
+	$fixedtext .= ' by ' . html_escape(decode_rfc1522($status{done}));
     }
     push @descstates, $fixedtext;
-} elsif (length($status{done})) {
-	push @descstates, "<strong>Done:</strong> ".htmlsanit(decode_rfc1522($status{done}));
-} elsif (length($status{forwarded})) {
-	push @descstates, "<strong>Forwarded</strong> to ".maybelink($status{forwarded});
 }
 
-$indexentry .= join(";\n", @descstates) . ";\n<br>" if @descstates;
+if (@{$status{found_versions}} or @{$status{fixed_versions}}) {
+     push @descstates, '<a href="'.
+	  version_url($status{package},
+		      $status{found_versions},
+		      $status{fixed_versions},
+		     ).qq{">Version Graph</a>};
+}
 
-$descriptivehead = $indexentry;
-foreach my $pkg (@tpacks) {
-    my $tmaint = defined($maintainer{$pkg}) ? $maintainer{$pkg} : '(unknown)';
-    my $tsrc = defined($pkgsrc{$pkg}) ? $pkgsrc{$pkg} : '(unknown)';
+if (length($status{done})) {
+    push @descstates, "<strong>Done:</strong> ".html_escape(decode_rfc1522($status{done}));
+}
 
-    $descriptivehead .=
-            htmlmaintlinks(sub { $_[0] == 1 ? "Maintainer for $pkg is\n"
-                                            : "Maintainers for $pkg are\n" },
-                           $tmaint);
-    $descriptivehead .= ";\nSource for $pkg is\n".
-            '<a href="'.srcurl($tsrc)."\">$tsrc</a>" if ($tsrc ne "(unknown)");
-    $descriptivehead .= ".\n<br>";
+if (length($status{forwarded})) {
+    push @descstates, "<strong>Forwarded</strong> to ".maybelink($status{forwarded});
 }
 
+
+my @blockedby= split(/ /, $status{blockedby});
+if (@blockedby && $status{"pending"} ne 'fixed' && ! length($status{done})) {
+    for my $b (@blockedby) {
+        my %s = %{get_bug_status($b)};
+        next if $s{"pending"} eq 'fixed' || length $s{done};
+        push @descstates, "Fix blocked by <a href=\"" . bug_url($b) . "\">#$b</a>: ".html_escape($s{subject});
+    }
+}
+
+my @blocks= split(/ /, $status{blocks});
+if (@blocks && $status{"pending"} ne 'fixed' && ! length($status{done})) {
+    for my $b (@blocks) {
+        my %s = %{get_bug_status($b)};
+        next if $s{"pending"} eq 'fixed' || length $s{done};
+        push @descstates, "Blocking fix for <a href=\"" . bug_url($b) . "\">#$b</a>: ".html_escape($s{subject});
+    }
+}
+
+if ($buglog !~ m#^\Q$gSpoolDir/db#) {
+    push @descstates, "Bug is archived. No further changes may be made";
+}
+
+$indexentry .= join(";\n<br>", @descstates) . ".\n" if @descstates;
+$indexentry .= "</h3>\n";
+
+my $descriptivehead = $indexentry;
+
 my $buglogfh;
 if ($buglog =~ m/\.gz$/) {
     my $oldpath = $ENV{'PATH'};
@@ -282,12 +366,15 @@ if ($buglog =~ m/\.gz$/) {
 } else {
     $buglogfh = new IO::File "<$buglog" or &quitcgi("open log for $ref: $!");
 }
-if ($buglog !~ m#^\Q$gSpoolDir/db#) {
-    $descriptivehead .= "\n<p>Bug is <strong>archived</strong>. No further changes may be made.</p>";
-}
 
 
-my @records = read_log_records($buglogfh);
+my @records;
+eval{
+     @records = read_log_records($buglogfh);
+};
+if ($@) {
+     quitcgi("Bad bug log for $gBug $ref. Unable to read records: $@");
+}
 undef $buglogfh;
 
 =head2 handle_email_message
@@ -308,13 +395,11 @@ sub handle_email_message{
 
      my $output = '';
      my $parser = new MIME::Parser;
+     # 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);
-     # $parser->output_under("/tmp");
      my $entity = $parser->parse_data( $email);
-     # TODO: make local subdir, clean it ourselves
-     # the following does NOT delete the msg dirs in /tmp
-     END { if ( $entity ) { $entity->purge; } if ( $parser ) { $parser->filer->purge; } }
      my @attachments = ();
      display_entity($entity, $options{ref}, 1, $options{msg_number}, $output, @attachments);
      return $output;
@@ -337,9 +422,30 @@ sub handle_record{
      my $output = '';
      local $_ = $record->{type};
      if (/html/) {
+	  my ($time) = $record->{text} =~ /<!--\s+time:(\d+)\s+-->/;
+	  my $class = $record->{text} =~ /^<strong>(?:Acknowledgement|Reply|Information|Report|Notification)/ ? 'infmessage':'msgreceived';
 	  $output .= decode_rfc1522($record->{text});
-	  $output .= '<a href="' . bugurl($ref, 'msg='.($msg_number+1)) . '">Full text</a> and <a href="' .
-	       bugurl($ref, 'msg='.($msg_number+1)) . '&mbox=yes">rfc822 format</a> available.</em>';
+	  # Link to forwarded http:// urls in the midst of the report
+	  # (even though these links already exist at the top)
+	  $output =~ s,((?:ftp|http|https)://[\S~-]+?/?)([\)\'\:\.\,]?(?:\s|\.<|$)),<a href=\"$1\">$1</a>$2,go;
+	  # Add links to the cloned bugs
+	  $output =~ s{(Bug )(\d+)( cloned as bugs? )(\d+)(?:\-(\d+)|)}{$1.bug_links($2).$3.bug_links($4,$5)}eo;
+	  # Add links to merged bugs
+	  $output =~ s{(?<=Merged )([\d\s]+)(?=\.)}{join(' ',map {bug_links($_)} (split /\s+/, $1))}eo;
+	  # Add links to blocked bugs
+	  $output =~ s{(?<=Blocking bugs)(?:( of )(\d+))?( (?:added|set to|removed):\s+)([\d\s\,]+)}
+		      {(defined $2?$1.bug_links($2):'').$3.
+			    join(' ',map {bug_links($_)} (split /\,?\s+/, $4))}eo;
+	  # Add links to reassigned packages
+	  $output =~ s{(Bug reassigned from package \`)([^']+)((?:'|\&\#39;) to \`)([^']+)((?:'|\&\#39;))}
+	  {$1.q(<a href=").pkg_url(pkg=>$2).qq(">$2</a>).$3.q(<a href=").pkg_url(pkg=>$4).qq(">$4</a>).$5}eo;
+	  if (defined $time) {
+	       $output .= ' ('.strftime('%a, %d %b %Y %T GMT',gmtime($time)).') ';
+	  }
+	  $output .= '<a href="' . bug_url($ref, msg => ($msg_number+1)) . '">Full text</a> and <a href="' .
+	       bug_url($ref, msg => ($msg_number+1), mbox => 'yes') . '">rfc822 format</a> available.';
+
+	  $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;
@@ -349,12 +455,12 @@ sub handle_record{
 	  elsif (defined $msg_id) {
 	       $$seen_msg_ids{$msg_id} = 1;
 	  }
-	  $output .= 'View this message in <a href="' . bugurl($ref, "msg=$msg_number") . '&mbox=yes">rfc822 format</a></em>';
-	  $output .= '<pre class="message">' .
-	       handle_email_message($record->{text},
+	  $output .= qq(<hr><p class="msgreceived"><a name="$msg_number"></a>\n);
+	  $output .= 'View this message in <a href="' . bug_url($ref, msg=>$msg_number, mbox=>'yes') . '">rfc822 format</a></p>';
+	  $output .= handle_email_message($record->{text},
 				    ref        => $bug_number,
 				    msg_number => $msg_number,
-				   ) . '</pre>';
+				   );
      }
      elsif (/autocheck/) {
 	  # Do nothing
@@ -369,13 +475,14 @@ sub handle_record{
 	  }
 	  # Incomming Mail Message
 	  my ($received,$hostname) = $record->{text} =~ m/Received: \(at (\S+)\) by (\S+)\;/;
-	  $output .= qq|<h2><a name="msg$msg_number">Message received at |.
-	       htmlsanit("$received\@$hostname") . q| (<a href="| . bugurl($ref, "msg=$msg_number") . '">full text</a>'.q|, <a href="| . bugurl($ref, "msg=$msg_number") . '&mbox=yes">mbox</a>)'.":</a></h2>\n";
-	  $output .= '<pre class="message">' .
-	       handle_email_message($record->{text},
+	  $output .= qq|<hr><p class="msgreceived"><a name="$msg_number"></a><a name="msg$msg_number"></a><a href="#$msg_number">Message</a> received at |.
+	       html_escape("$received\@$hostname") .
+		    q| (<a href="| . bug_url($ref, msg=>$msg_number) . '">full text</a>'.
+			 q|, <a href="| . bug_url($ref, msg=>$msg_number,mbox=>'yes') .'">mbox</a>)'.":</p>\n";
+	  $output .= handle_email_message($record->{text},
 				    ref        => $bug_number,
 				    msg_number => $msg_number,
-				   ) . '</pre>';
+				   );
      }
      else {
 	  die "Unknown record type $_";
@@ -392,17 +499,59 @@ if (looks_like_number($msg) and ($msg-1) <= $#records) {
 }
 my @log;
 if ( $mbox ) {
+     my $date = strftime "%a %b %d %T %Y", localtime;
      if (@records > 1) {
 	  print qq(Content-Disposition: attachment; filename="bug_${ref}.mbox"\n);
 	  print "Content-Type: text/plain\n\n";
      }
      else {
+	  $msg_num++;
 	  print qq(Content-Disposition: attachment; filename="bug_${ref}_message_${msg_num}.mbox"\n);
 	  print "Content-Type: message/rfc822\n\n";
      }
+     if ($mbox_status_message and @records > 1) {
+	  my $status_message='';
+	  my @status_fields = (retitle   => 'subject',
+			       package   => 'package',
+			       submitter => 'originator',
+			       severity  => 'severity',
+			       tag       => 'tags',
+			       owner     => 'owner',
+			       blocks    => 'blocks',
+			       forward   => 'forward',
+			      );
+	  my ($key,$value);
+	  while (($key,$value) = splice(@status_fields,0,2)) {
+	       if (defined $status{$value} and length $status{$value}) {
+		    $status_message .= qq($key $ref $status{$value}\n);
+	       }
+	  }
+	  print STDOUT qq(From unknown $date\n),
+	       create_mime_message([From       => "$gBug#$ref <$ref\@$gEmailDomain>",
+				    To         => "$gBug#$ref <$ref\@$gEmailDomain>",
+				    Subject    => "Status: $status{subject}",
+				    "Reply-To" => "$gBug#$ref <$ref\@$gEmailDomain>",
+				   ],
+				   <<END,);
+$status_message
+thanks
+
+
+END
+     }
+     my $message_number=0;
+     my %seen_message_ids;
      for my $record (@records) {
 	  next if $record->{type} !~ /^(?:recips|incoming-recv)$/;
-	  next if not $boring and $record->{type} eq 'recips';
+	  my $wanted_type = $mbox_maint?'recips':'incoming-recv';
+	  # we want to include control messages anyway
+	  my $record_wanted_anyway = 0;
+	  my ($msg_id) = $record->{text} =~ /^Message-Id:\s+<(.+)>/im;
+	  next if exists $seen_message_ids{$msg_id};
+	  next if $msg_id =~/handler\..+\.ack(?:info|done)?\@/;
+	  $record_wanted_anyway = 1 if $record->{text} =~ /^Received: \(at control\)/;
+	  next if not $boring and not $record->{type} eq $wanted_type and not $record_wanted_anyway and @records > 1;
+	  $seen_message_ids{$msg_id} = 1;
 	  my @lines = split( "\n", $record->{text}, -1 );
 	  if ( $lines[ 1 ] =~ m/^From / ) {
 	       my $tmp = $lines[ 0 ];
@@ -410,7 +559,6 @@ if ( $mbox ) {
 	       $lines[ 1 ] = $tmp;
 	  }
 	  if ( !( $lines[ 0 ] =~ m/^From / ) ) {
-	       my $date = strftime "%a %b %d %T %Y", localtime;
 	       unshift @lines, "From unknown $date";
 	  }
 	  map { s/^(>*From )/>$1/ } @lines[ 1 .. $#lines ];
@@ -433,27 +581,61 @@ else {
 }
 
 @log = reverse @log if $reverse;
-$log = join('<hr>',@log);
+$log = join("\n",@log);
 
 
 print "Content-Type: text/html; charset=utf-8\n\n";
 
-my $title = htmlsanit($status{subject});
+my $title = html_escape($status{subject});
+
+my $dummy2 = $gWebHostBugDir;
 
 print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
-print "<HTML><HEAD>\n" . 
-    "<TITLE>$debbugs::gProject $debbugs::gBug report logs - $short - $title</TITLE>\n" .
-#    "<link rel=\"stylesheet\" href=\"$debbugs::gWebHostBugDir/bugs.css\" type=\"text/css\">" .
-    "</HEAD>\n" .
-    '<BODY>' .
-    "\n";
-print "<H1>" . "$debbugs::gProject $debbugs::gBug report logs - <A HREF=\"mailto:$ref\@$gEmailDomain\">$short</A>" .
+print <<END;
+<HTML><HEAD>
+<TITLE>$short - $title - $gProject $gBug report logs</TITLE>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+<link rel="stylesheet" href="$gWebHostBugDir/css/bugs.css" type="text/css">
+<script type="text/javascript">
+<!--
+function toggle_infmessages()
+{
+        allDivs=document.getElementsByTagName("div");
+        for (var i = 0 ; i < allDivs.length ; i++ )
+        {
+                if (allDivs[i].className == "infmessage")
+                {
+                        allDivs[i].style.display=(allDivs[i].style.display == 'none' | allDivs[i].style.display == '') ? 'block' : 'none';
+                        break;
+                }
+        }
+}
+-->
+</script>
+</HEAD>
+<BODY>
+END
+print "<H1>" . "$gProject $gBug report logs - <A HREF=\"mailto:$ref\@$gEmailDomain\">$short</A>" .
       "<BR>" . $title . "</H1>\n";
-
 print "$descriptivehead\n";
-printf "<p>View this report as an <a href=\"%s\">mbox folder</a>.</p>\n", mboxurl($ref);
-print "<HR>";
+
+if (looks_like_number($msg)) {
+     printf qq(<p><a href="%s">Full log</a></p>),html_escape(bug_url($ref));
+}
+else {
+     print qq(<p><a href="mailto:$ref\@$gEmailDomain">Reply</a> ),
+	  qq(or <a href="mailto:$ref-subscribe\@$gEmailDomain">subscribe</a> ),
+	       qq(to this bug.</p>\n);
+     print qq(<p><a href="javascript:toggle_infmessages();">Toggle useless messages</a></p>);
+     printf qq(<div class="msgreceived"><p>View this report as an <a href="%s">mbox folder</a>, ).
+	  qq(<a href="%s">status mbox</a>, <a href="%s">maintainer mbox</a></p></div>\n),
+	       html_escape(bug_url($ref, mbox=>'yes')),
+		    html_escape(bug_url($ref, mbox=>'yes',mboxstatus=>'yes')),
+			 html_escape(bug_url($ref, mbox=>'yes',mboxmaint=>'yes'));
+}
 print "$log";
+print "<HR>";
+print "<p class=\"msgreceived\">Send a report that <a href=\"/cgi-bin/bugspam.cgi?bug=$ref\">this bug log contains spam</a>.</p>\n<HR>\n";
 print $tail_html;
 
 print "</BODY></HTML>\n";