Changeset 56654 for trunk/src/wp-login.php

Timestamp:

09/21/2023 06:22:10 PM (18 months ago)

Author:

joedolson

Message:

Login and Registration: Improve HTML for errors and notices.

Improve markup on Login and Registration errors. Use list markup for multiple issues, paragraph when only one to reduce semantic burden in the most common case. Normalize classes and markup for wrapper using wp_admin_notice() and wp_get_admin_notice() functions. Move definition of those functions from wp-admin\includes\misc.php to wp-includes\functions.php. Move tests to functions group.

Props extendwings, sabernhardt, afercia, lukecavanagh, rianrietveld, oglekler, sergeybiryukov, costdev, joedolson.
Fixes #30685.

File:

• trunk/src/wp-login.php (modified) (11 diffs)

trunk/src/wp-login.php

@@ -229 +229 @@
 
     if ( $wp_error->has_errors() ) {
-        $errors   = '';
-        $messages = '';
+        $error_list = array();
+        $messages   = '';
 
         foreach ( $wp_error->get_error_codes() as $code ) {
@@ -236 +236 @@
             foreach ( $wp_error->get_error_messages( $code ) as $error_message ) {
                 if ( 'message' === $severity ) {
-                    $messages .= '  ' . $error_message . "<br />\n";
+                    $messages .= '<p>' . $error_message . '</p>';
                 } else {
-                    $errors .= '    ' . $error_message . "<br />\n";
+                    $error_list[] = $error_message;
                 }
             }
         }
 
-        if ( ! empty( $errors ) ) {
+        if ( ! empty( $error_list ) ) {
+            $errors = '';
+
+            if ( count( $error_list ) > 1 ) {
+                $errors .= '<ul class="login-error-list">';
+
+                foreach ( $error_list as $item ) {
+                    $errors .= '<li>' . $item . '</li>';
+                }
+
+                $errors .= '</ul>';
+            } else {
+                $errors .= '<p>' . $error_message . '</p>';
+            }
+
             /**
              * Filters the error messages displayed above the login form.
@@ -251 +265 @@
              * @param string $errors Login error message.
              */
-            echo '<div id="login_error">' . apply_filters( 'login_errors', $errors ) . "</div>\n";
+            $errors = apply_filters( 'login_errors', $errors );
+            wp_admin_notice(
+                $errors,
+                array(
+                    'type'           => 'error',
+                    'id'             => 'login_error',
+                    'paragraph_wrap' => false,
+                )
+            );
         }
 
@@ -262 +284 @@
              * @param string $messages Login messages.
              */
-            echo '<p class="message" id="login-message">' . apply_filters( 'login_messages', $messages ) . "</p>\n";
+            $messages = apply_filters( 'login_messages', $messages );
+            wp_admin_notice(
+                $messages,
+                array(
+                    'type'               => 'info',
+                    'id'                 => 'login-message',
+                    'additional_classes' => array( 'message' ),
+                    'paragraph_wrap'     => false,
+                )
+            );
         }
     }
@@ -400 +431 @@
 
     ?>
-    <div class="clear"></div>
     </body>
     </html>
@@ -830 +860 @@
         do_action( 'lost_password', $errors );
 
-        login_header( __( 'Lost Password' ), '<p class="message">' . __( 'Please enter your username or email address. You will receive an email message with instructions on how to reset your password.' ) . '</p>', $errors );
+        login_header(
+            __( 'Lost Password' ),
+            wp_get_admin_notice(
+                __( 'Please enter your username or email address. You will receive an email message with instructions on how to reset your password.' ),
+                array(
+                    'type'               => 'info',
+                    'additional_classes' => array( 'message' ),
+                )
+            ),
+            $errors
+        );
 
         $user_login = '';
@@ -947 +987 @@
             reset_password( $user, $_POST['pass1'] );
             setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-            login_header( __( 'Password Reset' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' );
+            login_header(
+                __( 'Password Reset' ),
+                wp_get_admin_notice(
+                    __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a>',
+                    array(
+                        'type'               => 'info',
+                        'additional_classes' => array( 'message', 'reset-pass' ),
+                    )
+                )
+            );
             login_footer();
             exit;
@@ -955 +1004 @@
         wp_enqueue_script( 'user-profile' );
 
-        login_header( __( 'Reset Password' ), '<p class="message reset-pass">' . __( 'Enter your new password below or generate one.' ) . '</p>', $errors );
+        login_header(
+            __( 'Reset Password' ),
+            wp_get_admin_notice(
+                __( 'Enter your new password below or generate one.' ),
+                array(
+                    'type'               => 'info',
+                    'additional_classes' => array( 'message', 'reset-pass' ),
+                )
+            ),
+            $errors
+        );
 
         ?>
@@ -986 +1045 @@
 
             <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
-            <br class="clear" />
 
             <?php
@@ -1080 +1138 @@
         $redirect_to = apply_filters( 'registration_redirect', $registration_redirect, $errors );
 
-        login_header( __( 'Registration Form' ), '<p class="message register">' . __( 'Register For This Site' ) . '</p>', $errors );
+        login_header(
+            __( 'Registration Form' ),
+            wp_get_admin_notice(
+                __( 'Register For This Site' ),
+                array(
+                    'type'               => 'info',
+                    'additional_classes' => array( 'message', 'register' ),
+                )
+            ),
+            $errors
+        );
 
         ?>
@@ -1105 +1173 @@
                 <?php _e( 'Registration confirmation will be emailed to you.' ); ?>
             </p>
-            <br class="clear" />
             <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
             <p class="submit">