Changeset 8720

Timestamp:

08/24/08 06:56:22 (3 months ago)

Author:

azaozz

Message:

Reply to comments from admin, first run, see #7435

Files:

• trunk/wp-admin/admin-ajax.php (modified) (1 diff)
• trunk/wp-admin/admin-footer.php (modified) (1 diff)
• trunk/wp-admin/css/colors-classic.css (modified) (3 diffs)
• trunk/wp-admin/css/colors-fresh.css (modified) (3 diffs)
• trunk/wp-admin/edit-comments.php (modified) (4 diffs)
• trunk/wp-admin/edit-form-advanced.php (modified) (2 diffs)
• trunk/wp-admin/edit-pages.php (modified) (2 diffs)
• trunk/wp-admin/edit.php (modified) (2 diffs)
• trunk/wp-admin/gears-manifest.php (modified) (2 diffs)
• trunk/wp-admin/images/logo.gif (modified) (previous)
• trunk/wp-admin/images/se.png (added)
• trunk/wp-admin/includes/template.php (modified) (4 diffs)
• trunk/wp-admin/js/edit-comments.js (modified) (1 diff)
• trunk/wp-admin/js/editor.js (modified) (2 diffs)
• trunk/wp-admin/post.php (modified) (1 diff)
• trunk/wp-admin/upload.php (modified) (2 diffs)
• trunk/wp-admin/wp-admin.css (modified) (7 diffs)
• trunk/wp-comments-post.php (modified) (1 diff)
• trunk/wp-includes/comment.php (modified) (3 diffs)
• trunk/wp-includes/general-template.php (modified) (4 diffs)
• trunk/wp-includes/js/jquery/ui.dialog.js (added)
• trunk/wp-includes/js/jquery/ui.draggable.js (added)
• trunk/wp-includes/js/jquery/ui.resizable.js (added)
• trunk/wp-includes/js/quicktags.js (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (4 diffs)
• trunk/xmlrpc.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -423 +423 @@
-        ) );
-    }
+    $x->send();
+    break;
+case 'replyto-comment' :
+    check_ajax_referer( $action );
+
+    $comment_post_ID = (int) $_POST['comment_post_ID'];
+    if ( !current_user_can( 'edit_post', $comment_post_ID ) )
+        die('-1');
+
+    $status = $wpdb->get_var( $wpdb->prepare("SELECT post_status FROM $wpdb->posts WHERE ID = %d", $comment_post_ID) );
+
+    if ( empty($status) )
+        die('1');
+    elseif ( in_array($status->post_status, array('draft', 'pending') ) )
+        die( __('Error: you are replying to comment on a draft post.') );
+
+    $user = wp_get_current_user();
+    if ( $user->ID ) {
+        $comment_author       = $wpdb->escape($user->display_name);
+        $comment_author_email = $wpdb->escape($user->user_email);
+        $comment_author_url   = $wpdb->escape($user->user_url);
+        $comment_content      = trim($_POST['comment']);
+        if ( current_user_can('unfiltered_html') ) {
+            if ( wp_create_nonce('unfiltered-html-comment_' . $comment_post_ID) != $_POST['_wp_unfiltered_html_comment'] ) {
+                kses_remove_filters(); // start with a clean slate
+                kses_init_filters(); // set up the filters
+            }
+        }
+    } else {
+        die( __('Sorry, you must be logged in to reply to a comment.') );
+    }
+
+    if ( '' == $comment_content )
+        die( __('Error: please type a comment.') );
+
+    $comment_parent = absint($_POST['comment_ID']);
+    $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
+
+    $comment_id = wp_new_comment( $commentdata );
+    $comment = get_comment($comment_id);
+    if ( ! $comment ) die('1');
+
+    $mode = ( isset($_POST['mode']) && 'single' == $_POST['mode'] ) ? 'single' : 'detail';
+    $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
+    $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
+
+    if ( get_option('show_avatars') && 'single' != $mode )
+        add_filter( 'comment_author', 'floated_admin_avatar' );
+
+    $x = new WP_Ajax_Response();
+
+    ob_start();
+        _wp_comment_row( $comment->comment_ID, $mode, false, $checkbox );
+        $comment_list_item = ob_get_contents();
+    ob_end_clean();
+
+    $x->add( array(
+        'what' => 'comment',
+        'id' => $comment->comment_ID,
+        'data' => $comment_list_item,
+        'position' => $position
+    ));
+
-    $x->send();
-    break;

trunk/wp-admin/admin-footer.php

@@ -11 +11 @@
-</div><!-- wpbody -->
-</div><!-- wpcontent -->
-
+br class="clear" /><
-<div id="footer">
-<p><?php

trunk/wp-admin/css/colors-classic.css

@@ -55 +55 @@
-
-li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links,
-
+ #replyhandle,
-.login form, h3.info-box-title, #post-status-info {
-    background-color: #cfebf7;
@@ -71 +71 @@
-#post-body ul#category-tabs li.ui-tabs-selected, .button-secondary,
-#quicktags, #login form .submit input, #post-search .button,
-
+, #ed_reply_toolbar
-    background-color: #8ebddc !important;
-}
@@ -377 +377 @@
-}
-
-
+, #ed_reply_toolbar input
-    background: url( ../images/fade-butt.png ) #fff repeat-x 0 -2px;
-}

trunk/wp-admin/css/colors-fresh.css

@@ -55 +55 @@
-
-li.widget-list-control-item, div.nav, .tablenav, #dashboard-widgets p.dashboard-widget-links,
-
+ #replyhandle,
-.login form, h3.info-box-title, #post-status-info {
-    background-color: #eaf3fa;
@@ -71 +71 @@
-#post-body ul#category-tabs li.ui-tabs-selected, .button-secondary,
-#quicktags, #login form .submit input, #post-search .button,
-
+, #ed_reply_toolbar
-    background-color: #cee1ef !important;
-}
@@ -366 +366 @@
-}
-
-
+, #ed_reply_toolbar input
-    background: url( ../images/fade-butt.png ) #fff repeat-x 0 -2px;
-}

trunk/wp-admin/edit-comments.php

@@ -12 +12 @@
-$title = __('Edit Comments');
-wp_enqueue_script( 'admin-comments' );
-
+
+
-
-if ( !empty( $_REQUEST['delete_comments'] ) && isset($_REQUEST['action']) ) {
@@ -54 +55 @@
-require_once('admin-header.php');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-$search = attribute_escape( $search_dirty );
-?>
@@ -216 +208 @@
-    <th scope="col" class="comment-column"><?php _e('Comment') ?></th>
-    <th scope="col" class="author-column"><?php _e('Author') ?></th>
-Comment 
+
-    <th scope="col" class="response-column"><?php _e('In Response To This Post') ?></th>
-  </tr>
@@ -270 +262 @@
-</div>
-
-
+
+
+

trunk/wp-admin/edit-form-advanced.php

@@ -326 +326 @@
-</table>
-
-
-
-
-
-
+
-}
-add_meta_box('commentstatusdiv', __('Comments on this Post'), 'post_comment_status_meta_box', 'post', 'normal', 'core');
@@ -542 +538 @@
-</form>
-
+<?php wp_comment_reply(); ?>
+
-<?php if ((isset($post->post_title) && '' == $post->post_title) || (isset($_GET['message']) && 2 > $_GET['message'])) : ?>
-<script type="text/javascript">

trunk/wp-admin/edit-pages.php

@@ -69 +69 @@
-if ( is_singular() )
-    wp_enqueue_script( 'admin-comments' );
+
-require_once('admin-header.php');
-
@@ -241 +242 @@
-
-<?php
-
+
-endif; // comments
-endif; // posts;

trunk/wp-admin/edit.php

@@ -54 +54 @@
-list($post_stati, $avail_post_stati) = wp_edit_posts_query();
-
-
+ {
-    wp_enqueue_script( 'admin-comments' );
+    wp_enqueue_script( 'quicktags' );
+}
+
-require_once('admin-header.php');
-
@@ -268 +271 @@
-
-<?php
-
+
-endif; // comments
-endif; // posts;

trunk/wp-admin/gears-manifest.php

@@ -136 +136 @@
-{
-"betaManifestVersion" : 1,
-731
+823
-"entries" : [
-<?php echo $defaults; ?>
@@ -174 +174 @@
-{ "url" : "images/no.png" },
-{ "url" : "images/yes.png" },
+{ "url" : "images/se.png" },
-
-<?php if ( is_file('../wp-includes/js/tinymce/tiny_mce.js') ) { ?>

trunk/wp-admin/includes/template.php

@@ -800 +800 @@
-
-    if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-'</a> | '
-'</a> | '
+"</a> | "
+"</a> | "
-        $actions['edit']      = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a> | ';
-$actions['flag']      = "<a href='#' class='no-crazy'>Flag for Follow-up</a> | ";
-
+if ( 'spam' != $the_comment_status )
+   
-        $actions['delete']    = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete'>" . __('Delete') . '</a>';
-
@@ -817 +817 @@
-        }
-
-=
-unset($actions['spam'])
+!
+$actions['reply'] = ' | <a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',this);return false;" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>'
-
-        $actions = apply_filters( 'comment_row_actions', $actions, $comment );
-
-        foreach ( $actions as $action => $link )
-
+\n
-    }
-    ?>
@@ -842 +842 @@
-<?php if ( 'single' !== $mode ) : ?>
-    <td class="response-column">
-
+ 
-    <?php echo get_the_time(__('Y/m/d \a\t g:ia')); ?>
-    </td>
@@ -848 +848 @@
-  </tr>
-    <?php
+}
+
+function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single') {
+    global $current_user;
+
+    // allow plugin to replace the popup content
+    $content = apply_filters( 'wp_comment_reply', '' );
+    
+    if ( ! empty($content) ) {
+        echo $content;
+        return;
+    }
+?>
+    <div id="replyerror" style="display:none;">
+    <img src="images/logo.gif" />
+    <h3 class="info-box-title"><?php _e('Comment Reply Error'); ?></h3>
+    <p id="replyerrtext"></p>
+    <p class="submit"><button id="close-button" onclick="commentReply.close();" class="button"><?php _e('Close'); ?></button></p>
+    </div>
+    
+    <div id="replydiv" style="display:none;">
+    <p id="replyhandle"><?php _e('Reply'); ?></p>
+    <form action="" method="post" id="replyform">
+    <input type="hidden" name="user_ID" id="user_ID" value="<?php echo $current_user->ID; ?>" />
+    <input type="hidden" name="action" value="replyto-comment" />
+    <input type="hidden" name="comment_ID" id="comment_ID" value="" />
+    <input type="hidden" name="comment_post_ID" id="comment_post_ID" value="" />
+    <input type="hidden" name="position" id="position" value="<?php echo $position; ?>" />
+    <input type="hidden" name="checkbox" id="checkbox" value="<?php echo $checkbox ? 1 : 0; ?>" />
+    <input type="hidden" name="mode" id="mode" value="<?php echo $mode; ?>" />
+    <?php wp_nonce_field( 'replyto-comment', '_ajax_nonce', false ); ?>
+    <?php wp_comment_form_unfiltered_html_nonce(); ?>
+
+    <div id="replycontainer"><textarea rows="5" cols="50" name="replycontent" tabindex="10" id="replycontent"></textarea></div>
+
+    <p id="replysubmit"><input type="button" onclick="commentReply.close();" class="button" value="<?php _e('Cancel'); ?>" />
+    <input type="button" onclick="commentReply.send();" class="button" value="<?php _e('Submit Reply'); ?>" /></p>
+    </form>
+    </div>
+<?php
-}
-

trunk/wp-admin/js/edit-comments.js

@@ -79 +79 @@
-theList = $('#the-comment-list').wpList( { alt: '', dimAfter: dimAfter, delAfter: delAfter, addColor: 'none' } );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/wp-admin/js/editor.js

@@ -1 +1 @@
-wpEditorInit = function() {
-
-
-
-
+
+
+
+
+
+
+
-    } else {
-
-
-
-
+
+
+
-};
-
-switchEditors = {
-
-    
+   
-
-        
-        
-            
-        
-            
+       
+       
+           
+       
+           
-
-        
-    
+       
+   
-
-    
-        
+   
+       
-
-        
-        
-            
-            
-        
+       
+       
+           
+           
+       
-
-        
-        
-        
-        
+       
+       
+       
+       
-
-        
-        
+       
+       
-
-        
-        
+       
+       
-
-        
-        
-        
-        
-        
+       
+       
+       
+       
+       
-
-        
-        
-        
+       
+       
+       
-        content = content.replace(new RegExp('\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*', 'gi'), '\n\n[caption$1[/caption]\n\n');
-        content = content.replace(new RegExp('caption\\]\\n\\n+\\[caption', 'g'), 'caption]\n\n[caption');
-
-        
-        
-        
-        
+       
+       
+       
+       
-
-        
-            
-            
-        
+       
+           
+           
+       
-
-        
-        
-        
+       
+       
+       
-
-        
-        
-        
+       
+       
+       
-
-        
-        
+       
+       
-
-        
-        
-    
+       
+       
+   
-
-    
-        
-        
-        
-        
-        
-        
+   
+       
+       
+       
+       
+       
+       
-
-        
-            
+       
+           
-
-            
-            
+           
+           
-
-            
-            
-            
+           
+           
+           
-
-            
+           
-
-            
-            
+           
+           
-
-            
-        
-            
-            
+           
+       
+           
+           
-
-            
-            
+           
+           
-
-            
+           
-                ta.style.width = '98%';
-                ec.style.padding = '0px';
@@ -119 +121 @@
-                ta.style.width = '100%';
-                ec.style.padding = '6px';
-            
+           
-
-            
-            
-        
-    
+           
+           
+       
+   
-
-    
-        
-        
+   
+       
+       
-
-        
-        
-    
+       
+       
+   
-
-    
-        
-            
-        
-            
-        
+   
+       
+           
+       
+           
+       
-
-        
-        
-        
-        
-    
+       
+       
+       
+       
+   
-
-    
-        
+   
+       
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
-
-        
-        
+       
+       
-            a = a.replace(/<br ?\/?>[\r\n]*/g, '\n');
-            return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, '\n');
-        
+       
-
-    
-    
+   
+   
-}

trunk/wp-admin/post.php

@@ -131 +131 @@
-    wp_enqueue_script('media-upload');
-    wp_enqueue_script('word-count');
+    wp_enqueue_script( 'admin-comments' );
-
-    if ( current_user_can('edit_post', $post_ID) ) {

trunk/wp-admin/upload.php

@@ -10 +10 @@
-require_once('admin.php');
-add_thickbox();
-
+
+
-
-if (!current_user_can('upload_files'))
@@ -264 +265 @@
-</div>
-
-
+
+
+
+

trunk/wp-admin/wp-admin.css

@@ -321 +321 @@
-}
-
-
+
+
-    margin: 3px 2px 2px;
-    padding: 2px 4px;
@@ -328 +329 @@
-}
-
-
+
+
-    font-weight: bold;
-}
-
-
+
+
-    text-decoration: underline;
-}
-
-
+
+
-    text-decoration: line-through;
-}
-
-
+
+
-    font-style: italic;
-}
-
-
+
+
-    font-family: "Courier New", Courier, mono;
-    font-size: 1.1em;
@@ -503 +509 @@
-}
-
+.comment-column p {
+    margin-top: 0;
+}
+
-.comment-column {
-    width: 50%;
-}
-
-.comment-column p {
-    margin-top: 0;
-}
-