X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=cgi%2Fbugreport.cgi;h=3ff1cb5c7d2759adae51ff8eb104a2674119dfb6;hb=50372083ae0dac8ae45be227d335dae55749e847;hp=7a9498213e0828bad8cdf59ae8ef0380bd346b1e;hpb=235a779bdb026b6357e95053e1d7faaab87e8931;p=debbugs.git

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 7a94982..3ff1cb5 100755
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -19,6 +19,7 @@ use Debbugs::Config qw(:globals :text :config);
 
 # for read_log_records
 use Debbugs::Log qw(:read);
+use Debbugs::Log::Spam;
 use Debbugs::CGI qw(:url :html :util :cache);
 use Debbugs::CGI::Bugreport qw(:all);
 use Debbugs::Common qw(buglog getmaintainers make_list bug_status);
@@ -129,12 +130,12 @@ if (not (($mbox and not $mbox_status_message) or
 ## Identify the users required
 for my $user (map {split /[\s*,\s*]+/} make_list($param{users}||[])) {
     next unless length($user);
-    push @dependent_files,Debbugs::User::usertag_flie_from_email($user);
+    push @dependent_files,Debbugs::User::usertag_file_from_email($user);
 }
 if (defined $param{usertag}) {
     for my $usertag (make_list($param{usertag})) {
 	my ($user, $tag) = split /:/, $usertag, 2;
-	push @dependent_files,Debbugs::User::usertag_flie_from_email($user);
+	push @dependent_files,Debbugs::User::usertag_file_from_email($user);
     }
 }
 $etag =
@@ -146,7 +147,12 @@ $etag =
 				 ],
 		       );
 if (not $etag) {
-    print $q->header(-status => 304);
+    print $q->header(-status => 304,
+		     -cache_control => 'public, max-age=600',
+		     -etag => $etag,
+		     -charset => 'utf-8',
+		     -content_type => 'text/html',
+		    );
     print "304: Not modified\n";
     exit 0;
 }
@@ -156,6 +162,7 @@ if ($q->request_method() eq 'HEAD' and not defined($att) and not $mbox) {
     print $q->header(-status => 200,
 		     -cache_control => 'public, max-age=600',
 		     -etag => $etag,
+		     -charset => 'utf-8',
 		     -content_type => 'text/html',
 		    );
      exit 0;
@@ -179,18 +186,6 @@ if (defined $param{usertag}) {
      }
 }
 
-
-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: $!");
-}
-
-
 my %status;
 if ($need_status) {
     %status = %{split_status_fields(get_bug_status(bug=>$ref,
@@ -199,14 +194,14 @@ if ($need_status) {
 }
 
 my @records;
+my $spam;
 eval{
-     @records = read_log_records(logfh => $buglogfh,inner_file => 1);
+    @records = read_log_records(bug_num => $ref,inner_file => 1);
+    $spam = Debbugs::Log::Spam->new(bug_num => $ref);
 };
 if ($@) {
      quitcgi("Bad bug log for $gBug $ref. Unable to read records: $@");
 }
-undef $buglogfh;
-
 
 my $log='';
 my $msg_num = 0;
@@ -277,6 +272,8 @@ END
 	  $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;
+          # skip spam messages if we're outputting more than one message
+          next if @records > 1 and $spam->is_spam($msg_id);
       my @lines;
       if ($record->{inner_file}) {
           push @lines, $record->{fh}->getline;
@@ -331,6 +328,10 @@ else {
                                    \%seen_msg_ids,
                                    trim_headers => $trim_headers,
                                    avatars => $avatars,
+				   terse => $terse,
+                                   # if we're only looking at one record, allow
+                                   # spam to be output
+                                   spam  => (@records > 1)?$spam:undef,
                                   );
      }
 }
@@ -464,3 +465,10 @@ print fill_in_template(template => 'cgi/bugreport',
 				     '&maybelink'     => \&Debbugs::CGI::maybelink,
 				    },
 		      );
+
+__END__
+
+# Local Variables:
+# indent-tabs-mode: nil
+# cperl-indent-level: 4
+# End: