Changeset 6050 for trunk/src/includes/common/functions.php

Timestamp:

06/02/2016 01:57:59 AM (10 years ago)

Author:

netweb

Message:

Moderation: Add new bbp_moderation_keys and bbp_blacklist_keys filters

This changeset allows external plugins to filter the list of moderation and blacklist keyword terms, IP, URLs, words, etc.

Also cleans up bbp_check_for_moderation() to bails early if there are no moderation keys inline with bbp_check_for_blacklist()

Props thebrandonallen, satollo.
Fixes #2861.

File:

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

trunk/src/includes/common/functions.php

@@ -802 +802 @@
     $match_out = '';
 
+    /** Max Links *************************************************************/
+
+    $max_links = get_option( 'comment_max_links' );
+    if ( ! empty( $max_links ) ) {
+
+        // How many links?
+        $num_links = preg_match_all( '/(http|ftp|https):\/\//i', $content, $match_out );
+
+        // Allow for bumping the max to include the user's URL
+        if ( ! empty( $_post['url'] ) ) {
+            $num_links = apply_filters( 'comment_max_links_url', $num_links, $_post['url'] );
+        }
+
+        // Das ist zu viele links!
+        if ( $num_links >= $max_links ) {
+            return false;
+        }
+    }
+
+    /** Moderation ************************************************************/
+
+    /**
+     * Filters the bbPress moderation keys.
+     *
+     * @since 2.6.0 bbPress (r6050)
+     *
+     * @param string $moderation List of moderation keys. One per new line.
+     */
+    $moderation = apply_filters(
+        'bbp_moderation_keys',
+        trim( get_option( 'moderation_keys' )
+    ) );
+
+    // Bail if blacklist is empty
+    if ( empty( $moderation ) ) {
+        return true;
+    }
+
     /** User Data *************************************************************/
 
@@ -832 +870 @@
     $_post['content'] = $content;
 
-    /** Max Links *************************************************************/
-
-    $max_links = get_option( 'comment_max_links' );
-    if ( ! empty( $max_links ) ) {
-
-        // How many links?
-        $num_links = preg_match_all( '/(http|ftp|https):\/\//i', $content, $match_out );
-
-        // Allow for bumping the max to include the user's URL
-        if ( ! empty( $_post['url'] ) ) {
-            $num_links = apply_filters( 'comment_max_links_url', $num_links, $_post['url'] );
+    /** Words *****************************************************************/
+
+    // Get words separated by new lines
+    $words = explode( "\n", $moderation );
+
+    // Loop through words
+    foreach ( (array) $words as $word ) {
+
+        // Trim the whitespace from the word
+        $word = trim( $word );
+
+        // Skip empty lines
+        if ( empty( $word ) ) {
+            continue;
         }
 
-        // Das ist zu viele links!
-        if ( $num_links >= $max_links ) {
-            return false;
-        }
-    }
-
-    /** Blacklist *************************************************************/
-
-    // Get the moderation keys
-    $blacklist = trim( get_option( 'moderation_keys' ) );
-
-    // Bail if blacklist is empty
-    if ( ! empty( $blacklist ) ) {
-
-        // Get words separated by new lines
-        $words = explode( "\n", $blacklist );
-
-        // Loop through words
-        foreach ( (array) $words as $word ) {
-
-            // Trim the whitespace from the word
-            $word = trim( $word );
-
-            // Skip empty lines
-            if ( empty( $word ) ) {
-                continue;
-            }
-
-            // Do some escaping magic so that '#' chars in the
-            // spam words don't break things:
-            $word    = preg_quote( $word, '#' );
-            $pattern = "#$word#i";
-
-            // Loop through post data
-            foreach ( $_post as $post_data ) {
-
-                // Check each user data for current word
-                if ( preg_match( $pattern, $post_data ) ) {
-
-                    // Post does not pass
-                    return false;
-                }
+        // Do some escaping magic so that '#' chars in the
+        // spam words don't break things:
+        $word    = preg_quote( $word, '#' );
+        $pattern = "#$word#i";
+
+        // Loop through post data
+        foreach ( $_post as $post_data ) {
+
+            // Check each user data for current word
+            if ( preg_match( $pattern, $post_data ) ) {
+
+                // Post does not pass
+                return false;
             }
         }
@@ -921 +933 @@
     }
 
-    // Define local variable
-    $_post = array();
-
     /** Blacklist *************************************************************/
 
-    // Get the moderation keys
-    $blacklist = trim( get_option( 'blacklist_keys' ) );
+    /**
+     * Filters the bbPress blacklist keys.
+     *
+     * @since 2.6.0 bbPress (r6050)
+     *
+     * @param string $blacklist List of blacklist keys. One per new line.
+     */
+    $blacklist = apply_filters(
+        'bbp_blacklist_keys',
+        trim( get_option( 'blacklist_keys' )
+    ) );
 
     // Bail if blacklist is empty
@@ -935 +953 @@
 
     /** User Data *************************************************************/
+
+    // Define local variable
+    $_post = array();
 
     // Map anonymous user data