makes UserMailer::send() a bit simpler

[lhc/web/wiklou.git] / includes / UserMailer.php

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 91eaab7..0798c32 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -106,14 +106,15 @@ class UserMailer {
         * @param $subject String: email's subject.
         * @param $body String: email's text.
         * @param $replyto MailAddress: optional reply-to email (default: null).
-        * @param $contentType String: optional custom Content-Type
+        * @param $contentType String: optional custom Content-Type (default: text/plain; charset=UTF-8)
         * @return Status object
         */
-       public static function send( $to, $from, $subject, $body, $replyto = null, $contentType = null ) {
-               global $wgSMTP, $wgOutputEncoding, $wgEnotifImpersonal;
+       public static function send( $to, $from, $subject, $body, $replyto = null, $contentType = 'text/plain; charset=UTF-8') {
+               global $wgSMTP, $wgEnotifImpersonal;
                global $wgEnotifMaxRecips, $wgAdditionalMailParams;
 
                if ( is_array( $to ) ) {
+                       $emails = '';
                        // This wouldn't be necessary if implode() worked on arrays of
                        // objects using __toString(). http://bugs.php.net/bug.php?id=36612
                        foreach ( $to as $t ) {
@@ -126,13 +127,10 @@ class UserMailer {
                }
 
                if ( is_array( $wgSMTP ) ) {
-                       $found = false;
-                       $pathArray = explode( PATH_SEPARATOR, get_include_path() );
-                       foreach ( $pathArray as $path ) {
-                               if ( file_exists( $path . DIRECTORY_SEPARATOR . 'Mail.php' ) ) {
-                                       $found = true;
-                                       break;
-                               }
+                       if ( function_exists( 'stream_resolve_include_path' ) ) {
+                               $found = stream_resolve_include_path( 'Mail.php' );
+                       } else {
+                               $found = Fallback::stream_resolve_include_path( 'Mail.php' );
                        }
                        if ( !$found ) {
                                throw new MWException( 'PEAR mail package is not installed' );
@@ -166,9 +164,10 @@ class UserMailer {
                        $headers['Date'] = date( 'r' );
                        $headers['MIME-Version'] = '1.0';
                        $headers['Content-type'] = ( is_null( $contentType ) ?
-                                       'text/plain; charset=' . $wgOutputEncoding : $contentType );
+                                       'text/plain; charset=UTF-8' : $contentType );
                        $headers['Content-transfer-encoding'] = '8bit';
-                       $headers['Message-ID'] = "<$msgid@" . $wgSMTP['IDHost'] . '>'; // FIXME
+                       // @todo FIXME
+                       $headers['Message-ID'] = "<$msgid@" . $wgSMTP['IDHost'] . '>';
                        $headers['X-Mailer'] = 'MediaWiki mailer';
 
                        wfSuppressWarnings();
@@ -193,9 +192,6 @@ class UserMailer {
                        wfRestoreWarnings();
                        return Status::newGood();
                } else  {
-                       # In the following $headers = expression we removed "Reply-To: {$from}\r\n" , because it is treated differently
-                       # (fifth parameter of the PHP mail function, see some lines below)
-
                        # Line endings need to be different on Unix and Windows due to
                        # the bug described at http://trac.wordpress.org/ticket/2603
                        if ( wfIsWindows() ) {
@@ -204,18 +200,20 @@ class UserMailer {
                        } else {
                                $endl = "\n";
                        }
-                       $ctype = ( is_null( $contentType ) ?
-                                       'text/plain; charset=' . $wgOutputEncoding : $contentType );
-                       $headers =
-                               "MIME-Version: 1.0$endl" .
-                               "Content-type: $ctype$endl" .
-                               "Content-Transfer-Encoding: 8bit$endl" .
-                               "X-Mailer: MediaWiki mailer$endl" .
-                               'From: ' . $from->toString();
+
+                       $headers = array(
+                               "MIME-Version: 1.0",
+                               "Content-type: $contentType", 
+                               "Content-Transfer-Encoding: 8bit",
+                               "X-Mailer: MediaWiki mailer",
+                               "From: " . $from->toString(),
+                       );
                        if ( $replyto ) {
-                               $headers .= "{$endl}Reply-To: " . $replyto->toString();
+                               $headers[] = "Reply-To: " . $replyto->toString();
                        }
 
+                       $headers = implode( $endl, $headers );
+
                        wfDebug( "Sending mail via internal mail() function\n" );
 
                        self::$mErrorString = '';
@@ -223,12 +221,19 @@ class UserMailer {
                        ini_set( 'html_errors', '0' );
                        set_error_handler( array( 'UserMailer', 'errorHandler' ) );
 
-                       if ( is_array( $to ) ) {
-                               foreach ( $to as $recip ) {
+                       // We need to check for safe_mode, because mail() throws an E_NOTICE
+                       // on the 5th parameter when it's turned on
+                       $sm = wfIniGetBool( 'safe_mode' );
+
+                       if ( !is_array( $to ) ) {
+                               $to = array( $to );
+                       }
+                       foreach ( $to as $recip ) {
+                               if( $sm ) {
+                                       $sent = mail( $recip->toString(), self::quotedPrintable( $subject ), $body, $headers );
+                               } else {
                                        $sent = mail( $recip->toString(), self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams );
                                }
-                       } else {
-                               $sent = mail( $to->toString(), self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams );
                        }
 
                        restore_error_handler();
@@ -272,8 +277,7 @@ class UserMailer {
        public static function quotedPrintable( $string, $charset = '' ) {
                # Probably incomplete; see RFC 2045
                if( empty( $charset ) ) {
-                       global $wgInputEncoding;
-                       $charset = $wgInputEncoding;
+                       $charset = 'UTF-8';
                }
                $charset = strtoupper( $charset );
                $charset = str_replace( 'ISO-8859', 'ISO8859', $charset ); // ?
@@ -284,10 +288,15 @@ class UserMailer {
                        return $string;
                }
                $out = "=?$charset?Q?";
-               $out .= preg_replace( "/([$replace])/e", 'sprintf("=%02X",ord("$1"))', $string );
+               $out .= preg_replace_callback( "/([$replace])/", 
+                       array( __CLASS__, 'quotedPrintableCallback' ), $string );
                $out .= '?=';
                return $out;
        }
+
+       protected static function quotedPrintableCallback( $matches ) {
+               return sprintf( "=%02X", ord( $matches[1] ) );
+       }
 }
 
 /**
@@ -651,23 +660,3 @@ class EmailNotification {
        }
 
 } # end of class EmailNotification
-
-/**@{
- * Backwards compatibility functions
- *
- * @deprecated Use UserMailer method deprecated in 1.18, remove in 1.19.
- */
-function wfRFC822Phrase( $s ) {
-       wfDeprecated( __FUNCTION__ );
-       return UserMailer::rfc822Phrase( $s );
-}
-
-/**
- * @deprecated Use UserMailer method deprecated in 1.18, remove in 1.19.
- */
-function userMailer( $to, $from, $subject, $body, $replyto = null ) {
-       wfDeprecated( __FUNCTION__ );
-       return UserMailer::send( $to, $from, $subject, $body, $replyto );
-}
-
-/**@}*/