diff options
| -rwxr-xr-x | attachment.cgi | 2 | ||||
| -rwxr-xr-x | buglist.cgi | 2 | ||||
| -rwxr-xr-x | chart.cgi | 2 | ||||
| -rwxr-xr-x | editclassifications.cgi | 2 | ||||
| -rwxr-xr-x | editcomponents.cgi | 4 | ||||
| -rwxr-xr-x | editfields.cgi | 2 | ||||
| -rwxr-xr-x | editflagtypes.cgi | 2 | ||||
| -rwxr-xr-x | editgroups.cgi | 7 | ||||
| -rwxr-xr-x | editkeywords.cgi | 2 | ||||
| -rwxr-xr-x | editmilestones.cgi | 4 | ||||
| -rwxr-xr-x | editproducts.cgi | 5 | ||||
| -rwxr-xr-x | editusers.cgi | 3 | ||||
| -rwxr-xr-x | editvalues.cgi | 7 | ||||
| -rwxr-xr-x | editversions.cgi | 4 | ||||
| -rwxr-xr-x | editworkflow.cgi | 2 | ||||
| -rwxr-xr-x | relogin.cgi | 2 | ||||
| -rwxr-xr-x | report.cgi | 2 | ||||
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 15 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 11 | ||||
| -rwxr-xr-x | token.cgi | 7 | ||||
| -rwxr-xr-x | votes.cgi | 2 |
21 files changed, 28 insertions, 61 deletions
diff --git a/attachment.cgi b/attachment.cgi index b6515d037..b650a3522 100755 --- a/attachment.cgi +++ b/attachment.cgi @@ -127,7 +127,7 @@ elsif ($action eq "delete") { } else { - ThrowCodeError("unknown_action", { action => $action }); + ThrowUserError('unknown_action', {action => $action}); } exit; diff --git a/buglist.cgi b/buglist.cgi index 65eb6f380..8741f434f 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -511,7 +511,7 @@ elsif (($cmdtype eq "doit") && defined $cgi->param('remtype')) { # We add or remove bugs based on the action choosen. my $action = trim($cgi->param('action') || ''); $action =~ /^(add|remove)$/ - || ThrowCodeError('unknown_action', {'action' => $action}); + || ThrowUserError('unknown_action', {action => $action}); # If we are removing bugs, then we must have an existing # saved search selected. @@ -227,7 +227,7 @@ elsif ($action eq "convert_search") { print $cgi->redirect(-location => correct_urlbase() . "query.cgi?format=create-series$url"); } else { - ThrowCodeError("unknown_action"); + ThrowUserError('unknown_action', {action => $action}); } exit; diff --git a/editclassifications.cgi b/editclassifications.cgi index 61b014c8d..db9dd7f0a 100755 --- a/editclassifications.cgi +++ b/editclassifications.cgi @@ -233,4 +233,4 @@ if ($action eq 'reclassify') { # No valid action found # -ThrowCodeError("action_unrecognized", {action => $action}); +ThrowUserError('unknown_action', {action => $action}); diff --git a/editcomponents.cgi b/editcomponents.cgi index 70afd9c9f..fd30daed4 100755 --- a/editcomponents.cgi +++ b/editcomponents.cgi @@ -252,7 +252,5 @@ if ($action eq 'update') { exit; } -# # No valid action found -# -ThrowUserError('no_valid_action', {'field' => "component"}); +ThrowUserError('unknown_action', {action => $action}); diff --git a/editfields.cgi b/editfields.cgi index 0f7a45fb7..e207a2ee4 100755 --- a/editfields.cgi +++ b/editfields.cgi @@ -171,5 +171,5 @@ elsif ($action eq 'delete') { || ThrowTemplateError($template->error()); } else { - ThrowUserError('no_valid_action', {'field' => 'custom_field'}); + ThrowUserError('unknown_action', {action => $action}); } diff --git a/editflagtypes.cgi b/editflagtypes.cgi index d389c6db7..a0e64957b 100755 --- a/editflagtypes.cgi +++ b/editflagtypes.cgi @@ -86,7 +86,7 @@ elsif ($action eq 'confirmdelete') { confirmDelete(); } elsif ($action eq 'delete') { deleteType($token); } elsif ($action eq 'deactivate') { deactivate($token); } else { - ThrowCodeError("action_unrecognized", { action => $action }); + ThrowUserError('unknown_action', {action => $action}); } exit; diff --git a/editgroups.cgi b/editgroups.cgi index 87a31816d..a879aa770 100755 --- a/editgroups.cgi +++ b/editgroups.cgi @@ -357,13 +357,8 @@ if ($action eq 'remove_regexp') { exit; } - -# # No valid action found -# - -ThrowCodeError("action_unrecognized", $vars); - +ThrowUserError('unknown_action', {action => $action}); # Helper sub to handle the making of changes to a group sub doGroupChanges { diff --git a/editkeywords.cgi b/editkeywords.cgi index a9b46fef5..6c20dfd05 100755 --- a/editkeywords.cgi +++ b/editkeywords.cgi @@ -183,4 +183,4 @@ if ($action eq 'delete') { exit; } -ThrowCodeError("action_unrecognized", $vars); +ThrowUserError('unknown_action', {action => $action}); diff --git a/editmilestones.cgi b/editmilestones.cgi index ff13b6114..ce622705e 100755 --- a/editmilestones.cgi +++ b/editmilestones.cgi @@ -218,7 +218,5 @@ if ($action eq 'update') { exit; } -# # No valid action found -# -ThrowUserError('no_valid_action', {'field' => "target_milestone"}); +ThrowUserError('unknown_action', {action => $action}); diff --git a/editproducts.cgi b/editproducts.cgi index 4a302aa6c..6d5c5e593 100755 --- a/editproducts.cgi +++ b/editproducts.cgi @@ -422,8 +422,5 @@ if ($action eq 'updategroupcontrols') { exit; } -# # No valid action found -# - -ThrowUserError('no_valid_action', {field => "product"}); +ThrowUserError('unknown_action', {action => $action}); diff --git a/editusers.cgi b/editusers.cgi index 1950446c7..f53fde985 100755 --- a/editusers.cgi +++ b/editusers.cgi @@ -675,8 +675,7 @@ if ($action eq 'search') { ########################################################################### } else { - $vars->{'action'} = $action; - ThrowCodeError('action_unrecognized', $vars); + ThrowUserError('unknown_action', {action => $action}); } exit; diff --git a/editvalues.cgi b/editvalues.cgi index a95385230..3f08a1671 100755 --- a/editvalues.cgi +++ b/editvalues.cgi @@ -193,10 +193,5 @@ if ($action eq 'update') { display_field_values($vars); } - -# # No valid action found -# -# We can't get here without $field being defined -- -# See the unless($field) block at the top. -ThrowUserError('no_valid_action', { field => $field } ); +ThrowUserError('unknown_action', {action => $action}); diff --git a/editversions.cgi b/editversions.cgi index b4cf9febc..0888ef0c6 100755 --- a/editversions.cgi +++ b/editversions.cgi @@ -219,7 +219,5 @@ if ($action eq 'update') { exit; } -# # No valid action found -# -ThrowUserError('no_valid_action', {'field' => "version"}); +ThrowUserError('unknown_action', {action => $action}); diff --git a/editworkflow.cgi b/editworkflow.cgi index 7e51798fc..321f077fe 100755 --- a/editworkflow.cgi +++ b/editworkflow.cgi @@ -147,5 +147,5 @@ elsif ($action eq 'update_comment') { load_template('comment', 'workflow_updated'); } else { - ThrowCodeError("action_unrecognized", {action => $action}); + ThrowUserError('unknown_action', {action => $action}); } diff --git a/relogin.cgi b/relogin.cgi index 100fc2c7f..7dcbde625 100755 --- a/relogin.cgi +++ b/relogin.cgi @@ -190,7 +190,7 @@ elsif ($action eq 'end-sudo') { # No valid action found else { Bugzilla->login(LOGIN_OPTIONAL); - ThrowCodeError('unknown_action', {action => $action}); + ThrowUserError('unknown_action', {action => $action}); } # Display the template diff --git a/report.cgi b/report.cgi index 4c9a98b8a..0537235fe 100755 --- a/report.cgi +++ b/report.cgi @@ -289,7 +289,7 @@ elsif ($action eq "plot") { $vars->{'data'} = \@image_data; } else { - ThrowCodeError("unknown_action", {action => $cgi->param('action')}); + ThrowUserError('unknown_action', {action => $action}); } my $format = $template->get_format("reports/report", $formatparam, diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index e3bd3ba8b..74365a80f 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -37,13 +37,7 @@ [% DEFAULT title = "Internal Error" %] [% error_message = BLOCK %] - [% IF error == "action_unrecognized" %] - [% docslinks = {'query.html' => "Searching for $terms.bugs", - 'query.html#list' => "$terms.Bug lists"} %] - I don't recognize the value (<em>[% action FILTER html %]</em>) - of the <em>action</em> variable. - - [% ELSIF error == "attachment_local_storage_disabled" %] + [% IF error == "attachment_local_storage_disabled" %] [% title = "Local Storage Disabled" %] You cannot store attachments locally. This feature is disabled. @@ -450,13 +444,6 @@ [% ELSIF error == "undefined_field" %] Form field [% field FILTER html %] was not defined. - [% ELSIF error == "unknown_action" %] - [% IF action %] - Unknown action [% action FILTER html %]! - [% ELSE %] - I could not figure out what you wanted to do. - [% END %] - [% ELSIF error == "unknown_method" %] The requested method '[% method FILTER html %]' was not found. diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index c5667bd27..1d5997861 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1251,10 +1251,6 @@ Either no products have been defined to enter [% terms.bugs %] against or you have not been given access to any. - [% ELSIF error == "no_valid_action" %] - [% title = "No valid action specified" %] - Cannot edit [% field_descs.$field FILTER html %]: no valid action was specified. - [% ELSIF error == "number_not_numeric" %] [% title = "Numeric Value Required" %] The value '[% num FILTER html %]' in the @@ -1581,6 +1577,13 @@ [% END %] token too recently to request another. Please wait a while and try again. + [% ELSIF error == "unknown_action" %] + [% IF action %] + Unknown action [% action FILTER html %]! + [% ELSE %] + I could not figure out what you wanted to do. + [% END %] + [% ELSIF error == "unknown_keyword" %] [% title = "Unknown Keyword" %] <code>[% keyword FILTER html %]</code> is not a known keyword. @@ -56,7 +56,7 @@ Bugzilla->login(LOGIN_OPTIONAL); # Throw an error if the form does not contain an "action" field specifying # what the user wants to do. -$action || ThrowCodeError("unknown_action"); +$action || ThrowUserError('unknown_action'); # If a token was submitted, make sure it is a valid token that exists in the # database and is the correct type for the action being taken. @@ -163,10 +163,7 @@ if ($action eq 'reqpw') { } elsif ($action eq 'cancel_new_account') { cancel_create_account($token); } else { - # If the action that the user wants to take (specified in the "a" form field) - # is none of the above listed actions, display an error telling the user - # that we do not understand what they would like to do. - ThrowCodeError("unknown_action", { action => $action }); + ThrowUserError('unknown_action', {action => $action}); } exit; @@ -41,7 +41,7 @@ elsif ($action eq "show_user" or $action eq 'vote') { $cgi->param('id', 'voting/user.html'); } else { - ThrowCodeError("unknown_action", {action => $action}); + ThrowUserError('unknown_action', {action => $action}); } print $cgi->redirect('page.cgi?' . $cgi->query_string); |