<!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][8184] trunk/bp-members/bp-members-classes.php: Clean up `BP_Signup` class.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/8184">8184</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-03-27 23:36:09 +0000 (Thu, 27 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up `BP_Signup` class.
* Fix issue with sign-up meta not being populated correctly.
* Remove stray semi-colons.
* Code formatting clean-up.
* See <a href="http://buddypress.trac.wordpress.org/ticket/5374">#5374</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmembersclassesphp">trunk/bp-members/bp-members-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmembersclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-classes.php (8183 => 8184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-classes.php 2014-03-27 23:07:24 UTC (rev 8183)
+++ trunk/bp-members/bp-members-classes.php 2014-03-27 23:36:09 UTC (rev 8184)
</span><span class="lines">@@ -92,14 +92,13 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $signups_table = buddypress()->members->table_name_signups;
</span><ins>+ $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$signups_table} WHERE signup_id = %d AND active = 0", $this->id ) );
</ins><span class="cx">
</span><del>- $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$signups_table} WHERE signup_id = %d AND active = 0", $this->id ) );
-
</del><span class="cx"> $this->avatar = get_avatar( $signup->user_email, 32 );
</span><span class="cx"> $this->user_login = $signup->user_login;
</span><span class="cx"> $this->user_email = $signup->user_email;
</span><span class="cx"> $this->meta = maybe_unserialize( $signup->meta );
</span><del>- $this->user_name = ! empty( $meta['field_1'] ) ? wp_unslash( $meta['field_1'] ) : '';
</del><ins>+ $this->user_name = ! empty( $this->meta['field_1'] ) ? wp_unslash( $this->meta['field_1'] ) : '';
</ins><span class="cx"> $this->registered = $signup->registered;
</span><span class="cx"> $this->activation_key = $signup->activation_key;
</span><span class="cx"> }
</span><span class="lines">@@ -135,7 +134,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // @todo whitelist sanitization
</span><del>- if ( $r['orderby'] != 'signup_id' ) {
</del><ins>+ if ( $r['orderby'] !== 'signup_id' ) {
</ins><span class="cx"> $r['orderby'] = 'user_' . $r['orderby'];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -148,11 +147,12 @@
</span><span class="cx"> $sql['where'][] = "active = 0";
</span><span class="cx">
</span><span class="cx"> if ( empty( $r['include'] ) ) {
</span><ins>+
</ins><span class="cx"> // Search terms
</span><span class="cx"> if ( ! empty( $r['usersearch'] ) ) {
</span><span class="cx"> $search_terms_clean = esc_sql( esc_sql( $r['usersearch'] ) );
</span><span class="cx"> $search_terms_clean = like_escape( $search_terms_clean );
</span><del>- $sql['where'][] = "( user_login LIKE '%" . $search_terms_clean . "%' OR user_email LIKE '%" . $search_terms_clean . "%' OR meta LIKE '%" . $search_terms_clean . "%' )";
</del><ins>+ $sql['where'][] = "( user_login LIKE '%" . $search_terms_clean . "%' OR user_email LIKE '%" . $search_terms_clean . "%' OR meta LIKE '%" . $search_terms_clean . "%' )";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Activation key
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $paged_signups as $key => $signup ) {
</span><span class="cx">
</span><del>- $signup->id = intval( $signup->signup_id );
</del><ins>+ $signup->id = intval( $signup->signup_id );
</ins><span class="cx">
</span><span class="cx"> $signup->meta = ! empty( $signup->meta ) ? maybe_unserialize( $signup->meta ) : false;
</span><span class="cx">
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> if ( is_wp_error( $user_id ) || empty( $user_id ) ) {
</span><del>- $errors->add( 'registerfail', sprintf( __('<strong>ERROR</strong>: Couldn’t register you. Please contact the <a href="mailto:%s">webmaster</a>.', 'buddypress' ), bp_get_option( 'admin_email' ) ) );
</del><ins>+ $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn’t register you. Please contact the <a href="mailto:%s">webmaster</a>.', 'buddypress' ), bp_get_option( 'admin_email' ) ) );
</ins><span class="cx"> return $errors;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> // wp_insert_user(), but we delete them so that inactive
</span><span class="cx"> // signups don't appear in various user counts.
</span><span class="cx"> delete_user_option( $user_id, 'capabilities' );
</span><del>- delete_user_option( $user_id, 'user_level' );
</del><ins>+ delete_user_option( $user_id, 'user_level' );
</ins><span class="cx">
</span><span class="cx"> // Set any profile data
</span><span class="cx"> if ( bp_is_active( 'xprofile' ) ) {
</span><span class="lines">@@ -353,8 +353,9 @@
</span><span class="cx"> public static function check_user_status( $user_id = 0 ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( empty( $user_id ) )
</del><ins>+ if ( empty( $user_id ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $user_status = $wpdb->get_var( $wpdb->prepare( "SELECT user_status FROM {$wpdb->users} WHERE ID = %d", $user_id ) );
</span><span class="cx">
</span><span class="lines">@@ -493,8 +494,8 @@
</span><span class="cx">
</span><span class="cx"> foreach ( $signups as $signup ) {
</span><span class="cx">
</span><del>- $meta = $signup->meta;
- $meta['sent_date'] = current_time( 'mysql', true );
</del><ins>+ $meta = $signup->meta;
+ $meta['sent_date'] = current_time( 'mysql', true );
</ins><span class="cx"> $meta['count_sent'] = $signup->count_sent + 1;
</span><span class="cx">
</span><span class="cx"> // Send activation email
</span><span class="lines">@@ -506,10 +507,13 @@
</span><span class="cx"> $user_id = email_exists( $signup->user_email );
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $user_id ) && 2 != self::check_user_status( $user_id ) ) {
</span><ins>+
</ins><span class="cx"> // Status is not 2, so user's account has been activated
</span><del>- $result['errors'][ $signup->signup_id ] = array( $signup->user_login, esc_html__( 'the sign-up has already been activated.', 'buddypress' ) );;
</del><ins>+ $result['errors'][ $signup->signup_id ] = array( $signup->user_login, esc_html__( 'the sign-up has already been activated.', 'buddypress' ) );
+
</ins><span class="cx"> // repare signups table
</span><span class="cx"> self::validate( $signup->activation_key );
</span><ins>+
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // Send the validation email
</span><span class="lines">@@ -561,9 +565,13 @@
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $user->errors ) ) {
</span><span class="cx">
</span><del>- if ( $user_id = username_exists( $signup->user_login ) && 2 != self::check_user_status( $user_id ) ) {
</del><ins>+ $user_id = username_exists( $signup->user_login ) && 2 != self::check_user_status( $user_id );
+
+ if ( !empty( $user_id ) ) {
+
</ins><span class="cx"> // Status is not 2, so user's account has been activated
</span><span class="cx"> $result['errors'][ $signup->signup_id ] = array( $signup->user_login, esc_html__( 'the sign-up has already been activated.', 'buddypress' ) );
</span><ins>+
</ins><span class="cx"> // repare signups table
</span><span class="cx"> self::validate( $signup->activation_key );
</span><span class="cx">
</span><span class="lines">@@ -615,8 +623,10 @@
</span><span class="cx"> if ( ! empty( $user_id ) && $signup->activation_key == wp_hash( $user_id ) ) {
</span><span class="cx">
</span><span class="cx"> if ( 2 != self::check_user_status( $user_id ) ) {
</span><ins>+
</ins><span class="cx"> // Status is not 2, so user's account has been activated
</span><span class="cx"> $result['errors'][ $signup->signup_id ] = array( $signup->user_login, esc_html__( 'the sign-up has already been activated.', 'buddypress' ) );
</span><ins>+
</ins><span class="cx"> // repare signups table
</span><span class="cx"> self::validate( $signup->activation_key );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>