Changeset 12834

Timestamp:

08/11/2023 05:54:47 AM (18 months ago)

Author:

dd32

Message:

Login: When a user attempts to signup again using the same username that is currently pending approval, don't offer to resend the email, but instead that it's pending.

This avoids a case where the user see's a "resend confirmation email" which never actually works.

See [12811].

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-restapi.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-restapi.php

@@ -46 +46 @@
 
     // Check we don't have a pending registration for that username.
-    if ( $pending = wporg_get_pending_user( $login ) ) {
+    $pending = wporg_get_pending_user( $login );
+    if ( $pending && ! $pending['cleared'] ) {
+        // Account is in pending state, but requires manual human review, don't suggest sending a reset email.
+        $sso = WPOrg_SSO::get_instance();
+
+        return [
+            'available' => false,
+            'error' => sprintf(
+                __( 'That username is already in use.', 'wporg' ) . '<br>' .
+                /* translators: %s Email address */
+                __( 'Your account is pending approval. You will receive an email at %s to set your password when approved.', 'wporg' ) . 
+                /* translators: %s Email address */
+                '<br>' . __( 'Please contact %s for more details.', 'wporg' ),
+                '<code>' . esc_html( $pending['user_email'] ) . '</code>',
+                '<a href="mailto:' . $sso::SUPPORT_EMAIL . '">' . $sso::SUPPORT_EMAIL . '</a>'
+            ),
+            'avatar' => get_avatar( $email, 64 ),
+        ];
+    } elseif ( $pending ) {
         return [
             'available' => false,