<!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" />
<title>[BuddyPress][5840] trunk/bp-members: Some hardening of the member registration process:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5840">5840</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-02-25 18:21:27 +0000 (Sat, 25 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some hardening of the member registration process:
- Ensures that pre_user_login filters are applied before attempting to create a user with wp_insert_user(), so that BP's username validation is the same as WP's, and username_exists() checks are reliable.
- Check to see whether the return value of wp_insert_user() is a WP_Error object before continuing with the registration process.
- Improves error handling during user creation, by correctly parsing WP_Error objects returned from wp_insert_user().
See <a href="http://buddypress.trac.wordpress.org/ticket/3949">#3949</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmembersfunctionsphp">trunk/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunkbpmembersbpmembersscreensphp">trunk/bp-members/bp-members-screens.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-functions.php (5839 => 5840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-functions.php 2012-02-25 14:41:52 UTC (rev 5839)
+++ trunk/bp-members/bp-members-functions.php 2012-02-25 18:21:27 UTC (rev 5840)
</span><span class="lines">@@ -948,6 +948,9 @@
</span><span class="cx"> $errors = new WP_Error();
</span><span class="cx"> $user_email = sanitize_email( $user_email );
</span><span class="cx">
</span><ins>+ // Apply any user_login filters added by BP or other plugins before validating
+ $user_name = apply_filters( 'pre_user_login', $user_name );
+
</ins><span class="cx"> if ( empty( $user_name ) )
</span><span class="cx"> $errors->add( 'user_name', __( 'Please enter a username', 'buddypress' ) );
</span><span class="cx">
</span><span class="lines">@@ -1031,7 +1034,7 @@
</span><span class="cx"> 'user_email' => $user_email
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- if ( empty( $user_id ) ) {
</del><ins>+ if ( is_wp_error( $user_id ) || empty( $user_id ) ) {
</ins><span class="cx"> $errors->add( 'registerfail', sprintf( __('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'buddypress' ), bp_get_option( 'admin_email' ) ) );
</span><span class="cx"> return $errors;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpmembersbpmembersscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-screens.php (5839 => 5840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-screens.php 2012-02-25 14:41:52 UTC (rev 5839)
+++ trunk/bp-members/bp-members-screens.php 2012-02-25 18:21:27 UTC (rev 5840)
</span><span class="lines">@@ -188,11 +188,16 @@
</span><span class="cx">
</span><span class="cx"> // Finally, sign up the user and/or blog
</span><span class="cx"> if ( isset( $_POST['signup_with_blog'] ) && is_multisite() )
</span><del>- bp_core_signup_blog( $blog_details['domain'], $blog_details['path'], $blog_details['blog_title'], $_POST['signup_username'], $_POST['signup_email'], $usermeta );
</del><ins>+ $wp_user_id = bp_core_signup_blog( $blog_details['domain'], $blog_details['path'], $blog_details['blog_title'], $_POST['signup_username'], $_POST['signup_email'], $usermeta );
</ins><span class="cx"> else
</span><del>- bp_core_signup_user( $_POST['signup_username'], $_POST['signup_password'], $_POST['signup_email'], $usermeta );
</del><ins>+ $wp_user_id = bp_core_signup_user( $_POST['signup_username'], $_POST['signup_password'], $_POST['signup_email'], $usermeta );
</ins><span class="cx">
</span><del>- $bp->signup->step = 'completed-confirmation';
</del><ins>+ if ( is_wp_error( $wp_user_id ) ) {
+ $bp->signup->step = 'request-details';
+ bp_core_add_message( $wp_user_id->get_error_message(), 'error' );
+ } else {
+ $bp->signup->step = 'completed-confirmation';
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action( 'bp_complete_signup' );
</span></span></pre>
</div>
</div>
</body>
</html>