<!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][11766] trunk/src: Members: Require a form submission to activate an account.</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" 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/11766">11766</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/11766","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-12-12 02:26:15 +0000 (Tue, 12 Dec 2017)</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'>Members: Require a form submission to activate an account.
Previously, simply loading a URL of the form `/activate/12345` would activate
the account with key `12345`. This caused conflicts with some mail scanning
services, which follow links in emails, causing accounts to be self-activated.
A small backward-compatibility layer ensures that custom activate.php
templates containing forms with `action="get"` continue to work.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6049">#6049</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoretemplatephp">trunk/src/bp-core/bp-core-template.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersactionsphp">trunk/src/bp-members/bp-members-actions.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersscreensphp">trunk/src/bp-members/bp-members-screens.php</a></li>
<li><a href="#trunksrcbpmembersbpmemberstemplatephp">trunk/src/bp-members/bp-members-template.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressmembersactivatephp">trunk/src/bp-templates/bp-legacy/buddypress/members/activate.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypressmembersactivatephp">trunk/src/bp-templates/bp-nouveau/buddypress/members/activate.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoretemplatephp"></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-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-template.php 2017-12-11 11:36:12 UTC (rev 11765)
+++ trunk/src/bp-core/bp-core-template.php 2017-12-12 02:26:15 UTC (rev 11766)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1150,10 +1150,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * otherwise false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_account_was_activated() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp = buddypress();
- $activation_complete = !empty( $bp->activation_complete )
- ? $bp->activation_complete
- : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $activation_complete = ! empty( buddypress()->activation_complete ) || ( bp_is_current_component( 'activate' ) && ! empty( $_GET['activated'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $activation_complete;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersactionsphp"></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-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-actions.php 2017-12-11 11:36:12 UTC (rev 11765)
+++ trunk/src/bp-members/bp-members-actions.php 2017-12-12 02:26:15 UTC (rev 11766)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,6 +107,56 @@
</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">+/**
+ * Catches and processes account activation requests.
+ *
+ * @since 3.0.0
+ */
+function bp_members_action_activate_account() {
+ if ( ! bp_is_current_component( 'activate' ) ) {
+ return;
+ }
+
+ if ( is_user_logged_in() ) {
+ return;
+ }
+
+ if ( ! empty( $_POST['key'] ) ) {
+ $key = wp_unslash( $_POST['key'] );
+
+ // Backward compatibility with templates using `method="get"` in their activation forms.
+ } elseif ( ! empty( $_GET['key'] ) ) {
+ $key = wp_unslash( $_GET['key'] );
+ }
+
+ if ( empty( $key ) ) {
+ return;
+ }
+
+ $bp = buddypress();
+
+ /**
+ * Filters the activation signup.
+ *
+ * @since 1.1.0
+ *
+ * @param bool|int $value Value returned by activation.
+ * Integer on success, boolean on failure.
+ */
+ $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $key ) );
+
+ // If there were errors, add a message and redirect.
+ if ( ! empty( $user->errors ) ) {
+ bp_core_add_message( $user->get_error_message(), 'error' );
+ bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
+ }
+
+ bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
+ bp_core_redirect( add_query_arg( 'activated', '1', bp_get_activation_page() ) );
+
+}
+add_action( 'bp_actions', 'bp_members_action_activate_account' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Unhooked in 1.6.0 - moved to settings
</span><span class="cx" style="display: block; padding: 0 10px"> * add_action( 'bp_actions', 'bp_core_action_delete_user' );
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersscreensphp"></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-screens.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-screens.php 2017-12-11 11:36:12 UTC (rev 11765)
+++ trunk/src/bp-members/bp-members-screens.php 2017-12-12 02:26:15 UTC (rev 11766)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,8 +290,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Handle the loading of the Activate screen.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.1.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @todo Move the actual activation process into an action in bp-members-actions.php
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_core_screen_activation() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,40 +323,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bp_core_redirect( $redirect_to );
</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">- // Grab the key (the old way).
- $key = isset( $_GET['key'] ) ? $_GET['key'] : '';
-
- // Grab the key (the new way).
- if ( empty( $key ) ) {
- $key = bp_current_action();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Get BuddyPress.
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // We've got a key; let's attempt to activate the signup.
- if ( ! empty( $key ) ) {
-
- /**
- * Filters the activation signup.
- *
- * @since 1.1.0
- *
- * @param bool|int $value Value returned by activation.
- * Integer on success, boolean on failure.
- */
- $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $key ) );
-
- // If there were errors, add a message and redirect.
- if ( ! empty( $user->errors ) ) {
- bp_core_add_message( $user->get_error_message(), 'error' );
- bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
- }
-
- bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
- $bp->activation_complete = true;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the template to load for the Member activation page screen.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcbpmembersbpmemberstemplatephp"></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-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-template.php 2017-12-11 11:36:12 UTC (rev 11765)
+++ trunk/src/bp-members/bp-members-template.php 2017-12-12 02:26:15 UTC (rev 11766)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2118,6 +2118,34 @@
</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">+ * Get the activation key from the current request URL.
+ *
+ * @since 3.0.0
+ *
+ * @return string
+ */
+function bp_get_current_activation_key() {
+ $key = '';
+
+ if ( bp_is_current_component( 'activate' ) ) {
+ if ( isset( $_GET['key'] ) ) {
+ $key = wp_unslash( $_GET['key'] );
+ } else {
+ $key = bp_current_action();
+ }
+ }
+
+ /**
+ * Filters the activation key from the current request URL.
+ *
+ * @since 3.0.0
+ *
+ * @param string $key Activation key.
+ */
+ return apply_filters( 'bp_get_current_activation_key', $key );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Output the username submitted during signup.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.1.0
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressmembersactivatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress/members/activate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/members/activate.php 2017-12-11 11:36:12 UTC (rev 11765)
+++ trunk/src/bp-templates/bp-legacy/buddypress/members/activate.php 2017-12-12 02:26:15 UTC (rev 11766)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,10 +50,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Please provide a valid activation key.', 'buddypress' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <form action="" method="get" class="standard-form" id="activation-form">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <form action="" method="post" class="standard-form" id="activation-form">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="key"><?php _e( 'Activation Key:', 'buddypress' ); ?></label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" name="key" id="key" value="" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" name="key" id="key" value="<?php echo esc_attr( bp_get_current_activation_key() ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="submit" name="submit" value="<?php esc_attr_e( 'Activate', 'buddypress' ); ?>" />
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaubuddypressmembersactivatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/buddypress/members/activate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/members/activate.php 2017-12-11 11:36:12 UTC (rev 11765)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/members/activate.php 2017-12-12 02:26:15 UTC (rev 11766)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,10 +25,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Please provide a valid activation key.', 'buddypress' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <form action="" method="get" class="standard-form" id="activation-form">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <form action="" method="post" class="standard-form" id="activation-form">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="key"><?php _e( 'Activation Key:', 'buddypress' ); ?></label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" name="key" id="key" value="" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" name="key" id="key" value="<?php echo esc_attr( bp_get_current_activation_key() ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="submit" name="submit" value="<?php esc_attr_e( 'Activate', 'buddypress' ); ?>" />
</span></span></pre>
</div>
</div>
</body>
</html>