WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch error messages to have a footer instead of use wp_die, so they don't look busted. Use absint where appropiate. Formatting cleanup. Clearer styling and messaging on buttons. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@6371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
matt 2007-12-10 20:42:03 +00:00
parent dd17ae4da8
commit c5dc5fb56e
1 changed files with 115 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
wp-admin/comment.php
View File

@ -9,21 +9,28 @@ wp_reset_vars(array('action'));
if ( isset( $_POST['deletecomment'] ) ) if ( isset( $_POST['deletecomment'] ) )
$action = 'deletecomment'; $action = 'deletecomment';
function comment_footer_die( $msg ) { // $msg is assumed to contain HTML and be sanitized
echo "<div class='wrap'><p>$msg</p></div>";
include('admin-footer.php');
die;
}
switch( $action ) { switch( $action ) {
case 'editcomment' : case 'editcomment' :
$title = __('Edit Comment'); $title = __('Edit Comment');
require_once('admin-header.php'); require_once('admin-header.php');
$comment = (int) $_GET['c']; $comment_id = absint( $_GET['c'] );
if ( ! $comment = get_comment($comment) ) if ( !$comment = get_comment( $comment_id ) )
wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'javascript:history.go(-1)')); comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'javascript:history.go(-1)') );
if ( !current_user_can('edit_post', $comment->comment_post_ID) ) if ( !current_user_can('edit_post', $comment->comment_post_ID) )
wp_die( __('You are not allowed to edit comments on this post.') ); comment_footer_die( __('You are not allowed to edit comments on this post.') );
$comment = get_comment_to_edit($comment); $comment = get_comment_to_edit( $comment_id );
include('edit-form-comment.php'); include('edit-form-comment.php');
@ -32,38 +39,45 @@ case 'editcomment':
case 'cdc' : case 'cdc' :
case 'mac' : case 'mac' :
require_once('./admin-header.php'); require_once('admin-header.php');
$comment = (int) $_GET['c']; $comment_id = absint( $_GET['c'] );
$formaction = 'cdc' == $action ? 'deletecomment' : 'approvecomment'; $formaction = 'cdc' == $action ? 'deletecomment' : 'approvecomment';
$nonce_action = 'cdc' == $action ? 'delete-comment_' : 'approve-comment_'; $nonce_action = 'cdc' == $action ? 'delete-comment_' : 'approve-comment_';
$nonce_action .= $comment; $nonce_action .= $comment_id;
if ( ! $comment = get_comment_to_edit($comment) ) if ( !$comment = get_comment_to_edit( $comment_id ) )
wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php')); comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php') );
if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) ) if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
wp_die( 'cdc' == $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.') ); comment_footer_die( 'cdc' == $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.') );
?> ?>
<div class='wrap'> <div class='wrap'>
<div class="narrow"> <div class="narrow">
<?php if ( 'spam' == $_GET['dt'] ) { ?> <?php
<p><?php echo '<strong>'.__('Caution:').'</strong> '.__('You are about to mark the following comment as spam:'); ?></p> if ( 'spam' == $_GET['dt'] ) {
<?php } elseif ( 'cdc' == $action ) { ?> $caution_msg = __('You are about to mark the following comment as spam:');
<p><?php echo '<strong>'.__('Caution:').'</strong> '.__('You are about to delete the following comment:'); ?></p> $button = __('Spam Comment &raquo;');
<?php } else { ?> } elseif ( 'cdc' == $action ) {
<p><?php echo '<strong>'.__('Caution:').'</strong> '.__('You are about to approve the following comment:'); ?></p> $caution_msg = __('You are about to delete the following comment:');
<?php } ?> $button = __('Delete Comment &raquo;');
} else {
$caution_msg = __('You are about to approve the following comment:');
$button = __('Approve Comment &raquo;');
}
?>
<p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>
<p><?php _e('Are you sure you want to do that?'); ?></p> <p><?php _e('Are you sure you want to do that?'); ?></p>
<form action='<?php echo get_option('siteurl'); ?>/wp-admin/comment.php' method='get'> <form action='comment.php' method='get'>
<table width="100%"> <table width="100%">
<tr> <tr>
<td><input type='button' value='<?php _e('No'); ?>' onclick="self.location='<?php echo get_option('siteurl'); ?>/wp-admin/edit-comments.php';" /></td> <td><input type='button' class="button" value='<?php _e('No'); ?>' onclick="self.location='<?php echo get_option('siteurl'); ?>/wp-admin/edit-comments.php';" /></td>
<td align="right"><input type='submit' value='<?php _e('Yes'); ?>' /></td> <td align="right"><input type='submit' class="button" value='<?php echo $button; ?>' /></td>
</tr> </tr>
</table> </table>
@ -95,7 +109,7 @@ case 'mac':
</tr> </tr>
<?php } ?> <?php } ?>
<tr> <tr>
<th scope="row" valign="top"><p><?php _e('Comment:'); ?></p></th> <th scope="row" valign="top"><?php _e('Comment:'); ?></th>
<td><?php echo $comment->comment_content; ?></td> <td><?php echo $comment->comment_content; ?></td>
</tr> </tr>
</table> </table>
@ -106,106 +120,107 @@ case 'mac':
break; break;
case 'deletecomment' : case 'deletecomment' :
$comment = (int) $_REQUEST['c']; $comment_id = absint( $_REQUEST['c'] );
check_admin_referer('delete-comment_' . $comment); check_admin_referer( 'delete-comment_' . $comment_id );
if ( isset($_REQUEST['noredir']) ) { if ( isset( $_REQUEST['noredir'] ) )
$noredir = true; $noredir = true;
} else { else
$noredir = false; $noredir = false;
}
if ( ! $comment = get_comment($comment) ) if ( !$comment = get_comment( $comment_id ) )
wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit-comments.php')); comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit-comments.php') );
if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) ) if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
wp_die( __('You are not allowed to edit comments on this post.') ); comment_footer_die( __('You are not allowed to edit comments on this post.') );
if ( 'spam' == $_REQUEST['dt'] ) if ( 'spam' == $_REQUEST['dt'] )
wp_set_comment_status( $comment->comment_ID, 'spam' ); wp_set_comment_status( $comment->comment_ID, 'spam' );
else else
wp_delete_comment( $comment->comment_ID ); wp_delete_comment( $comment->comment_ID );
if ((wp_get_referer() != '') && (false == $noredir)) { if ( '' != wp_get_referer() && false == $noredir )
wp_redirect( wp_get_referer() ); wp_redirect( wp_get_referer() );
} else { else
wp_redirect( get_option('siteurl') . '/wp-admin/edit-comments.php' ); wp_redirect( get_option('siteurl') . '/wp-admin/edit-comments.php' );
}
exit(); die;
break; break;
case 'unapprovecomment' : case 'unapprovecomment' :
$comment = (int) $_GET['c']; $comment_id = absint( $_GET['c'] );
check_admin_referer('unapprove-comment_' . $comment); check_admin_referer( 'unapprove-comment_' . $comment_id );
if (isset($_GET['noredir'])) { if ( isset( $_GET['noredir'] ) )
$noredir = true; $noredir = true;
} else { else
$noredir = false; $noredir = false;
}
if ( ! $comment = get_comment($comment) ) if ( !$comment = get_comment( $comment_id ) )
wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php')); comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php') );
if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) ) if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
wp_die( __('You are not allowed to edit comments on this post, so you cannot disapprove this comment.') ); comment_footer_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"); wp_set_comment_status( $comment->comment_ID, 'hold' );
if ((wp_get_referer() != "") && (false == $noredir)) { if ( '' != wp_get_referer() && false == $noredir )
wp_redirect( wp_get_referer() ); wp_redirect( wp_get_referer() );
} else { else
wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p=' . (int) $comment->comment_post_ID.'&c=1#comments'); wp_redirect( get_option('siteurl') . '/wp-admin/edit.php?p=' . absint( $comment->comment_post_ID ) . '&c=1#comments' );
}
exit(); exit();
break; break;
case 'approvecomment' : case 'approvecomment' :
$comment = (int) $_GET['c']; $comment_id = absint( $_GET['c'] );
check_admin_referer('approve-comment_' . $comment); check_admin_referer( 'approve-comment_' . $comment_id );
if (isset($_GET['noredir'])) { if ( isset( $_GET['noredir'] ) )
$noredir = true; $noredir = true;
} else { else
$noredir = false; $noredir = false;
}
if ( ! $comment = get_comment($comment) ) if ( !$comment = get_comment( $comment_id ) )
wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php')); comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php') );
if ( !current_user_can('edit_post', $comment->comment_post_ID) ) if ( !current_user_can('edit_post', $comment->comment_post_ID) )
wp_die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') ); comment_footer_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"); wp_set_comment_status( $comment->comment_ID, 'approve' );
if (get_option("comments_notify") == true) {
if ( true == get_option('comments_notify') )
wp_notify_postauthor( $comment->comment_ID ); wp_notify_postauthor( $comment->comment_ID );
}
if ((wp_get_referer() != "") && (false == $noredir)) { if ( '' != wp_get_referer() && false == $noredir )
wp_redirect( wp_get_referer() ); wp_redirect( wp_get_referer() );
} else { else
wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p=' . (int) $comment->comment_post_ID.'&c=1#comments'); wp_redirect( get_option('siteurl') . '/wp-admin/edit.php?p=' . absint( $comment->comment_post_ID ) . '&c=1#comments' );
}
exit(); exit();
break; break;
case 'editedcomment' : case 'editedcomment' :
$comment_ID = (int) $_POST['comment_ID']; $comment_id = absint( $_POST['comment_ID'] );
$comment_post_ID = (int) $_POST['comment_post_id']; $comment_post_id = absint( $_POST['comment_post_id'] );
check_admin_referer('update-comment_' . $comment_ID); check_admin_referer( 'update-comment_' . $comment_id );
edit_comment(); edit_comment();
$location = ( empty($_POST['referredby']) ? "edit.php?p=$comment_post_ID&c=1" : $_POST['referredby'] ) . '#comment-' . $comment_ID; $location = ( empty( $_POST['referredby'] ) ? "edit.php?p=$comment_post_id&c=1" : $_POST['referredby'] ) . '#comment-' . $comment_id;
$location = apply_filters('comment_edit_redirect', $location, $comment_ID); $location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
wp_redirect( $location ); wp_redirect( $location );
exit(); exit();
break; break;
default: default:
wp_die( __('Unknown action.') );
break; break;
} // end switch } // end switch
include('admin-footer.php'); include('admin-footer.php');