Changeset 13170

Timestamp:

12/10/2021 04:15:05 PM (3 years ago)

Author:

dcavins

Message:

Membership Requests: Change labels on register page.

We are using the standard "register" form to collect
membership requests, so we need to change the labels
in many cases to avoid confusion. Also ensure that users
can access the registration page when membership
requests are enabled.

See #8582.

Location:

trunk/src

Files:

• bp-core/bp-core-template.php (modified) (1 diff)
• bp-members/bp-members-functions.php (modified) (1 diff)
• bp-members/bp-members-membership-requests.php (modified) (1 diff)
• bp-members/classes/class-bp-registration-theme-compat.php (modified) (1 diff)
• bp-members/screens/register.php (modified) (2 diffs)
• bp-templates/bp-legacy/buddypress/members/register.php (modified) (2 diffs)
• bp-templates/bp-nouveau/includes/functions.php (modified) (1 diff)

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

@@ -3193 +3193 @@
     // Sign up page.
     } elseif ( bp_is_register_page() ) {
-        $bp_title_parts = array( __( 'Create an Account', 'buddypress' ) );
+        if ( bp_get_membership_requests_required() ) {
+            $bp_title_parts = array( __( 'Request Membership', 'buddypress' ) );
+        } else {
+            $bp_title_parts = array( __( 'Create an Account', 'buddypress' ) );
+        }
 
     // Activation page.

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

@@ -2445 +2445 @@
 
     // Unactivated user account found!
-    // Set up the feedback message.
-    $signup_id = $signup['signups'][0]->signup_id;
-
-    $resend_url_params = array(
-        'action' => 'bp-resend-activation',
-        'id'     => $signup_id,
-    );
-
-    $resend_url = wp_nonce_url(
-        add_query_arg( $resend_url_params, wp_login_url() ),
-        'bp-resend-activation'
-    );
-
-    $resend_string = '<br /><br />';
-
-    /* translators: %s: the activation url */
-    $resend_string .= sprintf( __( 'If you have not received an email yet, <a href="%s">click here to resend it</a>.', 'buddypress' ), esc_url( $resend_url ) );
-
-    return new WP_Error( 'bp_account_not_activated', __( '<strong>Error</strong>: Your account has not been activated. Check your email for the activation link.', 'buddypress' ) . $resend_string );
+    /*
+     * Don't allow users to resend their own activation email
+     * when membership requests are enabled.
+     */
+    if ( bp_get_membership_requests_required() ) {
+        $error_message = sprintf(
+            '<strong>%1$s</strong> %2$s',
+            esc_html_x( 'Error:', 'Warning displayed on the WP Login screen', 'buddypress' ),
+            esc_html_x( 'Your membership request has not yet been approved.', 'Error message displayed on the WP Login screen', 'buddypress' )
+        );
+    } else {
+        // Set up the feedback message.
+        $signup_id = $signup['signups'][0]->signup_id;
+
+        $resend_url_params = array(
+            'action' => 'bp-resend-activation',
+            'id'     => $signup_id,
+        );
+
+        $resend_url = wp_nonce_url(
+            add_query_arg( $resend_url_params, wp_login_url() ),
+            'bp-resend-activation'
+        );
+
+        $error_message = sprintf(
+            '<strong>%1$s</strong> %2$s<br /><br />%3$s',
+            esc_html_x( 'Error:', 'Warning displayed on the WP Login screen', 'buddypress' ),
+            esc_html_x( 'Your account has not been activated. Check your email for the activation link.', 'Error message displayed on the WP Login screen', 'buddypress' ),
+            sprintf(
+                /* translators: %s: the link to resend the activation email. */
+                esc_html_x( 'If you have not received an email yet, %s.', 'WP Login screen message', 'buddypress' ),
+                sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url( $resend_url ),
+                    esc_html_x( 'click here to resend it', 'Text of the link to resend the activation email', 'buddypress' )
+                )
+            )
+        );
+    }
+
+    return new WP_Error( 'bp_account_not_activated', $error_message );
 }
 add_filter( 'authenticate', 'bp_core_signup_disable_inactive', 30, 3 );

trunk/src/bp-members/bp-members-membership-requests.php

@@ -260 +260 @@
 
 /**
+ * In the Nouveau template pack, when membership requests are required,
+ * change registration form submit button label to "Submit Request".
+ *
+ * @since 10.0.0
+ *
+ * @return string $retval the HTML for the request membership link.
+ */
+function bp_members_membership_requests_filter_complete_signup_button( $buttons ) {
+
+    $buttons['register']['attributes']['value'] = __( 'Submit Request', 'buddypress' );
+    return $buttons;
+}
+add_filter( 'bp_nouveau_get_submit_button', 'bp_members_membership_requests_filter_complete_signup_button' );
+
+/**
  * Administration: Change certain behavior and labels
  * on the WP Admin > Users > Manage Signups screen.

trunk/src/bp-members/classes/class-bp-registration-theme-compat.php

@@ -98 +98 @@
         // Registration page.
         if ( bp_is_register_page() ) {
-            $title = __( 'Create an Account', 'buddypress' );
+            if ( bp_get_membership_requests_required() ) {
+                $title = __( 'Request Membership', 'buddypress' );
+            } else {
+                $title = __( 'Create an Account', 'buddypress' );
+            }
 
             if ( 'completed-confirmation' == bp_get_current_signup_step() ) {
-                $title = __( 'Check Your Email To Activate Your Account!', 'buddypress' );
+                if ( bp_get_membership_requests_required() ) {
+                    $title = __( 'Your Membership Request has been submitted.', 'buddypress' );
+                } else {
+                    $title = __( 'Check Your Email To Activate Your Account!', 'buddypress' );
+                }
             }
 

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

@@ -62 +62 @@
     }
 
-    if ( ! bp_get_signup_allowed() && ! $active_invite ) {
+    $requests_enabled = bp_get_membership_requests_required();
+
+    if ( ! bp_get_signup_allowed() && ! $active_invite && ! $requests_enabled ) {
         $bp->signup->step = 'registration-disabled';
         // If the signup page is submitted, validate and save.
@@ -198 +200 @@
             $active_signup = bp_core_get_root_option( 'registration' );
 
-            if ( 'none' != $active_signup ) {
+            if ( 'none' != $active_signup || $requests_enabled ) {
 
                 // Make sure the extended profiles module is enabled.

trunk/src/bp-templates/bp-legacy/buddypress/members/register.php

@@ -352 +352 @@
              * @since 1.1.0
              */
-            do_action( 'bp_before_registration_submit_buttons' ); ?>
+            do_action( 'bp_before_registration_submit_buttons' );
+
+            if ( bp_get_membership_requests_required() ) {
+                $button_text = __( 'Submit Request', 'buddypress' );
+            } else {
+                $button_text = __( 'Complete Sign Up', 'buddypress' );
+            }
+            ?>
 
             <div class="submit">
-                <input type="submit" name="signup_submit" id="signup_submit" value="<?php esc_attr_e( 'Complete Sign Up', 'buddypress' ); ?>" />
+                <input type="submit" name="signup_submit" id="signup_submit" value="<?php echo esc_attr( $button_text ); ?>" />
             </div>
 
@@ -391 +398 @@
 
             <div id="template-notices" role="alert" aria-atomic="true">
-                <?php if ( bp_registration_needs_activation() ) : ?>
+                <?php if ( bp_get_membership_requests_required() ) : ?>
+                    <p><?php _e( 'You have successfully submitted your membership request! Our site moderators will review your submission and send you an activation email if your request is approved.', 'buddypress' ); ?></p>
+                <?php elseif ( bp_registration_needs_activation() ) : ?>
                     <p><?php _e( 'You have successfully created your account! To begin using this site you will need to activate your account via the email we have just sent to your address.', 'buddypress' ); ?></p>
                 <?php else : ?>

trunk/src/bp-templates/bp-nouveau/includes/functions.php

@@ -1123 +1123 @@
      * Adjust some messages to the context.
      */
-    if ( 'completed-confirmation' === $feedback_id && bp_registration_needs_activation() ) {
+    if ( 'completed-confirmation' === $feedback_id && bp_get_membership_requests_required() ) {
+        $feedback_messages['completed-confirmation']['message'] = __( 'You have successfully submitted your membership request! Our site moderators will review your submission and send you an activation email if your request is approved.', 'buddypress' );
+    } elseif ( 'completed-confirmation' === $feedback_id && bp_registration_needs_activation() ) {
         $feedback_messages['completed-confirmation']['message'] = __( 'You have successfully created your account! To begin using this site you will need to activate your account via the email we have just sent to your address.', 'buddypress' );
     } elseif ( 'member-notifications-none' === $feedback_id ) {