Changeset 6855 for trunk/src/includes/topics/functions.php

Timestamp:

08/22/2018 03:11:02 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Moderation: remove references to blacklist/whitelist verbiage.

This change combines 2 functions into 1, merging _blacklist() checks into _moderation() checks. A new $strict parameter is added, when set to true will continue to check against the WordPress blacklist_keys option name.

• Tests updated
• bbp_check_for_blacklist() deprecated
• Error response keys renamed (non breaking - nothing relies on them)
• Some docs updates

Fixes #3215. For 2.6.

File:

• trunk/src/includes/topics/functions.php (modified) (4 diffs)

trunk/src/includes/topics/functions.php

@@ -254 +254 @@
     }
 
-    /** Topic Blacklist *******************************************************/
-
-    if ( ! bbp_check_for_blacklist( $anonymous_data, $topic_author, $topic_title, $topic_content ) ) {
-        bbp_add_error( 'bbp_topic_blacklist', __( '<strong>ERROR</strong>: Your topic cannot be created at this time.', 'bbpress' ) );
+    /** Topic Bad Words *******************************************************/
+
+    if ( ! bbp_check_for_moderation( $anonymous_data, $topic_author, $topic_title, $topic_content, true ) ) {
+        bbp_add_error( 'bbp_topic_moderation', __( '<strong>ERROR</strong>: Your topic cannot be created at this time.', 'bbpress' ) );
     }
 
@@ -269 +269 @@
         $topic_status = bbp_get_pending_status_id();
 
-    // Check a whitelist of possible topic status ID's
+    // Check possible topic status ID's
     } elseif ( ! empty( $_POST['bbp_topic_status'] ) && in_array( $_POST['bbp_topic_status'], array_keys( $topic_statuses ), true ) ) {
         $topic_status = sanitize_key( $_POST['bbp_topic_status'] );
@@ -550 +550 @@
     }
 
-    /** Topic Blacklist *******************************************************/
-
-    if ( ! bbp_check_for_blacklist( $anonymous_data, $topic_author, $topic_title, $topic_content ) ) {
-        bbp_add_error( 'bbp_topic_blacklist', __( '<strong>ERROR</strong>: Your topic cannot be edited at this time.', 'bbpress' ) );
+    /** Topic Bad Words *******************************************************/
+
+    if ( ! bbp_check_for_moderation( $anonymous_data, $topic_author, $topic_title, $topic_content, true ) ) {
+        bbp_add_error( 'bbp_topic_moderation', __( '<strong>ERROR</strong>: Your topic cannot be edited at this time.', 'bbpress' ) );
     }
 
@@ -569 +569 @@
         }
 
-    // Check a whitelist of possible topic status ID's
+    // Check possible topic status ID's
     } elseif ( ! empty( $_POST['bbp_topic_status'] ) && in_array( $_POST['bbp_topic_status'], array_keys( $topic_statuses ), true ) ) {
         $topic_status = sanitize_key( $_POST['bbp_topic_status'] );