WordPress 3.6.1-scripts

[autoinstalls/wordpress.git] / wp-mail.php

diff --git a/wp-mail.php b/wp-mail.php
index cbc47315907c6b0b323a033f1fdd9d19d6921c46..27290b11151fcd2429aa9418cc306c56a0d7bf3f 100644 (file)
--- a/wp-mail.php
+++ b/wp-mail.php
@@ -10,6 +10,9 @@
 /** Make sure that the WordPress bootstrap has run before continuing. */
 require(dirname(__FILE__) . '/wp-load.php');
 
+if ( ! apply_filters( 'enable_post_by_email_configuration', true ) )
+       wp_die( __( 'This action has been disabled by the administrator.' ) );
+
 /** Allow a plugin to do a complete takeover of Post by Email **/
 do_action('wp-mail.php');
 
@@ -27,18 +30,23 @@ if ( $last_checked )
 
 set_transient('mailserver_last_checked', true, WP_MAIL_INTERVAL);
 
-$time_difference = get_option('gmt_offset') * 3600;
+$time_difference = get_option('gmt_offset') * HOUR_IN_SECONDS;
 
 $phone_delim = '::';
 
 $pop3 = new POP3();
-$count = 0;
 
-if ( ! $pop3->connect(get_option('mailserver_url'), get_option('mailserver_port') ) ||
-       ! $pop3->user(get_option('mailserver_login')) ||
-       ( ! $count = $pop3->pass(get_option('mailserver_pass')) ) ) {
-               $pop3->quit();
-               wp_die( ( 0 === $count ) ? __('There doesn’t seem to be any new mail.') : esc_html($pop3->ERROR) );
+if ( !$pop3->connect( get_option('mailserver_url'), get_option('mailserver_port') ) || !$pop3->user( get_option('mailserver_login') ) )
+       wp_die( esc_html( $pop3->ERROR ) );
+
+$count = $pop3->pass( get_option('mailserver_pass') );
+
+if( false === $count )
+       wp_die( esc_html( $pop3->ERROR ) );
+
+if( 0 === $count ) {
+       $pop3->quit();
+       wp_die( __('There doesn’t seem to be any new mail.') );
 }
 
 for ( $i = 1; $i <= $count; $i++ ) {
@@ -97,7 +105,7 @@ for ( $i = 1; $i <= $count; $i++ ) {
 
                        // Set the author using the email address (From or Reply-To, the last used)
                        // otherwise use the site admin
-                       if ( preg_match('/(From|Reply-To): /', $line) )  {
+                       if ( ! $author_found && preg_match( '/^(From|Reply-To): /', $line ) ) {
                                if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) )
                                        $author = $matches[0];
                                else
@@ -105,15 +113,11 @@ for ( $i = 1; $i <= $count; $i++ ) {
                                $author = sanitize_email($author);
                                if ( is_email($author) ) {
                                        echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
-                                       $userdata = get_user_by_email($author);
-                                       if ( empty($userdata) ) {
-                                               $author_found = false;
-                                       } else {
+                                       $userdata = get_user_by('email', $author);
+                                       if ( ! empty( $userdata ) ) {
                                                $post_author = $userdata->ID;
                                                $author_found = true;
                                        }
-                               } else {
-                                       $author_found = false;
                                }
                        }
 
@@ -153,7 +157,7 @@ for ( $i = 1; $i <= $count; $i++ ) {
                $user = new WP_User($post_author);
                $post_status = ( $user->has_cap('publish_posts') ) ? 'publish' : 'pending';
        } else {
-               // Author not found in DB, set status to pending.  Author already set to admin.
+               // Author not found in DB, set status to pending. Author already set to admin.
                $post_status = 'pending';
        }
 
@@ -198,7 +202,7 @@ for ( $i = 1; $i <= $count; $i++ ) {
        $post_category = array(get_option('default_email_category'));
 
        $post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status');
-       $post_data = add_magic_quotes($post_data);
+       $post_data = wp_slash($post_data);
 
        $post_ID = wp_insert_post($post_data);
        if ( is_wp_error( $post_ID ) )
@@ -218,11 +222,9 @@ for ( $i = 1; $i <= $count; $i++ ) {
                $pop3->reset();
                exit;
        } else {
-               echo '<p>' . sprintf(__('Mission complete.  Message <strong>%s</strong> deleted.'), $i) . '</p>';
+               echo '<p>' . sprintf(__('Mission complete. Message <strong>%s</strong> deleted.'), $i) . '</p>';
        }
 
 }
 
 $pop3->quit();
-
-?>