Changeset 9396

Timestamp:

01/21/2015 11:51:57 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Bring BuddyPress core moderation and blacklist functions up to date with bbPress's. See r9392 & r9395.

File:

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

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

@@ -65 +65 @@
 function bp_core_check_for_moderation( $user_id = 0, $title = '', $content = '' ) {
 
+    // Allow for moderation check to be skipped
+    if ( apply_filters( 'bp_bypass_check_for_moderation', false, $user_id, $title, $content ) ) {
+        return true;
+    }
+
     // Bail if super admin is author
     if ( is_super_admin( $user_id ) ) {
@@ -71 +76 @@
 
     // Define local variable(s)
-    $post      = array();
+    $_post     = array();
     $match_out = '';
 
@@ -83 +88 @@
         // If data exists, map it
         if ( ! empty( $user ) ) {
-            $post['author'] = $user->display_name;
-            $post['email']  = $user->user_email;
-            $post['url']    = $user->user_url;
+            $_post['author'] = $user->display_name;
+            $_post['email']  = $user->user_email;
+            $_post['url']    = $user->user_url;
         }
     }
 
     // Current user IP and user agent
-    $post['user_ip'] = bp_core_current_user_ip();
-    $post['user_ua'] = bp_core_current_user_ua();
+    $_post['user_ip'] = bp_core_current_user_ip();
+    $_post['user_ua'] = bp_core_current_user_ua();
 
     // Post title and content
-    $post['title']   = $title;
-    $post['content'] = $content;
+    $_post['title']   = $title;
+    $_post['content'] = $content;
 
     /** Max Links *************************************************************/
@@ -103 +108 @@
 
         // How many links?
-        $num_links = preg_match_all( '/<a [^>]*href/i', $content, $match_out );
+        $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'] );
+        if ( ! empty( $_post['url'] ) ) {
+            $num_links = apply_filters( 'comment_max_links_url', $num_links, $_post['url'] );
         }
 
@@ -122 +127 @@
 
     // 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;
+                }
+            }
+        }
+    }
+
+    // Check passed successfully
+    return true;
+}
+
+/**
+ * Check for blocked keys.
+ *
+ * @since BuddyPress (1.6.0)
+ *
+ * @uses bp_current_author_ip() To get current user IP address.
+ * @uses bp_current_author_ua() To get current user agent.
+ * @uses bp_current_user_can() Allow super admins to bypass blacklist.
+ *
+ * @param int $user_id Topic or reply author ID.
+ * @param string $title The title of the content.
+ * @param string $content The content being posted.
+ * @return bool True if test is passed, false if fail.
+ */
+function bp_core_check_for_blacklist( $user_id = 0, $title = '', $content = '' ) {
+
+    // Allow for blacklist check to be skipped
+    if ( apply_filters( 'bp_bypass_check_for_blacklist', false, $user_id, $title, $content ) ) {
+        return true;
+    }
+
+    // Bail if super admin is author
+    if ( is_super_admin( $user_id ) ) {
+        return true;
+    }
+
+    // Define local variable
+    $_post = array();
+
+    /** Blacklist *************************************************************/
+
+    // Get the moderation keys
+    $blacklist = trim( get_option( 'blacklist_keys' ) );
+
+    // Bail if blacklist is empty
     if ( empty( $blacklist ) ) {
         return true;
     }
+
+    /** User Data *************************************************************/
+
+    // Map current user data
+    if ( ! empty( $user_id ) ) {
+
+        // Get author data
+        $user = get_userdata( $user_id );
+
+        // If data exists, map it
+        if ( ! empty( $user ) ) {
+            $_post['author'] = $user->display_name;
+            $_post['email']  = $user->user_email;
+            $_post['url']    = $user->user_url;
+        }
+    }
+
+    // Current user IP and user agent
+    $_post['user_ip'] = bp_core_current_user_ip();
+    $_post['user_ua'] = bp_core_current_user_ua();
+
+    // Post title and content
+    $_post['title']   = $title;
+    $_post['content'] = $content;
 
     /** Words *****************************************************************/
@@ -146 +248 @@
 
         // 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;
-            }
-        }
-    }
-
-    // Check passed successfully
-    return true;
-}
-
-/**
- * Check for blocked keys.
- *
- * @since BuddyPress (1.6.0)
- *
- * @uses bp_current_author_ip() To get current user IP address.
- * @uses bp_current_author_ua() To get current user agent.
- * @uses bp_current_user_can() Allow super admins to bypass blacklist.
- *
- * @param int $user_id Topic or reply author ID.
- * @param string $title The title of the content.
- * @param string $content The content being posted.
- * @return bool True if test is passed, false if fail.
- */
-function bp_core_check_for_blacklist( $user_id = 0, $title = '', $content = '' ) {
-
-    // Bail if super admin is author
-    if ( is_super_admin( $user_id ) ) {
-        return true;
-    }
-
-    // Define local variable
-    $post = array();
-
-    /** Blacklist *************************************************************/
-
-    // Get the moderation keys
-    $blacklist = trim( get_option( 'blacklist_keys' ) );
-
-    // Bail if blacklist is empty
-    if ( empty( $blacklist ) ) {
-        return true;
-    }
-
-    /** User Data *************************************************************/
-
-    // Map current user data
-    if ( ! empty( $user_id ) ) {
-
-        // Get author data
-        $user = get_userdata( $user_id );
-
-        // If data exists, map it
-        if ( ! empty( $user ) ) {
-            $post['author'] = $user->display_name;
-            $post['email']  = $user->user_email;
-            $post['url']    = $user->user_url;
-        }
-    }
-
-    // Current user IP and user agent
-    $post['user_ip'] = bp_core_current_user_ip();
-    $post['user_ua'] = bp_core_current_user_ua();
-
-    // Post title and content
-    $post['title']   = $title;
-    $post['content'] = $content;
-
-    /** Words *****************************************************************/
-
-    // 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 ) {
+        foreach( $_post as $post_data ) {
 
             // Check each user data for current word