Changeset 2176

Timestamp:

01/31/2005 07:00:25 PM (22 years ago)

Author:

michelvaldrighi

Message:

moving the pop3->delete call to the end of the loop so that emails are deleted if and only if a post is made successfully

File:

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

trunk/wp-mail.php

@@ -24 +24 @@
 
         $message = $pop3->get($i);
-
-        if(!$pop3->delete($i)) {
-                echo '<p>Oops '.$pop3->ERROR.'</p></div>';
-                $pop3->reset();
-                exit;
-        } else {
-                echo "<p>Mission complete, message <strong>$i</strong> deleted.</p>";
-        }
 
         $content = '';
@@ -145 +137 @@
         $post_ID = wp_insert_post($post_data);
 
+        if (!$post_ID) {
+                // we couldn't post, for whatever reason. better move forward to the next email
+                continue;
+        }
+
         do_action('publish_phone', $post_ID);
 
@@ -153 +150 @@
         if (!$post_categories) $post_categories[] = 1;
         foreach ($post_categories as $post_category) :
-        $post_category = intval($post_category);
+                $post_category = intval($post_category);
 
-        // Double check it's not there already
-        $exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_ID AND category_id = $post_category");
+                // Double check it's not there already
+                $exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_ID AND category_id = $post_category");
 
-         if (!$exists && $result) { 
-                $wpdb->query("
-                INSERT INTO $wpdb->post2cat
-                (post_id, category_id)
-                VALUES
-                ($post_ID, $post_category)
-                ");
+                if (!$exists && $result) { 
+                        $wpdb->query("
+                        INSERT INTO $wpdb->post2cat
+                        (post_id, category_id)
+                        VALUES
+                        ($post_ID, $post_category)
+                        ");
+                }
+        endforeach;
+
+        if(!$pop3->delete($i)) {
+                echo '<p>Oops '.$pop3->ERROR.'</p></div>';
+                $pop3->reset();
+                exit;
+        } else {
+                echo "<p>Mission complete, message <strong>$i</strong> deleted.</p>";
         }
-endforeach;
 
 endfor;