\n";
+ if ($trim_headers) {
my @headers;
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($_: ) . 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 .= "\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 .= '[$printname } .
- "($type, $disposition)]\n\n";
+ $$this .= '[$printname } . + "($type, $disposition)]\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\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); @@ -149,13 +170,17 @@ sub display_entity ($$$$\$\@) { $$this .= "\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; - $body = htmlsanit($body); + $body = html_escape($body); + # Add links to URLs $body =~ s,((ftp|http|https)://[\S~-]+?/?)((\>\;)?[)]?[']?[:.\,]?(\s|$)),$1$3,go; - $$this .= $body; + # Add links to bug closures + $body =~ s[(closes:\s*(?:bug)?\#?\s?\d+(?:,?\s*(?:bug)?\#?\s?\d+)*) + ][my $temp = $1; $temp =~ s{(\d+)}{qq($1)}ge; $temp;]gxie; + $$this .= qq(\n); } } } @@ -164,30 +189,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 <
There is no record of $debbugs::gBug $short. +
There is no record of $gBug $short. Try the search page instead.
$tail_html EOF @@ -201,37 +222,53 @@ my @tpacks = splitpackages($tpack); if ($status{severity} eq 'normal') { $showseverity = ''; -#} elsif (isstrongseverity($status{severity})) { -# $showseverity = "Severity: $status{severity};\n"; +} elsif (isstrongseverity($status{severity})) { + $showseverity = "Severity: $status{severity};\n"; } else { - $showseverity = "Severity: $status{severity};\n"; + $showseverity = "Severity: $status{severity};\n"; } -$indexentry .= "$showseverity"; -$indexentry .= htmlpackagelinks($status{package}, 0) . ";\n"; +$indexentry .= "
Bug is archived. No further changes may be made.
"; -} my @records; @@ -293,7 +345,7 @@ eval{ @records = read_log_records($buglogfh); }; if ($@) { - quitcgi("Bad bug log for $debbugs::gBug $ref. Unable to read records: $@"); + quitcgi("Bad bug log for $gBug $ref. Unable to read records: $@"); } undef $buglogfh; @@ -315,43 +367,17 @@ 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; } -=head2 bug_links - - bug_links($one_bug); - bug_links($starting_bug,$stoping_bugs,); - -Creates a set of links to bugs, starting with bug number -$starting_bug, and finishing with $stoping_bug; if only one bug is -passed, makes a link to only a single bug. - -The content of the link is the bug number. - -=cut - -sub bug_links{ - my ($start,$stop,$query_arguments) = @_; - $stop = $stop || $start; - $query_arguments ||= ''; - my @output; - for my $bug ($start..$stop) { - push @output,'$bug); - } - return join(', ',@output); -} - =head2 handle_record push @log, handle_record($record,$ref,$msg_num); @@ -368,14 +394,26 @@ sub handle_record{ my $output = ''; local $_ = $record->{type}; if (/html/) { + my $class = $record->{text} =~ /^(?:Acknowledgement|Reply|Information|Report|Notification)/ ? 'infmessage':'msgreceived'; $output .= decode_rfc1522($record->{text}); # 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|\.<|$)),$1$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; - $output .= 'Full text and rfc822 format available.'; + # 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 \`)([^\']+)(' to \`)([^\']+)(')} + {$1.q($2).$3.q($4).$5}eo; + $output .= 'Full text and rfc822 format available.'; + + $output = qq(\n"; } elsif (/recips/) { my ($msg_id) = $record->{text} =~ /^Message-Id:\s+<(.+)>/im; @@ -385,12 +423,12 @@ sub handle_record{ elsif (defined $msg_id) { $$seen_msg_ids{$msg_id} = 1; } - $output .= 'View this message in rfc822 format'; - $output .= ''; + ); } elsif (/autocheck/) { # Do nothing @@ -405,13 +443,12 @@ sub handle_record{ } # Incomming Mail Message my ($received,$hostname) = $record->{text} =~ m/Received: \(at (\S+)\) by (\S+)\;/; - $output .= qq|View this report as an mbox folder.
\n", mboxurl($ref); -print "Reply ), + qq(or subscribe ), + qq(to this bug.
\n); +print qq(); +printf qq(View this report as an mbox folder, ). + qq(status mbox, maintainer mbox
Send a report that this bug log contains spam.
\n