diff options
author | mkanat%bugzilla.org <> | 2006-07-04 06:26:20 +0200 |
---|---|---|
committer | mkanat%bugzilla.org <> | 2006-07-04 06:26:20 +0200 |
commit | b1f4cf8bdc4b49c02ebebbee2553202bc46ab720 (patch) | |
tree | 8dddf198fa0cb29b5cef3833ff3469f07d34fdf7 /Bugzilla/Token.pm | |
parent | 49979b3775108f709cefbc9190eb9c7546aace94 (diff) | |
download | bugzilla-b1f4cf8bdc4b49c02ebebbee2553202bc46ab720.tar.gz bugzilla-b1f4cf8bdc4b49c02ebebbee2553202bc46ab720.tar.xz |
Bug 342869: Use Bugzilla->params everywhere except templates
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=justdave
Diffstat (limited to 'Bugzilla/Token.pm')
-rw-r--r-- | Bugzilla/Token.pm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm index 40eef4f1b..c2e11f5a3 100644 --- a/Bugzilla/Token.pm +++ b/Bugzilla/Token.pm @@ -50,6 +50,7 @@ my $maxtokenage = 3; sub IssueEmailChangeToken { my ($userid, $old_email, $new_email) = @_; + my $email_suffix = Bugzilla->params->{'emailsuffix'}; my ($token, $token_ts) = _create_token($userid, 'emailold', $old_email . ":" . $new_email); @@ -60,14 +61,14 @@ sub IssueEmailChangeToken { my $template = Bugzilla->template; my $vars = {}; - $vars->{'oldemailaddress'} = $old_email . Param('emailsuffix'); - $vars->{'newemailaddress'} = $new_email . Param('emailsuffix'); + $vars->{'oldemailaddress'} = $old_email . $email_suffix; + $vars->{'newemailaddress'} = $new_email . $email_suffix; $vars->{'max_token_age'} = $maxtokenage; $vars->{'token_ts'} = $token_ts; $vars->{'token'} = $token; - $vars->{'emailaddress'} = $old_email . Param('emailsuffix'); + $vars->{'emailaddress'} = $old_email . $email_suffix; my $message; $template->process("account/email/change-old.txt.tmpl", $vars, \$message) @@ -76,7 +77,7 @@ sub IssueEmailChangeToken { MessageToMTA($message); $vars->{'token'} = $newtoken; - $vars->{'emailaddress'} = $new_email . Param('emailsuffix'); + $vars->{'emailaddress'} = $new_email . $email_suffix; $message = ""; $template->process("account/email/change-new.txt.tmpl", $vars, \$message) @@ -112,7 +113,7 @@ sub IssuePasswordToken { # Mail the user the token along with instructions for using it. $vars->{'token'} = $token; - $vars->{'emailaddress'} = $loginname . Param('emailsuffix'); + $vars->{'emailaddress'} = $loginname . Bugzilla->params->{'emailsuffix'}; $vars->{'max_token_age'} = $maxtokenage; $vars->{'token_ts'} = $token_ts; @@ -191,11 +192,11 @@ sub Cancel { undef, $token); # Get the email address of the Bugzilla maintainer. - my $maintainer = Param('maintainer'); + my $maintainer = Bugzilla->params->{'maintainer'}; my $template = Bugzilla->template; - $vars->{'emailaddress'} = $loginname . Param('emailsuffix'); + $vars->{'emailaddress'} = $loginname . Bugzilla->params->{'emailsuffix'}; $vars->{'maintainer'} = $maintainer; $vars->{'remoteaddress'} = $::ENV{'REMOTE_ADDR'}; $vars->{'token'} = $token; |