page.cgi: code style, remove CGI usage
parent
afc4da85d2
commit
9a60ebb39d
50
page.cgi
50
page.cgi
|
@ -1,6 +1,4 @@
|
||||||
#!/usr/bin/perl -wT
|
#!/usr/bin/perl -wT
|
||||||
# -*- Mode: perl; indent-tabs-mode: nil -*-
|
|
||||||
#
|
|
||||||
# The contents of this file are subject to the Mozilla Public
|
# The contents of this file are subject to the Mozilla Public
|
||||||
# License Version 1.1 (the "License"); you may not use this file
|
# License Version 1.1 (the "License"); you may not use this file
|
||||||
# except in compliance with the License. You may obtain a copy of
|
# except in compliance with the License. You may obtain a copy of
|
||||||
|
@ -22,8 +20,8 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# This CGI is a general template display engine. To display templates using it,
|
# This script is a general template display engine. To display templates
|
||||||
# put them in the "pages" subdirectory of en/default, call them
|
# using it, put them in the "pages" subdirectory of en/default, call them
|
||||||
# "foo.<ctype>.tmpl" and use the URL page.cgi?id=foo.<ctype> , where <ctype> is
|
# "foo.<ctype>.tmpl" and use the URL page.cgi?id=foo.<ctype> , where <ctype> is
|
||||||
# a content-type, e.g. html.
|
# a content-type, e.g. html.
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
@ -42,15 +40,17 @@ use Bugzilla::Search::Quicksearch;
|
||||||
###############
|
###############
|
||||||
|
|
||||||
# For quicksearch.html.
|
# For quicksearch.html.
|
||||||
sub quicksearch_field_names {
|
sub quicksearch_field_names
|
||||||
|
{
|
||||||
my $fields = Bugzilla::Search::Quicksearch::FIELD_MAP;
|
my $fields = Bugzilla::Search::Quicksearch::FIELD_MAP;
|
||||||
my %fields_reverse;
|
my %fields_reverse;
|
||||||
# Put longer names before shorter names.
|
# Put longer names before shorter names.
|
||||||
my @nicknames = sort { length($b) <=> length($a) } (keys %$fields);
|
my @nicknames = sort { length($b) <=> length($a) } (keys %$fields);
|
||||||
foreach my $nickname (@nicknames) {
|
foreach my $nickname (@nicknames)
|
||||||
|
{
|
||||||
my $db_field = $fields->{$nickname};
|
my $db_field = $fields->{$nickname};
|
||||||
$fields_reverse{$db_field} ||= [];
|
$fields_reverse{$db_field} ||= [];
|
||||||
push(@{ $fields_reverse{$db_field} }, $nickname);
|
push @{ $fields_reverse{$db_field} }, $nickname;
|
||||||
}
|
}
|
||||||
return \%fields_reverse;
|
return \%fields_reverse;
|
||||||
}
|
}
|
||||||
|
@ -61,38 +61,36 @@ sub quicksearch_field_names {
|
||||||
|
|
||||||
Bugzilla->login();
|
Bugzilla->login();
|
||||||
|
|
||||||
my $cgi = Bugzilla->cgi;
|
|
||||||
my $template = Bugzilla->template;
|
my $template = Bugzilla->template;
|
||||||
|
|
||||||
my $id = $cgi->param('id');
|
my $id = Bugzilla->input_params->{id};
|
||||||
if ($id) {
|
if ($id)
|
||||||
|
{
|
||||||
# Be careful not to allow directory traversal.
|
# Be careful not to allow directory traversal.
|
||||||
if ($id =~ /\.\./) {
|
if ($id =~ /\.\./)
|
||||||
# two dots in a row is bad
|
{
|
||||||
ThrowCodeError("bad_page_cgi_id", { "page_id" => $id });
|
ThrowCodeError("bad_page_cgi_id", { "page_id" => $id });
|
||||||
}
|
}
|
||||||
# Split into name and ctype.
|
# Split into name and ctype.
|
||||||
$id =~ /^([\w\-\/\.]+)\.(\w+)$/;
|
$id =~ /^([\w\-\/\.]+)\.(\w+)$/;
|
||||||
if (!$2) {
|
if (!$2)
|
||||||
|
{
|
||||||
# if this regexp fails to match completely, something bad came in
|
# if this regexp fails to match completely, something bad came in
|
||||||
ThrowCodeError("bad_page_cgi_id", { "page_id" => $id });
|
ThrowCodeError("bad_page_cgi_id", { "page_id" => $id });
|
||||||
}
|
}
|
||||||
|
|
||||||
my %vars = (
|
my %vars = (quicksearch_field_names => \&quicksearch_field_names);
|
||||||
quicksearch_field_names => \&quicksearch_field_names,
|
Bugzilla::Hook::process('page_before_template', { page_id => $id, vars => \%vars });
|
||||||
);
|
|
||||||
Bugzilla::Hook::process('page_before_template',
|
|
||||||
{ page_id => $id, vars => \%vars });
|
|
||||||
|
|
||||||
my $format = $template->get_format("pages/$1", undef, $2);
|
my $format = $template->get_format("pages/$1", undef, $2);
|
||||||
|
Bugzilla->input_params->{id} = $id;
|
||||||
|
Bugzilla->cgi->send_header($format->{ctype});
|
||||||
|
|
||||||
$cgi->param('id', $id);
|
$template->process($format->{template}, \%vars)
|
||||||
|
|| ThrowTemplateError($template->error());
|
||||||
$cgi->send_header($format->{'ctype'});
|
exit;
|
||||||
|
|
||||||
$template->process("$format->{'template'}", \%vars)
|
|
||||||
|| ThrowTemplateError($template->error());
|
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
ThrowUserError("no_page_specified");
|
{
|
||||||
|
ThrowUserError('no_page_specified');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue