Bug 349336: Automatically log in the user when he chooses his password to create his new account - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat

2 files changed, 7 insertions, 8 deletions

diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 15100ac6b..dd3967dc1 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -31,16 +31,11 @@
 
 [% message = BLOCK %]
   [% IF    message_tag == "account_created" %]
-    [% title = "User $otheruser.login created" %]
-    A new user account [% otheruser.login FILTER html %] has been created
+    The user account [% otheruser.login FILTER html %] has been created
     successfully.
     [% IF groups.size %]
       You may want to edit the group settings now, using the form below.
     [% END %]
-    [% IF login_info %]
-      You can now go to the <a href="index.cgi">Log In</a> page to enter
-      this [% terms.Bugzilla %] installation.
-    [% END %]
 
   [% ELSIF message_tag == "account_creation_canceled" %]
     [% title = "User Account Creation Canceled" %]
diff --git a/token.cgi b/token.cgi
index eaadee3e0..1e62bb8a0 100755
--- a/token.cgi
+++ b/token.cgi
@@ -390,11 +390,15 @@ sub confirm_create_account {
     # Let the user know that his user account has been successfully created.
     $vars->{'message'} = 'account_created';
     $vars->{'otheruser'} = $otheruser;
-    $vars->{'login_info'} = 1;
+
+    # Log in the new user using credentials he just gave.
+    $cgi->param('Bugzilla_login', $otheruser->login);
+    $cgi->param('Bugzilla_password', $password);
+    Bugzilla->login(LOGIN_OPTIONAL);
 
     print $cgi->header();
 
-    $template->process('global/message.html.tmpl', $vars)
+    $template->process('index.html.tmpl', $vars)
       || ThrowTemplateError($template->error());
 }