Changeset 10859

Timestamp:

06/01/2016 09:12:44 PM (10 years ago)

Author:

r-a-y

Message:

Moderation: Add WP error handling.

bp_core_check_for_moderation() and bp_core_check_for_blacklist() now
supports returning WP errors.

See #6719.

File:

• trunk/src/bp-core/bp-core-moderation.php (modified) (5 diffs)

trunk/src/bp-core/bp-core-moderation.php

@@ -48 +48 @@
  *
  * @since 1.6.0
- *
- * @param int    $user_id Topic or reply author ID.
- * @param string $title   The title of the content.
- * @param string $content The content being posted.
+ * @since 2.6.0 Added $error_type parameter.
+ *
+ * @param int    $user_id    User ID.
+ * @param string $title      The title of the content.
+ * @param string $content    The content being posted.
+ * @param string $error_type The error type to return. Either 'bool' or 'wp_error'.
  * @return bool True if test is passed, false if fail.
  */
-function bp_core_check_for_moderation( $user_id = 0, $title = '', $content = '' ) {
+function bp_core_check_for_moderation( $user_id = 0, $title = '', $content = '', $error_type = 'bool' ) {
 
         /**
@@ -128 +130 @@
                 // Das ist zu viele links!
                 if ( $num_links >= $max_links ) {
-                        return false;
+                        if ( 'bool' === $error_type ) {
+                                return false;
+                        } else {
+                                return new WP_Error( 'bp_moderation_too_many_links', __( 'You have inputted too many links', 'buddypress' ) );
+                        }
                 }
         }
@@ -165 +171 @@
                                 // Check each user data for current word.
                                 if ( preg_match( $pattern, $post_data ) ) {
-
-                                        // Post does not pass.
-                                        return false;
+                                        if ( 'bool' === $error_type ) {
+                                                return false;
+                                        } else {
+                                                return new WP_Error( 'bp_moderation_word_match', _x( 'You have inputted an inappropriate word.', 'Comment moderation', 'buddypress' ) );
+                                        }
                                 }
                         }
@@ -181 +189 @@
  *
  * @since 1.6.0
- *
- * @param int    $user_id Topic or reply author ID.
- * @param string $title   The title of the content.
- * @param string $content The content being posted.
+ * @since 2.6.0 Added $error_type parameter.
+ *
+ * @todo Why don't we use wp_blacklist_check() for this?
+ *
+ * @param int    $user_id    User ID.
+ * @param string $title      The title of the content.
+ * @param string $content    The content being posted.
+ * @param string $error_type The error type to return. Either 'bool' or 'wp_error'.
  * @return bool True if test is passed, false if fail.
  */
-function bp_core_check_for_blacklist( $user_id = 0, $title = '', $content = '' ) {
+function bp_core_check_for_blacklist( $user_id = 0, $title = '', $content = '', $error_type = 'bool' ) {
 
         /**
@@ -272 +284 @@
                         // Check each user data for current word.
                         if ( preg_match( $pattern, $post_data ) ) {
-
-                                // Post does not pass.
-                                return false;
+                                if ( 'bool' === $error_type ) {
+                                        return false;
+                                } else {
+                                        return new WP_Error( 'bp_moderation_blacklist_match', _x( 'You have inputted an inappropriate word.', 'Comment blacklist', 'buddypress' ) );
+                                }
                         }
                 }