Changeset 6371

Timestamp:

12/10/07 20:42:03 (1 year ago)

Author:

matt

Message:

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.

Files:

• trunk/wp-admin/comment.php (modified) (4 diffs)

trunk/wp-admin/comment.php

@@ -5 +5 @@
-$submenu_file = 'edit-comments.php';
-
-array('action')
+ array('action') 
-
-if ( isset( $_POST['deletecomment'] ) )
-    $action = 'deletecomment';
-
-
-
+
+
+
+
+
+
+
+
+
-    $title = __('Edit Comment');
-
- 
-
- = (int) $_GET['c']
-
- $comment = get_comment($comment
-wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'javascript:history.go(-1)')
+
+
+_id = absint( $_GET['c'] )
+
+$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) )
-wp
-
-$comment
+comment_footer
+
+ $comment_id 
-
-    include('edit-form-comment.php');
@@ -30 +37 @@
-    break;
-
-
-
-
-./
-
- = (int) $_GET['c']
+ 
+ 
+
+
+
+_id = absint( $_GET['c'] )
-    $formaction = 'cdc' == $action ? 'deletecomment' : 'approvecomment';
-    $nonce_action = 'cdc' == $action ? 'delete-comment_' : 'approve-comment_';
-
-
- $comment = get_comment_to_edit($comment
-wp_die(__('Oops, no comment with this ID.').sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit.php')
-
-'edit_post', $comment->comment_post_ID
-wp
+_id
+
+$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') 
+
+ 'edit_post', $comment->comment_post_ID 
+comment_footer
-?>
-<div class='wrap'>
-
-<div class="narrow">
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-<p><?php _e('Are you sure you want to do that?'); ?></p>
-
-<?php echo get_option('siteurl'); ?>/wp-admin/
+
-
-<table width="100%">
-<tr>
-
-value='<?php _e('Yes')
+class="button" 
+class="button" value='<?php echo $button
-</tr>
-</table>
-
-$nonce_action
+ $nonce_action 
-<input type='hidden' name='action' value='<?php echo $formaction; ?>' />
-<?php if ( 'spam' == $_GET['dt'] ) { ?>
@@ -96 +110 @@
-<?php } ?>
-<tr>
-p><?php _e('Comment:'); ?></p
+?php _e('Comment:'); ?
-<td><?php echo $comment->comment_content; ?></td>
-</tr>
@@ -106 +120 @@
-    break;
-
-
- = (int) $_REQUEST['c']
-'delete-comment_' . $comment
-
-$_REQUEST['noredir']) ) {
+ 
+_id = absint( $_REQUEST['c'] )
+ 'delete-comment_' . $comment_id 
+
+ $_REQUEST['noredir'] ) )
-        $noredir = true;
-} else {
+else
-        $noredir = false;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    exit();
-    break;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    exit();
-    break;
-
-case 'approvecomment':
-    $comment = (int) $_GET['c'];
-    check_admin_referer('approve-comment_' . $comment);
-
-    if (isset($_GET['noredir'])) {
-        $noredir = true;
-    } else {
-        $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 ( !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.') );
-
-    wp_set_comment_status($comment->comment_ID, "approve");
-    if (get_option("comments_notify") == true) {
-        wp_notify_postauthor($comment->comment_ID);
-    }
-
-
-    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;
-
-case 'editedcomment':
-
-    $comment_ID = (int) $_POST['comment_ID'];
-    $comment_post_ID = (int) $_POST['comment_post_id'];
-
-    check_admin_referer('update-comment_' . $comment_ID);
-
-    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);
-    exit();
-    break;
-default:
-
+
+
+
-} // end switch
-