<!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][12905] trunk/src: Add a new BP Email to welcome new members</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/12905">12905</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/12905","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-04-23 17:17:02 +0000 (Fri, 23 Apr 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'>Add a new BP Email to welcome new members
Once users activated their account, they are now receiving a welcome email with a link to their profile and a link to reset their password in case they forgot about it since they registered.
Props vapvarun, dcavins
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8428">#8428</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunksrcbpcorebpcoreupdatephp">trunk/src/bp-core/bp-core-update.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersfunctionsphp">trunk/src/bp-members/bp-members-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorefunctionsphp"></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-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-functions.php 2021-04-23 11:37:10 UTC (rev 12904)
+++ trunk/src/bp-core/bp-core-functions.php 2021-04-23 17:17:02 UTC (rev 12905)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3728,6 +3728,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $emails The array of emails schema.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return (array) apply_filters( 'bp_email_get_schema', array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'core-user-activation' => array(
+ /* translators: do not remove {} brackets or translate its contents. */
+ 'post_title' => __( '[{{{site.name}}}] Welcome!', 'buddypress' ),
+ /* translators: do not remove {} brackets or translate its contents. */
+ 'post_content' => __( "Welcome to {{site.name}}!\n\nVisit your <a href=\"{{{profile.url}}}\">profile</a>, where you can tell us more about yourself, change your preferences, or make new connections, to get started.\n\nForgot your password? Don't worry, you can reset it with your email address from <a href=\"{{{lostpassword.url}}}\">this page</a> of our site", 'buddypress' ),
+ /* translators: do not remove {} brackets or translate its contents. */
+ 'post_excerpt' => __( "Welcome to {{site.name}}!\n\nVisit your profile, where you can tell us more about yourself, change your preferences, or make new connections, to get started: {{{profile.url}}}\n\nForgot your password? Don't worry, you can reset it with your email address from this page of our site: {{{lostpassword.url}}}", 'buddypress' ),
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'activity-comment' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: do not remove {} brackets or translate its contents. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => __( '[{{{site.name}}}] {{poster.name}} replied to one of your updates', 'buddypress' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4000,6 +4008,10 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $core_user_activation = array(
+ 'description' => __( 'Recipient has successfully activated an account.', 'buddypress' ),
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $types = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'activity-comment' => $activity_comment,
</span><span class="cx" style="display: block; padding: 0 10px"> 'activity-comment-author' => $activity_comment_author,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4017,6 +4029,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings-verify-email-change' => $settings_verify_email_change,
</span><span class="cx" style="display: block; padding: 0 10px"> 'groups-membership-request-accepted' => $groups_membership_request_accepted,
</span><span class="cx" style="display: block; padding: 0 10px"> 'groups-membership-request-rejected' => $groups_membership_request_rejected,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'core-user-activation' => $core_user_activation,
</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"> if ( $field !== 'all' ) {
</span></span></pre></div>
<a id="trunksrcbpcorebpcoreupdatephp"></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-update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-update.php 2021-04-23 11:37:10 UTC (rev 12904)
+++ trunk/src/bp-core/bp-core-update.php 2021-04-23 17:17:02 UTC (rev 12905)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -624,6 +624,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $bp_prefix = bp_core_get_table_prefix();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Install welcome email to email list.
+ add_filter( 'bp_email_get_schema', 'bp_core_get_8_0_upgrade_email_schema' );
+
+ bp_core_install_emails();
+
+ remove_filter( 'bp_email_get_schema', 'bp_core_get_8_0_upgrade_email_schema' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Update the `new_avatar` activity type's component to `members`.
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update(
</span><span class="cx" style="display: block; padding: 0 10px"> $bp_prefix . 'bp_activity',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -677,6 +684,23 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Select only the emails that need to be installed with version 8.0.
+ *
+ * @since 8.0.0
+ *
+ * @param array $emails The array of emails schema.
+ */
+function bp_core_get_8_0_upgrade_email_schema( $emails ) {
+ $new_emails = array();
+
+ if ( isset( $emails['core-user-activation'] ) ) {
+ $new_emails['core-user-activation'] = $emails['core-user-activation'];
+ }
+
+ return $new_emails;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Updates the component field for new_members type.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.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-04-23 11:37:10 UTC (rev 12904)
+++ trunk/src/bp-members/bp-members-functions.php 2021-04-23 17:17:02 UTC (rev 12905)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3306,3 +3306,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'error' => false
</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">+
+/**
+ * Send welcome email on successful user activation.
+ *
+ * @since 8.0.0
+ *
+ * @param int $user_id The new user's ID
+ */
+function bp_send_welcome_email( $user_id = 0 ) {
+ if ( ! $user_id ) {
+ return;
+ }
+
+ $profile_url = bp_core_get_user_domain( $user_id );
+
+ /**
+ * Use this filter to add/edit/remove tokens to use for your welcome email.
+ *
+ * @since 8.0.0
+ *
+ * @param array $value An array of BP Email tokens.
+ * @param int $user_id The user ID.
+ */
+ $welcome_tokens = apply_filters(
+ 'bp_send_welcome_email_tokens',
+ array(
+ 'displayname' => bp_core_get_user_displayname( $user_id ),
+ 'profile.url' => $profile_url,
+ 'lostpassword.url' => wp_lostpassword_url( $profile_url ),
+ ),
+ $user_id
+ );
+
+ bp_send_email( 'core-user-activation', $user_id, array( 'tokens' => $welcome_tokens ) );
+}
+add_action( 'bp_core_activated_user', 'bp_send_welcome_email', 10, 1 );
</ins></span></pre>
</div>
</div>
</body>
</html>