<!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] [2752] branches/1.2/bp-core/bp-core-wpabstraction.php:
Run username through validate_username() check on signup.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2752</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-20 00:34:32 +0000 (Sat, 20 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Run username through validate_username() check on signup. Fixes #1992</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcorewpabstractionphp">branches/1.2/bp-core/bp-core-wpabstraction.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcorewpabstractionphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-wpabstraction.php (2751 => 2752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-wpabstraction.php        2010-02-19 16:48:38 UTC (rev 2751)
+++ branches/1.2/bp-core/bp-core-wpabstraction.php        2010-02-20 00:34:32 UTC (rev 2752)
</span><span class="lines">@@ -96,7 +96,6 @@
</span><span class="cx">
</span><span class="cx">                 $errors = new WP_Error();
</span><span class="cx">
</span><del>-                $user_name = preg_replace( "/\s+/", '', sanitize_user( $user_name, true ) );
</del><span class="cx">                 $user_email = sanitize_email( $user_email );
</span><span class="cx">
</span><span class="cx">                 if ( empty( $user_name ) )
</span><span class="lines">@@ -105,17 +104,14 @@
</span><span class="cx">                 $maybe = array();
</span><span class="cx">                 preg_match( "/[a-z0-9]+/", $user_name, $maybe );
</span><span class="cx">
</span><del>-                if( $user_name != $maybe[0] ) {
-                 $errors->add('user_name', __("Only lowercase letters and numbers allowed"));
-                }
-
</del><span class="cx">                 $illegal_names = get_site_option( "illegal_names" );
</span><span class="cx">                 if( is_array( $illegal_names ) == false ) {
</span><span class="cx">                         $illegal_names = array( "www", "web", "root", "admin", "main", "invite", "administrator" );
</span><span class="cx">                         add_site_option( "illegal_names", $illegal_names );
</span><span class="cx">                 }
</span><del>-                if( in_array( $user_name, $illegal_names ) == true ) {
-                 $errors->add('user_name', __("That username is not allowed"));
</del><ins>+
+                if ( !validate_username( $user_name ) || in_array( $user_name, $illegal_names ) == true || $user_name != $maybe[0] ) {
+                 $errors->add('user_name', __("Only lowercase letters and numbers allowed"));
</ins><span class="cx">                 }
</span><span class="cx">
</span><span class="cx">                 if( strlen( $user_name ) < 4 ) {
</span></span></pre>
</div>
</div>
</body>
</html>