Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.588
diff -F^f -u -r1.588 user.module
--- modules/user.module	23 Feb 2006 12:52:02 -0000	1.588
+++ modules/user.module	26 Feb 2006 05:48:41 -0000
@@ -1148,7 +1148,7 @@ function user_register() {
     '#description' => t('A password and instructions will be sent to this e-mail address, so make sure it is accurate.'),
     '#required' => TRUE,
   );
-  if ($admin) {
+  if (!variable_get('user_email_verification', TRUE) || $admin) {
     $form['pass'] = array('#type' => 'password',
       '#title' => t('Password'),
       '#size' => 30,
@@ -1183,7 +1183,12 @@ function user_register_submit($form_id, 
 
   $mail = $form_values['mail'];
   $name = $form_values['name'];
-  $pass = $admin ? $form_values['pass'] : user_password();
+  if (!variable_get('user_email_verification', TRUE) || $admin) {
+    $pass = $form_values['pass'];
+  } 
+  else {
+    $pass = user_password();
+  };
   $from = variable_get('site_mail', ini_get('sendmail_from'));
 
   if (!$admin && array_intersect(array_keys($form_values), array('uid', 'roles', 'init', 'session', 'status'))) {
@@ -1214,6 +1219,14 @@ function user_register_submit($form_id, 
 
       return 'admin/user';
     }
+    // No e-mail verification is required, create new user account, and login user immediately.
+    else if (!variable_get('user_email_verification', TRUE) && $account->status) {
+      $subject = _user_mail_text('welcome_subject', $variables);
+      $body = _user_mail_text('welcome_body', $variables);
+      user_mail($edit['mail'], $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+      user_authenticate($account->name, trim($pass));
+      drupal_goto();
+    }
     else if ($account->status) {
       // Create new user account, no administrator approval required.
       $subject = _user_mail_text('welcome_subject', $variables);
@@ -1880,6 +1893,7 @@ function user_configure() {
   // User registration settings.
   $form['registration'] = array('#type' => 'fieldset', '#title' => t('User registration settings'));
   $form['registration']['user_register'] = array('#type' => 'radios', '#title' => t('Public registrations'), '#default_value' => variable_get('user_register', 1), '#options' => array(t('Only site administrators can create new user accounts.'), t('Visitors can create accounts and no administrator approval is required.'), t('Visitors can create accounts but administrator approval is required.')));
+  $form['registration']['user_email_verification'] = array('#type' => 'checkbox', '#title' => t('Require e-mail verification when a visitor creates an account'), '#default_value' => variable_get('user_email_verification', TRUE), '#description' => t('Check this box to require e-mail verification.'));
   $form['registration']['user_registration_help'] = array('#type' => 'textarea', '#title' => t('User registration guidelines'), '#default_value' => variable_get('user_registration_help', ''), '#description' => t('This text is displayed at the top of the user registration form.  It\'s useful for helping or instructing your users.'));
 
   // User e-mail settings.