diff --git a/wp-admin/comment.php b/wp-admin/comment.php index bee82259ec..d687514c33 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -1,199 +1,205 @@ -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': -case 'mailapprovecomment': - - require_once('./admin-header.php'); - - $comment = (int) $_GET['comment']; - $p = (int) $_GET['p']; - $formaction = 'confirmdeletecomment' == $action ? 'deletecomment' : 'approvecomment'; - - 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( 'confirmdeletecomment' == $action ? __('You are not allowed to delete comments on this post.') : __('You are not allowed to edit comments on this post, so you cannot approve this comment.') ); - - echo "
\n"; - if ( 'spam' == $_GET['delete_type'] ) - echo "

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

\n"; - elseif ( 'confirmdeletecomment' == $action ) - echo "

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

\n"; - else - echo "

" . __('Caution: You are about to approve 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 '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. 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': - - check_admin_referer(); - - 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'); -?> +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': +case 'mailapprovecomment': + + require_once('./admin-header.php'); + + $comment = (int) $_GET['comment']; + $p = (int) $_GET['p']; + $formaction = 'confirmdeletecomment' == $action ? 'deletecomment' : 'approvecomment'; + + 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( 'confirmdeletecomment' == $action ? __('You are not allowed to delete comments on this post.') : __('You are not allowed to edit comments on this post, so you cannot approve this comment.') ); + + echo "
\n"; + if ( 'spam' == $_GET['delete_type'] ) + echo "

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

\n"; + elseif ( 'confirmdeletecomment' == $action ) + echo "

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

\n"; + else + echo "

" . __('Caution: You are about to approve 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) $_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. 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' == $_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(); + + $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 '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. 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': + + check_admin_referer(); + + 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 52099508f6..c26423347f 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -123,7 +123,7 @@ if ('view' == $mode) { echo ' | ' . __('Unapprove') . ' '; echo ' | ' . __('Approve') . ' '; } - 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_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 )) . "' );\">" . __('Spam') . " ]"; } // end if any comments to show // Get post title $post = get_post($comment->comment_post_ID); diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php index d8b9259ece..fa7752d19a 100644 --- a/wp-admin/edit-form-comment.php +++ b/wp-admin/edit-form-comment.php @@ -17,19 +17,19 @@ function focusit() { // focus on first input field addLoadEvent(focusit);
- +
- +
- +
- +
- +
@@ -59,14 +59,18 @@ addLoadEvent(focusit); - : - + : + - : -

+ : + /> + + + + diff --git a/wp-admin/post.php b/wp-admin/post.php index 0954ec2472..16802e3486 100644 --- a/wp-admin/post.php +++ b/wp-admin/post.php @@ -17,8 +17,9 @@ for ($i=0; $i