<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [3446] branches/1.2: Second pass at banned names (see r3441)</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3446</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-11-19 16:44:13 +0000 (Fri, 19 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Second pass at banned names (see r3441)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcoresignupphp">branches/1.2/bp-core/bp-core-signup.php</a></li>
<li><a href="#branches12bpcorephp">branches/1.2/bp-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcoresignupphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-signup.php (3445 => 3446)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-signup.php 2010-11-19 13:13:55 UTC (rev 3445)
+++ branches/1.2/bp-core/bp-core-signup.php 2010-11-19 16:44:13 UTC (rev 3446)
</span><span class="lines">@@ -256,85 +256,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * 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 );
-
-/**
</del><span class="cx"> * bp_core_validate_user_signup()
</span><span class="cx"> *
</span><span class="cx"> * Validate a user name and email address when creating a new user.
</span></span></pre></div>
<a id="branches12bpcorephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core.php (3445 => 3446)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core.php 2010-11-19 13:13:55 UTC (rev 3445)
+++ branches/1.2/bp-core.php 2010-11-19 16:44:13 UTC (rev 3446)
</span><span class="lines">@@ -254,9 +254,8 @@
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</span><span class="cx"> dbDelta( $sql );
</span><span class="cx">
</span><del>- /* Add names of root components to the banned blog list to avoid conflicts */
- if ( bp_core_is_multisite() )
- bp_core_add_illegal_names();
</del><ins>+ // Add names of root components to the banned name list to avoid conflicts
+ bp_core_flush_illegal_names();
</ins><span class="cx">
</span><span class="cx"> update_site_option( 'bp-core-db-version', BP_CORE_DB_VERSION );
</span><span class="cx"> }
</span><span class="lines">@@ -1678,18 +1677,77 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * bp_core_add_illegal_names()
</del><ins>+ * bp_core_get_illegal_names()
</ins><span class="cx"> *
</span><span class="cx"> * Adds illegal names to WP so that root components will not conflict with
</span><span class="cx"> * blog names on a subdirectory installation.
</span><span class="cx"> *
</span><span class="cx"> * For example, it would stop someone creating a blog with the slug "groups".
</span><span class="cx"> */
</span><del>-function bp_core_add_illegal_names() {
- update_site_option( 'illegal_names', get_site_option( 'illegal_names' ), array() );
</del><ins>+function bp_core_get_illegal_names() {
+
+ // BuddyPress core illegal names
+ $bp_illegal_names[] = defined( 'BP_GROUPS_SLUG' ) ? BP_GROUPS_SLUG : 'groups';
+ $bp_illegal_names[] = defined( 'BP_MEMBERS_SLUG' ) ? BP_MEMBERS_SLUG : 'members';
+ $bp_illegal_names[] = defined( 'BP_FORUMS_SLUG' ) ? BP_FORUMS_SLUG : 'forums';
+ $bp_illegal_names[] = defined( 'BP_BLOGS_SLUG' ) ? BP_BLOGS_SLUG : 'blogs';
+ $bp_illegal_names[] = defined( 'BP_ACTIVITY_SLUG' ) ? BP_ACTIVITY_SLUG : 'activity';
+ $bp_illegal_names[] = defined( 'BP_XPROFILE_SLUG' ) ? BP_XPROFILE_SLUG : 'profile';
+ $bp_illegal_names[] = defined( 'BP_FRIENDS_SLUG' ) ? BP_FRIENDS_SLUG : 'friends';
+ $bp_illegal_names[] = defined( 'BP_SEARCH_SLUG' ) ? BP_SEARCH_SLUG : 'search';
+ $bp_illegal_names[] = defined( 'BP_SETTINGS_SLUG' ) ? BP_SETTINGS_SLUG : 'settings';
+ $bp_illegal_names[] = defined( 'BP_REGISTER_SLUG' ) ? BP_REGISTER_SLUG : 'register';
+ $bp_illegal_names[] = defined( 'BP_ACTIVATION_SLUG' ) ? BP_ACTIVATION_SLUG : 'activation';
+
+ // WordPress core illegal names
+ $wp_illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' );
+
+ // Merge illegal names together and filter them
+ return apply_filters( 'bp_core_illegal_names', array_merge( $bp_illegal_names, $wp_illegal_names ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * bp_core_update_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_update_illegal_names( $value = '', $oldvalue = '' ) {
+ if ( !bp_core_is_multisite() )
+ return false;
+
+ // Make sure $value is array
+ if ( is_array( $value ) )
+ $db_illegal_names = $value;
+ elseif ( is_string( $value ) )
+ $db_illegal_names = implode( ' ', $value );
+ elseif ( empty( $value ) )
+ $db_illegal_names = array();
+
+ // Get illegal names, merge with ones in DB, and remove duplicates
+ $bp_illegal_names = bp_core_get_illegal_names();
+ $merged_names = array_merge( (array)$bp_illegal_names, (array)$db_illegal_names );
+ $illegal_names = array_unique( (array)$merged_names );
+
+ return apply_filters( 'bp_core_update_illegal_names', $illegal_names );
+}
+add_filter( 'pre_update_site_option_illegal_names', 'bp_core_update_illegal_names', 10, 2 );
+
+/**
+ * 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 );
+}
+
+/**
</ins><span class="cx"> * bp_core_delete_account()
</span><span class="cx"> *
</span><span class="cx"> * Allows a user to completely remove their account from the system
</span></span></pre>
</div>
</div>
</body>
</html>