Changeset 13170 for trunk/src/bp-members/bp-members-functions.php

Timestamp:

12/10/2021 04:15:05 PM (4 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.

File:

• trunk/src/bp-members/bp-members-functions.php (modified) (1 diff)

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 );