Changeset 5668

Timestamp:

06/08/2007 02:27:44 PM (17 years ago)

Author:

rob1n

Message:

Revert [5639] for 2.2 branch, it's causing problems. see #4296

File:

• branches/2.2/wp-includes/pluggable.php (modified) (1 diff)

branches/2.2/wp-includes/pluggable.php

@@ -158 +158 @@
 
 if ( !function_exists( 'wp_mail' ) ) :
-function wp_mail( $to, $subject, $message, $headers = '' ) {
+function wp_mail($to, $subject, $message, $headers = '') {
     global $phpmailer;
-    
-    // (Re)create it, if it's gone missing
-    if ( !is_object( $phpmailer ) || !is_a( $phpmailer, 'PHPMailer' ) ) {
-        require_once ABSPATH . WPINC . '/class-phpmailer.php';
-        require_once ABSPATH . WPINC . '/class-smtp.php';
+
+    if ( !is_object( $phpmailer ) ) {
+        require_once(ABSPATH . WPINC . '/class-phpmailer.php');
+        require_once(ABSPATH . WPINC . '/class-smtp.php');
         $phpmailer = new PHPMailer();
     }
-    
-    // Compact the input, apply the filters, and extract them back out
-    extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers' ) ) );
-    
-    // Default headers
-    if ( empty( $headers ) ) {
-        $headers = array(
-            'MIME-Version' => '1.0'
-        );
-    } elseif ( !is_array( $headers ) ) {
-        // Explode the headers out, so this function can take both 
-        // string headers and an array of headers.
-        $tempheaders = (array) explode( "\n", $headers );
-        $headers = array();
-        
-        // If it's actually got contents
-        if ( !empty( $tempheaders ) ) {
-            // Iterate through the raw headers
-            foreach ( $tempheaders as $header ) {
-                // Explode them out
-                list( $name, $content ) = explode( ':', trim( $header ), 2 );
-                
-                // Cleanup crew
-                $name = trim( $name );
-                $content = trim( $content );
-                
-                // Mainly for legacy -- process a From: header if it's there
-                if ( $name == 'From' ) {
-                    if ( strpos( '<', $content ) !== false ) {
-                        // So... making my life hard again?
-                        $from_name = substr( $content, 0, strpos( '<', $content ) - 1 );
-                        $from_name = str_replace( '"', '', $from_name );
-                        $from_name = trim( $from_name );
-                        
-                        $from_email = substr( $content, strpos( '<', $content ) + 1 );
-                        $from_email = str_replace( '>', '', $from_email );
-                        $from_email = trim( $from_email );
-                    } else {
-                        $from_name = trim( $content );
-                    }
-                } elseif ( $name == 'Content-Type' ) {
-                    if ( strpos( ';', $content ) !== false ) {
-                        list( $type, $charset ) = explode( ';', $content );
-                        $content_type = trim( $content_type );
-                        $charset = trim( str_replace( array( 'charset=', '"' ), '', $charset ) );
-                    } else {
-                        $content_type = trim( $content );
-                    }
+
+    $mail = compact('to', 'subject', 'message', 'headers');
+    $mail = apply_filters('wp_mail', $mail);
+    extract($mail);
+
+    if ( $headers == '' ) {
+        $headers = "MIME-Version: 1.0\n" .
+            "From: " . apply_filters('wp_mail_from', "wordpress@" . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']))) . "\n" . 
+            "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+    }
+
+    $phpmailer->ClearAddresses();
+    $phpmailer->ClearCCs();
+    $phpmailer->ClearBCCs();
+    $phpmailer->ClearReplyTos();
+    $phpmailer->ClearAllRecipients();
+    $phpmailer->ClearCustomHeaders();
+
+    $phpmailer->FromName = "WordPress";
+    $phpmailer->AddAddress("$to", "");
+    $phpmailer->Subject = $subject;
+    $phpmailer->Body    = $message;
+    $phpmailer->IsHTML(false);
+    $phpmailer->IsMail(); // set mailer to use php mail()
+
+    do_action_ref_array('phpmailer_init', array(&$phpmailer));
+
+    $mailheaders = (array) explode( "\n", $headers );
+    foreach ( $mailheaders as $line ) {
+        $header = explode( ":", $line );
+        switch ( trim( $header[0] ) ) {
+            case "From":
+                $from = trim( str_replace( '"', '', $header[1] ) );
+                if ( strpos( $from, '<' ) ) {
+                    $phpmailer->FromName = str_replace( '"', '', substr( $header[1], 0, strpos( $header[1], '<' ) - 1 ) );
+                    $from = trim( substr( $from, strpos( $from, '<' ) + 1 ) );
+                    $from = str_replace( '>', '', $from );
                 } else {
-                    // Add it to our grand headers array
-                    $headers[trim( $name )] = trim( $content );
+                    $phpmailer->FromName = $from;
                 }
-            }
+                $phpmailer->From = trim( $from );
+                break;
+            default:
+                if ( $line != '' && $header[0] != 'MIME-Version' && $header[0] != 'Content-Type' )
+                    $phpmailer->AddCustomHeader( $line );
+                break;
         }
     }
-    
-    // Empty out the values that may be set
-    $phpmailer->ClearAddresses();
-    $phpmailer->ClearAllRecipients();
-    $phpmailer->ClearAttachments();
-    $phpmailer->ClearBCCs();
-    $phpmailer->ClearCCs();
-    $phpmailer->ClearCustomHeaders();
-    $phpmailer->ClearReplyTos();
-    
-    // From email and name
-    // If we don't have a name from the input headers
-    if ( !isset( $from_name ) ) {
-        $from_name = 'WordPress';
-    }
-    
-    // If we don't have an email from the input headers
-    if ( !isset( $from_email ) ) {
-        // Get the site domain and get rid of www.
-        $sitename = strtolower( $_SERVER['SERVER_NAME'] );
-        if ( substr( $sitename, 0, 4 ) == 'www.' ) {
-            $sitename = substr( $sitename, 4 );
-        }
-        
-        $from_email = 'wordpress@' . $sitename;
-    }
-    
-    // Set the from name and email
-    $phpmailer->From = apply_filters( 'wp_mail_from', $from_email );
-    $phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name );
-    
-    // Set destination address
-    $phpmailer->AddAddress( $to );
-    
-    // Set mail's subject and body
-    $phpmailer->Subject = $subject;
-    $phpmailer->Body = $message;
-    
-    // Set to use PHP's mail()
-    $phpmailer->IsMail();
-    
-    // Set Content-Type and charset
-    // If we don't have a content-type from the input headers
-    if ( !isset( $content_type ) ) {
-        $content_type = 'text/plain';
-    }
-    
-    // Set whether it's plaintext or not, depending on $content_type
-    if ( $content_type == 'text/html' ) {
-        $phpmailer->IsHTML( true );
-    } else {
-        $phpmailer->IsHTML( false );
-    }
-    
-    // If we don't have a charset from the input headers
-    if ( !isset( $charset ) ) {
-        $charset = get_bloginfo( 'charset' );
-    }
-    
-    // Set the content-type and charset
-    $phpmailer->ContentType = apply_filters( 'wp_mail_content_type', 'text/plain' );
-    $phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset );
-    
-    // Set custom headers
-    if ( !empty( $headers ) ) {
-        foreach ( $headers as $name => $content ) {
-            $phpmailer->AddCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
-        }
-    }
-    
-    do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) );
-    
-    // Send!
+
     $result = @$phpmailer->Send();
-    
+
     return $result;
 }