<!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] [3037] branches/1.2/bp-core/bp-core-signup.php: Fixes #2310</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3037</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-06-11 00:01:18 +0000 (Fri, 11 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2310</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcoresignupphp">branches/1.2/bp-core/bp-core-signup.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 (3036 => 3037)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-signup.php 2010-06-10 22:28:44 UTC (rev 3036)
+++ branches/1.2/bp-core/bp-core-signup.php 2010-06-11 00:01:18 UTC (rev 3037)
</span><span class="lines">@@ -255,6 +255,59 @@
</span><span class="cx"> * true or false on success or failure.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/**
+ * bp_core_refresh_illegal_names()
+ *
+ * Force refresh of illegal names by
+ */
+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 our slugs to the array and allow them to be filtered
+ $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', BP_GROUPS_SLUG, BP_MEMBERS_SLUG, BP_FORUMS_SLUG, BP_BLOGS_SLUG, BP_ACTIVITY_SLUG, BP_XPROFILE_SLUG, BP_FRIENDS_SLUG, BP_SEARCH_SLUG, BP_SETTINGS_SLUG, BP_REGISTER_SLUG, BP_ACTIVATION_SLUG ) );
+
+ // 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 );
+
+/**
+ * bp_core_validate_user_signup()
+ *
+ * Validate a user name and email address when creating a new user.
+ *
+ * @global object $wpdb DB Layer
+ * @param string $user_name Username to validate
+ * @param string $user_email Email address to validate
+ * @return array Results of user validation including errors, if any
+ */
</ins><span class="cx"> function bp_core_validate_user_signup( $user_name, $user_email ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="lines">@@ -267,16 +320,9 @@
</span><span class="cx"> $maybe = array();
</span><span class="cx"> preg_match( "/[a-z0-9]+/", $user_name, $maybe );
</span><span class="cx">
</span><del>- $db_illegal_names = get_site_option( 'illegal_names' );
- $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', BP_GROUPS_SLUG, BP_MEMBERS_SLUG, BP_FORUMS_SLUG, BP_BLOGS_SLUG, BP_ACTIVITY_SLUG, BP_XPROFILE_SLUG, BP_FRIENDS_SLUG, BP_SEARCH_SLUG, BP_SETTINGS_SLUG, BP_REGISTER_SLUG, BP_ACTIVATION_SLUG ) );
</del><ins>+ // Make sure illegal names include BuddyPress slugs and values
+ bp_core_flush_illegal_names();
</ins><span class="cx">
</span><del>- /* Safely merge our illegal names into existing site_option */
- $common_names = array_intersect( (array)$db_illegal_names, (array)$filtered_illegal_names );
- $diff_names = array_diff( (array)$db_illegal_names, (array)$filtered_illegal_names );
- $illegal_names = array_merge( (array)$diff_names, (array)$common_names );
-
- update_site_option( 'illegal_names', $illegal_names );
-
</del><span class="cx"> if ( !validate_username( $user_name ) || in_array( $user_name, (array)$illegal_names ) || $user_name != $maybe[0] )
</span><span class="cx"> $errors->add( 'user_name', __( 'Only lowercase letters and numbers allowed', 'buddypress' ) );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>