Changeset 6349

Timestamp:

11/29/2007 05:51:09 AM (19 years ago)

Author:

ryan

Message:

When posting by email, publish only if user has publish caps, otherwise set status to pending. Props Bobcat. fixes #4642

File:

• trunk/wp-mail.php (modified) (4 diffs)

trunk/wp-mail.php

@@ -28 +28 @@
         $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) :
@@ -71 +73 @@
                                 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)
+                                        $userdata = get_user_by_email($author);
+                                        if (!$userdata) {
                                                 $post_author = 1;
-                                        else
-                                                $post_author = $result->ID;
-                                } else
+                                                $author_found = false;
+                                        } else {
+                                                $post_author = $userdata->ID;
+                                                $author_found = true;
+                                        }
+                                } else {
                                         $post_author = 1;
+                                        $author_found = false;
+                                }
                         }
 
@@ -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);
@@ -145 +163 @@
         $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);