Changeset 13166

Timestamp:

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

Author:

dcavins

Message:

Introduce bp_get_membership_requests_required().

Introduce a new function to determine if membership
requests are enabled and add the toggle to the admin
form at BuddyPress Settings > Options.

See #8582.

Location:

trunk/src

Files:

• bp-core/admin/bp-core-admin-settings.php (modified) (2 diffs)
• bp-core/classes/class-bp-admin.php (modified) (1 diff)
• bp-members/bp-members-template.php (modified) (2 diffs)

trunk/src/bp-core/admin/bp-core-admin-settings.php

@@ -193 +193 @@
     <label for="bp-enable-members-invitations"><?php _e( 'Allow registered members to invite people to join this network', 'buddypress' ); ?></label>
     <?php if ( ! bp_get_signup_allowed() ) : ?>
-        <p class="description"><?php _e( 'Public registration is currently disabled. However, invitees will still be able to register if network invitations are enabled.', 'buddypress' ); ?></p>
+        <?php if ( is_multisite() ) : ?>
+            <p class="description"><?php esc_html_e( 'With a WP multisite setup, to require membership requests for new signups, choose one of the following two options from the Network Settings > Registration Settings pane:' ); ?><p>
+                <ul>
+                    <li><p class="description"><?php esc_html_e( 'To allow the submission of membership requests but not allow site creation requests, select "Registration is disabled".' ) ?></p></li>
+                    <li><p class="description"><?php esc_html_e( 'To allow the submission of membership requests and to allow new sites to be created by your users, choose "Logged in users may register new sites".' ) ?></p></li>
+                </ul>
+            <p class="description"><?php esc_html_e( 'The other two options, "User accounts may be registered" and "Both sites and user accounts can be registered," are open in nature and membership requests will not be enabled if one of those options is selected.' ); ?><p>
+        <?php else : ?>
+        <p class="description"><?php esc_html_e( 'Public registration is currently disabled. However, invitees will still be able to register if network invitations are enabled.', 'buddypress' ); ?></p>
+        <?php endif; ?>
     <?php endif; ?>
     <?php
@@ -202 +211 @@
      */
     do_action( 'bp_admin_settings_after_members_invitations' );
+}
+
+/**
+ * Allow new users to request membership to the network.
+ *
+ * @since 10.0.0
+ */
+function bp_admin_setting_callback_membership_requests() {
+?>
+    <input id="bp-enable-membership-requests" name="bp-enable-membership-requests" type="checkbox" value="1" <?php checked( bp_get_membership_requests_required( 'raw' ) ); ?> <?php disabled( bp_get_signup_allowed() ); ?> />
+    <label for="bp-enable-membership-requests"><?php esc_html_e( 'Allow visitors to request site membership. If enabled, an administrator must approve each new site membership request.', 'buddypress' ); ?></label>
+    <?php if ( bp_get_signup_allowed() ) : ?>
+        <p class="description"><?php esc_html_e( 'Public registration is currently enabled. If you wish to require approval for new memberships, disable public registration and enable the membership requests feature.', 'buddypress' ); ?></p>
+    <?php endif; ?>
+    <?php
+    /**
+     * Fires after the output of the membership requests settings section.
+     *
+     * @since 10.0.0
+     */
+    do_action( 'bp_admin_settings_after_membership_requests' );
 }
 

trunk/src/bp-core/classes/class-bp-admin.php

@@ -488 +488 @@
             add_settings_field( 'bp-enable-members-invitations', __( 'Invitations', 'buddypress' ), 'bp_admin_setting_callback_members_invitations', 'buddypress', 'bp_members' );
             register_setting( 'buddypress', 'bp-enable-members-invitations', 'intval' );
+        }
+
+        // Membership requests.
+        if ( bp_is_active( 'members', 'membership_requests' ) ) {
+            add_settings_field( 'bp-enable-membership-requests', __( 'Membership Requests', 'buddypress' ), 'bp_admin_setting_callback_membership_requests', 'buddypress', 'bp_members' );
+            register_setting( 'buddypress', 'bp-enable-membership-requests', 'intval' );
         }
 

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

@@ -2923 +2923 @@
 
 /**
+ * Are membership requests required for joining this site?
+ *
+ * @since 10.0.0
+ *
+ * @param bool $context "raw" to fetch value from database,
+ *                      "site" to take "anyone can register" setting into account.
+ * @return bool
+ */
+function bp_get_membership_requests_required( $context = 'site' ) {
+    if ( 'raw' === $context ) {
+        $retval = bp_is_active( 'members', 'membership_requests' ) && (bool) bp_get_option( 'bp-enable-membership-requests' );
+    } else {
+        $retval = bp_is_active( 'members', 'membership_requests' ) && ! bp_get_signup_allowed() && (bool) bp_get_option( 'bp-enable-membership-requests' );
+    }
+
+    /**
+     * Filters whether or not prospective members may submit network membership requests.
+     *
+     * @since 10.0.0
+     *
+     * @param bool $retval Whether or not membership requests are required.
+     * @param bool $retval Whether this is the value stored in the database ('raw')
+     *                     or whether the site's "anyone can register" setting is
+     *                     being considered ('site' or anything else).
+     */
+    return apply_filters( 'bp_get_membership_requests_required', $retval, $context );
+}
+
+/**
  * Should the system create and allow access
  * to the Register and Activate pages?
@@ -2931 +2960 @@
  */
 function bp_allow_access_to_registration_pages() {
-    $retval = bp_get_signup_allowed() || bp_get_members_invitations_allowed();
+    $retval = bp_get_signup_allowed() || bp_get_members_invitations_allowed() || bp_get_membership_requests_required();
 
     /**