Changeset 3446 for branches/1.2/bp-core/bp-core-signup.php

Timestamp:

11/19/2010 04:44:13 PM (16 years ago)

Author:

johnjamesjacoby

Message:

Second pass at banned names (see r3441)

File:

• branches/1.2/bp-core/bp-core-signup.php (modified) (1 diff)

branches/1.2/bp-core/bp-core-signup.php

@@ -255 +255 @@
  * true or false on success or failure.
  */
-
-/**
- * bp_core_flush_illegal_names()
- *
- * Flush illegal names by getting and setting 'illegal_names' site option
- */
-function bp_core_flush_illegal_names() {
-    $illegal_names = get_site_option( 'illegal_names' );
-    update_site_option( 'illegal_names', $illegal_names );
-}
-
-/**
- * bp_core_illegal_names()
- *
- * Filter the illegal_names site option and make sure it includes a few
- * specific BuddyPress and Multi-site slugs
- *
- * @param array|string $value Illegal names from field
- * @param array|string $oldvalue The value as it is currently
- * @return array Merged and unique array of illegal names
- */
-function bp_core_illegal_names( $value = '', $oldvalue = '' ) {
-
-    // Make sure $value is array
-    if ( empty( $value ) )
-        $db_illegal_names = array();
-    if ( is_array( $value ) )
-        $db_illegal_names = $value;
-    elseif ( is_string( $value ) )
-        $db_illegal_names = implode( ' ', $names );
-
-    // Add the core components' slugs to the banned list even if their components aren't active.
-    $bp_component_slugs = array( 'groups', 'members', 'forums', 'blogs', 'activity', 'profile', 'friends', 'search', 'settings', 'register', 'activate' );
-
-    if ( defined( 'BP_GROUPS_SLUG' ) )
-        $bp_component_slugs[] = BP_GROUPS_SLUG;
-
-    if ( defined( 'BP_MEMBERS_SLUG' ) )
-        $bp_component_slugs[] = BP_MEMBERS_SLUG;
-
-    if ( defined( 'BP_FORUMS_SLUG' ) )
-        $bp_component_slugs[] = BP_FORUMS_SLUG;
-
-    if ( defined( 'BP_BLOGS_SLUG' ) )
-        $bp_component_slugs[] = BP_BLOGS_SLUG;
-
-    if ( defined( 'BP_ACTIVITY_SLUG' ) )
-        $bp_component_slugs[] = BP_ACTIVITY_SLUG;
-
-    if ( defined( 'BP_XPROFILE_SLUG' ) )
-        $bp_component_slugs[] = BP_XPROFILE_SLUG;
-
-    if ( defined( 'BP_FRIENDS_SLUG' ) )
-        $bp_component_slugs[] = BP_FRIENDS_SLUG;
-
-    if ( defined( 'BP_SEARCH_SLUG' ) )
-        $bp_component_slugs[] = BP_SEARCH_SLUG;
-
-    if ( defined( 'BP_SETTINGS_SLUG' ) )
-        $bp_component_slugs[] = BP_SETTINGS_SLUG;
-
-    if ( defined( 'BP_REGISTER_SLUG' ) )
-        $bp_component_slugs[] = BP_REGISTER_SLUG;
-
-    if ( defined( 'BP_ACTIVATION_SLUG' ) )
-        $bp_component_slugs[] = BP_ACTIVATION_SLUG;
-    
-    // Add our slugs to the array and allow them to be filtered
-    $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 );
-
-    // Remove duplicates
-    $illegal_names = array_unique( (array)$merged_names );
-
-    return apply_filters( 'bp_core_illegal_names', $illegal_names );
-}
-add_filter( 'pre_update_site_option_illegal_names', 'bp_core_illegal_names', 10, 2 );
 
 /**