Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.799
diff -u -p -r1.799 user.module
--- modules/user/user.module	17 Jun 2007 11:59:05 -0000	1.799
+++ modules/user/user.module	17 Jun 2007 14:09:51 -0000
@@ -1107,7 +1107,7 @@ function user_login_default_validators()
  **/
 function user_login_authenticate_validate($form, &$form_state) {
   global $user;
-  if ($account = user_authenticate($form_state['values']['name'], trim($form_state['values']['pass']))) {
+  if ($account = user_authenticate($form_state['values']['name'], trim($form_state['values']['pass']), $form_state['values'])) {
     $user = $account;
   }
 }
@@ -1130,35 +1130,47 @@ function user_login_final_validate($form
  * Try to log in the user locally.
  *
  * @return
- *   A $user object, if successful.
+ *   A $user object.
  **/
-function user_authenticate($name, $pass) {
+function user_authenticate($name, $pass, $form_values = array()) {
   global $user;
 
   if ($account = user_load(array('name' => $name, 'pass' => $pass, 'status' => 1))) {
     $user = $account;
-    return $user;
+    user_authenticate_tasks($form_values);
   }
+
+  return $user;
 }
 
 /**
- * A validate handler on the login form. Update user's login timestamp, fire hook_user('login), and generate new session ID.
+ * Completes the user authentication by updating user's login timestamp,
+ * firing hook_user('login), and generating new session ID.
  *
  * @return void
- **/
-function user_login_submit($form, &$form_state) {
+ */
+function user_authenticate_tasks($form_values = array()) {
   global $user;
-  if ($user->uid) {
-    watchdog('user', 'Session opened for %name.', array('%name' => $user->name));
 
-    // Update the user table timestamp noting user has logged in.
-    db_query("UPDATE {users} SET login = %d WHERE uid = %d", time(), $user->uid);
+  watchdog('user', 'Session opened for %name.', array('%name' => $user->name));
 
-    user_module_invoke('login', $form_state['values'], $user);
+  // Update the user table timestamp noting user has logged in.
+  db_query("UPDATE {users} SET login = %d WHERE uid = %d", time(), $user->uid);
 
-    sess_regenerate();
+  user_module_invoke('login', $form_values, $user);
+
+  sess_regenerate();
+}
+
+/**
+ * A validate handler on the login form.
+ *
+ * @return void
+ **/
+function user_login_submit($form, &$form_state) {
+  global $user;
+  if ($user->uid) {
     $form_state['redirect'] = 'user/'. $user->uid;
-    return;
   }
 }
 
@@ -1269,14 +1281,12 @@ function user_pass_reset(&$form_state, $
         // First stage is a confirmation form, then login
         if ($action == 'login') {
           watchdog('user', 'User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp));
-          // Update the user table noting user has logged in.
-          // And this also makes this hashed password a one-time-only login.
-          db_query("UPDATE {users} SET login = %d WHERE uid = %d", time(), $account->uid);
           // Now we can set the new user.
           $user = $account;
+          // Update the user table noting user has logged in.
+          // And this also makes this hashed password a one-time-only login.
+          user_authenticate_tasks($form_state['values']);
           // And proceed with normal login, going to user page.
-          $edit = array();
-          user_module_invoke('login', $edit, $user);
           drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.'));
           drupal_goto('user/'. $user->uid .'/edit');
         }
@@ -1410,7 +1420,7 @@ function user_register_submit($form, &$f
       drupal_set_message(t('</p><p> Your password is <strong>%pass</strong>. You may change your password below.</p>', array('%pass' => $pass)));
     }
 
-    user_authenticate($account->name, trim($pass));
+    user_authenticate($account->name, trim($pass), $form_state['values']);
 
     $form_state['redirect'] = 'user/1/edit';
     return;
@@ -1422,7 +1432,7 @@ function user_register_submit($form, &$f
     else if (!variable_get('user_email_verification', TRUE) && $account->status && !$admin) {
       // No e-mail verification is required, create new user account, and login user immediately.
       _user_mail_notify('register_no_approval_required', $account, $pass);
-      user_authenticate($account->name, trim($pass));
+      user_authenticate($account->name, trim($pass), $form_state['values']);
       $form_state['redirect'] = '';
       return;
     }