Changeset 10204 for trunk/wp-admin/admin-ajax.php

Timestamp:

12/14/2008 12:13:30 PM (18 years ago)

Author:

matt

Message:

Update pagination links on edit-comments when approving/deleting/etc. Hat tip: mdawaffe. Fixes #8584.

File:

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

trunk/wp-admin/admin-ajax.php

@@ -64 +64 @@
 endif;
 
+/**
+ * Sends back current comment total and new page links if they need to be updated.
+ *
+ * Contrary to normal success AJAX response ("1"), die with time() on success.
+ *
+ * @since 2.7
+ *
+ * @param int $comment_id
+ * @return die
+ */
+function _wp_ajax_delete_comment_response( $comment_id ) {
+        $total = (int) @$_POST['_total'];
+        $per_page = (int) @$_POST['_per_page'];
+        $page = (int) @$_POST['_page'];
+        $url = clean_url( @$_POST['_url'], null, 'url' );
+        // JS didn't send us everything we need to know.  Just die with success message
+        if ( !$total || !$per_page || !$page || !$url )
+                die( (string) time() );
+
+        if ( --$total < 0 ) // Take the total from POST and decrement it (since we just deleted one)
+                $total = 0;
+
+        if ( 0 != $total % $per_page && 1 != mt_rand( 1, $per_page ) ) // Only do the expensive stuff on a page-break, and about 1 other time per page
+                die( (string) time() );
+
+        $status = 'total_comments'; // What type of comment count are we looking for?
+        $parsed = parse_url( $url );
+        if ( isset( $parsed['query'] ) ) {
+                parse_str( $parsed['query'], $query_vars );
+                if ( !empty( $query_vars['comment_status'] ) )
+                        $status = $query_vars['comment_status'];
+        }
+
+        $comment_count = wp_count_comments();
+        $time = time(); // The time since the last comment count
+
+        if ( isset( $comment_count->$status ) ) // We're looking for a known type of comment count
+                $total = $comment_count->$status;
+        // else use the decremented value from above
+
+        $page_links = paginate_links( array(
+                'base' => add_query_arg( 'apage', '%#%', $url ),
+                'format' => '',
+                'prev_text' => __('&laquo;'),
+                'next_text' => __('&raquo;'),
+                'total' => ceil($total / $per_page),
+                'current' => $page
+        ) );
+        $x = new WP_Ajax_Response( array(
+                'what' => 'comment',
+                'id' => $comment_id, // here for completeness - not used
+                'supplemental' => array(
+                        'pageLinks' => $page_links,
+                        'total' => $total,
+                        'time' => $time
+                )
+        ) );
+        $x->send();
+}
+
 $id = isset($_POST['id'])? (int) $_POST['id'] : 0;
 switch ( $action = $_POST['action'] ) :
-case 'delete-comment' :
+case 'delete-comment' : // On success, die with time() instead of 1
         check_ajax_referer( "delete-comment_$id" );
         if ( !$comment = get_comment( $id ) )
-                die('1');
+                die( (string) time() );
         if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
                 die('-1');
@@ -75 +135 @@
         if ( isset($_POST['spam']) && 1 == $_POST['spam'] ) {
                 if ( 'spam' == wp_get_comment_status( $comment->comment_ID ) )
-                        die('1');
+                        die( (string) time() );
                 $r = wp_set_comment_status( $comment->comment_ID, 'spam' );
         } else {
                 $r = wp_delete_comment( $comment->comment_ID );
         }
-
-        die( $r ? '1' : '0' );
+        if ( $r ) // Decide if we need to send back '1' or a more complicated response including page links and comment counts
+                _wp_ajax_delete_comment_response( $comment->comment_ID );
+        die( '0' );
         break;
 case 'delete-cat' :
@@ -196 +257 @@
                 die('0');
         break;
-case 'dim-comment' :
+case 'dim-comment' : // On success, die with time() instead of 1
         if ( !$comment = get_comment( $id ) )
                 die('0');
@@ -207 +268 @@
         $current = wp_get_comment_status( $comment->comment_ID );
         if ( $_POST['new'] == $current )
-                die('1');
-
+                die( (string) time() );
+
+        $r = 0;
         if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
                 check_ajax_referer( "approve-comment_$id" );
                 if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )
-                        die('1');
+                        $r = 1;
         } else {
                 check_ajax_referer( "unapprove-comment_$id" );
                 if ( wp_set_comment_status( $comment->comment_ID, 'hold' ) )
-                        die('1');
-        }
-        die('0');
+                        $r = 1;
+        }
+        if ( $r ) // Decide if we need to send back '1' or a more complicated response including page links and comment counts
+                _wp_ajax_delete_comment_response( $comment->comment_ID );
+        die( '0' );
         break;
 case 'add-category' : // On the Fly