Ticket #4642: 4642.5.diff

wp-includes/pluggable.php

@@ -107 +107 @@
 }
 endif;
 
-if ( !function_exists('get_userdatabylogin') ) :
-function get_userdatabylogin($user_login) {
+if ( !function_exists('get_user_by') ) :
+function get_user_by($field, $value, $output = OBJECT, $filter = 'raw') {
         global $wpdb;
-        $user_login = sanitize_user( $user_login );
+        $user_ID = false;
+        if ( 'login' == $field ) {
+                $field = 'user_login';
+                $value = sanitize_user( $value );
+                if ( empty($value) )
+                        return false;
+                $user_ID = wp_cache_get($value, 'userlogins');
+        } else if ( 'email' == $field ) {
+                $field = 'user_email';
+                $value = sanitize_email( $value );
+                if ( empty($value) || !is_email( $value ) )
+                        return false;
+        } else {
+                $field = 'ID';
+                $value = (int) $value;
+        }
 
-        if ( empty( $user_login ) )
-                return false;
+        if ( !$user_ID ) {
+                $user_ID = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->users WHERE $field = %s LIMIT 1", $value));
+                if ( !$user_ID )
+                        return false;
+        }
 
-        $user_id = wp_cache_get($user_login, 'userlogins');
-        $userdata = wp_cache_get($user_id, 'users');
+        if ( $output == OBJECT ) {
+                return $user_ID;
+        } elseif ( $output == ARRAY_A ) {
+                return get_object_vars($user_ID);
+        } elseif ( $output == ARRAY_N ) {
+                return array_values(get_object_vars($user_ID));
+        } else {
+                return $user_ID;
+        }
+}
+endif;
 
-        if ( $userdata )
-                return $userdata;
-
-        if ( !$user_ID = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_login = %s", $user_login)) )
+if ( !function_exists('get_userdatabylogin') ) :
+function get_userdatabylogin($user_login) {
+        $user_ID = get_user_by('login',$user_login);
+        if ( !$user_ID )
                 return false;
 
-        $user = get_userdata($user_ID);
+        $user = wp_cache_get($user_ID, 'users');
+        if ( !$user )
+                $user = get_userdata($user_ID);
+
         return $user;
 }
 endif;

wp-mail.php

@@ -27 +27 @@
         $content_transfer_encoding = '';
         $boundary = '';
         $bodysignal = 0;
+        $post_author = 1;
+        $author_found = false;
         $dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
         foreach ($message as $line) :
                 if (strlen($line) < 3) $bodysignal = 1;
@@ -70 +72 @@
                                 $author = sanitize_email($author);
                                 if ( is_email($author) ) {
                                         echo "Author = {$author} <p>";
-                                        $author = $wpdb->escape($author);
-                                        $result = $wpdb->get_row("SELECT ID FROM $wpdb->users WHERE user_email='$author' LIMIT 1");
-                                        if (!$result)
+                                        $user_ID = get_user_by('email',$author);
+                                        if (!$user_ID) {
                                                 $post_author = 1;
-                                        else
-                                                $post_author = $result->ID;
-                                } else
+                                                $author_found = false;
+                                        } else {
+                                                $post_author = $user_ID;
+                                                $author_found = true;
+                                        }
+                                } else {
                                         $post_author = 1;
+                                        $author_found = false;
+                                }
                         }
 
                         if (preg_match('/Date: /i', $line)) { // of the form '20 Mar 2002 20:32:37'
@@ -111 +117 @@
                 }
         endforeach;
 
+        // Set $post_status based on $author_found and on author's publish_posts capability
+        if ($author_found) {
+                $user = new WP_User($post_author);
+                if ($user->has_cap('publish_posts'))
+                        $post_status = 'publish';
+                else
+                        $post_status = 'pending';
+        } else {
+                // Author not found in DB, set status to pending.  Author already set to admin.
+                $post_status = 'pending';
+        }
+
         $subject = trim($subject);
 
         if ($content_type == 'multipart/alternative') {
@@ -144 +162 @@
 
         $post_category = $post_categories;
 
-        // or maybe we should leave the choice to email drafts? propose a way
-        $post_status = 'publish';
-
         $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);