Index: modules/user_status/user_status.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_status/user_status.module,v
retrieving revision 1.9.2.2
diff -u -p -r1.9.2.2 user_status.module
--- modules/user_status/user_status.module	9 Mar 2007 18:31:24 -0000	1.9.2.2
+++ modules/user_status/user_status.module	9 Mar 2007 20:22:59 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: user_status.module,v 1.9.2.2 2007/03/09 18:31:24 dww Exp $
+// $Id: user_status.module,v 1.9 2007/01/16 07:47:09 dww Exp $
 // $Name:  $
 
 /**
@@ -120,6 +120,11 @@ function user_status_settings_form() {
     '#collapsible' => true,
     '#collapsed' => true
   );
+  $form['activate_status']['user_status_reset_password'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Reset password when accounts are activated? If enabled, this will provide access to a %password placeholder in the notification message.', array('%password' => '%password')),
+    '#default_value' => variable_get('user_status_reset_password', FALSE)
+  );
   $form['activate_status']['user_status_activated_enable'] = array(
     '#type' => 'checkbox',
     '#title' => t('Notify user when account is activated.'),
@@ -283,11 +288,13 @@ function _user_status_get_variables($use
     '%edit_uri' => url('user/'. $user->uid .'/edit', NULL, NULL, TRUE),
   );
   if ($reset_password) {
-    $pass = user_password();
-    $variables['%password'] = $pass;
-    $user->pass = md5($pass);
+    if (variable_get('user_status_reset_password', FALSE)) {
+      $pass = user_password();
+      $user->pass = md5($pass);
+      db_query("UPDATE {users} SET pass='%s' WHERE uid = %d", $user->pass, $user->uid);
+      $variables['%password'] = $pass;
+    }
     $variables['%login_url'] = user_pass_reset_url($user);
-    db_query("UPDATE {users} SET pass='%s' WHERE uid = %d", $user->pass, $user->uid);
   }
   return $variables;
 }