Add affects to bugreport.cgi package info header (Closes: #609687).

[debbugs.git] / cgi / bugreport.cgi

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 55617ae1f2a9abcd186bbf5007576a2e4572670e..9064ca8c0565abf666dd397031f3973f86bc2998 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -8,8 +8,6 @@ BEGIN{
     delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 }
 
-# STDOUT should be using the utf8 io layer
-binmode(STDOUT,':utf8');
 
 use POSIX qw(strftime);
 use MIME::Parser;
@@ -38,12 +36,14 @@ 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)
+                                     qw(repeatmerged avatars),
                                     ],
                           default => {# msg       => '',
                                       boring    => 'no',
@@ -55,6 +55,7 @@ my %param = cgi_parameters(query => $q,
                                       mboxmaint => 'no',
                                       archive   => 'no',
                                       repeatmerged => 'yes',
+                                       avatars   => 'yes',
                                      },
                          );
 # This is craptacular.
@@ -70,6 +71,7 @@ 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 %bugusertags;
 my %ut;
@@ -265,7 +267,11 @@ else {
               next;
          }
          $skip_next = 1 if $record->{type} eq 'html' and not $boring;
-         push @log, handle_record($record,$ref,$msg_num,\%seen_msg_ids);
+         push @log, handle_record($record,$ref,$msg_num,
+                                   \%seen_msg_ids,
+                                   trim_headers => $trim_headers,
+                                   avatars => $avatars,
+                                  );
      }
 }
 
@@ -301,24 +307,30 @@ unless (%status) {
 
 #$|=1;
 
-my %package;
+
 my @packages = make_list($status{package});
 
-foreach my $pkg (@packages) {
-     if ($pkg =~ /^src\:/) {
-         my ($srcpkg) = $pkg =~ /^src:(.*)/;
-         $package{$pkg} = {maintainer => exists($maintainer{$srcpkg}) ? $maintainer{$srcpkg} : '(unknown)',
-                           source     => $srcpkg,
-                           package    => $pkg,
-                           is_source  => 1,
-                          };
-     }
-     else {
-         $package{$pkg} = {maintainer => exists($maintainer{$pkg}) ? $maintainer{$pkg} : '(unknown)',
-                           exists($pkgsrc{$pkg}) ? (source => $pkgsrc{$pkg}) : (),
-                           package    => $pkg,
-                          };
-     }
+
+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,
+               };
+        }
+    }
 }
 
 # fixup various bits of the status
@@ -381,7 +393,8 @@ print $q->header(-type => "text/html",
 
 print fill_in_template(template => 'cgi/bugreport',
                       variables => {status => \%status,
-                                    package => \%package,
+                                    package => $packages_affects{'package'},
+                                    affects => $packages_affects{'affects'},
                                     log           => $log,
                                     bug_num       => $ref,
                                     version_graph => $version_graph,