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

git-svn-id: http://svn.automattic.com/wordpress/trunk@2176 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
michelvaldrighi 2005-01-31 19:00:25 +00:00
parent dac4a93b38
commit 65950b5a8d
1 changed files with 24 additions and 19 deletions

View File

@ -24,14 +24,6 @@ for ($i=1; $i <= $count; $i++) :
$message = $pop3->get($i); $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 = ''; $content = '';
$content_type = ''; $content_type = '';
$boundary = ''; $boundary = '';
@ -144,6 +136,11 @@ for ($i=1; $i <= $count; $i++) :
$post_ID = wp_insert_post($post_data); $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); do_action('publish_phone', $post_ID);
echo "\n<p><b>Author:</b> $post_author</p>"; echo "\n<p><b>Author:</b> $post_author</p>";
@ -152,20 +149,28 @@ for ($i=1; $i <= $count; $i++) :
if (!$post_categories) $post_categories[] = 1; if (!$post_categories) $post_categories[] = 1;
foreach ($post_categories as $post_category) : foreach ($post_categories as $post_category) :
$post_category = intval($post_category); $post_category = intval($post_category);
// Double check it's not there already // 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"); $exists = $wpdb->get_row("SELECT * FROM $wpdb->post2cat WHERE post_id = $post_ID AND category_id = $post_category");
if (!$exists && $result) { if (!$exists && $result) {
$wpdb->query(" $wpdb->query("
INSERT INTO $wpdb->post2cat INSERT INTO $wpdb->post2cat
(post_id, category_id) (post_id, category_id)
VALUES VALUES
($post_ID, $post_category) ($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; endfor;