Changeset 1737

Timestamp:

10/04/2004 08:49:45 AM (21 years ago)

Author:

saxmatt

Message:

Kitten's emergent registration / comment whitelisting patch.

Location:

trunk

Files:

• wp-admin/options-discussion.php (modified) (2 diffs)
• wp-admin/upgrade-schema.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)

trunk/wp-admin/options-discussion.php

@@ -58 +58 @@
     <form name="form1" method="post" action="options.php"> 
         <input type="hidden" name="action" value="update" /> 
-        <input type="hidden" name="page_options" value="'default_pingback_flag','default_ping_status','default_comment_status','comments_notify','moderation_notify','comment_moderation','require_name_email','comment_max_links','moderation_keys'" /> 
+        <input type="hidden" name="page_options" value="'default_pingback_flag','default_ping_status','default_comment_status','comments_notify','moderation_notify','comment_moderation','require_name_email','comment_whitelist','comment_max_links','moderation_keys'" /> 
 <fieldset class="options">
         <legend><?php _e('Usual settings for an article: <em>(These settings may be overridden for individual articles.)</em>') ?></legend> 
@@ -102 +102 @@
                 <?php _e('An administrator must approve the comment (regardless of any matches below)') ?> </label> 
             </li> 
-            <li> 
-                <label for="require_name_email"> 
-                <input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_settings('require_name_email')); ?> /> 
-                <?php _e('User must fill out name and e-mail') ?> </label> 
-            </li> 
+            <li><label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_settings('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label></li> 
+            <li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_settings('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li> 
         </ul> 
 </fieldset>

trunk/wp-admin/upgrade-schema.php

@@ -212 +212 @@
     add_option('template', 'default');
     add_option('stylesheet', 'default');
+    add_option('comment_whitelist', 0);
 
     // Delete unused options

trunk/wp-includes/functions.php

@@ -1474 +1474 @@
 
 function check_comment($author, $email, $url, $comment, $user_ip) {
+    global $wpdb;
+
     if (1 == get_settings('comment_moderation')) return false; // If moderation is set to manual
 
@@ -1479 +1481 @@
         return false; // Check # of external links
 
-    if ('' == trim( get_settings('moderation_keys') ) ) return true; // If moderation keys are empty
-    $words = explode("\n", get_settings('moderation_keys') );
+    // Comment whitelisting:
+    if ( 1 == get_settings('comment_whitelist')) {
+        $ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author_email = '$email' and comment_approved = '1' ");
+        if ( 1 == $ok_to_comment && false === strpos( $email, get_settings('moderation_keys')) )
+            return true
+    return false;
+    }
+
+    $mod_keys = trim( get_settings('moderation_keys') );
+    if ('' == $mod_keys )
+        return true; // If moderation keys are empty
+    $words = explode("\n", $mod_keys );
+
     foreach ($words as $word) {
         $word = trim($word);