Changeset 11807 for trunk/wp-admin/edit.php

Timestamp:

08/12/2009 10:57:15 AM (17 years ago)

Author:

azaozz

Message:

Fix bulk edit, some cleanup and message fixes for moving in/out of the trash, see #4529

File:

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

trunk/wp-admin/edit.php

@@ -22 +22 @@
 
 // Handle bulk actions
-if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
+if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) || isset($_GET['bulk_edit']) ) {
     check_admin_referer('bulk-posts');
-    
+    $sendback = wp_get_referer();
+
+    if ( strpos($sendback, 'post.php') !== false )
+        $sendback = admin_url('post-new.php');
+
     if ( isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
-        $post_status = $wpdb->escape($_GET['post_status']);
-        $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='post' AND post_status = '$post_status'" );
+        $post_status = preg_replace('/[^a-z0-9_-]+/i', '', $_GET['post_status']);
+        $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='post' AND post_status = %s", $post_status ) );
         $doaction = 'delete';
-    } elseif (($_GET['action'] != -1 || $_GET['action2'] != -1) && isset($_GET['post'])) {
-        $post_ids = $_GET['post'];
+    } elseif ( ($_GET['action'] != -1 || $_GET['action2'] != -1) && isset($_GET['post']) ) {
+        $post_ids = array_map( 'intval', (array) $_GET['post'] );
         $doaction = ($_GET['action'] != -1) ? $_GET['action'] : $_GET['action2'];
-    } else wp_redirect($_SERVER['HTTP_REFERER']);
-    
+    } else {
+        wp_redirect( admin_url('edit.php') );
+    }
+
     switch ( $doaction ) {
         case 'trash':
             $trashed = 0;
             foreach( (array) $post_ids as $post_id ) {
-                $post_del = & get_post($post_id);
-
-                if ( !current_user_can('delete_post', $post_id_del) )
+                if ( !current_user_can('delete_post', $post_id) )
                     wp_die( __('You are not allowed to move this post to the trash.') );
 
@@ -48 +52 @@
                 $trashed++;
             }
+            $sendback = add_query_arg('trashed', $trashed, $sendback);
             break;
         case 'untrash':
             $untrashed = 0;
             foreach( (array) $post_ids as $post_id ) {
-                $post_del = & get_post($post_id);
-
-                if ( !current_user_can('delete_post', $post_id_del) )
-                    wp_die( __('You are not allowed to remove this post from the trash.') );
+                if ( !current_user_can('delete_post', $post_id) )
+                    wp_die( __('You are not allowed to restore this post from the trash.') );
 
                 if ( !wp_untrash_post($post_id) )
-                    wp_die( __('Error in removing from trash...') );
+                    wp_die( __('Error in restoring from trash...') );
                 
                 $untrashed++;
             }
+            $sendback = add_query_arg('untrashed', $untrashed, $sendback);
             break;
         case 'delete':
             $deleted = 0;
-            foreach( (array) $post_ids as $post_id_del ) {
-                $post_del = & get_post($post_id_del);
-
-                if ( !current_user_can('delete_post', $post_id_del) )
+            foreach( (array) $post_ids as $post_id ) {
+                $post_del = & get_post($post_id);
+
+                if ( !current_user_can('delete_post', $post_id) )
                     wp_die( __('You are not allowed to delete this post.') );
 
                 if ( $post_del->post_type == 'attachment' ) {
-                    if ( ! wp_delete_attachment($post_id_del) )
+                    if ( ! wp_delete_attachment($post_id) )
                         wp_die( __('Error in deleting...') );
                 } else {
-                    if ( !wp_delete_post($post_id_del) )
+                    if ( !wp_delete_post($post_id) )
                         wp_die( __('Error in deleting...') );
                 }
                 $deleted++;
             }
+            $sendback = add_query_arg('deleted', $deleted, $sendback);
             break;
         case 'edit':
-            if ( -1 == $_GET['_status'] ) {
-                $_GET['post_status'] = null;
-                unset($_GET['_status'], $_GET['post_status']);
-            } else {
-                $_GET['post_status'] = $_GET['_status'];
+            $done = bulk_edit_posts($_GET);
+
+            if ( is_array($done) ) {
+                $done['updated'] = count( $done['updated'] );
+                $done['skipped'] = count( $done['skipped'] );
+                $done['locked'] = count( $done['locked'] );
+                $sendback = add_query_arg( $done, $sendback );
             }
-
-            $done = bulk_edit_posts($_GET);
             break;
     }
 
-    $sendback = wp_get_referer();
-    if ( strpos($sendback, 'post.php') !== false ) $sendback = admin_url('post-new.php');
-    elseif ( strpos($sendback, 'attachments.php') !== false ) $sendback = admin_url('attachments.php');
-    if ( isset($done) ) {
-        $done['updated'] = count( $done['updated'] );
-        $done['skipped'] = count( $done['skipped'] );
-        $done['locked'] = count( $done['locked'] );
-        $sendback = add_query_arg( $done, $sendback );
-    }
-    if ( isset($deleted) )
-        $sendback = add_query_arg('deleted', $deleted, $sendback);
-    elseif ( isset($trashed) )
-        $sendback = add_query_arg('trashed', $trashed, $sendback);
-    elseif ( isset($untrashed) )
-        $sendback = add_query_arg('untrashed', $untrashed, $sendback);
+    if ( isset($_GET['action']) )
+        $sendback = remove_query_arg( array('action', 'action2', 'cat', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status',  'post', 'bulk_edit', 'post_view', 'post_type'), $sendback );
+
     wp_redirect($sendback);
     exit();
@@ -180 +173 @@
 <?php } ?>
 
-<form id="posts-filter" action="" method="get">
+<form id="posts-filter" action="<?php echo admin_url('edit.php'); ?>" method="get">
 
 <ul class="subsubsub">