Skip to content

bugzilla
bugzilla
Commit 669eed6c authored by jake%acutex.net's avatar jake%acutex.net
Browse files
Options

Fix for bug 95082 - Param('shutdownhtml') doesn't completely shut down bugzilla.

r= justdave@syndicomm.com
parent 45e6db58
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 7 deletions
CGI.pl
View file @ 669eed6c
......@@ -962,7 +962,7 @@ Content-type: text/html
exit();
}
print "Content-type: text/html\n\n";
PutHeader("Login", undef, undef, undef, 1);
PutHeader("Login");
if(Param("useLDAP")) {
print "I need a legitimate LDAP username and password to continue.\n";
} else {
......@@ -1059,7 +1059,7 @@ Content-type: text/html
sub PutHeader {
my ($title, $h1, $h2, $extra, $ignoreshutdown, $jscript) = (@_);
my ($title, $h1, $h2, $extra, $jscript) = (@_);
if (!defined $h1) {
$h1 = $title;
......@@ -1071,6 +1071,16 @@ sub PutHeader {
$extra = "";
}
$jscript ||= "";
# If we are shutdown, we want a very basic page to give that
# information. Also, the page title should indicate that
# we are down.
if (Param('shutdownhtml')) {
$title = "Bugzilla is Down";
$h1 = "Bugzilla is currently down";
$h2 = "";
$extra = "";
$jscript = "";
}
print "<HTML><HEAD>\n<TITLE>$title</TITLE>\n";
print Param("headerhtml") . "\n$jscript\n</HEAD>\n";
......@@ -1094,7 +1104,10 @@ sub PutHeader {
print "</TD></TR></TABLE>\n";
if (Param("shutdownhtml")) {
if (!$ignoreshutdown) {
# If we are dealing with the params page, we want
# to ignore shutdownhtml
if ($0 !~ m:[\\/](do)?editparams.cgi$:) {
print "<p>\n";
print Param("shutdownhtml");
exit;
}
......
doeditparams.cgi
View file @ 669eed6c
......@@ -44,7 +44,7 @@ if (!UserInGroup("tweakparams")) {
}
PutHeader("Saving new parameters", undef, undef, undef, 1);
PutHeader("Saving new parameters");
foreach my $i (@::param_list) {
# print "Processing $i...<BR>\n";
......
editparams.cgi
View file @ 669eed6c
......@@ -44,7 +44,7 @@ if (!UserInGroup("tweakparams")) {
PutHeader("Edit parameters", undef, undef, undef, 1);
PutHeader("Edit parameters");
print "This lets you edit the basic operating parameters of bugzilla.\n";
print "Be careful!\n";
......
globals.pl
View file @ 669eed6c
......@@ -200,6 +200,15 @@ sub SendSQL {
if ($str =~ /^LOCK TABLES/i && $str !~ /shadowlog/ && $::dbwritesallowed) {
$str =~ s/^LOCK TABLES/LOCK TABLES shadowlog WRITE, /i;
}
# If we are shutdown, we don't want to run queries except in special cases
if (Param('shutdownhtml')) {
if ($0 =~ m:[\\/](do)?editparams.cgi$:) {
$::ignorequery = 0;
} else {
$::ignorequery = 1;
return;
}
}
SqlLog($str);
$::currentquery = $::db->prepare($str);
$::currentquery->execute
......@@ -221,6 +230,10 @@ sub SendSQL {
}
sub MoreSQLData {
# $::ignorequery is set in SendSQL
if ($::ignorequery) {
return 0;
}
if (defined @::fetchahead) {
return 1;
}
......@@ -231,6 +244,10 @@ sub MoreSQLData {
}
sub FetchSQLData {
# $::ignorequery is set in SendSQL
if ($::ignorequery) {
return;
}
if (defined @::fetchahead) {
my @result = @::fetchahead;
undef @::fetchahead;
......
query.cgi
View file @ 669eed6c
......@@ -533,8 +533,7 @@ ENDSCRIPT
PutHeader("Bugzilla Query Page", "Query",
"This page lets you search the database for recorded bugs.",
q{onLoad="selectProduct(document.forms[0]);"},
0, $jscript);
q{onLoad="selectProduct(document.forms[0]);"}, $jscript);
push @::legal_resolution, "---"; # Oy, what a hack.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment