Fix default user for usertags

[debbugs.git] / cgi / bugreport.cgi

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index e090321e63d8719b7561b4faa53c75cc437b6c8c..39a0ccb5a1961b2a3ef96afd17deda7e49c61d3e 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -32,6 +32,13 @@ use Debbugs::Text qw(:templates);
 use URI::Escape qw(uri_escape_utf8);
 use List::AllUtils qw(max);
 
+if (defined $ENV{REMOTE_ADDR} and $ENV{REMOTE_ADDR} =~ /(?:218\.175\.56\.14|64\.126\.93\.93|72\.17\.168\.57|208\.138\.29\.104|66\.63\.250\.28|71\.70\.91\.207|219\.129\.83\.13)/) {
+    print "Content-Type: text/html\n\nGo away.";
+    sleep(5);
+    exit 0;
+}
+
+
 
 use CGI::Simple;
 my $q = new CGI::Simple;
@@ -267,12 +274,12 @@ END
          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)?\@/;
+         next if not defined $msg and 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;
           # skip spam messages if we're outputting more than one message
-          next if $multiple_messages and $bug->is_spam($msg_id);
+          next if $multiple_messages and $spam->is_spam($msg_id);
       my @lines;
       if ($record->{inner_file}) {
           push @lines, scalar $record->{fh}->getline;