Changeset 2165

Timestamp:

01/31/05 04:22:01 (4 years ago)

Author:

saxmatt

Message:

Moderation confirmation from Ryan, some other template and comment editing improvements.

Files:

• trunk/wp-admin/edit-form-comment.php (modified) (3 diffs)
• trunk/wp-admin/post.php (modified) (3 diffs)
• trunk/wp-content/themes/default/comments.php (modified) (1 diff)
• trunk/wp-includes/comment-functions.php (modified) (4 diffs)
• trunk/wp-rdf.php (modified) (1 diff)

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

@@ -1 +1 @@
-<?php
-
-$submitbutton_text = __('Edit Comment &raquo;');
-$toprow_title = sprintf(__('Editing Comment # %s'), $commentdata['comment_ID']);
@@ -6 +5 @@
-$form_extra = "' />\n<input type='hidden' name='comment_ID' value='$comment' />\n<input type='hidden' name='comment_post_ID' value='".$commentdata["comment_post_ID"];
-?>
-<div class="wrap">
-
-<form name="post" action="post.php" method="post" id="post">
+<div class="wrap">
-<input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
-<input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' />
@@ -60 +59 @@
-</p>
-
+</div>
-
-
+
+
-
+<table width="100%" cellspacing="2" cellpadding="5" class="editform">
+    <tr>
+        <th scope="row" valign="top"><?php _e('Comment Status') ?>:</th>
+        <td><label for="comment_status_approved" class="selectit"><input id="comment_status_approved" name="comment_status" type="radio" value="1" <?php checked($comment_status, '1'); ?> /> <?php _e('Approved') ?></label><br />
+      <label for="comment_status_moderated" class="selectit"><input id="comment_status_moderated" name="comment_status" type="radio" value="0" <?php checked($comment_status, '0'); ?> /> <?php _e('Moderated') ?></label><br />
+      <label for="comment_status_spam" class="selectit"><input id="comment_status_spam" name="comment_status" type="radio" value="spam" <?php checked($comment_status, 'spam'); ?> /> <?php _e('Spam') ?></label></td>
+    </tr>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-</form>
-<p><a class="delete" href="post.php?action=confirmdeletecomment&amp;noredir=true&amp;comment=<?php echo $commentdata['comment_ID']; ?>&amp;p=<?php echo $commentdata['comment_post_ID']; ?>"><?php _e('Delete comment') ?></a></p>
-</div>

trunk/wp-admin/post.php

@@ -430 +430 @@
-    $content = format_to_edit($content);
-    $content = apply_filters('comment_edit_pre', $content);
+    
+    $comment_status = $commentdata['comment_approved'];
-
-    include('edit-form-comment.php');
@@ -586 +588 @@
-    $newcomment_author_email = $_POST['newcomment_author_email'];
-    $newcomment_author_url = $_POST['newcomment_author_url'];
+    $comment_status = $_POST['comment_status'];
-
-    if (!user_can_edit_post_comments($user_ID, $comment_post_ID)) {
@@ -613 +616 @@
-            comment_author = '$newcomment_author',
-            comment_author_email = '$newcomment_author_email',
+            comment_approved = '$comment_status',
-            comment_author_url = '$newcomment_author_url'".$datemodif."
-        WHERE comment_ID = $comment_ID"

trunk/wp-content/themes/default/comments.php

@@ -28 +28 @@
-
-        <li class="<?php echo $oddcomment; ?>" id="comment-<?php comment_ID() ?>">
-
-
+
+
+
+
+
+
+
+
-            <small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?> at <?php comment_time() ?></a> <?php edit_comment_link('e','',''); ?></small>
-            

trunk/wp-includes/comment-functions.php

@@ -8 +8 @@
-    if ( is_single() || is_page() || $withcomments ) :
-        $req = get_settings('require_name_email');
-        
+       
-        $comment_author_email = isset($_COOKIE['comment_author_email_'.COOKIEHASH]) ? trim(stripslashes($_COOKIE['comment_author_email_'.COOKIEHASH])) : '';
-        $comment_author_url = isset($_COOKIE['comment_author_url_'.COOKIEHASH]) ? trim(stripslashes($_COOKIE['comment_author_url_'.COOKIEHASH])) : '';
+    if ( empty($comment_author) ) {
-        $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date");
+    } else {
+        $author_db = addslashes($comment_author);
+        $email_db  = addslashes($comment_author_email);
+        $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND ( comment_approved = '1' OR ( comment_author = '$author_db' AND comment_author_email = '$email_db' AND comment_approved = '0' ) ) ORDER BY comment_date");
+    }
-
-    if ( file_exists( TEMPLATEPATH . '/comments.php') )
@@ -662 +668 @@
-    }
-    $notify_message .= get_permalink($comment->comment_post_ID) . '#comments';
-, visit: 
+:\r\n
-
-    if ('' == $comment->comment_author_email || '' == $comment->comment_author) {
@@ -733 +739 @@
-        return false; // Check # of external links
-
-    // Comment whitelisting:
-    if ( 1 == get_settings('comment_whitelist')) {
-        if ( 'trackback' == $comment_type || 'pingback' == $comment_type ) { // check if domain is in blogroll
-            $uri = parse_url($url);
-            $domain = $uri['host'];
-            $in_blogroll = $wpdb->get_var("SELECT link_id FROM $wpdb->links WHERE link_url LIKE ('%$domain%') LIMIT 1");
-            if ( $in_blogroll )
-                return true;
-        } elseif( $author != '' && $email != '' ) {
-            $ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' ");
-            if ( 1 == $ok_to_comment && false === strpos( $email, get_settings('moderation_keys')) )
-                return true;
-            else
-                return false;
-        } else {
-            return false;
-        }
-    }
-
-    $mod_keys = trim( get_settings('moderation_keys') );
-    if ('' == $mod_keys )
@@ -776 +763 @@
-    }
-
+    // Comment whitelisting:
+    if ( 1 == get_settings('comment_whitelist')) {
+        if ( 'trackback' == $comment_type || 'pingback' == $comment_type ) { // check if domain is in blogroll
+            $uri = parse_url($url);
+            $domain = $uri['host'];
+            if ( $wpdb->get_var("SELECT link_id FROM $wpdb->links WHERE link_url LIKE ('%$domain%') LIMIT 1") )
+                return true;
+        } elseif( $author != '' && $email != '' ) {
+            $ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' ");
+            if ( 1 == $ok_to_comment && false === strpos( $email, get_settings('moderation_keys')) )
+                return true;
+            else
+                return false;
+        } else {
+            return false;
+        }
+    }
+
-    return true;
-}

trunk/wp-rdf.php

@@ -44 +44 @@
-    <link><?php permalink_single_rss() ?></link>
-    <dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', $post->post_date_gmt); ?></dc:date>
- (mailto:<?php the_author_email() ?>)
+
-    <?php the_category_rss('rdf') ?>
-<?php if (get_settings('rss_use_excerpt')) : ?>