Changeset 13125

Timestamp:

10/10/2021 11:46:17 AM (3 years ago)

Author:

imath

Message:

Introduce filters to allow custom redirection URL on activated account

• bp_members_invitations_activation_errored_redirect can be used to customize the URL to redirect the user to if activating the invitation failed.
• bp_members_invitations_activation_successed_redirect can be used for the same purpose but on a successful activated account.
• bp_members_action_activate_errored_redirect can be used to customize the URL to redirect the user to if activating the account failed.
• bp_members_action_activate_successed_redirect can be used for the same purpose but on a successful activated account.

NB: this commit also makes sure the bp_get_activation_page() is used to build the activation page url instead of rebuilding this URL from the activate actions.

Fixes #8542

Location:

trunk/src/bp-members

Files:

• bp-members-invitations.php (modified) (2 diffs)
• screens/activate.php (modified) (2 diffs)

trunk/src/bp-members/bp-members-invitations.php

@@ -126 +126 @@
     $key = bp_get_user_meta( $user_id, 'activation_key', true );
     if ( $key ) {
+        $redirect = bp_get_activation_page();
+
         /**
          * Filters the activation signup.
@@ -138 +140 @@
         // If there were errors, add a message and redirect.
         if ( ! empty( $user->errors ) ) {
+            /**
+             * Filter here to redirect the User to a different URL than the activation page.
+             *
+             * @since 10.0.0
+             *
+             * @param string   $redirect The URL to use to redirect the user.
+             * @param WP_Error $user     The WP Error object.
+             */
+            $redirect = apply_filters( 'bp_members_invitations_activation_errored_redirect', $redirect, $user );
+
             bp_core_add_message( $user->get_error_message(), 'error' );
-            bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
+            bp_core_redirect( $redirect );
         }
 
+        /**
+         * Filter here to redirect the User to a different URL than the activation page.
+         *
+         * @since 10.0.0
+         *
+         * @param string $redirect The URL to use to redirect the user.
+         */
+        $redirect = apply_filters( 'bp_members_invitations_activation_successed_redirect', $redirect );
+
         bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
-        bp_core_redirect( add_query_arg( 'activated', '1', bp_get_activation_page() ) );
+        bp_core_redirect( add_query_arg( 'activated', '1', $redirect ) );
     }
 }

trunk/src/bp-members/screens/activate.php

@@ -86 +86 @@
     }
 
-    $bp = buddypress();
+    $bp       = buddypress();
+    $redirect = bp_get_activation_page();
 
     /**
@@ -100 +101 @@
     // If there were errors, add a message and redirect.
     if ( ! empty( $user->errors ) ) {
+        /**
+         * Filter here to redirect the User to a different URL than the activation page.
+         *
+         * @since 10.0.0
+         *
+         * @param string   $redirect The URL to use to redirect the user.
+         * @param WP_Error $user     The WP Error object.
+         */
+        $redirect = apply_filters( 'bp_members_action_activate_errored_redirect', $redirect, $user );
+
         bp_core_add_message( $user->get_error_message(), 'error' );
-        bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
+        bp_core_redirect( $redirect );
     }
 
+    /**
+     * Filter here to redirect the User to a different URL than the activation page.
+     *
+     * @since 10.0.0
+     *
+     * @param string $redirect The URL to use to redirect the user.
+     */
+    $redirect = apply_filters( 'bp_members_action_activate_successed_redirect', $redirect );
+
     bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
-    bp_core_redirect( add_query_arg( 'activated', '1', bp_get_activation_page() ) );
+    bp_core_redirect( add_query_arg( 'activated', '1', $redirect ) );
 
 }