Changeset 3721 for trunk/wp-admin/comment.php

Timestamp:

04/19/2006 08:02:16 AM (20 years ago)

Author:

matt

Message:

A better comment delete button

File:

• trunk/wp-admin/comment.php (modified) (7 diffs)

trunk/wp-admin/comment.php

@@ -18 +18 @@
     }
 }
+
+if ( isset( $_POST['deletecomment'] ) )
+    $action = 'deletecomment';
 
 switch($action) {
@@ -80 +83 @@
     echo "<input type='submit' value='" . __('Yes') . "' />";
     echo "&nbsp;&nbsp;";
-    echo "<input type='button' value='" . __('No') . "' onclick=\"self.location='". get_settings('siteurl') ."/wp-admin/edit.php?p=$p&amp;c=1#comments';\" />\n";
+    echo "<input type='button' value='" . __('No') . "' onclick=\"self.location='". get_settings('siteurl') ."/wp-admin/edit-comments.php';\" />\n";
     echo "</form>\n";
     echo "</div>\n";
@@ -87 +90 @@
 
 case 'deletecomment':
+
+    check_admin_referer();
+
+    $comment = (int) $_REQUEST['comment'];
+    $p = (int) $_REQUEST['p'];
+    if ( isset($_REQUEST['noredir']) ) {
+        $noredir = true;
+    } else {
+        $noredir = false;
+    }
+
+    $postdata = get_post($p) or 
+        die(sprintf(__('Oops, no post with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
+
+    if ( ! $comment = get_comment($comment) )
+             die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit-comments.php'));
+
+    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
+        die( __('You are not allowed to edit comments on this post.') );
+
+    if ( 'spam' == $_REQUEST['delete_type'] )
+        wp_set_comment_status($comment->comment_ID, 'spam');
+    else
+        wp_delete_comment($comment->comment_ID);
+
+    if (($_SERVER['HTTP_REFERER'] != '') && (false == $noredir)) {
+        header('Location: ' . $_SERVER['HTTP_REFERER']);
+    } else {
+        header('Location: '. get_settings('siteurl') .'/wp-admin/edit-comments.php');
+    }
+    exit();
+    break;
+
+case 'unapprovecomment':
 
     check_admin_referer();
@@ -98 +135 @@
     }
 
-    $postdata = get_post($p) or die(sprintf(__('Oops, no post with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
-
-    if ( ! $comment = get_comment($comment) )
-             die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit-comments.php'));
-
-    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-        die( __('You are not allowed to edit comments on this post.') );
-
-    if ( 'spam' == $_GET['delete_type'] )
-        wp_set_comment_status($comment->comment_ID, 'spam');
-    else
-        wp_delete_comment($comment->comment_ID);
+    if ( ! $comment = get_comment($comment) )
+        die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
+
+    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
+        die( __('You are not allowed to edit comments on this post, so you cannot disapprove this comment.') );
+
+    wp_set_comment_status($comment->comment_ID, "hold");
 
     if (($_SERVER['HTTP_REFERER'] != "") && (false == $noredir)) {
@@ -119 +151 @@
     break;
 
-case 'unapprovecomment':
+case 'approvecomment':
 
     check_admin_referer();
@@ -135 +167 @@
 
     if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-        die( __('You are not allowed to edit comments on this post, so you cannot disapprove this comment.') );
-
-    wp_set_comment_status($comment->comment_ID, "hold");
-
-    if (($_SERVER['HTTP_REFERER'] != "") && (false == $noredir)) {
-        header('Location: ' . $_SERVER['HTTP_REFERER']);
-    } else {
-        header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
-    }
-    exit();
-    break;
-
-case 'approvecomment':
-
-    check_admin_referer();
-
-    $comment = (int) $_GET['comment'];
-    $p = (int) $_GET['p'];
-    if (isset($_GET['noredir'])) {
-        $noredir = true;
-    } else {
-        $noredir = false;
-    }
-
-    if ( ! $comment = get_comment($comment) )
-        die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
-
-    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
         die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
 
@@ -196 +200 @@
     break;
 } // end switch
+
 include('admin-footer.php');
+
 ?>