Changeset 13167

Timestamp:

12/10/2021 04:14:25 PM (3 years ago)

Author:

dcavins

Message:

Add key membership request functionality.

When membership requests are active, interrupt the
activation process by not sending the activation mail
upon submission of the registration form. This allows the
site admin an opportunity to look over the request and
send the activation email manually.

See #8582.

Location:

trunk/src

Files:

• bp-core/bp-core-filters.php (modified) (6 diffs)
• bp-members/bp-members-membership-requests.php (added)
• bp-members/classes/class-bp-members-component.php (modified) (2 diffs)

trunk/src/bp-core/bp-core-filters.php

@@ -462 +462 @@
  */
 function bp_core_activation_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key ) {
+    $is_signup_resend = false;
+    if ( is_admin() && buddypress()->members->admin->signups_page == get_current_screen()->id ) {
+        // The admin is just approving/sending/resending the verification email.
+        $is_signup_resend = true;
+    }
+
     $args = array(
         'tokens' => array(
@@ -482 +488 @@
     }
 
-    bp_send_email( 'core-user-registration-with-blog', array( array( $user_email => $salutation ) ), $args );
+    /**
+     * Filters if BuddyPress should send an activation key for a new multisite signup.
+     *
+     * @since 10.0.0
+     *
+     * @param string $user             The user's login name.
+     * @param string $user_email       The user's email address.
+     * @param string $key              The activation key created in wpmu_signup_blog().
+     * @param bool   $is_signup_resend Is the site admin sending this email?
+     * @param string $domain           The new blog domain.
+     * @param string $path             The new blog path.
+     * @param string $title            The site title.
+     */
+    if ( apply_filters( 'bp_core_signup_send_activation_key_multisite_blog', true, $user, $user_email, $key, $is_signup_resend, $domain, $path, $title ) ) {
+        bp_send_email( 'core-user-registration-with-blog', array( array( $user_email => $salutation ) ), $args );
+    }
 
     // Return false to stop the original WPMU function from continuing.
@@ -503 +524 @@
  */
 function bp_core_activation_signup_user_notification( $user, $user_email, $key, $meta ) {
+    $is_signup_resend = false;
     if ( is_admin() ) {
 
@@ -516 +538 @@
             }
 
-        /*
-         * There can be a case where the user was created without the skip confirmation
-         * And the super admin goes in pending accounts to resend it. In this case, as the
-         * meta['password'] is not set, the activation url must be WordPress one.
-         */
+        // The site admin is approving/resending from the "manage signups" screen.
         } elseif ( buddypress()->members->admin->signups_page == get_current_screen()->id ) {
+            /*
+             * There can be a case where the user was created without the skip confirmation
+             * And the super admin goes in pending accounts to resend it. In this case, as the
+             * meta['password'] is not set, the activation url must be WordPress one.
+             */
             $is_hashpass_in_meta = maybe_unserialize( $meta );
 
@@ -527 +550 @@
                 return $user;
             }
+
+            // Or the admin is just approving/sending/resending the verification email.
+            $is_signup_resend = true;
         }
     }
@@ -551 +577 @@
         ),
     );
-    bp_send_email( 'core-user-registration', array( array( $user_email => $salutation ) ), $args );
+
+    /**
+     * Filters if BuddyPress should send an activation key for a new multisite signup.
+     *
+     * @since 10.0.0
+     *
+     * @param string $user             The user's login name.
+     * @param string $user_email       The user's email address.
+     * @param string $key              The activation key created in wpmu_signup_blog().
+     * @param bool   $is_signup_resend Is the site admin sending this email?
+     */
+    if ( apply_filters( 'bp_core_signup_send_activation_key_multisite', true, $user, $user_email, $key, $is_signup_resend ) ) {
+        bp_send_email( 'core-user-registration', array( array( $user_email => $salutation ) ), $args );
+    }
 
     // Return false to stop the original WPMU function from continuing.

trunk/src/bp-members/classes/class-bp-members-component.php

@@ -41 +41 @@
                 'adminbar_myaccount_order' => 20,
                 'search_query_arg'         => 'members_search',
-                'features'                 => array( 'invitations' )
+                'features'                 => array( 'invitations', 'membership_requests' ),
             )
         );
@@ -73 +73 @@
         if ( bp_is_active( 'activity' ) ) {
             $includes[] = 'activity';
+        }
+
+        /**
+         * Duplicate bp_get_membership_requests_required() and
+         * bp_get_signup_allowed() logic here,
+         * because those functions are not available yet.
+         * The `bp_get_signup_allowed` filter is documented in
+         * bp-members/bp-members-template.php.
+         */
+        $signup_allowed = apply_filters( 'bp_get_signup_allowed', (bool) bp_get_option( 'users_can_register' ) );
+        $membership_requests_enabled = (bool) bp_get_option( 'bp-enable-membership-requests' );
+        if ( bp_is_active( 'members', 'membership_requests' ) && ! $signup_allowed && $membership_requests_enabled ) {
+            $includes[] = 'membership-requests';
         }