From 29540c8e2bbc4333f68109f06c5bd841654df744 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 21 Feb 2006 06:11:46 +0000 Subject: [PATCH] Breakup post.php into post.php, comment.php, page.php, post-new.php git-svn-id: http://svn.automattic.com/wordpress/trunk@3563 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-functions.php | 4 +- wp-admin/admin-header.php | 4 +- wp-admin/comment.php | 213 +++++++++++++++++++ wp-admin/edit-comments.php | 25 ++- wp-admin/edit-form-comment.php | 4 +- wp-admin/edit-page-form.php | 5 +- wp-admin/edit-pages.php | 4 +- wp-admin/menu.php | 6 +- wp-admin/page-new.php | 2 +- wp-admin/page.php | 146 +++++++++++++ wp-admin/post-new.php | 90 ++++++++ wp-admin/post.php | 304 +--------------------------- wp-includes/pluggable-functions.php | 10 +- 13 files changed, 494 insertions(+), 323 deletions(-) create mode 100644 wp-admin/comment.php create mode 100644 wp-admin/page.php create mode 100644 wp-admin/post-new.php diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 43ae977d7..26ce08857 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -665,8 +665,8 @@ function page_rows($parent = 0, $level = 0, $pages = 0) { post_modified); ?> - " . __('Edit') . ""; } ?> - " . __('Delete') . ""; } ?> + " . __('Edit') . ""; } ?> + " . __('Delete') . ""; } ?> // + var manager = new dbxManager('postmeta'); - + var manager = new dbxManager('pagemeta'); }); diff --git a/wp-admin/comment.php b/wp-admin/comment.php new file mode 100644 index 000000000..2a97d9172 --- /dev/null +++ b/wp-admin/comment.php @@ -0,0 +1,213 @@ +Go back!'), 'javascript:history.go(-1)')); + + if ( !current_user_can('edit_post', $comment->comment_post_ID) ) + die( __('You are not allowed to edit comments on this post.') ); + + $comment = get_comment_to_edit($comment); + + include('edit-form-comment.php'); + + break; + +case 'confirmdeletecomment': + + require_once('./admin-header.php'); + + $comment = (int) $_GET['comment']; + $p = (int) $_GET['p']; + + if ( ! $comment = get_comment($comment) ) + die(sprintf(__('Oops, no comment with this ID. Go back!'), 'edit.php')); + + if ( !current_user_can('edit_post', $comment->comment_post_ID) ) + die( __('You are not allowed to delete comments on this post.') ); + + echo "
\n"; + if ( 'spam' == $_GET['delete_type'] ) + echo "

" . __('Caution: You are about to mark the following comment as spam:') . "

\n"; + else + echo "

" . __('Caution: You are about to delete the following comment:') . "

\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
" . __('Author:') . "$comment->comment_author
" . __('E-mail:') . "$comment->comment_author_email
". __('URL:') . "$comment->comment_author_url
". __('Comment:') . "$comment->comment_content
\n"; + echo "

" . __('Are you sure you want to do that?') . "

\n"; + + echo "
\n"; + echo "\n"; + if ( 'spam' == $_GET['delete_type'] ) + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo ""; + echo "  "; + echo "\n"; + echo "
\n"; + echo "
\n"; + + break; + +case 'deletecomment': + + check_admin_referer(); + + $comment = (int) $_GET['comment']; + $p = (int) $_GET['p']; + if (isset($_GET['noredir'])) { + $noredir = true; + } else { + $noredir = false; + } + + $postdata = get_post($p) or die(sprintf(__('Oops, no post with this ID. Go back!'), 'edit.php')); + + if ( ! $comment = get_comment($comment) ) + die(sprintf(__('Oops, no comment with this ID. Go back!'), '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 (($_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 'unapprovecomment': + + 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. Go back!'), '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)) { + header('Location: ' . $_SERVER['HTTP_REFERER']); + } else { + header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments'); + } + exit(); + break; + +case 'mailapprovecomment': + + $comment = (int) $_GET['comment']; + + if ( ! $comment = get_comment($comment) ) + die(sprintf(__('Oops, no comment with this ID. Go back!'), '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.') ); + + if ('1' != $comment->comment_approved) { + wp_set_comment_status($comment->comment_ID, 'approve'); + if (true == get_option('comments_notify')) + wp_notify_postauthor($comment->comment_ID); + } + + header('Location: ' . get_option('siteurl') . '/wp-admin/moderation.php?approved=1'); + exit(); + break; + +case 'approvecomment': + + $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. Go back!'), '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.') ); + + wp_set_comment_status($comment->comment_ID, "approve"); + if (get_settings("comments_notify") == true) { + wp_notify_postauthor($comment->comment_ID); + } + + + 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 'editedcomment': + + edit_comment(); + + $referredby = $_POST['referredby']; + if (!empty($referredby)) { + header('Location: ' . $referredby); + } else { + header ("Location: edit.php?p=$comment_post_ID&c=1#comments"); + } + + break; +default: + break; +} // end switch +include('admin-footer.php'); +?> \ No newline at end of file diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index 2a26f1fce..0bd09ca74 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -103,16 +103,21 @@ if ('view' == $mode) {

comment_post_ID) ) { - echo " | comment_ID."\">" . __('Edit Comment') . ""; - echo " | comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), wp_specialchars( $comment->comment_author, 1 )) . "' );\">" . __('Delete Comment') . " "; - echo " | comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . sprintf(__("You are about to mark as spam this comment by "%s".\\n"Cancel" to stop, "OK" to mark as spam."), wp_specialchars( $comment->comment_author, 1 )) . "' );\">" . __('Mark Comment as Spam') . " "; + echo " | comment_ID."\">" . __('Edit Comment') . ""; + echo " | comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), wp_specialchars( $comment->comment_author, 1 )) . "' );\">" . __('Delete Comment') . " "; + echo " | comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . sprintf(__("You are about to mark as spam this comment by "%s".\\n"Cancel" to stop, "OK" to mark as spam."), wp_specialchars( $comment->comment_author, 1 )) . "' );\">" . __('Mark Comment as Spam') . " "; } // end if any comments to show // Get post title - if ( current_user_can('edit_post', $comment->comment_post_ID) ) { - $post_title = $wpdb->get_var("SELECT post_title FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"); - $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title; - ?> | - + $post = get_post($comment->comment_post_ID); + $post_title = $post->post_title; + $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title; + if ( 'page' == $post->post_type ) { + if ( current_user_can('edit_page', $comment->comment_post_ID) ) ?> + | + comment_post_ID) ) ?> + | + |

@@ -155,9 +160,9 @@ if ('view' == $mode) { comment_post_ID) ) { - echo "" . __('Edit') . ""; } ?> + echo "" . __('Edit') . ""; } ?> comment_post_ID) ) { - echo "comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return confirm('" . sprintf(__("You are about to delete this comment by \'%s\'\\n \'Cancel\' to stop, \'OK\' to delete."), $comment->comment_author) . "')\" class='delete'>" . __('Delete') . ""; } ?> + echo "comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return confirm('" . sprintf(__("You are about to delete this comment by \'%s\'\\n \'Cancel\' to stop, \'OK\' to delete."), $comment->comment_author) . "')\" class='delete'>" . __('Delete') . ""; } ?> \n\n' /> @@ -113,7 +113,7 @@ else : -

+

diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php index 5bac80e75..e10897ad3 100644 --- a/wp-admin/edit-page-form.php +++ b/wp-admin/edit-page-form.php @@ -20,7 +20,7 @@ $sendto = wp_specialchars( $sendto ); ?> -
+ - +ID) ) ?> escape($post->post_title) ) . "')\""; ?> />
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php index b3fd21457..ad71803bf 100644 --- a/wp-admin/edit-pages.php +++ b/wp-admin/edit-pages.php @@ -51,8 +51,8 @@ foreach ( $posts as $post ) : post_modified); ?> - ID) ) { echo "" . __('Edit') . ""; } ?> - ID) ) { echo "" . __('Delete') . ""; } ?> + ID) ) { echo "" . __('Edit') . ""; } ?> + ID) ) { echo "" . __('Delete') . ""; } ?> diff --git a/wp-admin/page.php b/wp-admin/page.php new file mode 100644 index 000000000..66bdae42a --- /dev/null +++ b/wp-admin/page.php @@ -0,0 +1,146 @@ + +
+

+ +
+ post_type == 'attachment' ) { + if ( ! wp_delete_attachment($page_id) ) + die( __('Error in deleting...') ); + } else { + if ( !wp_delete_post($page_id) ) + die( __('Error in deleting...') ); + } + + $sendback = $_SERVER['HTTP_REFERER']; + if (strstr($sendback, 'page.php')) $sendback = get_settings('siteurl') .'/wp-admin/page.php'; + elseif (strstr($sendback, 'attachments.php')) $sendback = get_settings('siteurl') .'/wp-admin/attachments.php'; + $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); + header ('Location: ' . $sendback); + exit(); + break; + +default: + break; +} // end switch +include('admin-footer.php'); +?> diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php new file mode 100644 index 000000000..b0dc1b658 --- /dev/null +++ b/wp-admin/post-new.php @@ -0,0 +1,90 @@ + +
+

+You can also e-mail the admin to ask for a promotion.
+When you’re promoted, just reload this page and you’ll be able to blog. :)'), get_settings('admin_email')); ?> +

+
+ +

View site »'), get_bloginfo('home') . '/'); ?>

+ +
+

+ 15 ) $num_drafts = 15; + for ( $i = 0; $i < $num_drafts; $i++ ) { + $draft = $drafts[$i]; + if ( 0 != $i ) + echo ', '; + if ( empty($draft->post_title) ) + $draft->post_title = sprintf(__('Post # %s'), $draft->ID); + echo "$draft->post_title"; + } + + if ( 15 < count($drafts) ) { ?> + , » + +.

+
+ +
+

+

+

+ + + + + + +
+
+
+ + + + + + +

+
+ diff --git a/wp-admin/post.php b/wp-admin/post.php index 11d46c23c..5351b7f41 100644 --- a/wp-admin/post.php +++ b/wp-admin/post.php @@ -18,15 +18,8 @@ for ($i=0; $ipost_type == 'page') - include('edit-page-form.php'); - else - include('edit-form-advanced.php'); + include('edit-form-advanced.php'); ?>
@@ -131,7 +121,7 @@ case 'delete': $post = & get_post($post_id); - if ( !current_user_can('edit_post', $post_id) ) + if ( !current_user_can('delete_post', $post_id) ) die( __('You are not allowed to delete this post.') ); if ( $post->post_type == 'attachment' ) { @@ -147,285 +137,11 @@ case 'delete': elseif (strstr($sendback, 'attachments.php')) $sendback = get_settings('siteurl') .'/wp-admin/attachments.php'; $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); header ('Location: ' . $sendback); - break; - -case 'editcomment': - $title = __('Edit Comment'); - $parent_file = 'edit.php'; - require_once ('admin-header.php'); - - get_currentuserinfo(); - - $comment = (int) $_GET['comment']; - - if ( ! $comment = get_comment($comment) ) - die(sprintf(__('Oops, no comment with this ID. Go back!'), 'javascript:history.go(-1)')); - - if ( !current_user_can('edit_post', $comment->comment_post_ID) ) - die( __('You are not allowed to edit comments on this post.') ); - - $comment = get_comment_to_edit($comment); - - include('edit-form-comment.php'); - - break; - -case 'confirmdeletecomment': - - require_once('./admin-header.php'); - - $comment = (int) $_GET['comment']; - $p = (int) $_GET['p']; - - if ( ! $comment = get_comment($comment) ) - die(sprintf(__('Oops, no comment with this ID. Go back!'), 'edit.php')); - - if ( !current_user_can('edit_post', $comment->comment_post_ID) ) - die( __('You are not allowed to delete comments on this post.') ); - - echo "
\n"; - if ( 'spam' == $_GET['delete_type'] ) - echo "

" . __('Caution: You are about to mark the following comment as spam:') . "

\n"; - else - echo "

" . __('Caution: You are about to delete the following comment:') . "

\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
" . __('Author:') . "$comment->comment_author
" . __('E-mail:') . "$comment->comment_author_email
". __('URL:') . "$comment->comment_author_url
". __('Comment:') . "$comment->comment_content
\n"; - echo "

" . __('Are you sure you want to do that?') . "

\n"; - - echo "
\n"; - echo "\n"; - if ( 'spam' == $_GET['delete_type'] ) - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo ""; - echo "  "; - echo "\n"; - echo "
\n"; - echo "
\n"; - - break; - -case 'deletecomment': - - check_admin_referer(); - - $comment = (int) $_GET['comment']; - $p = (int) $_GET['p']; - if (isset($_GET['noredir'])) { - $noredir = true; - } else { - $noredir = false; - } - - $postdata = get_post($p) or die(sprintf(__('Oops, no post with this ID. Go back!'), 'edit.php')); - - if ( ! $comment = get_comment($comment) ) - die(sprintf(__('Oops, no comment with this ID. Go back!'), 'post.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 (($_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'); - } - - break; - -case 'unapprovecomment': - - 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. Go back!'), '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)) { - header('Location: ' . $_SERVER['HTTP_REFERER']); - } else { - header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments'); - } - - break; - -case 'mailapprovecomment': - - $comment = (int) $_GET['comment']; - - if ( ! $comment = get_comment($comment) ) - die(sprintf(__('Oops, no comment with this ID. Go back!'), '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.') ); - - if ('1' != $comment->comment_approved) { - wp_set_comment_status($comment->comment_ID, 'approve'); - if (true == get_option('comments_notify')) - wp_notify_postauthor($comment->comment_ID); - } - - header('Location: ' . get_option('siteurl') . '/wp-admin/moderation.php?approved=1'); - - break; - -case 'approvecomment': - - $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. Go back!'), '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.') ); - - wp_set_comment_status($comment->comment_ID, "approve"); - if (get_settings("comments_notify") == true) { - wp_notify_postauthor($comment->comment_ID); - } - - - 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'); - } - - break; - -case 'editedcomment': - - edit_comment(); - - $referredby = $_POST['referredby']; - if (!empty($referredby)) { - header('Location: ' . $referredby); - } else { - header ("Location: edit.php?p=$comment_post_ID&c=1#comments"); - } - + exit(); break; default: - $title = __('Create New Post'); - require_once ('./admin-header.php'); -?> - -

View site »'), get_bloginfo('home') . '/'); ?>

- - -
-

- 15 ) $num_drafts = 15; - for ( $i = 0; $i < $num_drafts; $i++ ) { - $draft = $drafts[$i]; - if ( 0 != $i ) - echo ', '; - $draft->post_title = stripslashes($draft->post_title); - if ( empty($draft->post_title) ) - $draft->post_title = sprintf(__('Post # %s'), $draft->ID); - echo "$draft->post_title"; - } - ?> - - , » - - .

-
- -
-'.__('WordPress bookmarklet').' -

'.__('Right click on the following link and choose "Add to favorites" to create a posting shortcut.').'

'; ?> -

- - - - - - -
-
-
- - - - - - -

-
- -
-

-You can also e-mail the admin to ask for a promotion.
-When you’re promoted, just reload this page and you’ll be able to blog. :)'), get_settings('admin_email')); ?> -

-
- */ include('admin-footer.php'); ?> diff --git a/wp-includes/pluggable-functions.php b/wp-includes/pluggable-functions.php index d8cad5267..16dfb9945 100644 --- a/wp-includes/pluggable-functions.php +++ b/wp-includes/pluggable-functions.php @@ -331,8 +331,8 @@ function wp_notify_postauthor($comment_id, $comment_type='') { $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title ); } $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n"; - $notify_message .= sprintf( __('To delete this comment, visit: %s'), get_settings('siteurl').'/wp-admin/post.php?action=confirmdeletecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n"; - $notify_message .= sprintf( __('To mark this comment as spam, visit: %s'), get_settings('siteurl').'/wp-admin/post.php?action=confirmdeletecomment&delete_type=spam&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n"; + $notify_message .= sprintf( __('To delete this comment, visit: %s'), get_settings('siteurl').'/wp-admin/comment.php?action=confirmdeletecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n"; + $notify_message .= sprintf( __('To mark this comment as spam, visit: %s'), get_settings('siteurl').'/wp-admin/comment.php?action=confirmdeletecomment&delete_type=spam&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n"; $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME'])); @@ -388,9 +388,9 @@ function wp_notify_moderator($comment_id) { $notify_message .= sprintf( __('URI : %s'), $comment->comment_author_url ) . "\r\n"; $notify_message .= sprintf( __('Whois : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n"; $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; - $notify_message .= sprintf( __('To approve this comment, visit: %s'), get_settings('siteurl').'/wp-admin/post.php?action=mailapprovecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n"; - $notify_message .= sprintf( __('To delete this comment, visit: %s'), get_settings('siteurl').'/wp-admin/post.php?action=confirmdeletecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n"; - $notify_message .= sprintf( __('To mark this comment as spam, visit: %s'), get_settings('siteurl').'/wp-admin/post.php?action=confirmdeletecomment&delete_type=spam&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n"; + $notify_message .= sprintf( __('To approve this comment, visit: %s'), get_settings('siteurl').'/wp-admin/comment.php?action=mailapprovecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n"; + $notify_message .= sprintf( __('To delete this comment, visit: %s'), get_settings('siteurl').'/wp-admin/comment.php?action=confirmdeletecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n"; + $notify_message .= sprintf( __('To mark this comment as spam, visit: %s'), get_settings('siteurl').'/wp-admin/comment.php?action=confirmdeletecomment&delete_type=spam&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n"; $notify_message .= sprintf( __('Currently %s comments are waiting for approval. Please visit the moderation panel:'), $comments_waiting ) . "\r\n"; $notify_message .= get_settings('siteurl') . "/wp-admin/moderation.php\r\n";