Changeset 3529

Timestamp:

02/14/06 20:09:13 (3 years ago)

Author:

ryan

Message:

Option to 'mark as spam' in notification e-mail from Mark J. fixes #1048

Files:

• trunk/wp-admin/edit-comments.php (modified) (4 diffs)
• trunk/wp-admin/list-manipulation.js (modified) (1 diff)
• trunk/wp-admin/list-manipulation.php (modified) (1 diff)
• trunk/wp-admin/post.php (modified) (3 diffs)
• trunk/wp-includes/pluggable-functions.php (modified) (2 diffs)

trunk/wp-admin/edit-comments.php

@@ -44 +44 @@
-        $comment = (int) $comment;
-        $post_id = $wpdb->get_var("SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = $comment");
-
-
-
+
+
+
+
+
+
-            ++$i;
-endif;
+}
-    endforeach;
-
+
+
+
+
+
+
-endif;
-
@@ -97 +105 @@
-            if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-                echo " | <a href=\"post.php?action=editcomment&amp;comment=".$comment->comment_ID."\">" . __('Edit Comment') . "</a>";
-
+
+
-            } // end if any comments to show
-            // Get post title
@@ -103 +112 @@
-                $post_title = $wpdb->get_var("SELECT post_title FROM $wpdb->posts WHERE ID = $comment->comment_post_ID");
-                $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
-
+| 
-                <?php } ?>
-             | <a href="<?php echo get_permalink($comment->comment_post_ID); ?>"><?php _e('View Post') ?></a></p>
@@ -155 +164 @@
-    ?></table>
-    <p><a href="javascript:;" onclick="checkAll(document.getElementById('deletecomments')); return false; "><?php _e('Invert Checkbox Selection') ?></a></p>
-
+
+
-  </form>
-<?php

trunk/wp-admin/list-manipulation.js

@@ -33 +33 @@
-    ajaxDel.onLoaded = function() { ajaxDel.myResponseElement.innerHTML = 'Data Sent...'; };
-    ajaxDel.onInteractive = function() { ajaxDel.myResponseElement.innerHTML = 'Processing Data...'; };
-
+.replace('-as-spam', '')
-    ajaxDel.runAJAX('action=delete-' + what + '&id=' + id);
-    return false;

trunk/wp-admin/list-manipulation.php

@@ -64 +64 @@
-    }
-    break;
+case 'delete-comment-as-spam' :
+    $id = (int) $_POST['id'];
+
+    if ( !$comment = get_comment($id) )
+        die('0');
+    if ( !current_user_can('edit_post', $comment->comment_post_ID) )
+        die('-1');
+
+    if ( wp_set_comment_status($comment->comment_ID, 'spam') ) {
+        die('1');
+    } else {
+        die('0');
+    }
+    break;
-case 'delete-link-category' :
-    $id = (int) $_POST['id'];

trunk/wp-admin/post.php

@@ -185 +185 @@
-
-    echo "<div class='wrap'>\n";
-
+
+
+
+
-    echo "<table border='0'>\n";
-    echo "<tr><td>" . __('Author:') . "</td><td>$comment->comment_author</td></tr>\n";
@@ -196 +199 @@
-    echo "<form action='".get_settings('siteurl')."/wp-admin/post.php' method='get'>\n";
-    echo "<input type='hidden' name='action' value='deletecomment' />\n";
+    if ( 'spam' == $_GET['delete_type'] )
+        echo "<input type='hidden' name='delete_type' value='spam' />\n";
-    echo "<input type='hidden' name='p' value='$p' />\n";
-    echo "<input type='hidden' name='comment' value='{$comment->comment_ID}' />\n";
@@ -227 +232 @@
-        die( __('You are not allowed to edit comments on this post.') );
-
-
-
+
+
+
+
-
-    if (($_SERVER['HTTP_REFERER'] != "") && (false == $noredir)) {

trunk/wp-includes/pluggable-functions.php

@@ -333 +333 @@
-    $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
-    $notify_message .= sprintf( __('To delete this comment, visit: %s'), get_settings('siteurl').'/wp-admin/post.php?action=confirmdeletecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
+    $notify_message .= sprintf( __('To mark this comment as spam, visit: %s'), get_settings('siteurl').'/wp-admin/post.php?action=confirmdeletecomment&delete_type=spam&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
-
-    $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
@@ -390 +391 @@
-    $notify_message .= sprintf( __('To approve this comment, visit: %s'),  get_settings('siteurl').'/wp-admin/post.php?action=mailapprovecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
-    $notify_message .= sprintf( __('To delete this comment, visit: %s'), get_settings('siteurl').'/wp-admin/post.php?action=confirmdeletecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
+    $notify_message .= sprintf( __('To mark this comment as spam, visit: %s'), get_settings('siteurl').'/wp-admin/post.php?action=confirmdeletecomment&delete_type=spam&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
-    $notify_message .= sprintf( __('Currently %s comments are waiting for approval. Please visit the moderation panel:'), $comments_waiting ) . "\r\n";
-    $notify_message .= get_settings('siteurl') . "/wp-admin/moderation.php\r\n";