diff options
| author | bbaetz%acm.org <> | 2003-09-14 15:04:38 +0200 |
|---|---|---|
| committer | bbaetz%acm.org <> | 2003-09-14 15:04:38 +0200 |
| commit | 4e7e3310242bd5264b5f48e4bf3c387e59288b85 (patch) | |
| tree | df9878685199a51358c148c1531d51116f32f650 /Bugzilla/Token.pm | |
| parent | 95791d4b9edc26cd55483e71970d9f743f12f094 (diff) | |
| download | bugzilla-4e7e3310242bd5264b5f48e4bf3c387e59288b85.tar.gz bugzilla-4e7e3310242bd5264b5f48e4bf3c387e59288b85.tar.xz | |
Bug 208699 - Move Throw{Code,Template}Error into Error.pm
r,a=justdave
Diffstat (limited to 'Bugzilla/Token.pm')
| -rw-r--r-- | Bugzilla/Token.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm index 400d7d4fc..f7be40ab3 100644 --- a/Bugzilla/Token.pm +++ b/Bugzilla/Token.pm @@ -30,6 +30,7 @@ use strict; package Token; use Bugzilla::Config; +use Bugzilla::Error; use Date::Format; @@ -88,7 +89,7 @@ sub IssueEmailChangeToken { my $message; $template->process("account/email/change-old.txt.tmpl", $vars, \$message) - || &::ThrowTemplateError($template->error()); + || ThrowTemplateError($template->error()); open SENDMAIL, "|/usr/lib/sendmail -t -i"; print SENDMAIL $message; @@ -99,7 +100,7 @@ sub IssueEmailChangeToken { $message = ""; $template->process("account/email/change-new.txt.tmpl", $vars, \$message) - || &::ThrowTemplateError($template->error()); + || ThrowTemplateError($template->error()); open SENDMAIL, "|/usr/lib/sendmail -t -i"; print SENDMAIL $message; @@ -146,7 +147,7 @@ sub IssuePasswordToken { my $message = ""; $template->process("account/password/forgotten-password.txt.tmpl", $vars, \$message) - || &::ThrowTemplateError($template->error()); + || ThrowTemplateError($template->error()); open SENDMAIL, "|/usr/lib/sendmail -t -i"; print SENDMAIL $message; @@ -176,7 +177,7 @@ sub GenerateUniqueToken { ++$tries; if ($tries > 100) { - &::ThrowCodeError("token_generation_error"); + ThrowCodeError("token_generation_error"); } $token = &::GenerateRandomPassword(); @@ -225,7 +226,7 @@ sub Cancel { my $message; $template->process("account/cancel-token.txt.tmpl", $vars, \$message) - || &::ThrowTemplateError($template->error()); + || ThrowTemplateError($template->error()); open SENDMAIL, "|/usr/lib/sendmail -t -i"; print SENDMAIL $message; |