my $buglog = buglog($ref);
if ($ENV{REQUEST_METHOD} eq 'HEAD' and not defined($att) and not $mbox) {
- print "Content-Type: text/html\n";
+ print "Content-Type: text/html; charset=utf-8\n";
my @stat = stat $buglog;
if (@stat) {
my $mtime = strftime '%a, %d %b %Y %T GMT', gmtime($stat[9]);
my $type = $entity->effective_type;
my $filename = $entity->head->recommended_filename;
$filename = '' unless defined $filename;
+ $filename = decode_rfc1522($filename);
if ($top) {
- $$this .= htmlsanit($entity->stringify_header) unless ($terse);
+ $$this .= htmlsanit(decode_rfc1522($entity->stringify_header))
+ unless ($terse);
$$this .= "\n";
}
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";
+ print "Content-Type: $type\n";
+ if ($filename ne '') {
+ my $qf = $filename;
+ $qf =~ s/"/\\"/g;
+ $qf =~ s[.*/][];
+ print qq{Content-Disposition: attachment; filename="$qf"\n};
+ }
+ print "\n";
my $decoder = new MIME::Decoder($head->mime_encoding);
$decoder->decode(new IO::Scalar(\$body), \*STDOUT);
exit(0);
}
}
- return if $disposition eq 'attachment' and not defined($att);
- return unless ($type =~ m[^text/?] and $type !~ m[^text/html(?:;|$)]) or
+ 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->is_multipart;
+ $entity->parts;
if ($entity->is_multipart) {
my @parts = $entity->parts;
$$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);
}
my %status = %{getbugstatus($ref)};
unless (%status) {
print <<EOF;
-Content-Type: text/html
+Content-Type: text/html; charset=utf-8
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
if ($status{severity} eq 'normal') {
$showseverity = '';
-#} elsif (grep($status{severity} eq $_, @strongseverities)) {
+#} elsif (isstrongseverity($status{severity})) {
# $showseverity = "<strong>Severity: $status{severity}</strong>;\n";
} else {
$showseverity = "Severity: <em>$status{severity}</em>;\n";
$indexentry .= "<p>$showseverity";
$indexentry .= htmlpackagelinks($status{package}, 0);
-$indexentry .= "Reported by: <a href=\"" . submitterurl($status{originator})
- . "\">" . htmlsanit($status{originator}) . "</a>;\n";
+$indexentry .= htmladdresslinks("Reported by: ", \&submitterurl,
+ $status{originator}) . ";\n";
+
+$indexentry .= "Owned by: " . htmlsanit($status{owner}) . ";\n"
+ if length $status{owner};
my $dummy = strftime "%a, %e %b %Y %T UTC", localtime($status{date});
$indexentry .= "Date: ".$dummy.";\n<br>";
push @descstates, $descmerged;
}
-if (length($status{done})) {
+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;
+}
+
+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});
+ }
+ 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});
my $tmaint = defined($maintainer{$pkg}) ? $maintainer{$pkg} : '(unknown)';
my $tsrc = defined($pkgsrc{$pkg}) ? $pkgsrc{$pkg} : '(unknown)';
- $descriptivehead .= "Maintainer for $pkg is\n".
- '<a href="'.mainturl($tmaint).'">'.htmlsanit($tmaint).'</a>';
+ $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>";
}
-open L, "<$buglog" or &quitcgi("open log for $ref: $!");
-if ($buglog !~ m#^\Q$gSpoolDir/db-h/#) {
+if ($buglog =~ m/\.gz$/) {
+ my $oldpath = $ENV{'PATH'};
+ $ENV{'PATH'} = '/bin:/usr/bin';
+ open L, "zcat $buglog |" or &quitcgi("open log for $ref: $!");
+ $ENV{'PATH'} = $oldpath;
+} else {
+ 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>";
}
$this = "<pre>\n$this</pre>\n";
}
if ($normstate eq 'html') {
- $this .= " <em><a href=\"" . bugurl($ref, "msg=$xmessage") . "\">Full text</a> available.</em>";
+ $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 = '';
$pl =~ s/\n+$//;
m/^Received: \(at (\S+)\) by (\S+)\;/
|| &quitcgi("bad line \`$pl' in state incoming-recv");
- $thisheader = "<h2>Message received at ".htmlsanit("$1\@$2")
- . ":</h2>\n";
+ $thisheader = "<h2><a name=\"msg$xmessage\">"
+ . "Message received at ".htmlsanit("$1\@$2")
+ . ":</a></h2>\n";
$this = '';
$normstate= 'go';
push @mail, $_;
print join("", @mails );
exit 0;
}
-print "Content-Type: text/html\n\n";
+print "Content-Type: text/html; charset=utf-8\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>\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>" . htmlsanit($status{subject}) . "</H1>\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);
projects / debbugs.git / blobdiff