<!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][13165] trunk/src: BP_Signup improvements.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/13165">13165</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13165","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dcavins</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-12-10 16:13:57 +0000 (Fri, 10 Dec 2021)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>BP_Signup improvements.

On multisite, when resending actvation emails, send the
right kind (user or user + site). Also ensure that default
meta is set via wpmu meta filters.

introduce  `bp_members_get_signup_by()` and
`bp_members_site_requests_enabled()`.

Correct default value calculation in BP_Signup
to allow backcompat.

See <a href="http://buddypress.trac.wordpress.org/ticket/8540">#8540</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorefiltersphp">trunk/src/bp-core/bp-core-filters.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersfunctionsphp">trunk/src/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpmembersadminphp">trunk/src/bp-members/classes/class-bp-members-admin.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpsignupphp">trunk/src/bp-members/classes/class-bp-signup.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorefiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-filters.php     2021-12-10 01:29:52 UTC (rev 13164)
+++ trunk/src/bp-core/bp-core-filters.php       2021-12-10 16:13:57 UTC (rev 13165)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,15 +473,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                ),
</span><span class="cx" style="display: block; padding: 0 10px">        );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $signups = BP_Signup::get(
-               array(
-                       'user_login' => $user,
-               )
-       );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $signup     = bp_members_get_signup_by( 'activation_key', $key );
</ins><span class="cx" style="display: block; padding: 0 10px">         $salutation = $user;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( $signups && bp_is_active( 'xprofile' ) ) {
-               $signup = $signups['signups'][0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $signup && bp_is_active( 'xprofile' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( isset( $signup->meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $salutation = $signup->meta[ 'field_' . bp_xprofile_fullname_field_id() ];
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -564,6 +558,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wpmu_signup_user_notification', 'bp_core_activation_signup_user_notification', 1, 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Ensure that some meta values are set for new multisite signups.
+ *
+ * @since 10.0.0
+ *
+ * @see wpmu_signup_user() for a full description of params.
+ *
+ * @param array $meta Signup meta data. Default empty array.
+ * @return array Signup meta data.
+ */
+function bp_core_add_meta_to_multisite_signups( $meta ) {
+
+       // Ensure that sent_date and count_sent are set in meta.
+       if ( ! isset( $meta['sent_date'] ) ) {
+               $meta['sent_date'] = '0000-00-00 00:00:00';
+       }
+       if ( ! isset( $meta['count_sent'] ) ) {
+               $meta['count_sent'] = 0;
+       }
+
+       return $meta;
+}
+add_filter( 'signup_user_meta', 'bp_core_add_meta_to_multisite_signups' );
+add_filter( 'signup_site_meta', 'bp_core_add_meta_to_multisite_signups' );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px">  * Filter the page title for BuddyPress pages.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 1.5.0
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-functions.php     2021-12-10 01:29:52 UTC (rev 13164)
+++ trunk/src/bp-members/bp-members-functions.php       2021-12-10 16:13:57 UTC (rev 13165)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2388,24 +2388,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">        bp_send_email( 'core-user-registration', $to, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // Record that the activation email has been sent.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $signups = BP_Signup::get(
-               array(
-                       'activation_key' => $key,
-               )
-       );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $signup = bp_members_get_signup_by( 'activation_key', $key );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( ! empty( $signups['signups'] ) ) {
-               foreach ( $signups['signups'] as $signup ) {
-                       $meta = array(
-                               'sent_date'  => current_time( 'mysql', true ),
-                               'count_sent' => $signup->count_sent + 1
-                       );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $signup ) {
+               $meta = array(
+                       'sent_date'  => current_time( 'mysql', true ),
+                       'count_sent' => $signup->count_sent + 1
+               );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        BP_Signup::update( array(
-                               'signup_id' => $signup->id,
-                               'meta'      => $meta,
-                       ) );
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         BP_Signup::update( array(
+                       'signup_id' => $signup->id,
+                       'meta'      => $meta,
+               ) );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3694,3 +3688,56 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        return apply_filters( 'bp_get_members_invitation_from_request', $invite );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Get WP_User object corresponding to a record in the signups table.
+ *
+ * @since 10.0.0
+ *
+ * @param string $field Which fields to search by. Possible values are
+ *                      activation_key, user_email, id.
+ * @param string $value Value to search by.
+ * @return bool|BP_Signup $signup Found signup, returns first found
+ *                                if more than one is found.
+ */
+function bp_members_get_signup_by( $field = 'activation_key', $value = '' ) {
+       switch ( $field ) {
+               case 'activation_key':
+               case 'user_email':
+                       $key = $field;
+                       break;
+
+               case 'id':
+               default:
+                       $key = 'include';
+                       break;
+       }
+
+       $signups = BP_Signup::get(
+               array(
+                       $key => $value,
+               )
+       );
+
+       if ( ! empty( $signups['signups'] ) ) {
+               $signup = current( $signups['signups'] );
+       } else {
+               $signup = false;
+       }
+
+       return $signup;
+}
+
+/**
+ * Are site creation requests currently enabled?
+ *
+ * @since 10.0.0
+ *
+ * @return bool Whether site requests are currently enabled.
+ */
+function bp_members_site_requests_enabled() {
+
+       $matches = array( 'blog', 'all' );
+
+       return is_multisite() && in_array( bp_core_get_root_option( 'registration' ), $matches, true );
+}
</ins></span></pre></div>
<a id="trunksrcbpmembersclassesclassbpmembersadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/classes/class-bp-members-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-members-admin.php   2021-12-10 01:29:52 UTC (rev 13164)
+++ trunk/src/bp-members/classes/class-bp-members-admin.php     2021-12-10 16:13:57 UTC (rev 13165)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2204,7 +2204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $signups    = $signups_query['signups'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $signup_ids = wp_list_pluck( $signups, 'signup_id' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $signup_ids = wp_list_pluck( $signups, 'id' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Set up strings.
</span><span class="cx" style="display: block; padding: 0 10px">                switch ( $action ) {
</span></span></pre></div>
<a id="trunksrcbpmembersclassesclassbpsignupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/classes/class-bp-signup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-signup.php  2021-12-10 01:29:52 UTC (rev 13164)
+++ trunk/src/bp-members/classes/class-bp-signup.php    2021-12-10 16:13:57 UTC (rev 13165)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,6 +214,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $this->date_sent = $signup->registered;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // How many times has the activation email been sent?
+               if ( isset( $this->meta['count_sent'] ) ) {
+                       $this->count_sent = absint( $this->meta['count_sent'] );
+               } else {
+                       /**
+                        * Meta will not be set if this is a pre-10.0 signup.
+                        * In this case, we assume that the count is 1.
+                        */
+                       $this->count_sent = 1;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * Calculate a diff between now & last time
</span><span class="cx" style="display: block; padding: 0 10px">                 * an activation link has been resent.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,14 +237,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 * Set a boolean to track whether an activation link
</span><span class="cx" style="display: block; padding: 0 10px">                 * was sent in the last day.
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->recently_sent = ( $diff < 1 * DAY_IN_SECONDS );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->recently_sent = $this->count_sent && ( $diff < 1 * DAY_IN_SECONDS );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // How many times has the activation email been sent?
-               if ( isset( $this->meta['count_sent'] ) ) {
-                       $this->count_sent = absint( $this->meta['count_sent'] );
-               } else {
-                       $this->count_sent = 0;
-               }
</del><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /** Static Methods *******************************************************/
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -814,14 +819,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $signups as $signup ) {
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $meta = array(
-                               'sent_date'  => current_time( 'mysql', true ),
-                               'count_sent' => $signup->count_sent + 1
-                       );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $meta               = $signup->meta;
+                       $meta['sent_date']  = current_time( 'mysql', true );
+                       $meta['count_sent'] = $signup->count_sent + 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Send activation email.
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                wpmu_signup_user_notification( $signup->user_login, $signup->user_email, $signup->activation_key, serialize( $meta ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Should we send the user or blog activation email?
+                               if ( ! empty( $signup->domain ) || ! empty( $signup->path ) ) {
+                                       wpmu_signup_blog_notification( $signup->domain, $signup->path, $signup->title, $signup->user_login, $signup->user_email, $signup->activation_key, $meta );
+                               } else {
+                                       wpmu_signup_user_notification( $signup->user_login, $signup->user_email, $signup->activation_key, $meta );
+                               }
</ins><span class="cx" style="display: block; padding: 0 10px">                         } else {
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                // Check user status before sending email.
</span></span></pre>
</div>
</div>

</body>
</html>