Wordpress 3.2

[autoinstalls/wordpress.git] / wp-includes / pluggable.php

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 9bf35d70b4244b4a8697d27e5d0ca514aeede7be..3001433b82d1b8d634e23e021cc0d30cd28816cc 100644 (file)
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -281,7 +281,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
        if ( !is_object( $phpmailer ) || !is_a( $phpmailer, 'PHPMailer' ) ) {
                require_once ABSPATH . WPINC . '/class-phpmailer.php';
                require_once ABSPATH . WPINC . '/class-smtp.php';
-               $phpmailer = new PHPMailer();
+               $phpmailer = new PHPMailer( true );
        }
 
        // Headers
@@ -296,6 +296,8 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
                        $tempheaders = $headers;
                }
                $headers = array();
+               $cc = array();
+               $bcc = array();
 
                // If it's actually got contents
                if ( !empty( $tempheaders ) ) {
@@ -400,7 +402,19 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
                $to = explode( ',', $to );
 
        foreach ( (array) $to as $recipient ) {
-               $phpmailer->AddAddress( trim( $recipient ) );
+               try {
+                       // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
+                       $recipient_name = '';
+                       if( preg_match( '/(.+)\s?<(.+)>/', $recipient, $matches ) ) {
+                               if ( count( $matches ) == 3 ) {
+                                       $recipient_name = $matches[1];
+                                       $recipient = $matches[2];
+                               }
+                       }
+                       $phpmailer->AddAddress( trim( $recipient ), $recipient_name);
+               } catch ( phpmailerException $e ) {
+                       continue;
+               }
        }
 
        // Set mail's subject and body
@@ -410,13 +424,37 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
        // Add any CC and BCC recipients
        if ( !empty( $cc ) ) {
                foreach ( (array) $cc as $recipient ) {
-                       $phpmailer->AddCc( trim($recipient) );
+                       try {
+                               // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
+                               $recipient_name = '';
+                               if( preg_match( '/(.+)\s?<(.+)>/', $recipient, $matches ) ) {
+                                       if ( count( $matches ) == 3 ) {
+                                               $recipient_name = $matches[1];
+                                               $recipient = $matches[2];
+                                       }
+                               }
+                               $phpmailer->AddCc( trim($recipient), $recipient_name );
+                       } catch ( phpmailerException $e ) {
+                               continue;
+                       }
                }
        }
 
        if ( !empty( $bcc ) ) {
                foreach ( (array) $bcc as $recipient) {
-                       $phpmailer->AddBcc( trim($recipient) );
+                       try {
+                               // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
+                               $recipient_name = '';
+                               if( preg_match( '/(.+)\s?<(.+)>/', $recipient, $matches ) ) {
+                                       if ( count( $matches ) == 3 ) {
+                                               $recipient_name = $matches[1];
+                                               $recipient = $matches[2];
+                                       }
+                               }
+                               $phpmailer->AddBcc( trim($recipient), $recipient_name );
+                       } catch ( phpmailerException $e ) {
+                               continue;
+                       }
                }
        }
 
@@ -455,16 +493,24 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 
        if ( !empty( $attachments ) ) {
                foreach ( $attachments as $attachment ) {
-                       $phpmailer->AddAttachment($attachment);
+                       try {
+                               $phpmailer->AddAttachment($attachment);
+                       } catch ( phpmailerException $e ) {
+                               continue;
+                       }
                }
        }
 
        do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) );
 
        // Send!
-       $result = @$phpmailer->Send();
+       try {
+               $phpmailer->Send();
+       } catch ( phpmailerException $e ) {
+               return false;
+       }
 
-       return $result;
+       return true;
 }
 endif;
 
@@ -688,23 +734,11 @@ function wp_set_auth_cookie($user_id, $remember = false, $secure = '') {
        do_action('set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme);
        do_action('set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in');
 
-       // Set httponly if the php version is >= 5.2.0
-       if ( version_compare(phpversion(), '5.2.0', 'ge') ) {
-               setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
-               setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
-               setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-               if ( COOKIEPATH != SITECOOKIEPATH )
-                       setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-       } else {
-               $cookie_domain = COOKIE_DOMAIN;
-               if ( !empty($cookie_domain) )
-                       $cookie_domain .= '; HttpOnly';
-               setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, $cookie_domain, $secure);
-               setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, $cookie_domain, $secure);
-               setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, $cookie_domain, $secure_logged_in_cookie);
-               if ( COOKIEPATH != SITECOOKIEPATH )
-                       setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, $cookie_domain, $secure_logged_in_cookie);
-       }
+       setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
+       setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
+       setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
+       if ( COOKIEPATH != SITECOOKIEPATH )
+               setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
 }
 endif;
 
@@ -832,6 +866,9 @@ if ( !function_exists('check_admin_referer') ) :
  * @param string $query_arg where to look for nonce in $_REQUEST (since 2.5)
  */
 function check_admin_referer($action = -1, $query_arg = '_wpnonce') {
+       if ( -1 == $action )
+               _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2' );
+
        $adminurl = strtolower(admin_url());
        $referer = strtolower(wp_get_referer());
        $result = isset($_REQUEST[$query_arg]) ? wp_verify_nonce($_REQUEST[$query_arg], $action) : false;