Wordpress 2.8-scripts

[autoinstalls/wordpress.git] / wp-admin / comment.php

diff --git a/wp-admin/comment.php b/wp-admin/comment.php
index eee6a12fa0008da4b032390e0a7c093c11aa472a..f6437e575eaa56f356b2b57bf8868d1fed322ef7 100644 (file)
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -1,101 +1,129 @@
 <?php
 <?php

+/**
+ * Comment Management Panel
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** Load WordPress Bootstrap */

 require_once('admin.php');
 
 $parent_file = 'edit-comments.php';
 $submenu_file = 'edit-comments.php';
 
 require_once('admin.php');
 
 $parent_file = 'edit-comments.php';
 $submenu_file = 'edit-comments.php';
 

-wp_reset_vars(array('action'));
+wp_reset_vars( array('action') );

 
 if ( isset( $_POST['deletecomment'] ) )
        $action = 'deletecomment';
 
 
 if ( isset( $_POST['deletecomment'] ) )
        $action = 'deletecomment';
 

-switch($action) {
-case 'editcomment':
+/**
+ * Display error message at bottom of comments.
+ *
+ * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
+ */
+function comment_footer_die( $msg ) {  //
+       echo "<div class='wrap'><p>$msg</p></div>";
+       include('admin-footer.php');
+       die;
+}
+
+switch( $action ) {
+
+case 'editcomment' :

        $title = __('Edit Comment');
 
        $title = __('Edit Comment');
 

-       require_once ('admin-header.php');
+       wp_enqueue_script('comment');
+       require_once('admin-header.php');

 
 

-       $comment = (int) $_GET['c'];
+       $comment_id = absint( $_GET['c'] );

 
 

-       if ( ! $comment = get_comment($comment) )
-               wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'javascript:history.go(-1)'));
+       if ( !$comment = get_comment( $comment_id ) )
+               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');
 
        break;
 
 
        include('edit-form-comment.php');
 
        break;
 

-case 'cdc':
-case 'mac':
+case 'cdc' :
+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';
        $nonce_action = 'cdc' == $action ? 'delete-comment_' : 'approve-comment_';
        $formaction = 'cdc' == $action ? 'deletecomment' : 'approvecomment';
        $nonce_action = 'cdc' == $action ? 'delete-comment_' : 'approve-comment_';

-       $nonce_action .= $comment;
+       $nonce_action .= $comment_id;

 
 

-       if ( ! $comment = get_comment_to_edit($comment) )
-               wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php'));
+       if ( !$comment = get_comment_to_edit( $comment_id ) )
+               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) )
-               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.') );
+       if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
+               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="narrow">
 ?>
 <div class='wrap'>
 
 <div class="narrow">

-<?php if ( 'spam' == $_GET['dt'] ) { ?>
-<p><?php echo '<strong>'.__('Caution:').'</strong> '.__('You are about to mark the following comment as spam:'); ?></p>
-<?php } elseif ( 'cdc' == $action ) { ?>
-<p><?php echo '<strong>'.__('Caution:').'</strong> '.__('You are about to delete the following comment:'); ?></p>
-<?php } else { ?>
-<p><?php echo '<strong>'.__('Caution:').'</strong> '.__('You are about to approve the following comment:'); ?></p>
-<?php } ?>
+<?php
+if ( 'spam' == $_GET['dt'] ) {
+       $caution_msg = __('You are about to mark the following comment as spam:');
+       $button = __('Spam Comment');
+} elseif ( 'cdc' == $action ) {
+       $caution_msg = __('You are about to delete the following comment:');
+       $button = __('Delete Comment');
+} else {
+       $caution_msg = __('You are about to approve the following comment:');
+       $button = __('Approve Comment');
+}
+?>
+
+<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%">
 <tr>
 
 <table width="100%">
 <tr>

-<td><input type='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><input type='button' class="button" value='<?php esc_attr_e('No'); ?>' onclick="self.location='<?php echo admin_url('edit-comments.php'); ?>" /></td>
+<td class="textright"><input type='submit' class="button" value='<?php echo esc_attr($button); ?>' /></td>

 </tr>
 </table>
 
 </tr>
 </table>
 

-<?php wp_nonce_field($nonce_action); ?>
-<input type='hidden' name='action' value='<?php echo $formaction; ?>' />
+<?php wp_nonce_field( $nonce_action ); ?>
+<input type='hidden' name='action' value='<?php echo esc_attr($formaction); ?>' />

 <?php if ( 'spam' == $_GET['dt'] ) { ?>
 <input type='hidden' name='dt' value='spam' />
 <?php } ?>
 <?php if ( 'spam' == $_GET['dt'] ) { ?>
 <input type='hidden' name='dt' value='spam' />
 <?php } ?>

-<input type='hidden' name='p' value='<?php echo $comment->comment_post_ID; ?>' />
-<input type='hidden' name='c' value='<?php echo $comment->comment_ID; ?>' />
+<input type='hidden' name='p' value='<?php echo esc_attr($comment->comment_post_ID); ?>' />
+<input type='hidden' name='c' value='<?php echo esc_attr($comment->comment_ID); ?>' />

 <input type='hidden' name='noredir' value='1' />
 </form>
 
 <input type='hidden' name='noredir' value='1' />
 </form>
 

-<table class="editform" cellpadding="5">
+<table class="form-table" cellpadding="5">

 <tr class="alt">
 <tr class="alt">

-<th scope="row"><?php _e('Author:'); ?></th>
+<th scope="row"><?php _e('Author'); ?></th>

 <td><?php echo $comment->comment_author; ?></td>
 </tr>
 <?php if ( $comment->comment_author_email ) { ?>
 <tr>
 <td><?php echo $comment->comment_author; ?></td>
 </tr>
 <?php if ( $comment->comment_author_email ) { ?>
 <tr>

-<th scope="row"><?php _e('E-mail:'); ?></th>
+<th scope="row"><?php _e('E-mail'); ?></th>

 <td><?php echo $comment->comment_author_email; ?></td>
 </tr>
 <?php } ?>
 <?php if ( $comment->comment_author_url ) { ?>
 <tr>
 <td><?php echo $comment->comment_author_email; ?></td>
 </tr>
 <?php } ?>
 <?php if ( $comment->comment_author_url ) { ?>
 <tr>

-<th scope="row"><?php _e('URL:'); ?></th>
+<th scope="row"><?php _e('URL'); ?></th>

 <td><a href='<?php echo $comment->comment_author_url; ?>'><?php echo $comment->comment_author_url; ?></a></td>
 </tr>
 <?php } ?>
 <tr>
 <td><a href='<?php echo $comment->comment_author_url; ?>'><?php echo $comment->comment_author_url; ?></a></td>
 </tr>
 <?php } ?>
 <tr>

-<th scope="row" valign="top"><p><?php _e('Comment:'); ?></p></th>
+<th scope="row" valign="top"><?php /* translators: field name in comment form */ echo _x('Comment', 'noun'); ?></th>

 <td><?php echo $comment->comment_content; ?></td>
 </tr>
 </table>
 <td><?php echo $comment->comment_content; ?></td>
 </tr>
 </table>


@@ -105,109 +133,108 @@ case 'mac':
 <?php
        break;
 
 <?php
        break;
 

-case 'deletecomment':
-       $comment = (int) $_REQUEST['c'];
-       check_admin_referer('delete-comment_' . $comment);
+case 'deletecomment' :
+       $comment_id = absint( $_REQUEST['c'] );
+       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) )
-                        wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit-comments.php'));
+       if ( !$comment = get_comment( $comment_id ) )
+               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) )
-               wp_die( __('You are not allowed to edit comments on this post.') );
+       if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
+               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)) {
-               wp_redirect(wp_get_referer());
-       } else {
-               wp_redirect(get_option('siteurl') .'/wp-admin/edit-comments.php');
-       }
-       exit();
+       if ( '' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php' ) )
+               wp_redirect( wp_get_referer() );
+       else if ( '' != wp_get_original_referer() && false == $noredir )
+               wp_redirect( wp_get_original_referer() );
+       else
+               wp_redirect( admin_url('edit-comments.php') );
+
+       die;

        break;
 
        break;
 

-case 'unapprovecomment':
-       $comment = (int) $_GET['c'];
-       check_admin_referer('unapprove-comment_' . $comment);
+case 'unapprovecomment' :
+       $comment_id = absint( $_GET['c'] );
+       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) )
-               wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php'));
+       if ( !$comment = get_comment( $comment_id ) )
+               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) )
-               wp_die( __('You are not allowed to edit comments on this post, so you cannot disapprove this comment.') );
+       if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
+               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 )
+               wp_redirect( wp_get_referer() );
+       else
+               wp_redirect( admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) . '#comments') );

 
 

-       if ((wp_get_referer() != "") && (false == $noredir)) {
-               wp_redirect(wp_get_referer());
-       } else {
-               wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p=' . (int) $comment->comment_post_ID.'&c=1#comments');
-       }

        exit();
        break;
 
        exit();
        break;
 

-case 'approvecomment':
-       $comment = (int) $_GET['c'];
-       check_admin_referer('approve-comment_' . $comment);
+case 'approvecomment' :
+       $comment_id = absint( $_GET['c'] );
+       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) )
-               wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php'));
+       if ( !$comment = get_comment( $comment_id ) )
+               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");
-       if (get_option("comments_notify") == true) {
-               wp_notify_postauthor($comment->comment_ID);
-       }
+       wp_set_comment_status( $comment->comment_ID, 'approve' );

 
 

+       if ( '' != wp_get_referer() && false == $noredir )
+               wp_redirect( wp_get_referer() );
+       else
+               wp_redirect( admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) . '#comments') );

 
 

-       if ((wp_get_referer() != "") && (false == $noredir)) {
-               wp_redirect(wp_get_referer());
-       } else {
-               wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p=' . (int) $comment->comment_post_ID.'&c=1#comments');
-       }

        exit();
        break;
 
        exit();
        break;
 

-case 'editedcomment':
+case 'editedcomment' :

 
 

-       $comment_ID = (int) $_POST['comment_ID'];
-       $comment_post_ID = (int) $_POST['comment_post_id'];
+       $comment_id = absint( $_POST['comment_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 = apply_filters('comment_edit_redirect', $location, $comment_ID);
-       wp_redirect($location);
+       $location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
+       $location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
+       wp_redirect( $location );
+

        exit();
        break;
        exit();
        break;

+

 default:
 default:

+       wp_die( __('Unknown action.') );

        break;
        break;

+

 } // end switch
 
 include('admin-footer.php');
 
 } // end switch
 
 include('admin-footer.php');
 

-?>
+?>
\ No newline at end of file