Bug 299572: Move MailPassword() from CGI.pl into BugMail.pm (and remove an unused variable) - Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=justdave

3 files changed, 13 insertions, 13 deletions

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index faa30b090..a1fdefde0 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -658,4 +658,15 @@ sub PerformSubsts ($;$) {
     return $str;
 }
 
+# Send the login name and password of the newly created account to the user.
+sub MailPassword ($$) {
+    my ($login, $password) = (@_);
+    my $template = Param("passwordmail");
+    my $msg = PerformSubsts($template,
+                            {"mailaddress" => $login . Param('emailsuffix'),
+                             "login" => $login,
+                             "password" => $password});
+    MessageToMTA($msg);
+}
+
 1;
diff --git a/CGI.pl b/CGI.pl
index e00881ade..27e9fab26 100644
--- a/CGI.pl
+++ b/CGI.pl
@@ -186,18 +186,6 @@ sub CheckEmailSyntax {
     }
 }
 
-sub MailPassword {
-    my ($login, $password) = (@_);
-    my $urlbase = Param("urlbase");
-    my $template = Param("passwordmail");
-    my $msg = PerformSubsts($template,
-                            {"mailaddress" => $login . Param('emailsuffix'),
-                             "login" => $login,
-                             "password" => $password});
-
-    Bugzilla::BugMail::MessageToMTA($msg);
-}
-
 sub PutHeader {
     ($vars->{'title'}, $vars->{'h1'}, $vars->{'h2'}) = (@_);
      
diff --git a/createaccount.cgi b/createaccount.cgi
index 9d9f55d8a..499e200e7 100755
--- a/createaccount.cgi
+++ b/createaccount.cgi
@@ -32,6 +32,7 @@ require "CGI.pl";
 
 use Bugzilla::Constants;
 use Bugzilla::User;
+use Bugzilla::BugMail;
 
 # Shut up misguided -w warnings about "used only once":
 use vars qw(
@@ -81,7 +82,7 @@ if (defined($login)) {
 
     # Create account
     my $password = insert_new_user($login, $realname);
-    MailPassword($login, $password);
+    Bugzilla::BugMail::MailPassword($login, $password);
     
     $template->process("account/created.html.tmpl", $vars)
       || ThrowTemplateError($template->error());