Changeset 11747

Timestamp:

11/16/2017 08:00:41 PM (9 years ago)

Author:

boonebgorges

Message:

Members: Run BP's illegal user names through WP filter.

This ensures that user names added to the blacklist via the
'illegal_user_logins' filter are also blacklisted during BP registration.

Props espellcaste.
Fixes #7461.

Location:

trunk

Files:

• src/bp-members/bp-members-functions.php (modified) (1 diff)
• tests/phpunit/testcases/members/functions.php (modified) (1 diff)

trunk/src/bp-members/bp-members-functions.php

@@ -1579 +1579 @@
         $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array_merge( array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ), $bp_component_slugs ) );
 
-        // Merge the arrays together.
-        $merged_names           = array_merge( (array) $filtered_illegal_names, (array) $db_illegal_names );
+        /**
+         * Filters the list of illegal usernames from WordPress.
+         *
+         * @since 3.0
+         *
+         * @param array Array of illegal usernames.
+         */
+        $wp_filtered_illegal_names = apply_filters( 'illegal_user_logins', array() );
+
+        // First merge BuddyPress illegal names.
+        $bp_merged_names           = array_merge( (array) $filtered_illegal_names, (array) $db_illegal_names );
+
+        // Then merge WordPress and BuddyPress illegal names.
+        $merged_names              = array_merge( (array) $wp_filtered_illegal_names, (array) $bp_merged_names );
 
         // Remove duplicates.
-        $illegal_names          = array_unique( (array) $merged_names );
+        $illegal_names             = array_unique( (array) $merged_names );
 
         /**

trunk/tests/phpunit/testcases/members/functions.php

@@ -638 +638 @@
                 $wpdb->suppress_errors( $suppress );
         }
+
+        /**
+         * @ticket BP7461
+         *
+         * Test function before and after adding custom illegal names from WordPress.
+         */
+        public function test_bp_core_get_illegal_names() {
+
+                // Making sure BP custom illegals are in the array.
+                $this->assertTrue( in_array( 'profile', bp_core_get_illegal_names(), true ) );
+                $this->assertTrue( in_array( 'forums', bp_core_get_illegal_names(), true ) );
+
+                add_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
+
+                // Testing fake custom illegal names.
+                $this->assertTrue( in_array( 'testuser', bp_core_get_illegal_names(), true ) );
+                $this->assertTrue( in_array( 'admins', bp_core_get_illegal_names(), true ) );
+                $this->assertFalse( in_array( 'buddypresss', bp_core_get_illegal_names(), true ) );
+
+                // Making sure BP custom illegals are in the array after including the custom ones.
+                $this->assertTrue( in_array( 'profile', bp_core_get_illegal_names(), true ) );
+                $this->assertTrue( in_array( 'forums', bp_core_get_illegal_names(), true ) );
+
+                remove_filter( 'illegal_user_logins', array( $this, '_illegal_user_logins' ) );
+        }
+
+        public function _illegal_user_logins() {
+                return array(
+                        'testuser',
+                        'admins',
+                        'buddypress',
+                );
+        }
 }