Changeset 5488

Timestamp:

09/10/2014 02:15:35 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Change behavior of bbp_check_for_moderation() so empty moderation_keys no longer skips max_links check. Props netweb. See #2546.

File:

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

trunk/src/includes/common/functions.php

@@ -792 +792 @@
     }
 
-    // Bail if keymaster is author
-    if ( !empty( $author_id ) && bbp_is_user_keymaster( $author_id ) ) {
+    // Bail if author is keymaster
+    if ( ! empty( $author_id ) && bbp_is_user_keymaster( $author_id ) ) {
         return true;
     }
@@ -801 +801 @@
     $match_out = '';
 
-    /** Blacklist *************************************************************/
-
-    // Get the moderation keys
-    $blacklist = trim( get_option( 'moderation_keys' ) );
-
-    // Bail if blacklist is empty
-    if ( empty( $blacklist ) ) {
-        return true;
-    }
-
     /** User Data *************************************************************/
 
     // Map anonymous user data
-    if ( !empty( $anonymous_data ) ) {
+    if ( ! empty( $anonymous_data ) ) {
         $_post['author'] = $anonymous_data['bbp_anonymous_name'];
         $_post['email']  = $anonymous_data['bbp_anonymous_email'];
@@ -820 +810 @@
 
     // Map current user data
-    } elseif ( !empty( $author_id ) ) {
+    } elseif ( ! empty( $author_id ) ) {
 
         // Get author data
@@ -844 +834 @@
 
     $max_links = get_option( 'comment_max_links' );
-    if ( !empty( $max_links ) ) {
+    if ( ! empty( $max_links ) ) {
 
         // 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
@@ -858 +848 @@
     }
 
-    /** 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 ) {
-
-            // Check each user data for current word
-            if ( preg_match( $pattern, $post_data ) ) {
-
-                // Post does not pass
-                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;
+                }
             }
         }