Wordpress 4.6

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

diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index dfef0a78e9adfc9b18931f499944f5b1710f5059..9fac3e934cecee068c66e5e32750f99f652521af 100644 (file)
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -1,108 +1,209 @@
 <?php
 <?php

-$submitbutton_text = __('Edit Comment');
-$toprow_title = sprintf(__('Editing Comment # %s'), $comment->comment_ID);
-$form_action = 'editedcomment';
-$form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment->comment_ID . "' />\n<input type='hidden' name='comment_post_ID' value='" . $comment->comment_post_ID;
+/**
+ * Edit comment form for inclusion in another file.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+// don't load directly
+if ( !defined('ABSPATH') )
+       die('-1');

 ?>
 ?>

-

 <form name="post" action="comment.php" method="post" id="post">
 <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
 <div class="wrap">
 <form name="post" action="comment.php" method="post" id="post">
 <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
 <div class="wrap">

-<h2><?php echo $toprow_title; ?></h2>
-<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />
-<input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' />
+<h1><?php _e( 'Edit Comment' ); ?></h1>

 
 <div id="poststuff">
 
 <div id="poststuff">

+<input type="hidden" name="action" value="editedcomment" />
+<input type="hidden" name="comment_ID" value="<?php echo esc_attr( $comment->comment_ID ); ?>" />
+<input type="hidden" name="comment_post_ID" value="<?php echo esc_attr( $comment->comment_post_ID ); ?>" />

 
 

-<div class="submitbox" id="submitcomment">
+<div id="post-body" class="metabox-holder columns-2">
+<div id="post-body-content" class="edit-form-section edit-comment-section">
+<?php
+if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_ID > 0 ) :
+       $comment_link = get_comment_link( $comment );
+?>
+<div class="inside">
+       <div id="comment-link-box">
+               <strong><?php _ex( 'Permalink:', 'comment' ); ?></strong>
+               <span id="sample-permalink"><a href="<?php echo $comment_link; ?>"><?php echo $comment_link; ?></a></span>
+       </div>
+</div>
+<?php endif; ?>
+<div id="namediv" class="stuffbox">
+<div class="inside">
+<fieldset>
+<legend class="edit-comment-author"><?php _e( 'Author' ) ?></legend>
+<table class="form-table editcomment">
+<tbody>
+<tr>
+       <td class="first"><label for="name"><?php _e( 'Name:' ); ?></label></td>
+       <td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" id="name" /></td>
+</tr>
+<tr>
+       <td class="first"><label for="email"><?php _e( 'Email:' ); ?></label></td>
+       <td>
+               <input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" id="email" />
+       </td>
+</tr>
+<tr>
+       <td class="first"><label for="newcomment_author_url"><?php _e( 'URL:' ); ?></label></td>
+       <td>
+               <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr($comment->comment_author_url); ?>" />
+       </td>
+</tr>
+</tbody>
+</table>
+<br />
+</fieldset>
+</div>
+</div>

 
 

-<div id="previewview">
-<a href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View this Comment'); ?></a>
+<div id="postdiv" class="postarea">
+<?php
+       echo '<label for="content" class="screen-reader-text">' . __( 'Comment' ) . '</label>';
+       $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
+       wp_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
+       wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>

 </div>
 </div>

+</div><!-- /post-body-content -->

 
 

+<div id="postbox-container-1" class="postbox-container">
+<div id="submitdiv" class="stuffbox" >
+<h2><?php _e( 'Status' ) ?></h2>

 <div class="inside">
 <div class="inside">

+<div class="submitbox" id="submitcomment">
+<div id="minor-publishing">

 
 

-<p><strong><?php _e('Approval Status') ?></strong></p>
-<p>
-<select name='comment_status'>
-<option<?php selected( $comment->comment_approved, '1' ); ?> value='1'><?php _e('Approved') ?></option>
-<option<?php selected( $comment->comment_approved, '0' ); ?> value='0'><?php _e('Moderated') ?></option>
-<option<?php selected( $comment->comment_approved, 'spam' ); ?> value='spam'><?php _e('Spam') ?></option>
-</select>
-</p>
+<div id="misc-publishing-actions">

 
 

+<fieldset class="misc-pub-section misc-pub-comment-status" id="comment-status-radio">
+<legend class="screen-reader-text"><?php _e( 'Comment status' ); ?></legend>
+<label><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php _ex( 'Approved', 'comment status' ); ?></label><br />
+<label><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php _ex( 'Pending', 'comment status' ); ?></label><br />
+<label><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php _ex( 'Spam', 'comment status' ); ?></label>
+</fieldset>
+
+<div class="misc-pub-section curtime misc-pub-curtime">

 <?php
 <?php

-$stamp = __('%1$s at %2$s');
-$date = mysql2date(get_option('date_format'), $comment->comment_date);
-$time = mysql2date(get_option('time_format'), $comment->comment_date);
+/* translators: Publish box date format, see https://secure.php.net/date */
+$datef = __( 'M j, Y @ H:i' );

 ?>
 ?>

-<p class="curtime"><?php printf($stamp, $date, $time); ?>
-&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><?php _e('Edit') ?></a></p>
+<span id="timestamp"><?php
+printf(
+       /* translators: %s: comment date */
+       __( 'Submitted on: %s' ),
+       '<b>' . date_i18n( $datef, strtotime( $comment->comment_date ) ) . '</b>'
+);
+?></span>
+<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
+<fieldset id='timestampdiv' class='hide-if-js'>
+<legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
+<?php touch_time( ( 'editcomment' === $action ), 0 ); ?>
+</fieldset>
+</div>

 
 

-<div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0, 5); ?></div>
+<?php
+$post_id = $comment->comment_post_ID;
+if ( current_user_can( 'edit_post', $post_id ) ) {
+       $post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
+       $post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
+} else {
+       $post_link = esc_html( get_the_title( $post_id ) );
+}
+?>

 
 

+<div class="misc-pub-section misc-pub-response-to">
+       <?php printf(
+               /* translators: %s: post link */
+               __( 'In response to: %s' ),
+               '<b>' . $post_link . '</b>'
+       ); ?>

 </div>
 
 </div>
 

-<p class="submit">
-<input type="submit" name="save" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" />

 <?php
 <?php

-echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete comment') . "</a>";
-?>
-</p>
+if ( $comment->comment_parent ) :
+       $parent      = get_comment( $comment->comment_parent );
+       if ( $parent ) :
+               $parent_link = esc_url( get_comment_link( $parent ) );
+               $name        = get_comment_author( $parent );
+       ?>
+       <div class="misc-pub-section misc-pub-reply-to">
+               <?php printf(
+                       /* translators: %s: comment link */
+                       __( 'In reply to: %s' ),
+                       '<b><a href="' . $parent_link . '">' . $name . '</a></b>'
+               ); ?>
+       </div>
+<?php endif;
+endif; ?>

 
 

-<div class="side-info">
-<h5><?php _e('Related') ?></h5>
+<?php
+       /**
+        * Filters miscellaneous actions for the edit comment form sidebar.
+        *
+        * @since 4.3.0
+        *
+        * @param string $html    Output HTML to display miscellaneous action.
+        * @param object $comment Current comment object.
+        */
+        echo apply_filters( 'edit_comment_misc_actions', '', $comment );
+?>

 
 

-<ul>
-<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
-<li><a href="edit-comments.php?comment_status=moderated"><?php _e('Moderate Comments') ?></a></li>
-<?php do_action('comment_relatedlinks_list'); ?>
-</ul>
-</div>
-<?php do_action('submitcomment_box'); ?>
+</div> <!-- misc actions -->
+<div class="clear"></div>

 </div>
 
 </div>
 

-<div id="post-body">
-<div id="namediv" class="stuffbox">
-<h3><?php _e('Name') ?></h3>
-<div class="inside">
-<input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" />
+<div id="major-publishing-actions">
+<div id="delete-action">
+<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=" . ( !EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "'>" . ( !EMPTY_TRASH_DAYS ? __('Delete Permanently') : __('Move to Trash') ) . "</a>\n"; ?>

 </div>
 </div>

+<div id="publishing-action">
+<?php submit_button( __( 'Update' ), 'primary', 'save', false ); ?>

 </div>
 </div>

-
-<div id="emaildiv" class="stuffbox">
-<h3><?php _e('E-mail') ?></h3>
-<div class="inside">
-<input type="text" name="newcomment_author_email" size="30" value="<?php echo attribute_escape( $comment->comment_author_email ); ?>" tabindex="2" id="email" />
+<div class="clear"></div>

 </div>
 </div>
 </div>
 </div>

-
-<div id="uridiv" class="stuffbox">
-<h3><?php _e('URL') ?></h3>
-<div class="inside">
-<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="3" />

 </div>
 </div>

+</div><!-- /submitdiv -->

 </div>
 
 </div>
 

-<div id="postdiv" class="postarea">
-<h3><?php _e('Comment') ?></h3>
-<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
-<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
-</div>
+<div id="postbox-container-2" class="postbox-container">
+<?php
+/** This action is documented in wp-admin/edit-form-advanced.php */
+do_action( 'add_meta_boxes', 'comment', $comment );
+
+/**
+ * Fires when comment-specific meta boxes are added.
+ *
+ * @since 3.0.0
+ *
+ * @param WP_Comment $comment Comment object.
+ */
+do_action( 'add_meta_boxes_comment', $comment );

 
 

-<?php do_meta_boxes('comment', 'normal', $comment); ?>
+do_meta_boxes(null, 'normal', $comment);

 
 

-<input type="hidden" name="c" value="<?php echo $comment->comment_ID ?>" />
-<input type="hidden" name="p" value="<?php echo $comment->comment_post_ID ?>" />
-<input name="referredby" type="hidden" id="referredby" value="<?php echo wp_get_referer(); ?>" />
+$referer = wp_get_referer();
+?>
+</div>
+
+<input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID) ?>" />
+<input type="hidden" name="p" value="<?php echo esc_attr($comment->comment_post_ID) ?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo $referer ? esc_url( $referer ) : ''; ?>" />

 <?php wp_original_referer_field(true, 'previous'); ?>
 <input type="hidden" name="noredir" value="1" />
 <?php wp_original_referer_field(true, 'previous'); ?>
 <input type="hidden" name="noredir" value="1" />

+
+</div><!-- /post-body -->

 </div>
 </div>
 </div>
 </div>

-</div>
-

 </form>
 
 </form>
 

+<?php if ( ! wp_is_mobile() ) : ?>

 <script type="text/javascript">
 try{document.post.name.focus();}catch(e){}
 </script>
 <script type="text/javascript">
 try{document.post.name.focus();}catch(e){}
 </script>

+<?php endif;