Permalink
Browse files

Added Mailsystem, missing headers...

  • Loading branch information...
Jose Reyero
Jose Reyero committed Oct 19, 2010
1 parent ae2371b commit d5807d90e2d7d8053eda8041f172501e3f4ccaf3
Showing with 117 additions and 6 deletions.
  1. +116 −5 messaging_sendgrid.inc
  2. +1 −1 messaging_sendgrid.module
View
@@ -6,14 +6,16 @@
*/
/**
- * Sendgrid mass mailing
+ * Messaging Send Method: Sendgrid mass mailing
*/
class Messaging_Sendgrid_Method extends Messaging_Mail_Method {
// Default group and address type
public $method = 'sendgrid';
public $type = 'mail';
public $anonymous = TRUE;
- public $format = MESSAGING_FORMAT_PLAIN;
+ public $format = MESSAGING_FORMAT_HTML;
+ // Mail system object
+ protected static $mail_system;
/**
* Send message to multiple destinations
@@ -67,12 +69,28 @@ class Messaging_Sendgrid_Method extends Messaging_Mail_Method {
*/
protected static function mail_send($mail, $message) {
// Retrieve the responsible implementation for this message.
- $system = drupal_mail_system($mail['module'], $mail['key']);
+ //$system = drupal_mail_system($mail['module'], $mail['key']);
+ if (!isset(self::$mail_system)) {
+ self::$mail_system = new Messaging_Sendgrid_MailSystem();
+ }
// Format the message body, last chance for formatting
- $mail = $system->format($mail);
- return $system->mail($mail);
+ $mail = self::$mail_system->format($mail);
+ return self::$mail_system->mail($mail);
}
+ /**
+ * Get mail headers. Helper function for mail methods
+ *
+ * Just add some headers, but reuse most of default headers from parent
+ */
+ static function mail_headers($message, $params = array()) {
+ $params += array('headers' => array());
+ $params['headers'] += array(
+ 'MIME-Version' => '1.0',
+ 'Content-Type' => 'text/html; charset=UTF-8; format=flowed; delsp=yes',
+ );
+ return parent::mail_headers($message, $params);
+ }
}
/**
@@ -159,3 +177,96 @@ class Messaging_Sendgrid_SmtpApiHeader
return $str;
}
}
+
+/**
+ * Sendgrid mail system
+ *
+ * We use HTML formatting + we need to take care of properly filtering the headers.
+ *
+ * The e-mail is sent through default PHP mail though, Sendgrid config should be in the backend
+ *
+ * For Exim configuration see http://wiki.sendgrid.com/doku.php?id=exim4
+ *
+ * @todo Explore other options for sending, like PHPMailer or
+ */
+class Messaging_Sendgrid_MailSystem extends DefaultMailSystem {
+ /**
+ * Concatenate and wrap the e-mail body for plain-text mails.
+ *
+ * @param $message
+ * A message array, as described in hook_mail_alter().
+ *
+ * @return
+ * The formatted $message.
+ */
+ public function format(array $message) {
+ // Join the body array into one string.
+ $message['body'] = implode("\n\n", $message['body']);
+ // Convert any HTML to plain-text.
+ // $message['body'] = drupal_html_to_text($message['body']);
+ // Wrap the mail body for sending.
+ $message['body'] = drupal_wrap_mail($message['body']);
+ return $message;
+ }
+
+ /**
+ * Send an e-mail message, using Drupal variables and default settings.
+ *
+ * @see http://php.net/manual/en/function.mail.php
+ * @see drupal_mail()
+ *
+ * @param $message
+ * A message array, as described in hook_mail_alter().
+ * @return
+ * TRUE if the mail was successfully accepted, otherwise FALSE.
+ */
+ public function mail(array $message) {
+ // If 'Return-Path' isn't already set in php.ini, we pass it separately
+ // as an additional parameter instead of in the header.
+ // However, if PHP's 'safe_mode' is on, this is not allowed.
+ if (isset($message['headers']['Return-Path']) && !ini_get('safe_mode')) {
+ $return_path_set = strpos(ini_get('sendmail_path'), ' -f');
+ if (!$return_path_set) {
+ $message['Return-Path'] = $message['headers']['Return-Path'];
+ unset($message['headers']['Return-Path']);
+ }
+ }
+ $mimeheaders = array();
+ foreach ($message['headers'] as $name => $value) {
+ $mimeheaders[] = $name . ': ' . mime_header_encode($value);
+ }
+ $line_endings = variable_get('mail_line_endings', MAIL_LINE_ENDINGS);
+ // Prepare mail commands.
+ $mail_subject = mime_header_encode($message['subject']);
+ // Note: e-mail uses CRLF for line-endings. PHP's API requires LF
+ // on Unix and CRLF on Windows. Drupal automatically guesses the
+ // line-ending format appropriate for your system. If you need to
+ // override this, adjust $conf['mail_line_endings'] in settings.php.
+ $mail_body = preg_replace('@\r?\n@', $line_endings, $message['body']);
+ // For headers, PHP's API suggests that we use CRLF normally,
+ // but some MTAs incorrectly replace LF with CRLF. See #234403.
+ $mail_headers = join("\n", $mimeheaders);
+ if (isset($message['Return-Path']) && !ini_get('safe_mode')) {
+ $mail_result = mail(
+ $message['to'],
+ $mail_subject,
+ $mail_body,
+ $mail_headers,
+ // Pass the Return-Path via sendmail's -f command.
+ '-f ' . $message['Return-Path']
+ );
+ }
+ else {
+ // The optional $additional_parameters argument to mail() is not allowed
+ // if safe_mode is enabled. Passing any value throws a PHP warning and
+ // makes mail() return FALSE.
+ $mail_result = mail(
+ $message['to'],
+ $mail_subject,
+ $mail_body,
+ $mail_headers
+ );
+ }
+ return $mail_result;
+ }
+}
@@ -42,7 +42,7 @@ function messaging_sendgrid_messaging($op, $type = NULL) {
'title' => t('Sendgrid mail'),
'class' => 'Messaging_Sendgrid_Method',
'name' => t('Mail'),
- 'description' => t('Get messages as plain text e-mail.'),
+ 'description' => t('Get messages as e-mail.'),
);
return $info;
}

0 comments on commit d5807d9

Please sign in to comment.