$debbugs::gProject $debbugs::gBug report logs - $short

\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($_: ) . htmlsanit(decode_rfc1522($head_field)); } $$this .= join(qq(), @headers) unless $terse; - $$this .= qq(\n); - } - elsif (not $terse) { + } else { $$this .= htmlsanit(decode_rfc1522($entity->head->stringify)); - $$this .= qq(\n); } + $$this .= "

\n"; $indexentry .= htmlpackagelinks($status{package}, 0) . ";\n"; +foreach my $pkg (@tpacks) { + my $tmaint = defined($maintainer{$pkg}) ? $maintainer{$pkg} : '(unknown)'; + my $tsrc = defined($pkgsrc{$pkg}) ? $pkgsrc{$pkg} : '(unknown)'; + + $indexentry .= + htmlmaintlinks(sub { $_[0] == 1 ? "Maintainer for $pkg is\n" + : "Maintainers for $pkg are\n" }, + $tmaint); + $indexentry .= ";\nSource for $pkg is\n". + '$tsrc" if ($tsrc ne "(unknown)"); + $indexentry .= ".\n"; +} + +$indexentry .= "
"; $indexentry .= htmladdresslinks("Reported by: ", \&submitterurl, $status{originator}) . ";\n"; +$indexentry .= sprintf "Date: %s.\n", + (strftime "%a, %e %b %Y %T UTC", localtime($status{date})); -$indexentry .= "Owned by: " . htmlsanit($status{owner}) . ";\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
"; +$indexentry .= "

$showseverity"; +$indexentry .= sprintf "Tags: %s;\n", + htmlsanit(join(", ", sort(split(/\s+/, $status{tags})))) if length($status{tags}); +$indexentry .= "
" if (length($showseverity) or length($status{tags})); my @merged= split(/ /,$status{mergedwith}); if (@merged) { - my $descmerged = 'merged with '; + my $descmerged = 'Merged with '; my $mseparator = ''; for my $m (@merged) { $descmerged .= $mseparator."#$m"; @@ -253,26 +269,15 @@ if (@{$status{fixed_versions}}) { } push @descstates, $fixedtext; } elsif (length($status{done})) { - push @descstates, "Done: ".htmlsanit(decode_rfc1522($status{done})); + push @descstates, "Done: ".htmlsanit(decode_rfc1522($status{done})); } elsif (length($status{forwarded})) { - push @descstates, "Forwarded to ".maybelink($status{forwarded}); + push @descstates, "Forwarded to ".maybelink($status{forwarded}); } -$indexentry .= join(";\n", @descstates) . ";\n
" if @descstates; +$indexentry .= join(";\n
", @descstates) . ";\n
" if @descstates; +$indexentry .= "

Message received at |. - htmlsanit("$received\@$hostname") . q| (full text'.q|, mbox)'.":

' . - handle_email_message($record->{text}, + $output .= qq|

Message received at |. + htmlsanit("$received\@$hostname") . q| (full text'.q|, mbox)'.":

\n"; + $output .= handle_email_message($record->{text}, ref => $bug_number, msg_number => $msg_number, - ) . '

" . "$debbugs::gProject $debbugs::gBug report logs - " . $title . "

$tail_html"; print "\n"; diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi index 4860c79..f251d6f 100755 --- a/cgi/pkgreport.cgi +++ b/cgi/pkgreport.cgi @@ -43,6 +43,33 @@ my $arch = $param{'arch'} || undef; my $show_list_header = ($param{'show_list_header'} || $userAgent->{'show_list_header'} || "yes" ) eq "yes"; my $show_list_footer = ($param{'show_list_footer'} || $userAgent->{'show_list_footer'} || "yes" ) eq "yes"; +{ + if (defined $param{'vt'}) { + my $vt = $param{'vt'}; + if ($vt eq "none") { $dist = undef; $arch = undef; $version = undef; } + if ($vt eq "bysuite") { + $version = undef; + $arch = undef if ($arch eq "any"); + } + if ($vt eq "bypkg" || $vt eq "bysrc") { $dist = undef; $arch = undef; } + } + if (defined $param{'ordering'}) { + my $o = $param{'ordering'}; + if ($o eq "raw") { $raw_sort = 1; $bug_rev = 0; } + if ($o eq "normal") { $raw_sort = 0; $bug_rev = 0; } + if ($o eq "reverse") { $raw_sort = 0; $bug_rev = 1; } + } + if (defined $param{'includesubj'}) { + my $is = $param{'includesubj'}; + $include .= "," . join(",", map { "subj:$_" } (split /[\s,]+/, $is)); + } + if (defined $param{'excludesubj'}) { + my $es = $param{'excludesubj'}; + $exclude .= "," . join(",", map { "subj:$_" } (split /[\s,]+/, $es)); + } +} + + my ($pkg, $src, $maint, $maintenc, $submitter, $severity, $status, $tag); my %which = ( @@ -239,15 +266,16 @@ if (defined $pkg) { })}; } -my $result = htmlizebugs(\@bugs); +my $result = pkg_htmlizebugs(\@bugs); print "Content-Type: text/html; charset=utf-8\n\n"; print "\n"; print "\n" . "$debbugs::gProject$Archived $debbugs::gBug report logs: $title\n" . + '' . "\n" . - '' . + '' . "\n"; print "

" . "$debbugs::gProject$Archived $debbugs::gBug report logs: $title" . "

You may want to refer to the following packages that are part of the same source:\n"; } else { - print "You may want to refer to the following individual bug pages:
\n"; + print "

You may want to refer to the following individual bug pages:\n"; } push @pkgs, $src if ( $src && !grep(/^\Q$src\E$/, @pkgs) ); print join( ", ", map( "$_", @pkgs ) ); @@ -337,7 +365,413 @@ if (defined $pkg || defined $src) { print $result if $showresult; +print pkg_javascript(); +print "

Options

\n"; +printf "

\n", myurl(); + +print "\n"; + +my ($checked_any, $checked_sui, $checked_ver) = ("", "", ""); +if (defined $dist) { + $checked_sui = "CHECKED"; +} elsif (defined $version) { + $checked_ver = "CHECKED"; +} else { + $checked_any = "CHECKED"; +} + +print "\n"; +print " \n"; +print ""; +print " \n"; + +if (defined $pkg) { + print ""; + print " \n"; +} elsif (defined $src) { + print ""; + print " \n"; +} + +my $sel_rmy = ($repeatmerged ? " selected" : ""); +my $sel_rmn = ($repeatmerged ? "" : " selected"); +my $sel_ordraw = ($raw_sort ? " selected" : ""); +my $sel_ordnor = (!$raw_sort && !$bug_rev ? " selected" : ""); +my $sel_ordrev = (!$raw_sort && $bug_rev ? " selected" : ""); +my $includetags = join(" ", grep { !m/^subj:/i } split /[\s,]+/, $include); +my $excludetags = join(" ", grep { !m/^subj:/i } split /[\s,]+/, $exclude); +my $includesubj = join(" ", map { s/^subj://i; $_ } grep { m/^subj:/i } split /[\s,]+/, $include); +my $excludesubj = join(" ", map { s/^subj://i; $_ } grep { m/^subj:/i } split /[\s,]+/, $exclude); +my $vismindays = ($mindays == 0 ? "" : $mindays); +my $vismaxdays = ($maxdays == -1 ? "" : $maxdays); + +print < + + + + + +EOF + +print "

Show bugs applicable to	anything
	" . pkg_htmlselectsuite(1,2,1) . " for " . pkg_htmlselectarch(1,2,2) . "
	$pkg version
	$src version
Display merged bugs	+ +
Order bugs by	+ +
Only include bugs tagged with	or that have in their subject
Exclude bugs tagged with	or that have in their subject
Only show bugs older than	days, and younger than days
with new settings

$tail_html"; print "\n"; + +sub pkg_htmlindexentrystatus { + my $s = shift; + my %status = %{$s}; + + my $result = ""; + + my $showseverity; + if ($status{severity} eq 'normal') { + $showseverity = ''; + } elsif (isstrongseverity($status{severity})) { + $showseverity = "Severity: $status{severity};\n"; + } else { + $showseverity = "Severity: $status{severity};\n"; + } + + $result .= pkg_htmlpackagelinks($status{"package"}, 1); + + my $showversions = ''; + if (@{$status{found_versions}}) { + my @found = @{$status{found_versions}}; + local $_; + s{/}{ } foreach @found; + $showversions .= join ', ', map htmlsanit($_), @found; + } + if (@{$status{fixed_versions}}) { + $showversions .= '; ' if length $showversions; + $showversions .= 'fixed: '; + my @fixed = @{$status{fixed_versions}}; + local $_; + s{/}{ } foreach @fixed; + $showversions .= join ', ', map htmlsanit($_), @fixed; + } + $result .= " ($showversions)" if length $showversions; + $result .= ";\n"; + + $result .= $showseverity; + $result .= pkg_htmladdresslinks("Reported by: ", \&submitterurl, + $status{originator}); + $result .= ";\nOwned by: " . htmlsanit($status{owner}) + if length $status{owner}; + $result .= ";\nTags: " + . htmlsanit(join(", ", sort(split(/\s+/, $status{tags})))) + . "" + if (length($status{tags})); + + my @merged= split(/ /,$status{mergedwith}); + my $mseparator= ";\nMerged with "; + for my $m (@merged) { + $result .= $mseparator."#$m"; + $mseparator= ", "; + } + + my $days = 0; + if (length($status{done})) { + $result .= "
Done: " . htmlsanit($status{done}); + $days = ceil($debbugs::gRemoveAge - -M buglog($status{id})); + if ($days >= 0) { + $result .= ";\nWill be archived" . ( $days == 0 ? " today" : $days == 1 ? " in $days day" : " in $days days" ) . ""; + } else { + $result .= ";\nArchived"; + } + } + + unless (length($status{done})) { + if (length($status{forwarded})) { + $result .= ";\nForwarded to " + . maybelink($status{forwarded}); + } + my $daysold = int((time - $status{date}) / 86400); # seconds to days + if ($daysold >= 7) { + my $font = ""; + my $efont = ""; + $font = "em" if ($daysold > 30); + $font = "strong" if ($daysold > 60); + $efont = "" if ($font); + $font = "<$font>" if ($font); + + my $yearsold = int($daysold / 365); + $daysold -= $yearsold * 365; + + $result .= ";\n $font"; + my @age; + push @age, "1 year" if ($yearsold == 1); + push @age, "$yearsold years" if ($yearsold > 1); + push @age, "1 day" if ($daysold == 1); + push @age, "$daysold days" if ($daysold > 1); + $result .= join(" and ", @age); + $result .= " old$efont"; + } + } + + $result .= "."; + + return $result; +} + + +sub pkg_htmlizebugs { + $b = $_[0]; + my @bugs = @$b; + my $anydone = 0; + + my @status = (); + my %count; + my $header = ''; + my $footer = "

No reports found!

#%d: %s\n
", + bugurl($bug), $bug, htmlsanit($status{subject}); + $html .= pkg_htmlindexentrystatus(\%status) . "\n"; + my $key = join( '_', map( {$status{$_}} @common_grouping ) ); + $section{$key} .= $html; + $count{"_$key"}++; + foreach my $grouping ( @common_grouping ) { + $count{"${grouping}_$status{$grouping}"}++; + } + $anydone = 1 if $status{pending} eq 'done'; + push @status, [ $bug, \%status, $html ]; + } + + my $result = ""; + if ($common_raw_sort) { + $result .= "

\n" . join("", map( { $_->[ 2 ] } @status ) ) . "\n"; + } else { + my (@order, @headers); + for( my $i = 0; $i < @common_grouping; $i++ ) { + my $grouping_name = $common_grouping[ $i ]; + my @items = @{ $common_grouping_order{ $grouping_name } }; + @items = reverse( @items ) if ( $common_reverse{ $grouping_name } ); + my @neworder = (); + my @newheaders = (); + if ( @order ) { + foreach my $grouping ( @items ) { + push @neworder, map( { "${_}_$grouping" } @order ); + push @newheaders, map( { "$_ - $common_headers{$grouping_name}{$grouping}" } @headers ); + } + @order = @neworder; + @headers = @newheaders; + } else { + push @order, @items; + push @headers, map( { $common_headers{$common_grouping[$i]}{$_} } @items ); + } + } + $header .= "

"; + for ( my $i = 0; $i < @order; $i++ ) { + my $order = $order[ $i ]; + next unless defined $section{$order}; + my $count = $count{"_$order"}; + my $bugs = $count == 1 ? "bug" : "bugs"; + $header .= "

$headers[$i] ($count $bugs)

\n"; + } + $header .= "

\n"; + for ( my $i = 0; $i < @order; $i++ ) { + my $order = $order[ $i ]; + next unless defined $section{$order}; + if ($common{show_list_header}) { + my $count = $count{"_$order"}; + my $bugs = $count == 1 ? "bug" : "bugs"; + $result .= "

$headers[$i] ($count $bugs)

\n"; + } else { + $result .= "

$headers[$i]

\n"; + } + $result .= "

\n"; + $result .= $section{$order}; + $result .= "\n

\n"; + } + $footer .= "

"; + foreach my $grouping ( @common_grouping ) { + my $local_result = ''; + foreach my $key ( @{$common_grouping_order{ $grouping }} ) { + my $count = $count{"${grouping}_$key"}; + next if !$count; + $local_result .= "

$count $common_headers{$grouping}{$key}

\n"; + } + if ( $local_result ) { + $footer .= "

$common_grouping_display{$grouping}

\n$local_result

\n"; + } + } + $footer .= "

\n"; + } + + $result = $header . $result if ( $common{show_list_header} ); + #$result .= "

" . $debbugs::gHTMLExpireNote if $debbugs::gRemoveAge and $anydone; + $result .= $footer if ( $common{show_list_footer} ); + return $result; +} + +sub pkg_htmlpackagelinks { + my $pkgs = shift; + return unless defined $pkgs and $pkgs ne ''; + my $strong = shift; + my @pkglist = splitpackages($pkgs); + + $strong = 0; + my $openstrong = $strong ? '' : ''; + my $closestrong = $strong ? '' : ''; + + return 'Package' . (@pkglist > 1 ? 's' : '') . ': ' . + join(', ', + map { + '' . + $openstrong . htmlsanit($_) . $closestrong . '' + } @pkglist + ); +} + +sub pkg_htmladdresslinks { + my ($prefixfunc, $urlfunc, $addresses) = @_; + if (defined $addresses and $addresses ne '') { + my @addrs = getparsedaddrs($addresses); + my $prefix = (ref $prefixfunc) ? $prefixfunc->(scalar @addrs) + : $prefixfunc; + return $prefix . + join ', ', map { sprintf '%s', + $urlfunc->($_->address), + htmlsanit($_->format) || '(unknown)' + } @addrs; + } else { + my $prefix = (ref $prefixfunc) ? $prefixfunc->(1) : $prefixfunc; + return sprintf '%s(unknown)', $prefix, $urlfunc->(''); + } +} + +sub pkg_javascript { + return < + + +EOF +} + +sub pkg_htmlselectsuite { + my $id = sprintf "b_%d_%d_%d", $_[0], $_[1], $_[2]; + my @suites = ("stable", "testing", "unstable", "experimental"); + my %suiteaka = ("stable", "sarge", "testing", "etch", "unstable", "sid"); + my $defaultsuite = "unstable"; + + my $result = sprintf ''; + return $result; +} + +sub pkg_htmlselectarch { + my $id = sprintf "b_%d_%d_%d", $_[0], $_[1], $_[2]; + my @arches = qw(alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc); + + my $result = sprintf ''; + return $result; +} + +sub myurl { + return pkg_etc_url($pkg, "pkg", 0) if defined($pkg); + return pkg_etc_url($src, "src", 0) if defined($src); + return pkg_etc_url($maint, "maint", 0) if defined($maint); + return pkg_etc_url($submitter, "submitter", 0) if defined($submitter); + return pkg_etc_url($severity, "severity", 0) if defined($severity); + return pkg_etc_url($tag, "tag", 0) if defined($tag); +} diff --git a/cgi/smarturl.cgi b/cgi/smarturl.cgi index f911d10..4e6056a 100644 --- a/cgi/smarturl.cgi +++ b/cgi/smarturl.cgi @@ -18,9 +18,8 @@ if (defined $ENV{REQUEST_METHOD} and $ENV{REQUEST_METHOD} eq 'HEAD') { } my $path = $ENV{PATH_INFO}; -my %param = readparse(); -if ($path =~ m,^/(\d+)(/(\d)+(/.*)?)?$,) { +if ($path =~ m,^/(\d+)(/(\d+)(/.*)?)?$,) { my $bug = $1; my $msg = $3; my $rest = $4; -- 2.39.2

Message received at |. - htmlsanit("$received\@$hostname") . q| (full text'.q|, mbox)'.":

" . "$debbugs::gProject $debbugs::gBug report logs - " . $title . "

" . "$debbugs::gProject$Archived $debbugs::gBug report logs: $title" . "

Options

Summary

No reports found!

$headers[$i] ($count $bugs)

$headers[$i]