? Drupal.mail_alter.patch
Index: modules/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact.module,v
retrieving revision 1.54
diff -u -r1.54 contact.module
--- modules/contact.module 29 May 2006 13:26:41 -0000 1.54
+++ modules/contact.module 28 Jun 2006 10:54:57 -0000
@@ -394,11 +394,11 @@
$body = implode("\n\n", $message);
// Send the e-mail:
- user_mail($to, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+ user_mail(array('#mail-id' => 'contact-user-mail', '#to' => $to, '#subject' => $subject, '#body' => $body, '#from' => $from));
// Send a copy if requested:
if ($edit['copy']) {
- user_mail($from, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+ user_mail(array('#mail-id' => 'contact-user-copy', '#to' => $from, '#subject' => $subject, '#body' => $body, '#from' => => $from));
}
// Log the operation:
@@ -535,16 +535,16 @@
$body = implode("\n\n", $message);
// Send the e-mail to the recipients:
- user_mail($contact->recipients, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+ user_mail(array('#mail-id' => 'contact-page-mail', '#to' => $contact->recipients, '#subject' => $subject, '#body' => $body, '#from' => $from));
// If the user requests it, send a copy.
if ($edit['copy']) {
- user_mail($from, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+ user_mail(array('#mail-id' => 'contact-page-copy', '#to' => $from, '#subject' => $subject, '#body' => $body, '#from' => $from));
}
// Send an auto-reply if necessary:
if ($contact->reply) {
- user_mail($from, $subject, wordwrap($contact->reply), "From: $contact->recipients\nReply-to: $contact->recipients\nX-Mailer: Drupal\nReturn-path: $contact->recipients\nErrors-to: $contact->recipients");
+ user_mail(array('#mail-id' => 'contact-page-autoreply', '#to' => $from, '#subject' => $subject, '#body' => wordwrap($contact->reply), '#from' => $contact->recipients));
}
// Log the operation:
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.632
diff -u -r1.632 user.module
--- modules/user.module 23 Jun 2006 07:06:17 -0000 1.632
+++ modules/user.module 28 Jun 2006 10:55:04 -0000
@@ -383,11 +383,25 @@
/**
* Send an e-mail message.
+ *
+ * @param $mail
+ * Associative array: #to, #subject and #body (string); #headers (associative array)
*/
-function user_mail($mail, $subject, $message, $header) {
+function user_mail($mail) {
+ $headers = array('MIME-Version' => '1.0', 'Content-Type' => 'text/plain; charset=UTF-8; format=flowed', 'Content-transfer-encoding' => '8Bit', 'X-Mailer' => 'Drupal');
+ if (isset($mail['#from'])) {
+ $headers = array_merge($headers, array('From' => $mail['#from'], 'Reply-to' => $mail['#from'], 'Return-path' => $mail['#from'], 'Errors-to' => $mail['#from']));
+ }
+ $mail['#headers'] = array_merge($headers, isset($mail['#headers']) ? $mail['#headers'] : array());
+ // Custom hook traversal to allow pass by reference
+ foreach (module_implements('mail_alter') AS $module) {
+ $function = $module .'_mail_alter';
+ $function($mail);
+ }
+ // Allow for custom mail backend
if (variable_get('smtp_library', '') && file_exists(variable_get('smtp_library', ''))) {
- include_once './' . variable_get('smtp_library', '');
- return user_mail_wrapper($mail, $subject, $message, $header);
+ include_once './' . variable_get('smtp_library', '');
+ return user_mail_wrapper($mail);
}
else {
/*
@@ -410,11 +424,15 @@
** http://www.rfc-editor.org/rfc/rfc2646.txt
**
*/
+ $headers = array();
+ foreach ($mail['#headers'] as $name => $value) {
+ $headers[] = $name . ': ' . $value;
+ }
return mail(
- $mail,
- mime_header_encode($subject),
- str_replace("\r", '', $message),
- "MIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8; format=flowed\nContent-transfer-encoding: 8Bit\n" . $header
+ $mail['#to'],
+ mime_header_encode($mail['#subject']),
+ str_replace("\r", '', $mail['#body']),
+ join("\n", $headers)
);
}
}
@@ -1066,8 +1084,7 @@
$variables = array('%username' => $account->name, '%site' => variable_get('site_name', 'drupal'), '%login_url' => user_pass_reset_url($account), '%uri' => $base_url, '%uri_brief' => substr($base_url, strlen('http://')), '%mailto' => $account->mail, '%date' => format_date(time()), '%login_uri' => url('user', NULL, NULL, TRUE), '%edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE));
$subject = _user_mail_text('pass_subject', $variables);
$body = _user_mail_text('pass_body', $variables);
- $headers = "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from";
- $mail_success = user_mail($account->mail, $subject, $body, $headers);
+ $mail_success = user_mail(array('#mail-id' => 'user-pass', '#to' => $account->mail, '#subject' => $subject, '#body' => $body, '#from' => $from));
if ($mail_success) {
watchdog('user', t('Password reset instructions mailed to %name at %email.', array('%name' => ''. $account->name .'', '%email' => ''. $account->mail .'')));
@@ -1256,7 +1273,7 @@
// The first user may login immediately, and receives a customized welcome e-mail.
if ($account->uid == 1) {
- user_mail($mail, t('Drupal user account details for %s', array('%s' => $name)), strtr(t("%username,\n\nYou may now login to %uri using the following username and password:\n\n username: %username\n password: %password\n\n%edit_uri\n\n--drupal"), $variables), "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+ user_mail(array('#mail-id' => 'user-register-admin', '#to' => $mail, '#subject' => t('Drupal user account details for %s', array('%s' => $name)), '#body' => strtr(t("%username,\n\nYou may now login to %uri using the following username and password:\n\n username: %username\n password: %password\n\n%edit_uri\n\n--drupal"), $variables), '#from' => $from));
drupal_set_message(t('Welcome to Drupal. You are user #1, which gives you full and immediate access. All future registrants will receive their passwords via e-mail, so please make sure your website e-mail address is set properly under the general settings on the settings page.
Your password is %pass. You may change your password below.
', array('%pass' => $pass, '%settings' => url('admin/settings'))));
user_authenticate($account->name, trim($pass));
@@ -1275,7 +1292,7 @@
$subject = $notify ? _user_mail_text('admin_subject', $variables) : _user_mail_text('welcome_subject', $variables);
$body = $notify ? _user_mail_text('admin_body', $variables) : _user_mail_text('welcome_body', $variables);
- user_mail($mail, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+ user_mail(array('#mail-id' => ($notify ? 'user-register-notify' : 'user-register-welcome'), '#to' => $mail, '#subject' => $subject, '#body' => $body, '#from' => $from));
if ($notify) {
drupal_set_message(t('Password and further instructions have been e-mailed to the new user %user.', array('%user' => theme('placeholder', $name))));
@@ -1290,8 +1307,8 @@
$subject = _user_mail_text('approval_subject', $variables);
$body = _user_mail_text('approval_body', $variables);
- user_mail($mail, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
- user_mail(variable_get('site_mail', ini_get('sendmail_from')), $subject, t("%u has applied for an account.\n\n%uri", array('%u' => $account->name, '%uri' => url("user/$account->uid/edit", NULL, NULL, TRUE))), "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+ user_mail(array('#mail-id' => 'user-register-approval-user', '#to' => $mail, '#subject' => $subject, '#body' => $body, '#from' => $from));
+ user_mail(array('#mail-id' => 'user-register-approval-admin', '#to' => $from, '#subject' => $subject, '#body' => t("%u has applied for an account.\n\n%uri", array('%u' => $account->name, '%uri' => url("user/$account->uid/edit", NULL, NULL, TRUE))), '#from' => $from));
drupal_set_message(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.
In the meantime, your password and further instructions have been sent to your e-mail address.'));
}