Bug 237864: clean up leftovers from the bug 192516 checkin (some occurances of Token...

r= gerv, a= justdave

diff --git a/Bugzilla/Auth.pm b/Bugzilla/Auth.pm
index 21d4409604a64bada0c03171d4db824fe52fa809..22c2fc56161ad72db0eaf595f1393d151ae48add 100644 (file)
--- a/Bugzilla/Auth.pm
+++ b/Bugzilla/Auth.pm
@@ -175,7 +175,7 @@ argument is a string, not a tag.
 This determines if the user's account details can be modified. If this
 method returns a C<true> value, then accounts can be created and modified
 through the Bugzilla user interface. Forgotten passwords can also be
-retrieved through the L<Token interface|Token>.
+retrieved through the L<Token interface|Bugzilla::Token>.
 
 =back
 

diff --git a/Bugzilla/Auth/DB.pm b/Bugzilla/Auth/DB.pm
index 34ec9983c65aab7eb2de4ec77ea251fd0b526646..dee3b5db9b173316b2f806d0756b3cfdbe052027 100644 (file)
--- a/Bugzilla/Auth/DB.pm
+++ b/Bugzilla/Auth/DB.pm
@@ -50,8 +50,8 @@ sub authenticate {
 
     # The user's credentials are okay, so delete any outstanding
     # password tokens they may have generated.
-    require Token;
-    Token::DeletePasswordTokens($userid, "user_logged_in");
+    require Bugzilla::Token;
+    Bugzilla::Token::DeletePasswordTokens($userid, "user_logged_in");
 
     # Account may have been disabled
     my $disabledtext = $class->get_disabled($userid);

diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index 20ce480501356c4fd0bbaff5d5e9c0fea9a52d21..d7d326ccca63748d828e3a3db3d1a5be8e85eb7c 100644 (file)
--- a/Bugzilla/Token.pm
+++ b/Bugzilla/Token.pm
@@ -26,7 +26,7 @@
 # Make it harder for us to do dangerous things in Perl.
 use strict;
 
-# Bundle the functions in this file together into the "Token" package.
+# Bundle the functions in this file together into the "Bugzilla::Token" package.
 package Bugzilla::Token;
 
 use Bugzilla::Config;
@@ -247,7 +247,7 @@ sub DeletePasswordTokens {
                             "WHERE userid=? AND tokentype='password'");
     $sth->execute($userid);
     while (my $token = $sth->fetchrow_array) {
-        Token::Cancel($token, $reason);
+        Bugzilla::Token::Cancel($token, $reason);
     }
 }
 

diff --git a/token.cgi b/token.cgi
index f9188900922c03ffd5a45bb59902d055446192dc..2a0f3c515535b80c33cd100de0b71cfc6c5bf5e5 100755 (executable)
--- a/token.cgi
+++ b/token.cgi
@@ -157,7 +157,7 @@ exit;
 ################################################################################
 
 sub requestChangePassword {
-    Token::IssuePasswordToken($cgi->param('loginname'));
+    Bugzilla::Token::IssuePasswordToken($cgi->param('loginname'));
 
     $vars->{'message'} = "password_change_request";
 
@@ -236,8 +236,8 @@ sub changeEmail {
     # The new email address should be available as this was 
     # confirmed initially so cancel token if it is not still available
     if (! ValidateNewUser($new_email,$old_email)) {
-        $vars->{'email'} = $new_email; # Needed for Token::Cancel's mail
-        Token::Cancel($::token,"account_exists");
+        $vars->{'email'} = $new_email; # Needed for Bugzilla::Token::Cancel's mail
+        Bugzilla::Token::Cancel($::token,"account_exists");
         ThrowUserError("account_exists", { email => $new_email } );
     }