]> git.donarmstrong.com Git - debbugs.git/blobdiff - cgi/bugreport.cgi
abstract out no_such_bug
[debbugs.git] / cgi / bugreport.cgi
index 63419c343dc4854294f0762769dcb9bc0799ff65..b68eac64b7f9ba7c92d38e0d151ce1431362d18f 100755 (executable)
-#!/usr/bin/perl -wT
-
-package debbugs;
+#!/usr/bin/perl
 
+use warnings;
 use strict;
-use POSIX qw(strftime tzset);
-use MIME::Parser;
-use MIME::Decoder;
-use IO::Scalar;
-use IO::Lines;
 
-#require '/usr/lib/debbugs/errorlib';
-require './common.pl';
-
-require '/etc/debbugs/config';
-require '/etc/debbugs/text';
-
-use vars(qw($gEmailDomain $gHTMLTail $gSpoolDir $gWebDomain));
-
-my %param = readparse();
+# Sanitize environent for taint
+BEGIN{
+    delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
+}
 
-my $tail_html;
 
-my $ref = $param{'bug'} || quitcgi("No bug number");
+use POSIX qw(strftime);
+use MIME::Parser;
+use MIME::Decoder;
+use IO::Scalar;
+use IO::File;
+
+use Debbugs::Config qw(:globals :text);
+
+# for read_log_records
+use Debbugs::Log qw(:read);
+use Debbugs::CGI qw(:url :html :util);
+use Debbugs::CGI::Bugreport qw(:all);
+use Debbugs::Common qw(buglog getmaintainers make_list bug_status);
+use Debbugs::Packages qw(getpkgsrc);
+use Debbugs::Status qw(splitpackages split_status_fields get_bug_status isstrongseverity);
+
+use Debbugs::User;
+
+use Scalar::Util qw(looks_like_number);
+
+use Debbugs::Text qw(:templates);
+
+use List::Util qw(max);
+
+
+use CGI::Simple;
+my $q = new CGI::Simple;
+# STDOUT should be using the utf8 io layer
+binmode(STDOUT,':raw:encoding(UTF-8)');
+
+my %param = cgi_parameters(query => $q,
+                          single => [qw(bug msg att boring terse),
+                                     qw(reverse mbox mime trim),
+                                     qw(mboxstat mboxmaint archive),
+                                     qw(repeatmerged avatars),
+                                    ],
+                          default => {# msg       => '',
+                                      boring    => 'no',
+                                      terse     => 'no',
+                                      reverse   => 'no',
+                                      mbox      => 'no',
+                                      mime      => 'no',
+                                      mboxstat  => 'no',
+                                      mboxmaint => 'no',
+                                      archive   => 'no',
+                                      repeatmerged => 'yes',
+                                       avatars   => 'yes',
+                                     },
+                         );
+# This is craptacular.
+
+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 $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 ($msg) = $param{msg} =~ /^(\d+)$/ if exists $param{msg};
+my ($att) = $param{att} =~ /^(\d+)$/ if exists $param{att};
+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 $avatars = $param{avatars} eq 'yes';
+
+my $trim_headers = ($param{trim} || ((defined $msg and $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 %bugusertags;
+my %ut;
+my %seen_users;
 
 my $buglog = buglog($ref);
+my $bug_status = bug_status($ref);
+if (not defined $buglog or not defined $bug_status) {
+    no_such_bug($q,$ref);
+}
 
-if ($ENV{REQUEST_METHOD} eq 'HEAD' and not defined($att) and not $mbox) {
-    print "Content-Type: text/html\n";
-    my @stat = stat $buglog;
-    if (@stat) {
-       my $mtime = strftime '%a, %d %b %Y %T GMT', gmtime($stat[9]);
-       print "Last-Modified: $mtime\n";
-    }
-    print "\n";
+sub no_such_bug {
+    my ($q,$ref) = @_;
+    print $q->header(-status => 404,
+                    -content_type => "text/html",
+                    -charset => 'utf-8',
+                    -cache_control => 'public, max-age=600',
+                   );
+    print fill_in_template(template=>'cgi/no_such_bug',
+                          variables => {modify_time => strftime('%a, %e %b %Y %T UTC', gmtime),
+                                        bug_num     => $ref,
+                                       },
+                         );
     exit 0;
 }
 
-sub display_entity ($$$$\$\@);
-sub display_entity ($$$$\$\@) {
-    my $entity = shift;
-    my $ref = shift;
-    my $top = shift;
-    my $xmessage = shift;
-    my $this = shift;
-    my $attachments = shift;
-
-    my $head = $entity->head;
-    my $disposition = $head->mime_attr('content-disposition');
-    $disposition = 'inline' if not defined $disposition or $disposition eq '';
-    my $type = $entity->effective_type;
-    my $filename = $entity->head->recommended_filename;
-    $filename = '' unless defined $filename;
-
-    if ($top) {
-       $$this .= htmlsanit($entity->stringify_header) unless ($terse);
-       $$this .= "\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 $printname = $filename;
-       $printname = 'Message part ' . ($#$attachments + 1) if $filename eq '';
-       $$this .= '[<a href="' . dlurl(@dlargs) . qq{">$printname</a> } .
-                 "($type, $disposition)]\n\n";
-
-       if ($msg and defined($att) and $att eq $#$attachments) {
-           my $head = $entity->head;
-           chomp(my $type = $entity->effective_type);
-           my $body = $entity->stringify_body;
-           print "Content-Type: $type";
-           print "; name=$filename" if $filename ne '';
-           print "\n\n";
-           my $decoder = new MIME::Decoder($head->mime_encoding);
-           $decoder->decode(new IO::Scalar(\$body), \*STDOUT);
-           exit(0);
-       }
-    }
+# the log should almost always be newer, but just in case
+my $log_mtime = +(stat $buglog)[9] || time;
+my $status_mtime = +(stat $bug_status)[9] || time;
+my $mtime = strftime '%a, %d %b %Y %T GMT', gmtime(max($status_mtime,$log_mtime));
+
+if ($q->request_method() eq 'HEAD' and not defined($att) and not $mbox) {
+     print $q->header(-type => "text/html",
+                     -charset => 'utf-8',
+                     (length $mtime)?(-last_modified => $mtime):(),
+                    );
+     exit 0;
+}
 
-    return if not $top and $disposition eq 'attachment' and not defined($att);
-    return unless ($type =~ m[^text/?] and
-                  $type !~ m[^text/(?:html|enriched)(?:;|$)]) or
-                 $type =~ m[^application/pgp(?:;|$)] or
-                 $entity->parts;
-
-    if ($entity->is_multipart) {
-       my @parts = $entity->parts;
-       foreach my $part (@parts) {
-           display_entity($part, $ref, 0, $xmessage,
-                          $$this, @$attachments);
-           $$this .= "\n";
-       }
-    } elsif ($entity->parts) {
-       # We must be dealing with a nested message.
-       $$this .= "<blockquote>\n";
-       my @parts = $entity->parts;
-       foreach my $part (@parts) {
-           display_entity($part, $ref, 1, $xmessage,
-                          $$this, @$attachments);
-           $$this .= "\n";
-       }
-       $$this .= "</blockquote>\n";
-    } else {
-       $$this .= htmlsanit($entity->bodyhandle->as_string) unless ($terse);
-    }
+for my $user (map {split /[\s*,\s*]+/} make_list($param{users}||[])) {
+    next unless length($user);
+    add_user($user,\%ut,\%bugusertags,\%seen_users);
 }
 
-my %maintainer = %{getmaintainers()};
-my %pkgsrc = %{getpkgsrc()};
+if (defined $param{usertag}) {
+     for my $usertag (make_list($param{usertag})) {
+         my %select_ut = ();
+         my ($u, $t) = split /:/, $usertag, 2;
+         Debbugs::User::read_usertags(\%select_ut, $u);
+         unless (defined $t && $t ne "") {
+              $t = join(",", keys(%select_ut));
+         }
+         add_user($u,\%ut,\%bugusertags,\%seen_users);
+         push @{$param{tag}}, split /,/, $t;
+     }
+}
 
-my $indexentry;
-my $descriptivehead;
-my $showseverity;
 
-my $tpack;
-my $tmain;
+my $buglogfh;
+if ($buglog =~ m/\.gz$/) {
+    my $oldpath = $ENV{'PATH'};
+    $ENV{'PATH'} = '/bin:/usr/bin';
+    $buglogfh = IO::File->new("zcat $buglog |") or quitcgi("open log for $ref: $!");
+    $ENV{'PATH'} = $oldpath;
+} else {
+    $buglogfh = IO::File->new($buglog,'r') or quitcgi("open log for $ref: $!");
+}
 
-$ENV{"TZ"} = 'UTC';
-tzset();
 
-my $dtime = strftime "%a, %e %b %Y %T UTC", localtime;
-$tail_html = $debbugs::gHTMLTail;
-$tail_html =~ s/SUBSTITUTE_DTIME/$dtime/;
+my %status =
+    %{split_status_fields(get_bug_status(bug=>$ref,
+                                        bugusertags => \%bugusertags,
+                                       ))};
 
-my %status = %{getbugstatus($ref)};
-unless (%status) {
-    print <<EOF;
-Content-Type: text/html
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head><title>$debbugs::gProject $debbugs::gBug report logs - $short</title></head>
-<body>
-<h1>$debbugs::gProject $debbugs::gBug report logs - $short</h1>
-<p>There is no record of $debbugs::gBug $short.
-Try the <a href="http://$gWebDomain/">search page</a> instead.</p>
-$tail_html</body></html>
-EOF
-    exit 0;
+my @records;
+eval{
+     @records = read_log_records(logfh => $buglogfh,inner_file => 1);
+};
+if ($@) {
+     quitcgi("Bad bug log for $gBug $ref. Unable to read records: $@");
 }
+undef $buglogfh;
 
-$|=1;
 
-$tpack = lc $status{'package'};
-my @tpacks = splitpackages($tpack);
+my $log='';
+my $msg_num = 0;
+my $skip_next = 0;
+if (defined($msg) and ($msg-1) <= $#records) {
+     @records = ($records[$msg-1]);
+     $msg_num = $msg - 1;
+}
+my @log;
+if ( $mbox ) {
+     binmode(STDOUT,":raw");
+     my $date = strftime "%a %b %d %T %Y", localtime;
+     if (@records > 1) {
+        print $q->header(-type => "text/plain",
+                         content_disposition => qq(attachment; filename="bug_${ref}.mbox"),
+                         (length $mtime)?(-last_modified => $mtime):(),
+                        );
+     }
+     else {
+         $msg_num++;
+         print $q->header(-type => "message/rfc822",
+                          content_disposition => qq(attachment; filename="bug_${ref}_message_${msg_num}.mbox"),
+                          (length $mtime)?(-last_modified => $mtime):(),
+                         );
+     }
+     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)$/;
+         my $wanted_type = $mbox_maint?'recips':'incoming-recv';
+         # we want to include control messages anyway
+         my $record_wanted_anyway = 0;
+         my ($msg_id) = record_regex($record,qr/^Message-Id:\s+<(.+)>/im);
+         next if defined $msg_id and exists $seen_message_ids{$msg_id};
+         next if defined $msg_id and $msg_id =~/handler\..+\.ack(?:info|done)?\@/;
+         $record_wanted_anyway = 1 if record_regex($record,qr/^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 if defined $msg_id;
+      my @lines;
+      if ($record->{inner_file}) {
+          push @lines, $record->{fh}->getline;
+          push @lines, $record->{fh}->getline;
+          chomp $lines[0];
+          chomp $lines[1];
+      } else {
+          @lines = split( "\n", $record->{text}, -1 );
+      }
+         if ( $lines[ 1 ] =~ m/^From / ) {
+          @lines = reverse @lines;
+         }
+         if ( !( $lines[ 0 ] =~ m/^From / ) ) {
+              unshift @lines, "From unknown $date";
+       }
+      print $lines[0]."\n";
+         print map { s/^(>*From )/>$1/; $_."\n" } @lines[ 1 .. $#lines ];
+      if ($record->{inner_file}) {
+          my $fh = $record->{fh};
+          print $_ while (<$fh>);
+      }
+     }
+     exit 0;
+}
 
-if  ($status{severity} eq 'normal') {
-       $showseverity = '';
-#} elsif (isstrongseverity($status{severity})) {
-#      $showseverity = "<strong>Severity: $status{severity}</strong>;\n";
-} else {
-       $showseverity = "Severity: <em>$status{severity}</em>;\n";
+else {
+     if (defined $att and defined $msg and @records) {
+        binmode(STDOUT,":raw");
+         $msg_num++;
+         print handle_email_message($records[0],
+                                    ref => $ref,
+                                    msg_num => $msg_num,
+                                    att => $att,
+                                    msg => $msg,
+                                    trim_headers => $trim_headers,
+                                   );
+         exit 0;
+     }
+     my %seen_msg_ids;
+     for my $record (@records) {
+         $msg_num++;
+         if ($skip_next) {
+              $skip_next = 0;
+              next;
+         }
+         $skip_next = 1 if $record->{type} eq 'html' and not $boring;
+         push @log, handle_record($record,$ref,$msg_num,
+                                   \%seen_msg_ids,
+                                   trim_headers => $trim_headers,
+                                   avatars => $avatars,
+                                  );
+     }
 }
 
-$indexentry .= "<p>$showseverity";
-$indexentry .= htmlpackagelinks($status{package}, 0);
+@log = reverse @log if $reverse;
+$log = join("\n",@log);
 
-$indexentry .= "Reported by: <a href=\"" . submitterurl($status{originator})
-              . "\">" . htmlsanit($status{originator}) . "</a>;\n";
 
-$indexentry .= "Owned by: " . htmlsanit($status{owner}) . ";\n"
-              if length $status{owner};
+# All of the below should be turned into a template
 
-my $dummy = strftime "%a, %e %b %Y %T UTC", localtime($status{date});
-$indexentry .= "Date: ".$dummy.";\n<br>";
+my %maintainer = %{getmaintainers()};
+my %pkgsrc = %{getpkgsrc()};
 
-my @descstates;
+my $indexentry;
+my $showseverity;
 
-push @descstates, "Tags: <strong>"
-               . htmlsanit(join(", ", sort(split(/\s+/, $status{tags}))))
-               . "</strong>"
-                       if length($status{tags});
+my $tpack;
+my $tmain;
 
-my @merged= split(/ /,$status{mergedwith});
-if (@merged) {
-       my $descmerged = 'merged with ';
-       my $mseparator = '';
-       for my $m (@merged) {
-               $descmerged .= $mseparator."<a href=\"" . bugurl($m) . "\">#$m</a>";
-               $mseparator= ",\n";
-       }
-       push @descstates, $descmerged;
-}
+my $dtime = strftime "%a, %e %b %Y %T UTC", gmtime;
 
-if (@{$status{found_versions}}) {
-    my $foundtext = 'Found in ';
-    $foundtext .= (@{$status{found_versions}} == 1) ? 'version ' : 'versions ';
-    $foundtext .= join ', ', map htmlsanit($_), @{$status{found_versions}};
-    push @descstates, $foundtext;
+unless (%status) {
+    no_such_bug($q,$ref);
 }
 
-if (@{$status{fixed_versions}}) {
-    my $fixedtext = '<strong>Fixed</strong> in ';
-    $fixedtext .= (@{$status{fixed_versions}} == 1) ? 'version ' : 'versions ';
-    $fixedtext .= join ', ', map htmlsanit($_), @{$status{fixed_versions}};
-    if (length($status{done})) {
-       $fixedtext .= ' by ' . htmlsanit($status{done});
+#$|=1;
+
+
+my @packages = make_list($status{package});
+
+
+my %packages_affects;
+for my $p_a (qw(package affects)) {
+    foreach my $pkg (make_list($status{$p_a})) {
+        if ($pkg =~ /^src\:/) {
+            my ($srcpkg) = $pkg =~ /^src:(.*)/;
+            $packages_affects{$p_a}{$pkg} =
+               {maintainer => exists($maintainer{$srcpkg}) ? $maintainer{$srcpkg} : '(unknown)',
+                source     => $srcpkg,
+                package    => $pkg,
+                is_source  => 1,
+               };
+        }
+        else {
+            $packages_affects{$p_a}{$pkg} =
+               {maintainer => exists($maintainer{$pkg}) ? $maintainer{$pkg} : '(unknown)',
+                exists($pkgsrc{$pkg}) ? (source => $pkgsrc{$pkg}) : (),
+                package    => $pkg,
+               };
+        }
     }
-    push @descstates, $fixedtext;
-} elsif (length($status{done})) {
-       push @descstates, "<strong>Done:</strong> ".htmlsanit($status{done});
-} elsif (length($status{forwarded})) {
-       push @descstates, "<strong>Forwarded</strong> to ".maybelink($status{forwarded});
 }
 
-$indexentry .= join(";\n", @descstates) . ";\n<br>" if @descstates;
-
-$descriptivehead = $indexentry;
-foreach my $pkg (@tpacks) {
-    my $tmaint = defined($maintainer{$pkg}) ? $maintainer{$pkg} : '(unknown)';
-    my $tsrc = defined($pkgsrc{$pkg}) ? $pkgsrc{$pkg} : '(unknown)';
-
-    $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>";
+# fixup various bits of the status
+$status{tags_array} = [sort(make_list($status{tags}))];
+$status{date_text} = strftime('%a, %e %b %Y %T UTC', gmtime($status{date}));
+$status{mergedwith_array} = [make_list($status{mergedwith})];
+
+
+my $version_graph = '';
+if (@{$status{found_versions}} or @{$status{fixed_versions}}) {
+     $version_graph = q(<a href=").
+         html_escape(version_url(package => $status{package},
+                                 found => $status{found_versions},
+                                 fixed => $status{fixed_versions},
+                                )
+                    ).
+         q("><img alt="version graph" src=").
+         html_escape(version_url(package => $status{package},
+                                 found => $status{found_versions},
+                                 fixed => $status{fixed_versions},
+                                 width => 2,
+                                 height => 2,
+                                )
+                    ).
+         qq{"></a>};
 }
 
-open L, "<$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 $log='';
 
-my $xmessage = 1;
-my $suppressnext = 0;
-my $found_msgid = 0;
-my %seen_msgid = ();
-
-my $thisheader = '';
-my $this = '';
-
-my $cmsg = 1;
-
-my $normstate= 'kill-init';
-my $linenum = 0;
-my @mail = ();
-my @mails = ();
-while(my $line = <L>) {
-       $linenum++;
-       if ($line =~ m/^.$/ and 1 <= ord($line) && ord($line) <= 7) {
-               # state transitions
-               my $newstate;
-               my $statenum = ord($line);
-
-               $newstate = 'autocheck'     if ($statenum == 1);
-               $newstate = 'recips'        if ($statenum == 2);
-               $newstate = 'kill-end'      if ($statenum == 3);
-               $newstate = 'go'            if ($statenum == 5);
-               $newstate = 'html'          if ($statenum == 6);
-               $newstate = 'incoming-recv' if ($statenum == 7);
-
-               # disallowed transitions:
-               $_ = "$normstate $newstate";
-               unless (m/^(go|go-nox|html) kill-end$/
-                   || m/^(kill-init|kill-end) (incoming-recv|autocheck|recips|html)$/
-                   || m/^kill-body go$/)
-               {
-                       &quitcgi("$ref: Transition from $normstate to $newstate at $linenum disallowed");
-               }
-
-#$this .= "\n<br>states: $normstate $newstate<br>\n";
-
-#              if ($newstate eq 'go') {
-#                      $this .= "<pre>\n";
-#              }
-               if ($newstate eq 'html') {
-                       $this = '';
-               }
-
-               if ($newstate eq 'kill-end') {
-
-                       my $show = 1;
-                       $show = $boring
-                               if ($suppressnext && $normstate ne 'html');
-
-                       $show = ($xmessage == $msg) if ($msg);
-
-                       push @mails, join( '', @mail ) if ( $mbox && @mail );
-                       if ($show) {
-                               if (not $mime and @mail) {
-                                       $this .= htmlsanit(join '', @mail);
-                               } elsif (@mail) {
-                                       my $parser = new MIME::Parser;
-                                       $parser->tmp_to_core(1);
-                                       $parser->output_to_core(1);
-#                                      $parser->output_under("/tmp");
-                                       my $entity = $parser->parse( new IO::Lines \@mail );
-                                       # 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, $ref, 1, $xmessage, $this, @attachments);
-                               }
-#                              if ($normstate eq 'go' || $normstate eq 'go-nox') {
-                               if ($normstate ne 'html') {
-                                       $this = "<pre>\n$this</pre>\n";
-                               }
-                               if ($normstate eq 'html') {
-                                       $this = "<a name=\"msg$xmessage\">$this  <em><a href=\"" . bugurl($ref, "msg=$xmessage") . "\">Full text</a> available.</em></a>";
-                               }
-                               $this = "$thisheader$this" if $thisheader && !( $normstate eq 'html' );;
-                               $thisheader = '';
-                               my $delim = $terse ? "<p>" : "<hr>";
-                               if ($reverse) {
-                                       $log = "$this\n$delim$log";
-                               } else {
-                                       $log .= "$this\n$delim\n";
-                               }
-                       }
-
-                       $xmessage++ if ($normstate ne 'html');
-
-                       $suppressnext = $normstate eq 'html';
-                       $found_msgid = 0;
-               }
-               
-               $normstate = $newstate;
-               @mail = ();
-               next;
-       }
-
-       $_ = $line;
-       if ($normstate eq 'incoming-recv') {
-               my $pl= $_;
-               $pl =~ s/\n+$//;
-               m/^Received: \(at (\S+)\) by (\S+)\;/
-                       || &quitcgi("bad line \`$pl' in state incoming-recv");
-               $thisheader = "<h2><a name=\"msg$xmessage\">"
-                       . "Message received at ".htmlsanit("$1\@$2")
-                       . ":</a></h2>\n";
-               $this = '';
-               $normstate= 'go';
-               push @mail, $_;
-       } elsif ($normstate eq 'html') {
-               $this .= $_;
-       } elsif ($normstate eq 'go') {
-               s/^\030//;
-               if (!$suppressnext && !$found_msgid &&
-                   /^Message-ID: <(.*)>/i) {
-                       my $msgid = $1;
-                       $found_msgid = 1;
-                       if ($seen_msgid{$msgid}) {
-                               $suppressnext = 1;
-                       } else {
-                               $seen_msgid{$msgid} = 1;
-                       }
-               }
-               if (@mail) {
-                       push @mail, $_;
-               } else {
-                       $this .= htmlsanit($_);
-               }
-       } elsif ($normstate eq 'go-nox') {
-               next if !s/^X//;
-               if (!$suppressnext && !$found_msgid &&
-                   /^Message-ID: <(.*)>/i) {
-                       my $msgid = $1;
-                       $found_msgid = 1;
-                       if ($seen_msgid{$msgid}) {
-                               $suppressnext = 1;
-                       } else {
-                               $seen_msgid{$msgid} = 1;
-                       }
-               }
-               if (@mail) {
-                       push @mail, $_;
-               } else {
-                       $this .= htmlsanit($_);
-               }
-        } elsif ($normstate eq 'recips') {
-               if (m/^-t$/) {
-                       $thisheader = "<h2>Message sent:</h2>\n";
-               } else {
-                       s/\04/, /g; s/\n$//;
-                       $thisheader = "<h2>Message sent to ".htmlsanit($_).":</h2>\n";
-               }
-               $this = "";
-               $normstate= 'kill-body';
-       } elsif ($normstate eq 'autocheck') {
-               next if !m/^X-Debian-Bugs(-\w+)?: This is an autoforward from (\S+)/;
-               $normstate= 'autowait';
-               $thisheader = "<h2>Message received at $2:</h2>\n";
-               $this = '';
-               push @mail, $_;
-       } elsif ($normstate eq 'autowait') {
-               next if !m/^$/;
-               $normstate= 'go-nox';
-       } else {
-               &quitcgi("$ref state $normstate line \`$_'");
-       }
+my @blockedby= make_list($status{blockedby});
+$status{blockedby_array} = [];
+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 @{$status{blockedby_array}},{bug_num => $b, subject => $s{subject}, status => \%s};
+   }
 }
-&quitcgi("$ref state $normstate at end") unless $normstate eq 'kill-end';
-close(L);
 
-if ( $mbox ) {
-       print "Content-Type: text/plain\n\n";
-       foreach ( @mails ) {
-               my @lines = split( "\n", $_, -1 );
-               if ( $lines[ 1 ] =~ m/^From / ) {
-                       my $tmp = $lines[ 0 ];
-                       $lines[ 0 ] = $lines[ 1 ];
-                       $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 ];
-               $_ = join( "\n", @lines ) . "\n";
-       }
-       print join("", @mails );
-       exit 0;
+my @blocks= make_list($status{blocks});
+$status{blocks_array} = [];
+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 @{$status{blocks_array}}, {bug_num => $b, subject => $s{subject}, status => \%s};
+    }
 }
-print "Content-Type: text/html\n\n";
-
-my $title = htmlsanit($status{subject});
-
-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" .
-    "</HEAD>\n" .
-    '<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000FF" VLINK="#800080">' .
-    "\n";
-print "<H1>" . "$debbugs::gProject $debbugs::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>";
-print "$log";
-print $tail_html;
-
-print "</BODY></HTML>\n";
+if ($buglog !~ m#^\Q$gSpoolDir/db#) {
+     $status{archived} = 1;
+}
 
-exit 0;
+my $descriptivehead = $indexentry;
+
+print $q->header(-type => "text/html",
+                -charset => 'utf-8',
+                (length $mtime)?(-last_modified => $mtime):(),
+               );
+
+print fill_in_template(template => 'cgi/bugreport',
+                      variables => {status => \%status,
+                                    package => $packages_affects{'package'},
+                                    affects => $packages_affects{'affects'},
+                                    log           => $log,
+                                    bug_num       => $ref,
+                                    version_graph => $version_graph,
+                                    msg           => $msg,
+                                    isstrongseverity => \&Debbugs::Status::isstrongseverity,
+                                    html_escape   => \&Debbugs::CGI::html_escape,
+                                    looks_like_number => \&Scalar::Util::looks_like_number,
+                                    make_list        => \&Debbugs::Common::make_list,
+                                   },
+                      hole_var  => {'&package_links' => \&Debbugs::CGI::package_links,
+                                    '&bug_links'     => \&Debbugs::CGI::bug_links,
+                                    '&version_url'   => \&Debbugs::CGI::version_url,
+                                    '&bug_url'       => \&Debbugs::CGI::bug_url,
+                                    '&strftime'      => \&POSIX::strftime,
+                                    '&maybelink'     => \&Debbugs::CGI::maybelink,
+                                   },
+                     );