- Patch #331180 by sun: rename file to be more consistent with other files.

1 files changed, 0 insertions, 83 deletions

diff --git a/modules/system/mail.sending.inc b/modules/system/mail.sending.inc
deleted file mode 100644
index f80b6953c..000000000
--- a/modules/system/mail.sending.inc
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-// $Id$
-
-/**
- * @file
- * Drupal core implementations of MailSystemInterface.
- */
-
-/**
- * The default Drupal mail backend using PHP's mail function.
- */
-class DefaultMailSystem implements MailSystemInterface {
-  /**
-   * 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) {
-    $mimeheaders = array();
-    foreach ($message['headers'] as $name => $value) {
-      $mimeheaders[] = $name . ': ' . mime_header_encode($value);
-    }
-    $line_endings = variable_get('mail_line_endings', MAIL_LINE_ENDINGS);
-    return mail(
-      $message['to'],
-      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.
-      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.
-      join("\n", $mimeheaders)
-    );
-  }
-}
-
-/**
- * A mail sending implementation that captures sent messages to a variable.
- *
- * This class is for running tests or for development.
- */
-class TestingMailSystem extends DefaultMailSystem implements MailSystemInterface {
-  /**
-   * Accept an e-mail message and store it in a variable.
-   *
-   * @param $message
-   *   An e-mail message.
-   */
-  public function mail(array $message) {
-    $captured_emails = variable_get('drupal_test_email_collector', array());
-    $captured_emails[] = $message;
-    variable_set('drupal_test_email_collector', $captured_emails);
-    return TRUE;
-  }
-}
-