<!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][13043] trunk/src/bp-settings/actions/general.php: Settings: do not try to validate a dismissed email change</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/13043">13043</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/13043","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-08-13 13:19:38 +0000 (Fri, 13 Aug 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'>Settings: do not try to validate a dismissed email change
If a user clicks on the link to verify and validate an email change he previously dismissed, we need to show him an error feedback instead of trying (and failing) to validate a dismissed email change.
Doing so is also avoiding errors with PHP8.
Props nunks
See <a href="http://buddypress.trac.wordpress.org/ticket/8538">#8538</a> (trunk)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpsettingsactionsgeneralphp">trunk/src/bp-settings/actions/general.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpsettingsactionsgeneralphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-settings/actions/general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-settings/actions/general.php 2021-08-13 12:21:11 UTC (rev 13042)
+++ trunk/src/bp-settings/actions/general.php 2021-08-13 13:19:38 UTC (rev 13043)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,8 +245,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Email change is being verified.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['verify_email_change'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pending_email = bp_get_user_meta( bp_displayed_user_id(), 'pending_email_change', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = bp_displayed_user_id();
+ $pending_email = (array) bp_get_user_meta( $user_id, 'pending_email_change', true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The user may have dismissed the email change.
+ if ( ! array_filter( $pending_email ) ) {
+ /**
+ * Fires when a Pending Email Change is missing and before
+ * BuddyPress redirects the user to an error message.
+ *
+ * @since 9.1.0
+ *
+ * @param int $user_id The user ID.
+ * @param string $redirect_to The Default Front-end Settings Screen URL.
+ */
+ do_action( 'bp_settings_missing_pending_email_change_hash', $user_id, $redirect_to );
+
+ bp_core_add_message( __( 'There was a problem verifying your new email address. If you haven’t dismissed the pending email change, please request a new email update.', 'buddypress' ), 'error' );
+ bp_core_redirect( $redirect_to );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Bail if the hash provided doesn't match the one saved in the database.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! hash_equals( urldecode( $_GET['verify_email_change'] ), $pending_email['hash'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,15 +271,25 @@
</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"> $email_changed = wp_update_user( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ID' => bp_displayed_user_id(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ID' => $user_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => trim( $pending_email['newemail'] ),
</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"> if ( $email_changed ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> // Delete the pending email change key.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_delete_user_meta( bp_displayed_user_id(), 'pending_email_change' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_delete_user_meta( $user_id, 'pending_email_change' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Fires when a Pending Email Change has been validated and before
+ * BuddyPress redirects the user to a success message.
+ *
+ * @since 9.1.0
+ *
+ * @param int $user_id The user ID.
+ * @param string $redirect_to The Default Front-end Settings Screen URL.
+ */
+ do_action( 'bp_settings_email_changed', $user_id, $redirect_to );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Post a success message and redirect.
</span><span class="cx" style="display: block; padding: 0 10px"> bp_core_add_message( __( 'You have successfully verified your new email address.', 'buddypress' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +298,6 @@
</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"> bp_core_redirect( $redirect_to );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- die();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Email change is being dismissed.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $_GET['dismiss_email_change'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,12 +304,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce_check = isset( $_GET['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), 'bp_dismiss_email_change' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $nonce_check ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_delete_user_meta( bp_displayed_user_id(), 'pending_email_change' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = bp_displayed_user_id();
+ bp_delete_user_meta( $user_id, 'pending_email_change' );
+
+ /**
+ * Fires when a Pending Email Change has been dismissed and before
+ * BuddyPress redirects the user to a success message.
+ *
+ * @since 9.1.0
+ *
+ * @param int $user_id The user ID.
+ * @param string $redirect_to The Default Front-end Settings Screen URL.
+ */
+ do_action( 'bp_settings_email_change_dismissed', $user_id, $redirect_to );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_core_add_message( __( 'You have successfully dismissed your pending email change.', 'buddypress' ) );
</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"> bp_core_redirect( $redirect_to );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- die();
</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"> add_action( 'bp_actions', 'bp_settings_verify_email_change' );
</span></span></pre>
</div>
</div>
</body>
</html>