Changeset 13043 for trunk/src/bp-settings/actions/general.php

Timestamp:

08/13/2021 01:19:38 PM (3 years ago)

Author:

imath

Message:

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 #8538 (trunk)

File:

• trunk/src/bp-settings/actions/general.php (modified) (4 diffs)

trunk/src/bp-settings/actions/general.php

@@ -246 +246 @@
     // Email change is being verified.
     if ( isset( $_GET['verify_email_change'] ) ) {
-        $pending_email = bp_get_user_meta( bp_displayed_user_id(), 'pending_email_change', true );
+        $user_id       = bp_displayed_user_id();
+        $pending_email = (array) bp_get_user_meta( $user_id, 'pending_email_change', true );
+
+        // 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 );
+        }
 
         // Bail if the hash provided doesn't match the one saved in the database.
@@ -254 +272 @@
 
         $email_changed = wp_update_user( array(
-            'ID'         => bp_displayed_user_id(),
+            'ID'         => $user_id,
             'user_email' => trim( $pending_email['newemail'] ),
         ) );
 
         if ( $email_changed ) {
-
             // Delete the pending email change key.
-            bp_delete_user_meta( bp_displayed_user_id(), 'pending_email_change' );
+            bp_delete_user_meta( $user_id, 'pending_email_change' );
+
+            /**
+             * 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 );
 
             // Post a success message and redirect.
@@ -271 +299 @@
 
         bp_core_redirect( $redirect_to );
-        die();
 
     // Email change is being dismissed.
@@ -278 +305 @@
 
         if ( $nonce_check ) {
-            bp_delete_user_meta( bp_displayed_user_id(), 'pending_email_change' );
+            $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 );
+
             bp_core_add_message( __( 'You have successfully dismissed your pending email change.', 'buddypress' ) );
         }
 
         bp_core_redirect( $redirect_to );
-        die();
     }
 }