X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fpkgindex.cgi;h=a43428a6cd7f6362433a1c3ace25a6b2b04b3b07;hb=235a779bdb026b6357e95053e1d7faaab87e8931;hp=767b5721ca420a7363cf7b008f6be7e1aaaad4b4;hpb=5a54df69cab3aa561b47e704402ab1c18f75e6df;p=debbugs.git
diff --git a/cgi/pkgindex.cgi b/cgi/pkgindex.cgi
index 767b572..a43428a 100755
--- a/cgi/pkgindex.cgi
+++ b/cgi/pkgindex.cgi
@@ -43,14 +43,14 @@ elsif (defined $param{prev}) {
my $indexon = $param{indexon};
if ($param{indexon} !~ m/^(pkg|src|maint|submitter|tag)$/) {
- quitcgi("You have to choose something to index on");
+ quitcgi("You have to choose something to index on", '400 Bad Request');
}
my $repeatmerged = $param{repeatmerged} eq 'yes';
my $archive = $param{archive} eq "yes";
my $sortby = $param{sortby};
if ($sortby !~ m/^(alpha|count)$/) {
- quitcgi("Don't know how to sort like that");
+ quitcgi("Don't know how to sort like that", '400 Bad Request');
}
my $Archived = $archive ? " Archived" : "";
@@ -85,9 +85,9 @@ if ($indexon eq "pkg") {
foreach my $pkg (keys %count) {
$sortkey{$pkg} = lc $pkg;
$htmldescrip{$pkg} = sprintf('%s (%s)',
- package_links(package => $pkg, links_only=>1),
- html_escape($pkg),
- package_links(maint=>$maintainers{$pkg}//[]));
+ package_links(package => $pkg, links_only=>1),
+ html_escape($pkg),
+ package_links(maint=>$maintainers{$pkg}//['']));
}
} elsif ($indexon eq "src") {
$tag = "source package";
@@ -115,7 +115,7 @@ if ($indexon eq "pkg") {
$htmldescrip{$src} = sprintf('%s (%s)',
package_links(src => $src, links_only=>1),
html_escape($src),
- package_links(maint => $maintainers{$src}//[]));
+ package_links(maint => $maintainers{$src}//['']));
}
} elsif ($indexon eq "maint") {
$tag = "maintainer";
@@ -147,7 +147,7 @@ if ($indexon eq "pkg") {
$note .= "different addresses.\n";
foreach my $maint (keys %count) {
$sortkey{$maint} = lc $email2maint{$maint} || "(unknown)";
- $htmldescrip{$maint} = package_links(maint => $email2maint{$maint}//[]);
+ $htmldescrip{$maint} = package_links(maint => $email2maint{$maint}//['']);
}
} elsif ($indexon eq "submitter") {
$tag = "submitter";
@@ -226,44 +226,16 @@ $result .= "\n";
print "Content-Type: text/html\n\n";
-print "\n";
-print "\n" .
- "$gProject$Archived $gBug reports by $tag\n" .
- qq() .
- "\n" .
- '' .
- "\n";
-print "" . "$gProject$Archived $gBug report logs by $tag" .
- "
\n";
-
-print $note;
-print <
-
-
-
-
-
-
-END
-if (defined $param{first}) {
- print qq(\n);
-}
-else {
- print q();
- if ($param{skip} > 0) {
- print q();
- }
- if (keys %count > ($param{skip} + $param{max_results})) {
- print q();
- }
- print qq(
\n);
-}
-print $result;
-
-print "
\n";
-print fill_in_template(template=>'html/html_tail',
+print fill_in_template(template=>'cgi/pkgindex.tmpl',
+ variables => {count => \%count,
+ param => \%param,
+ result => $result,
+ html_escape => \&Debbugs::CGI::html_escape,
+ archived => $Archived,
+ note => $note,
+ tag => $tag,
+ },
hole_var => {'&strftime' => \&POSIX::strftime,
},
);
-print "\n";
+