Ticket #44676: 44676.3.diff

src/wp-admin/includes/user.php

@@ -683 +683 @@
                                                 __( 'Invalid action.' ),
                                                 'error'
                                         );
+                                        break;
                                 }
-                                $action_type               = sanitize_text_field( wp_unslash( $_POST['type_of_action'] ) );
-                                $username_or_email_address = sanitize_text_field( wp_unslash( $_POST['username_or_email_for_privacy_request'] ) );
-                                $email_address             = '';
 
+                                $action_type = sanitize_text_field( wp_unslash( $_POST['type_of_action'] ) );
+                                
                                 if ( ! in_array( $action_type, _wp_privacy_action_request_types(), true ) ) {
                                         add_settings_error(
                                                 'action_type',
@@ -695 +695 @@
                                                 __( 'Invalid action.' ),
                                                 'error'
                                         );
+                                        break;
                                 }
 
-                                if ( ! is_email( $username_or_email_address ) ) {
-                                        $user = get_user_by( 'login', $username_or_email_address );
-                                        if ( ! $user instanceof WP_User ) {
-                                                add_settings_error(
-                                                        'username_or_email_for_privacy_request',
-                                                        'username_or_email_for_privacy_request',
-                                                        __( 'Unable to add this request. A valid email address or username must be supplied.' ),
-                                                        'error'
-                                                );
+                                $count                  = 0;
+                                $failure_count  = 0;
+
+                                $username_or_email_for_privacy_request  = sanitize_text_field( wp_unslash( $_POST['username_or_email_for_privacy_request'] ) );
+                                $usernames_or_email_addresses                   = explode( ',', $username_or_email_for_privacy_request );
+
+                                foreach ( $usernames_or_email_addresses as $username_or_email_address ) {
+                                        $email_address = '';
+
+                                        if ( ! is_email( $username_or_email_address ) ) {
+                                                $user = get_user_by( 'login', $username_or_email_address );
+                                                if ( ! $user instanceof WP_User ) {
+                                                        $failure_count++;
+                                                        break;
+                                                } else {
+                                                        $email_address = $user->user_email;
+                                                }
                                         } else {
-                                                $email_address = $user->user_email;
+                                                $email_address = $username_or_email_address;
                                         }
-                                } else {
-                                        $email_address = $username_or_email_address;
-                                }
 
-                                if ( empty( $email_address ) ) {
+                                        if ( empty( $email_address ) ) {
+                                                $failure_count++;
+                                                break;
+                                        }
+
+                                        $request_id = wp_create_user_request( $email_address, $action_type );
+
+                                        if ( ! $request_id || is_wp_error( $request_id ) ) {
+                                                $failure_count++;
+                                                break;
+                                        }
+
+                                        $result = wp_send_user_request( $request_id );
+
+                                        if ( ! $result || is_wp_error( $result ) ) {
+                                                $failure_count++;
+                                                break;
+                                        }
+
+                                        $count++;
                                         break;
                                 }
 
-                                $request_id = wp_create_user_request( $email_address, $action_type );
-
-                                if ( is_wp_error( $request_id ) ) {
+                                if ( $count ) {
                                         add_settings_error(
                                                 'username_or_email_for_privacy_request',
                                                 'username_or_email_for_privacy_request',
-                                                $request_id->get_error_message(),
-                                                'error'
+                                                /* translators: %d: number of requests */
+                                                sprintf( _n( '%d confirmation request initiated successfully.', '%d confirmation requests initiated successfully.', $count ), $count ),
+                                                'updated'
                                         );
-                                        break;
-                                } elseif ( ! $request_id ) {
+                                }
+
+                                if ( $failure_count ) {
                                         add_settings_error(
                                                 'username_or_email_for_privacy_request',
                                                 'username_or_email_for_privacy_request',
-                                                __( 'Unable to initiate confirmation request.' ),
-                                                'error'
+                                                /* translators: %d: number of requests */
+                                                sprintf( _n( 'Unable to initiate %d confirmation request.', 'Unable to initiate %d confirmation requests.', $count ), $count ),
+                                                'updated'
                                         );
-                                        break;
                                 }
-
-                                wp_send_user_request( $request_id );
-
-                                add_settings_error(
-                                        'username_or_email_for_privacy_request',
-                                        'username_or_email_for_privacy_request',
-                                        __( 'Confirmation request initiated successfully.' ),
-                                        'updated'
-                                );
                                 break;
                 }
         }
@@ -822 +838 @@
 
                 <form method="post" class="wp-privacy-request-form">
                         <h2><?php esc_html_e( 'Add Data Export Request' ); ?></h2>
-                        <p><?php esc_html_e( 'An email will be sent to the user at this email address asking them to verify the request.' ); ?></p>
+                        <p><?php esc_html_e( 'An email will be sent to the user asking them to verify the request.' ); ?></p>
+                        <p><?php esc_html_e( 'To trigger multiple requests supply the usernames or email addresses in a comma-delimited list.' ); ?></p>
 
                         <div class="wp-privacy-request-form-field">
                                 <label for="username_or_email_for_privacy_request"><?php esc_html_e( 'Username or email address' ); ?></label>
@@ -897 +914 @@
 
                 <form method="post" class="wp-privacy-request-form">
                         <h2><?php esc_html_e( 'Add Data Erasure Request' ); ?></h2>
-                        <p><?php esc_html_e( 'An email will be sent to the user at this email address asking them to verify the request.' ); ?></p>
+                        <p><?php esc_html_e( 'An email will be sent to the user asking them to verify the request.' ); ?></p>
+                        <p><?php esc_html_e( 'To trigger multiple requests supply the usernames or email addresses in a comma-delimited list.' ); ?></p>
 
                         <div class="wp-privacy-request-form-field">
                                 <label for="username_or_email_for_privacy_request"><?php esc_html_e( 'Username or email address' ); ?></label>