summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2006-06-04 04:48:57 +0200
committerlpsolit%gmail.com <>2006-06-04 04:48:57 +0200
commit623aee25de2e1ee758aae7124d451b3be469a233 (patch)
treeb45c9cdbbc0ea3db6725e475a902b6362d3205f1
parent1a18e5fc2c3678e9a4a3049b9289e417ce174c7e (diff)
downloadbugzilla-623aee25de2e1ee758aae7124d451b3be469a233.tar.gz
bugzilla-623aee25de2e1ee758aae7124d451b3be469a233.tar.xz
Bug 340253: .cgi scripts should call Throw*Error() instead of die() - Patch by Frédéric Buclin <LpSolit@gmail.com> r=vladd a=justdave
-rwxr-xr-xprocess_bug.cgi3
-rwxr-xr-xreports.cgi3
-rw-r--r--template/en/default/global/code-error.html.tmpl5
-rw-r--r--template/en/default/global/user-error.html.tmpl5
4 files changed, 12 insertions, 4 deletions
diff --git a/process_bug.cgi b/process_bug.cgi
index 9773dce6d..29b9990ae 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -1890,8 +1890,7 @@ foreach my $id (@idlist) {
shift @oldlist;
} else {
if ($oldlist[0] != $newlist[0]) {
- $dbh->bz_unlock_tables(UNLOCK_ABORT);
- die "Error in list comparing code";
+ ThrowCodeError('list_comparison_error');
}
shift @oldlist;
shift @newlist;
diff --git a/reports.cgi b/reports.cgi
index 947993a56..1181e3a81 100755
--- a/reports.cgi
+++ b/reports.cgi
@@ -232,7 +232,8 @@ sub chart_image_name {
# and number
if ($datasets !~ m/^[A-Za-z0-9:]+$/) {
- die "Invalid datasets $datasets";
+ $vars->{'datasets'} = $datasets;
+ ThrowUserError('invalid_datasets', $vars);
}
# Since we pass the tests, consider it OK
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 0ec46461f..5081589ed 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -192,7 +192,10 @@
[% title = "Invalid Series" %]
The series_id [% series_id FILTER html %] is not valid. It may be that
this series has been deleted.
-
+
+ [% ELSIF error == "list_comparison_error" %]
+ Unexpected error in list comparing code.
+
[% ELSIF error == "mismatched_bug_ids_on_obsolete" %]
Attachment [% attach_id FILTER html %] ([% description FILTER html %])
is attached to [% terms.bug %] [%+ attach_bug_id FILTER html %],
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index ac1bca1c2..5ffae70ac 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -696,6 +696,11 @@
The context [% context FILTER html %] is invalid (must be a number,
"file" or "patch").
+ [% ELSIF error == "invalid_datasets" %]
+ [% title = "Invalid Datasets" %]
+ Invalid datasets <em>[% datasets FILTER html %]</em>. Only digits,
+ letters and colons are allowed.
+
[% ELSIF error == "invalid_format" %]
[% title = "Invalid Format" %]
The format "[% format FILTER html %]" is invalid (must be one of