- Patch #144859 by dww: added optional e-mail notifications when user are...

- Patch #144859 by dww: added optional e-mail notifications when user are approved, blocked, or deleted.

CHANGELOG.txt

@@ -8,6 +8,7 @@ Drupal 6.0, xxxx-xx-xx (development version)
    * The watchdog module is now called dblog, and is optional, but enabled by default in the default install profile.
    * Extended the database log module so log messages can be filtered.
    * Added syslog module: useful for monitoring large Drupal installations.
+- Added optional e-mail notifications when user are approved, blocked, or deleted.
 - Added versioning support to node terms.
 - Made it easier to theme the forum overview page.
 - Drupal works with error reporting set to E_ALL.

modules/comment/comment.js

@@ -26,7 +26,7 @@ Drupal.comment.getCookie = function(name) {
       if (end == -1) {
         end = document.cookie.length;
       }
-      returnValue = unescape(document.cookie.substring(offset, end));
+      returnValue = decodeURIComponent(document.cookie.substring(offset, end).replace(/\+/g, '%20'));
     }
   }
 

modules/system/system.install

@@ -4032,6 +4032,36 @@ function system_update_6016() {
   return $ret;
 }
 
+/**
+ * Rename settings related to user.module email notifications.
+ */
+function system_update_6017() {
+  $ret = array();
+  // Maps old names to new ones.
+  $var_names = array(
+    'admin'    => 'register_admin_created',
+    'approval' => 'register_pending_approval',
+    'welcome'  => 'register_no_approval_required',
+    'pass'     => 'password_reset',
+  );
+  foreach ($var_names as $old => $new) {
+    foreach (array('_subject', '_body') as $suffix) {
+      $old_name = 'user_mail_'. $old . $suffix;
+      $new_name = 'user_mail_'. $new . $suffix;
+      if ($old_val = variable_get($old_name, FALSE)) {
+        variable_set($new_name, $old_val);
+        variable_del($old_name);
+        $ret[] = array('success' => TRUE, 'query' => "variable_set($new_name)");
+        $ret[] = array('success' => TRUE, 'query' => "variable_del($old_name)");
+        if ($old_name == 'user_mail_approval_body') {
+          drupal_set_message(t('Saving an old value of the welcome message body for users that are pending administrator approval. However, you should consider modifying this text, since Drupal can now be configured to automatically notify users and send them their login infomation when their accounts are approved.  See the !admin_user_settings page for details.', array('!admin_user_settings' => l(t('User settings'), 'admin/user/settings'))));
+        }
+      }
+    }
+  }
+  return $ret;
+}
+
 /**
  * @} End of "defgroup updates-5.x-to-6.x"
  * The next series of updates should start at 7000.

modules/user/user.css

@@ -30,6 +30,10 @@
   margin-left: 0.5em;
   clear: right;
 }
+#user-admin-settings fieldset .description {
+  font-size: 0.85em;
+  padding-bottom: .5em;
+}
 
 /* Generated by user.module but used by profile.module: */
 .profile {