Ticket #43895: 43895.diff

Gruntfile.js

@@ -264 +264 @@
                                         [ WORKING_DIR + 'wp-admin/js/tags-suggest.js' ]: [ './src/js/_enqueues/admin/tags-suggest.js' ],
                                         [ WORKING_DIR + 'wp-admin/js/tags.js' ]: [ './src/js/_enqueues/admin/tags.js' ],
                                         [ WORKING_DIR + 'wp-admin/js/site-health.js' ]: [ './src/js/_enqueues/admin/site-health.js' ],
+                                        [ WORKING_DIR + 'wp-admin/js/privacy.js' ]: [ './src/js/_enqueues/admin/privacy.js' ],
                                         [ WORKING_DIR + 'wp-admin/js/theme-plugin-editor.js' ]: [ './src/js/_enqueues/wp/theme-plugin-editor.js' ],
                                         [ WORKING_DIR + 'wp-admin/js/theme.js' ]: [ './src/js/_enqueues/wp/theme.js' ],
                                         [ WORKING_DIR + 'wp-admin/js/updates.js' ]: [ './src/js/_enqueues/wp/updates.js' ],

new file src/js/_enqueues/admin/privacy.js

@@ +1 @@
+/**
+ * Interactions used by the Site Health modules in WordPress.
+ *
+ * @output wp-admin/js/privacy.js
+ */
+
+( function( $ ) {
+        // Privacy request action handling
+        $( document ).ready( function() {
+                var strings = window.privacyToolsL10n || {};
+
+                function setActionState( $action, state ) {
+                        $action.children().hide();
+                        $action.children( '.' + state ).show();
+                }
+
+                function clearResultsAfterRow( $requestRow ) {
+                        $requestRow.removeClass( 'has-request-results' );
+
+                        if ( $requestRow.next().hasClass( 'request-results' ) ) {
+                                $requestRow.next().remove();
+                        }
+                }
+
+                function appendResultsAfterRow( $requestRow, classes, summaryMessage, additionalMessages ) {
+                        var itemList = '',
+                                resultRowClasses = 'request-results';
+
+                        clearResultsAfterRow( $requestRow );
+
+                        if ( additionalMessages.length ) {
+                                $.each( additionalMessages, function( index, value ) {
+                                        itemList = itemList + '<li>' + value + '</li>';
+                                });
+                                itemList = '<ul>' + itemList + '</ul>';
+                        }
+
+                        $requestRow.addClass( 'has-request-results' );
+
+                        if ( $requestRow.hasClass( 'status-request-confirmed' ) ) {
+                                resultRowClasses = resultRowClasses + ' status-request-confirmed';
+                        }
+
+                        if ( $requestRow.hasClass( 'status-request-failed' ) ) {
+                                resultRowClasses = resultRowClasses + ' status-request-failed';
+                        }
+
+                        $requestRow.after( function() {
+                                return '<tr class="' + resultRowClasses + '"><th colspan="5">' +
+                                        '<div class="notice inline notice-alt ' + classes + '">' +
+                                        '<p>' + summaryMessage + '</p>' +
+                                        itemList +
+                                        '</div>' +
+                                        '</td>' +
+                                        '</tr>';
+                        });
+                }
+
+                $( '.export-personal-data-handle' ).click( function( event ) {
+
+                        var $this          = $( this ),
+                                $action        = $this.parents( '.export-personal-data' ),
+                                $requestRow    = $this.parents( 'tr' ),
+                                requestID      = $action.data( 'request-id' ),
+                                nonce          = $action.data( 'nonce' ),
+                                exportersCount = $action.data( 'exporters-count' ),
+                                sendAsEmail    = $action.data( 'send-as-email' ) ? true : false;
+
+                        event.preventDefault();
+                        event.stopPropagation();
+
+                        $action.blur();
+                        clearResultsAfterRow( $requestRow );
+
+                        function onExportDoneSuccess( zipUrl ) {
+                                setActionState( $action, 'export-personal-data-success' );
+                                if ( 'undefined' !== typeof zipUrl ) {
+                                        window.location = zipUrl;
+                                } else if ( ! sendAsEmail ) {
+                                        onExportFailure( strings.noExportFile );
+                                }
+                        }
+
+                        function onExportFailure( errorMessage ) {
+                                setActionState( $action, 'export-personal-data-failed' );
+                                if ( errorMessage ) {
+                                        appendResultsAfterRow( $requestRow, 'notice-error', strings.exportError, [ errorMessage ] );
+                                }
+                        }
+
+                        function doNextExport( exporterIndex, pageIndex ) {
+                                $.ajax(
+                                        {
+                                                url: window.ajaxurl,
+                                                data: {
+                                                        action: 'wp-privacy-export-personal-data',
+                                                        exporter: exporterIndex,
+                                                        id: requestID,
+                                                        page: pageIndex,
+                                                        security: nonce,
+                                                        sendAsEmail: sendAsEmail
+                                                },
+                                                method: 'post'
+                                        }
+                                ).done( function( response ) {
+                                        var responseData = response.data;
+
+                                        if ( ! response.success ) {
+
+                                                // e.g. invalid request ID
+                                                onExportFailure( response.data );
+                                                return;
+                                        }
+
+                                        if ( ! responseData.done ) {
+                                                setTimeout( doNextExport( exporterIndex, pageIndex + 1 ) );
+                                        } else {
+                                                if ( exporterIndex < exportersCount ) {
+                                                        setTimeout( doNextExport( exporterIndex + 1, 1 ) );
+                                                } else {
+                                                        onExportDoneSuccess( responseData.url );
+                                                }
+                                        }
+                                }).fail( function( jqxhr, textStatus, error ) {
+
+                                        // e.g. Nonce failure
+                                        onExportFailure( error );
+                                });
+                        }
+
+                        // And now, let's begin
+                        setActionState( $action, 'export-personal-data-processing' );
+                        doNextExport( 1, 1 );
+                });
+
+                $( '.remove-personal-data-handle' ).click( function( event ) {
+
+                        var $this         = $( this ),
+                                $action       = $this.parents( '.remove-personal-data' ),
+                                $requestRow   = $this.parents( 'tr' ),
+                                requestID     = $action.data( 'request-id' ),
+                                nonce         = $action.data( 'nonce' ),
+                                erasersCount  = $action.data( 'erasers-count' ),
+                                hasRemoved    = false,
+                                hasRetained   = false,
+                                messages      = [];
+
+                        event.stopPropagation();
+
+                        $action.blur();
+                        clearResultsAfterRow( $requestRow );
+
+                        function onErasureDoneSuccess() {
+                                var summaryMessage = strings.noDataFound;
+                                var classes = 'notice-success';
+
+                                setActionState( $action, 'remove-personal-data-idle' );
+
+                                if ( false === hasRemoved ) {
+                                        if ( false === hasRetained ) {
+                                                summaryMessage = strings.noDataFound;
+                                        } else {
+                                                summaryMessage = strings.noneRemoved;
+                                                classes = 'notice-warning';
+                                        }
+                                } else {
+                                        if ( false === hasRetained ) {
+                                                summaryMessage = strings.foundAndRemoved;
+                                        } else {
+                                                summaryMessage = strings.someNotRemoved;
+                                                classes = 'notice-warning';
+                                        }
+                                }
+                                appendResultsAfterRow( $requestRow, 'notice-success', summaryMessage, messages );
+                        }
+
+                        function onErasureFailure() {
+                                setActionState( $action, 'remove-personal-data-failed' );
+                                appendResultsAfterRow( $requestRow, 'notice-error', strings.removalError, [] );
+                        }
+
+                        function doNextErasure( eraserIndex, pageIndex ) {
+                                $.ajax({
+                                        url: window.ajaxurl,
+                                        data: {
+                                                action: 'wp-privacy-erase-personal-data',
+                                                eraser: eraserIndex,
+                                                id: requestID,
+                                                page: pageIndex,
+                                                security: nonce
+                                        },
+                                        method: 'post'
+                                }).done( function( response ) {
+                                        var responseData = response.data;
+
+                                        if ( ! response.success ) {
+                                                onErasureFailure();
+                                                return;
+                                        }
+                                        if ( responseData.items_removed ) {
+                                                hasRemoved = hasRemoved || responseData.items_removed;
+                                        }
+                                        if ( responseData.items_retained ) {
+                                                hasRetained = hasRetained || responseData.items_retained;
+                                        }
+                                        if ( responseData.messages ) {
+                                                messages = messages.concat( responseData.messages );
+                                        }
+                                        if ( ! responseData.done ) {
+                                                setTimeout( doNextErasure( eraserIndex, pageIndex + 1 ) );
+                                        } else {
+                                                if ( eraserIndex < erasersCount ) {
+                                                        setTimeout( doNextErasure( eraserIndex + 1, 1 ) );
+                                                } else {
+                                                        onErasureDoneSuccess();
+                                                }
+                                        }
+                                }).fail( function() {
+                                        onErasureFailure();
+                                });
+                        }
+
+                        // And now, let's begin
+                        setActionState( $action, 'remove-personal-data-processing' );
+
+                        doNextErasure( 1, 1 );
+                });
+        });
+
+        // Privacy policy page, copy button.
+        $( document ).on( 'click', function( event ) {
+                var $target = $( event.target );
+                var $parent, $container, range;
+
+                if ( $target.is( 'button.privacy-text-copy' ) ) {
+                        $parent = $target.parent().parent();
+                        $container = $parent.find( 'div.wp-suggested-text' );
+
+                        if ( ! $container.length ) {
+                                $container = $parent.find( 'div.policy-text' );
+                        }
+
+                        if ( $container.length ) {
+                                try {
+                                        window.getSelection().removeAllRanges();
+                                        range = document.createRange();
+                                        $container.addClass( 'hide-privacy-policy-tutorial' );
+
+                                        range.selectNodeContents( $container[0] );
+                                        window.getSelection().addRange( range );
+                                        document.execCommand( 'copy' );
+
+                                        $container.removeClass( 'hide-privacy-policy-tutorial' );
+                                        window.getSelection().removeAllRanges();
+                                } catch ( er ) {}
+                        }
+                }
+        });
+
+} ( jQuery ) );
+ No newline at end of file

src/js/_enqueues/admin/xfn.js

@@ -21 +21 @@
                 $( '#link_rel' ).val( ( isMe ) ? 'me' : inputs.substr( 0,inputs.length - 1 ) );
         });
 });
-
-// Privacy request action handling
-jQuery( document ).ready( function( $ ) {
-        var strings = window.privacyToolsL10n || {};
-
-        function setActionState( $action, state ) {
-                $action.children().hide();
-                $action.children( '.' + state ).show();
-        }
-
-        function clearResultsAfterRow( $requestRow ) {
-                $requestRow.removeClass( 'has-request-results' );
-
-                if ( $requestRow.next().hasClass( 'request-results' ) ) {
-                        $requestRow.next().remove();
-                }
-        }
-
-        function appendResultsAfterRow( $requestRow, classes, summaryMessage, additionalMessages ) {
-                var itemList = '',
-                        resultRowClasses = 'request-results';
-
-                clearResultsAfterRow( $requestRow );
-
-                if ( additionalMessages.length ) {
-                        $.each( additionalMessages, function( index, value ) {
-                                itemList = itemList + '<li>' + value + '</li>';
-                        });
-                        itemList = '<ul>' + itemList + '</ul>';
-                }
-
-                $requestRow.addClass( 'has-request-results' );
-
-                if ( $requestRow.hasClass( 'status-request-confirmed' ) ) {
-                        resultRowClasses = resultRowClasses + ' status-request-confirmed';
-                }
-
-                if ( $requestRow.hasClass( 'status-request-failed' ) ) {
-                        resultRowClasses = resultRowClasses + ' status-request-failed';
-                }
-
-                $requestRow.after( function() {
-                        return '<tr class="' + resultRowClasses + '"><th colspan="5">' +
-                                '<div class="notice inline notice-alt ' + classes + '">' +
-                                '<p>' + summaryMessage + '</p>' +
-                                itemList +
-                                '</div>' +
-                                '</td>' +
-                                '</tr>';
-                });
-        }
-
-        $( '.export-personal-data-handle' ).click( function( event ) {
-
-                var $this          = $( this ),
-                        $action        = $this.parents( '.export-personal-data' ),
-                        $requestRow    = $this.parents( 'tr' ),
-                        requestID      = $action.data( 'request-id' ),
-                        nonce          = $action.data( 'nonce' ),
-                        exportersCount = $action.data( 'exporters-count' ),
-                        sendAsEmail    = $action.data( 'send-as-email' ) ? true : false;
-
-                event.preventDefault();
-                event.stopPropagation();
-
-                $action.blur();
-                clearResultsAfterRow( $requestRow );
-
-                function onExportDoneSuccess( zipUrl ) {
-                        setActionState( $action, 'export-personal-data-success' );
-                        if ( 'undefined' !== typeof zipUrl ) {
-                                window.location = zipUrl;
-                        } else if ( ! sendAsEmail ) {
-                                onExportFailure( strings.noExportFile );
-                        }
-                }
-
-                function onExportFailure( errorMessage ) {
-                        setActionState( $action, 'export-personal-data-failed' );
-                        if ( errorMessage ) {
-                                appendResultsAfterRow( $requestRow, 'notice-error', strings.exportError, [ errorMessage ] );
-                        }
-                }
-
-                function doNextExport( exporterIndex, pageIndex ) {
-                        $.ajax(
-                                {
-                                        url: window.ajaxurl,
-                                        data: {
-                                                action: 'wp-privacy-export-personal-data',
-                                                exporter: exporterIndex,
-                                                id: requestID,
-                                                page: pageIndex,
-                                                security: nonce,
-                                                sendAsEmail: sendAsEmail
-                                        },
-                                        method: 'post'
-                                }
-                        ).done( function( response ) {
-                                var responseData = response.data;
-
-                                if ( ! response.success ) {
-
-                                        // e.g. invalid request ID
-                                        onExportFailure( response.data );
-                                        return;
-                                }
-
-                                if ( ! responseData.done ) {
-                                        setTimeout( doNextExport( exporterIndex, pageIndex + 1 ) );
-                                } else {
-                                        if ( exporterIndex < exportersCount ) {
-                                                setTimeout( doNextExport( exporterIndex + 1, 1 ) );
-                                        } else {
-                                                onExportDoneSuccess( responseData.url );
-                                        }
-                                }
-                        }).fail( function( jqxhr, textStatus, error ) {
-
-                                // e.g. Nonce failure
-                                onExportFailure( error );
-                        });
-                }
-
-                // And now, let's begin
-                setActionState( $action, 'export-personal-data-processing' );
-                doNextExport( 1, 1 );
-        });
-
-        $( '.remove-personal-data-handle' ).click( function( event ) {
-
-                var $this         = $( this ),
-                        $action       = $this.parents( '.remove-personal-data' ),
-                        $requestRow   = $this.parents( 'tr' ),
-                        requestID     = $action.data( 'request-id' ),
-                        nonce         = $action.data( 'nonce' ),
-                        erasersCount  = $action.data( 'erasers-count' ),
-                        hasRemoved    = false,
-                        hasRetained   = false,
-                        messages      = [];
-
-                event.stopPropagation();
-
-                $action.blur();
-                clearResultsAfterRow( $requestRow );
-
-                function onErasureDoneSuccess() {
-                        var summaryMessage = strings.noDataFound;
-                        var classes = 'notice-success';
-
-                        setActionState( $action, 'remove-personal-data-idle' );
-
-                        if ( false === hasRemoved ) {
-                                if ( false === hasRetained ) {
-                                        summaryMessage = strings.noDataFound;
-                                } else {
-                                        summaryMessage = strings.noneRemoved;
-                                        classes = 'notice-warning';
-                                }
-                        } else {
-                                if ( false === hasRetained ) {
-                                        summaryMessage = strings.foundAndRemoved;
-                                } else {
-                                        summaryMessage = strings.someNotRemoved;
-                                        classes = 'notice-warning';
-                                }
-                        }
-                        appendResultsAfterRow( $requestRow, 'notice-success', summaryMessage, messages );
-                }
-
-                function onErasureFailure() {
-                        setActionState( $action, 'remove-personal-data-failed' );
-                        appendResultsAfterRow( $requestRow, 'notice-error', strings.removalError, [] );
-                }
-
-                function doNextErasure( eraserIndex, pageIndex ) {
-                        $.ajax({
-                                url: window.ajaxurl,
-                                data: {
-                                        action: 'wp-privacy-erase-personal-data',
-                                        eraser: eraserIndex,
-                                        id: requestID,
-                                        page: pageIndex,
-                                        security: nonce
-                                },
-                                method: 'post'
-                        }).done( function( response ) {
-                                var responseData = response.data;
-
-                                if ( ! response.success ) {
-                                        onErasureFailure();
-                                        return;
-                                }
-                                if ( responseData.items_removed ) {
-                                        hasRemoved = hasRemoved || responseData.items_removed;
-                                }
-                                if ( responseData.items_retained ) {
-                                        hasRetained = hasRetained || responseData.items_retained;
-                                }
-                                if ( responseData.messages ) {
-                                        messages = messages.concat( responseData.messages );
-                                }
-                                if ( ! responseData.done ) {
-                                        setTimeout( doNextErasure( eraserIndex, pageIndex + 1 ) );
-                                } else {
-                                        if ( eraserIndex < erasersCount ) {
-                                                setTimeout( doNextErasure( eraserIndex + 1, 1 ) );
-                                        } else {
-                                                onErasureDoneSuccess();
-                                        }
-                                }
-                        }).fail( function() {
-                                onErasureFailure();
-                        });
-                }
-
-                // And now, let's begin
-                setActionState( $action, 'remove-personal-data-processing' );
-
-                doNextErasure( 1, 1 );
-        });
-});
-
-( function( $ ) {
-
-        // Privacy policy page, copy button.
-        $( document ).on( 'click', function( event ) {
-                var $target = $( event.target );
-                var $parent, $container, range;
-
-                if ( $target.is( 'button.privacy-text-copy' ) ) {
-                        $parent = $target.parent().parent();
-                        $container = $parent.find( 'div.wp-suggested-text' );
-
-                        if ( ! $container.length ) {
-                                $container = $parent.find( 'div.policy-text' );
-                        }
-
-                        if ( $container.length ) {
-                                try {
-                                        window.getSelection().removeAllRanges();
-                                        range = document.createRange();
-                                        $container.addClass( 'hide-privacy-policy-tutorial' );
-
-                                        range.selectNodeContents( $container[0] );
-                                        window.getSelection().addRange( range );
-                                        document.execCommand( 'copy' );
-
-                                        $container.removeClass( 'hide-privacy-policy-tutorial' );
-                                        window.getSelection().removeAllRanges();
-                                } catch ( er ) {}
-                        }
-                }
-        });
-
-} ( jQuery ) );

new file src/wp-admin/erase-personal-data.php

@@ +1 @@
+<?php
+
+/**
+ * Personal data anonymization.
+ *
+ * @since 4.9.6
+ * @access private
+ */
+
+/** WordPress Administration Bootstrap */
+require_once( dirname( __FILE__ ) . '/admin.php' );
+
+if ( ! current_user_can( 'erase_others_personal_data' ) || ! current_user_can( 'delete_users' ) ) {
+        wp_die( __( 'Sorry, you are not allowed to erase data on this site.' ) );
+}
+
+if ( ! class_exists( 'WP_Privacy_Data_Removal_Requests_Table' ) ) {
+        require_once( ABSPATH . 'wp-admin/includes/class-wp-privacy-data-removal-requests-table.php' );
+}
+
+// Handle list table actions.
+_wp_personal_data_handle_actions();
+
+// Cleans up failed and expired requests before displaying the list table.
+_wp_personal_data_cleanup_requests();
+
+// Enqueue Privacy scripts.
+wp_enqueue_script( 'privacy' );
+
+$requests_table = new WP_Privacy_Data_Removal_Requests_Table(
+        array(
+                'plural'   => 'privacy_requests',
+                'singular' => 'privacy_request',
+                'screen'   => 'remove_personal_data',
+        )
+);
+
+$requests_table->screen->set_screen_reader_content(
+        array(
+                'heading_views'      => __( 'Filter erase personal data list' ),
+                'heading_pagination' => __( 'Erase personal data list navigation' ),
+                'heading_list'       => __( 'Erase personal data list' ),
+        )
+);
+
+$requests_table->process_bulk_action();
+$requests_table->prepare_items();
+
+require_once( ABSPATH . 'wp-admin/admin-header.php' );
+?>
+
+<div class="wrap nosubsub">
+        <h1><?php esc_html_e( 'Erase Personal Data' ); ?></h1>
+        <hr class="wp-header-end" />
+
+        <?php settings_errors(); ?>
+
+        <form action="<?php echo esc_url( admin_url( 'erase-personal-data.php' ) ); ?>" 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>
+
+                <div class="wp-privacy-request-form-field">
+                        <label for="username_or_email_for_privacy_request"><?php esc_html_e( 'Username or email address' ); ?></label>
+                        <input type="text" required class="regular-text" id="username_or_email_for_privacy_request" name="username_or_email_for_privacy_request" />
+                        <?php submit_button( __( 'Send Request' ), 'secondary', 'submit', false ); ?>
+                </div>
+                <?php wp_nonce_field( 'personal-data-request' ); ?>
+                <input type="hidden" name="action" value="add_remove_personal_data_request" />
+                <input type="hidden" name="type_of_action" value="remove_personal_data" />
+        </form>
+        <hr />
+
+        <?php $requests_table->views(); ?>
+
+        <form class="search-form wp-clearfix">
+                <?php $requests_table->search_box( __( 'Search Requests' ), 'requests' ); ?>
+                <input type="hidden" name="page" value="remove_personal_data" />
+                <input type="hidden" name="filter-status" value="<?php echo isset( $_REQUEST['filter-status'] ) ? esc_attr( sanitize_text_field( $_REQUEST['filter-status'] ) ) : ''; ?>" />
+                <input type="hidden" name="orderby" value="<?php echo isset( $_REQUEST['orderby'] ) ? esc_attr( sanitize_text_field( $_REQUEST['orderby'] ) ) : ''; ?>" />
+                <input type="hidden" name="order" value="<?php echo isset( $_REQUEST['order'] ) ? esc_attr( sanitize_text_field( $_REQUEST['order'] ) ) : ''; ?>" />
+        </form>
+
+        <form method="post">
+                <?php
+                $requests_table->display();
+                $requests_table->embed_scripts();
+                ?>
+        </form>
+</div>
+
+<?php
+include( ABSPATH . 'wp-admin/admin-footer.php' );

new file src/wp-admin/export-personal-data.php

@@ +1 @@
+<?php
+
+/**
+ * Personal data export.
+ *
+ * @since 4.9.6
+ * @access private
+ */
+
+/** WordPress Administration Bootstrap */
+require_once( dirname( __FILE__ ) . '/admin.php' );
+
+if ( ! current_user_can( 'export_others_personal_data' ) ) {
+        wp_die( __( 'Sorry, you are not allowed to export personal data on this site.' ) );
+}
+
+if ( ! class_exists( 'WP_Privacy_Data_Export_Requests_Table' ) ) {
+        require_once( ABSPATH . 'wp-admin/includes/class-wp-privacy-data-export-requests-table.php' );
+}
+
+// Handle list table actions.
+_wp_personal_data_handle_actions();
+
+// Cleans up failed and expired requests before displaying the list table.
+_wp_personal_data_cleanup_requests();
+
+// Enqueue Privacy scripts.
+wp_enqueue_script( 'privacy' );
+
+$requests_table = new WP_Privacy_Data_Export_Requests_Table(
+        array(
+                'plural'   => 'privacy_requests',
+                'singular' => 'privacy_request',
+                'screen'   => 'export_personal_data',
+        )
+);
+
+$requests_table->screen->set_screen_reader_content(
+        array(
+                'heading_views'      => __( 'Filter export personal data list' ),
+                'heading_pagination' => __( 'Export personal data list navigation' ),
+                'heading_list'       => __( 'Export personal data list' ),
+        )
+);
+
+$requests_table->process_bulk_action();
+$requests_table->prepare_items();
+
+require_once( ABSPATH . 'wp-admin/admin-header.php' );
+?>
+
+<div class="wrap nosubsub">
+        <h1><?php esc_html_e( 'Export Personal Data' ); ?></h1>
+        <hr class="wp-header-end" />
+
+        <?php settings_errors(); ?>
+
+        <form action="<?php echo esc_url( admin_url( 'export-personal-data.php' ) ); ?>" 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>
+
+                <div class="wp-privacy-request-form-field">
+                        <label for="username_or_email_for_privacy_request"><?php esc_html_e( 'Username or email address' ); ?></label>
+                        <input type="text" required class="regular-text" id="username_or_email_for_privacy_request" name="username_or_email_for_privacy_request" />
+                        <?php submit_button( __( 'Send Request' ), 'secondary', 'submit', false ); ?>
+                </div>
+                <?php wp_nonce_field( 'personal-data-request' ); ?>
+                <input type="hidden" name="action" value="add_export_personal_data_request" />
+                <input type="hidden" name="type_of_action" value="export_personal_data" />
+        </form>
+        <hr />
+
+        <?php $requests_table->views(); ?>
+
+        <form class="search-form wp-clearfix">
+                <?php $requests_table->search_box( __( 'Search Requests' ), 'requests' ); ?>
+                <input type="hidden" name="page" value="export_personal_data" />
+                <input type="hidden" name="filter-status" value="<?php echo isset( $_REQUEST['filter-status'] ) ? esc_attr( sanitize_text_field( $_REQUEST['filter-status'] ) ) : ''; ?>" />
+                <input type="hidden" name="orderby" value="<?php echo isset( $_REQUEST['orderby'] ) ? esc_attr( sanitize_text_field( $_REQUEST['orderby'] ) ) : ''; ?>" />
+                <input type="hidden" name="order" value="<?php echo isset( $_REQUEST['order'] ) ? esc_attr( sanitize_text_field( $_REQUEST['order'] ) ) : ''; ?>" />
+        </form>
+
+        <form method="post">
+                <?php
+                $requests_table->display();
+                $requests_table->embed_scripts();
+                ?>
+        </form>
+</div>
+
+<?php
+include( ABSPATH . 'wp-admin/admin-footer.php' );

src/wp-admin/includes/admin-filters.php

@@ -46 +46 @@
 add_action( 'admin_head', '_ipad_meta' );
 
 // Privacy tools
-add_action( 'admin_menu', '_wp_privacy_hook_requests_page' );
 add_action( 'load-tools_page_export_personal_data', '_wp_privacy_requests_screen_options' );
 add_action( 'load-tools_page_remove_personal_data', '_wp_privacy_requests_screen_options' );
 

src/wp-admin/includes/admin.php

@@ -79 +79 @@
 /** WordPress Deprecated Administration API */
 require_once( ABSPATH . 'wp-admin/includes/deprecated.php' );
 
+/** WordPress Privacy Functions */
+require_once( ABSPATH . 'wp-admin/includes/privacy.php' );
+
 /** WordPress Multisite support API */
 if ( is_multisite() ) {
         require_once( ABSPATH . 'wp-admin/includes/ms-admin-filters.php' );

new file src/wp-admin/includes/class-wp-privacy-data-export-requests-table.php

@@ +1 @@
+<?php
+
+if ( ! class_exists( 'WP_Privacy_Requests_Table' ) ) {
+        require_once( ABSPATH . 'wp-admin/includes/class-wp-privacy-requests-table.php' );
+}
+
+/**
+ * WP_Privacy_Data_Export_Requests_Table class.
+ *
+ * @since 4.9.6
+ */
+class WP_Privacy_Data_Export_Requests_Table extends WP_Privacy_Requests_Table {
+        /**
+         * Action name for the requests this table will work with.
+         *
+         * @since 4.9.6
+         *
+         * @var string $request_type Name of action.
+         */
+        protected $request_type = 'export_personal_data';
+
+        /**
+         * Post type for the requests.
+         *
+         * @since 4.9.6
+         *
+         * @var string $post_type The post type.
+         */
+        protected $post_type = 'user_request';
+
+        /**
+         * Actions column.
+         *
+         * @since 4.9.6
+         *
+         * @param WP_User_Request $item Item being shown.
+         * @return string Email column markup.
+         */
+        public function column_email( $item ) {
+                /** This filter is documented in wp-admin/includes/ajax-actions.php */
+                $exporters       = apply_filters( 'wp_privacy_personal_data_exporters', array() );
+                $exporters_count = count( $exporters );
+                $request_id      = $item->ID;
+                $nonce           = wp_create_nonce( 'wp-privacy-export-personal-data-' . $request_id );
+
+                $download_data_markup = '<div class="export-personal-data" ' .
+                        'data-exporters-count="' . esc_attr( $exporters_count ) . '" ' .
+                        'data-request-id="' . esc_attr( $request_id ) . '" ' .
+                        'data-nonce="' . esc_attr( $nonce ) .
+                        '">';
+
+                $download_data_markup .= '<span class="export-personal-data-idle"><button type="button" class="button-link export-personal-data-handle">' . __( 'Download Personal Data' ) . '</button></span>' .
+                        '<span style="display:none" class="export-personal-data-processing" >' . __( 'Downloading Data...' ) . '</span>' .
+                        '<span style="display:none" class="export-personal-data-success"><button type="button" class="button-link export-personal-data-handle">' . __( 'Download Personal Data Again' ) . '</button></span>' .
+                        '<span style="display:none" class="export-personal-data-failed">' . __( 'Download failed.' ) . ' <button type="button" class="button-link">' . __( 'Retry' ) . '</button></span>';
+
+                $download_data_markup .= '</div>';
+
+                $row_actions = array(
+                        'download-data' => $download_data_markup,
+                );
+
+                return sprintf( '<a href="%1$s">%2$s</a> %3$s', esc_url( 'mailto:' . $item->email ), $item->email, $this->row_actions( $row_actions ) );
+        }
+
+        /**
+         * Displays the next steps column.
+         *
+         * @since 4.9.6
+         *
+         * @param WP_User_Request $item Item being shown.
+         */
+        public function column_next_steps( $item ) {
+                $status = $item->status;
+
+                switch ( $status ) {
+                        case 'request-pending':
+                                esc_html_e( 'Waiting for confirmation' );
+                                break;
+                        case 'request-confirmed':
+                                /** This filter is documented in wp-admin/includes/ajax-actions.php */
+                                $exporters       = apply_filters( 'wp_privacy_personal_data_exporters', array() );
+                                $exporters_count = count( $exporters );
+                                $request_id      = $item->ID;
+                                $nonce           = wp_create_nonce( 'wp-privacy-export-personal-data-' . $request_id );
+
+                                echo '<div class="export-personal-data" ' .
+                                        'data-send-as-email="1" ' .
+                                        'data-exporters-count="' . esc_attr( $exporters_count ) . '" ' .
+                                        'data-request-id="' . esc_attr( $request_id ) . '" ' .
+                                        'data-nonce="' . esc_attr( $nonce ) .
+                                        '">';
+
+                                ?>
+                                <span class="export-personal-data-idle"><button type="button" class="button export-personal-data-handle"><?php _e( 'Send Export Link' ); ?></button></span>
+                                <span style="display:none" class="export-personal-data-processing button updating-message" ><?php _e( 'Sending Email...' ); ?></span>
+                                <span style="display:none" class="export-personal-data-success success-message" ><?php _e( 'Email sent.' ); ?></span>
+                                <span style="display:none" class="export-personal-data-failed"><?php _e( 'Email could not be sent.' ); ?> <button type="button" class="button export-personal-data-handle"><?php _e( 'Retry' ); ?></button></span>
+                                <?php
+
+                                echo '</div>';
+                                break;
+                        case 'request-failed':
+                                submit_button( __( 'Retry' ), 'secondary', 'privacy_action_email_retry[' . $item->ID . ']', false );
+                                break;
+                        case 'request-completed':
+                                echo '<a href="' . esc_url(
+                                        wp_nonce_url(
+                                                add_query_arg(
+                                                        array(
+                                                                'action'     => 'delete',
+                                                                'request_id' => array( $item->ID ),
+                                                        ),
+                                                        admin_url( 'export-personal-data.php' )
+                                                ),
+                                                'bulk-privacy_requests'
+                                        )
+                                ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
+                                break;
+                }
+        }
+}

new file src/wp-admin/includes/class-wp-privacy-data-removal-requests-table.php

@@ +1 @@
+<?php
+
+if ( ! class_exists( 'WP_Privacy_Requests_Table' ) ) {
+        require_once( ABSPATH . 'wp-admin/includes/class-wp-privacy-requests-table.php' );
+}
+
+/**
+ * WP_Privacy_Data_Removal_Requests_Table class.
+ *
+ * @since 4.9.6
+ */
+class WP_Privacy_Data_Removal_Requests_Table extends WP_Privacy_Requests_Table {
+        /**
+         * Action name for the requests this table will work with.
+         *
+         * @since 4.9.6
+         *
+         * @var string $request_type Name of action.
+         */
+        protected $request_type = 'remove_personal_data';
+
+        /**
+         * Post type for the requests.
+         *
+         * @since 4.9.6
+         *
+         * @var string $post_type The post type.
+         */
+        protected $post_type = 'user_request';
+
+        /**
+         * Actions column.
+         *
+         * @since 4.9.6
+         *
+         * @param WP_User_Request $item Item being shown.
+         * @return string Email column markup.
+         */
+        public function column_email( $item ) {
+                $row_actions = array();
+
+                // Allow the administrator to "force remove" the personal data even if confirmation has not yet been received.
+                $status = $item->status;
+                if ( 'request-confirmed' !== $status ) {
+                        /** This filter is documented in wp-admin/includes/ajax-actions.php */
+                        $erasers       = apply_filters( 'wp_privacy_personal_data_erasers', array() );
+                        $erasers_count = count( $erasers );
+                        $request_id    = $item->ID;
+                        $nonce         = wp_create_nonce( 'wp-privacy-erase-personal-data-' . $request_id );
+
+                        $remove_data_markup = '<div class="remove-personal-data force-remove-personal-data" ' .
+                                'data-erasers-count="' . esc_attr( $erasers_count ) . '" ' .
+                                'data-request-id="' . esc_attr( $request_id ) . '" ' .
+                                'data-nonce="' . esc_attr( $nonce ) .
+                                '">';
+
+                        $remove_data_markup .= '<span class="remove-personal-data-idle"><button type="button" class="button-link remove-personal-data-handle">' . __( 'Force Erase Personal Data' ) . '</button></span>' .
+                                '<span style="display:none" class="remove-personal-data-processing" >' . __( 'Erasing Data...' ) . '</span>' .
+                                '<span style="display:none" class="remove-personal-data-failed">' . __( 'Force Erase has failed.' ) . ' <button type="button" class="button-link remove-personal-data-handle">' . __( 'Retry' ) . '</button></span>';
+
+                        $remove_data_markup .= '</div>';
+
+                        $row_actions = array(
+                                'remove-data' => $remove_data_markup,
+                        );
+                }
+
+                return sprintf( '<a href="%1$s">%2$s</a> %3$s', esc_url( 'mailto:' . $item->email ), $item->email, $this->row_actions( $row_actions ) );
+        }
+
+        /**
+         * Next steps column.
+         *
+         * @since 4.9.6
+         *
+         * @param WP_User_Request $item Item being shown.
+         */
+        public function column_next_steps( $item ) {
+                $status = $item->status;
+
+                switch ( $status ) {
+                        case 'request-pending':
+                                esc_html_e( 'Waiting for confirmation' );
+                                break;
+                        case 'request-confirmed':
+                                /** This filter is documented in wp-admin/includes/ajax-actions.php */
+                                $erasers       = apply_filters( 'wp_privacy_personal_data_erasers', array() );
+                                $erasers_count = count( $erasers );
+                                $request_id    = $item->ID;
+                                $nonce         = wp_create_nonce( 'wp-privacy-erase-personal-data-' . $request_id );
+
+                                echo '<div class="remove-personal-data" ' .
+                                        'data-force-erase="1" ' .
+                                        'data-erasers-count="' . esc_attr( $erasers_count ) . '" ' .
+                                        'data-request-id="' . esc_attr( $request_id ) . '" ' .
+                                        'data-nonce="' . esc_attr( $nonce ) .
+                                        '">';
+
+                                ?>
+                                <span class="remove-personal-data-idle"><button type="button" class="button remove-personal-data-handle"><?php _e( 'Erase Personal Data' ); ?></button></span>
+                                <span style="display:none" class="remove-personal-data-processing button updating-message" ><?php _e( 'Erasing Data...' ); ?></span>
+                                <span style="display:none" class="remove-personal-data-failed"><?php _e( 'Erasing Data has failed.' ); ?> <button type="button" class="button remove-personal-data-handle"><?php _e( 'Retry' ); ?></button></span>
+                                <?php
+
+                                echo '</div>';
+
+                                break;
+                        case 'request-failed':
+                                submit_button( __( 'Retry' ), 'secondary', 'privacy_action_email_retry[' . $item->ID . ']', false );
+                                break;
+                        case 'request-completed':
+                                echo '<a href="' . esc_url(
+                                        wp_nonce_url(
+                                                add_query_arg(
+                                                        array(
+                                                                'action'     => 'delete',
+                                                                'request_id' => array( $item->ID ),
+                                                        ),
+                                                        admin_url( 'erase-personal-data.php' )
+                                                ),
+                                                'bulk-privacy_requests'
+                                        )
+                                ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
+                                break;
+                }
+        }
+
+}

new file src/wp-admin/includes/class-wp-privacy-requests-table.php

@@ +1 @@
+<?php
+
+/**
+ * WP_Privacy_Requests_Table class.
+ *
+ * @since 4.9.6
+ */
+abstract class WP_Privacy_Requests_Table extends WP_List_Table {
+
+        /**
+         * Action name for the requests this table will work with. Classes
+         * which inherit from WP_Privacy_Requests_Table should define this.
+         *
+         * Example: 'export_personal_data'.
+         *
+         * @since 4.9.6
+         *
+         * @var string $request_type Name of action.
+         */
+        protected $request_type = 'INVALID';
+
+        /**
+         * Post type to be used.
+         *
+         * @since 4.9.6
+         *
+         * @var string $post_type The post type.
+         */
+        protected $post_type = 'INVALID';
+
+        /**
+         * Get columns to show in the list table.
+         *
+         * @since 4.9.6
+         *
+         * @return array Array of columns.
+         */
+        public function get_columns() {
+                $columns = array(
+                        'cb'                => '<input type="checkbox" />',
+                        'email'             => __( 'Requester' ),
+                        'status'            => __( 'Status' ),
+                        'created_timestamp' => __( 'Requested' ),
+                        'next_steps'        => __( 'Next Steps' ),
+                );
+                return $columns;
+        }
+
+        /**
+         * Get a list of sortable columns.
+         *
+         * @since 4.9.6
+         *
+         * @return array Default sortable columns.
+         */
+        protected function get_sortable_columns() {
+                // The initial sorting is by 'Requested' (post_date) and descending.
+                // With initial sorting, the first click on 'Requested' should be ascending.
+                // With 'Requester' sorting active, the next click on 'Requested' should be descending.
+                $desc_first = isset( $_GET['orderby'] );
+
+                return array(
+                        'email'             => 'requester',
+                        'created_timestamp' => array( 'requested', $desc_first ),
+                );
+        }
+
+        /**
+         * Default primary column.
+         *
+         * @since 4.9.6
+         *
+         * @return string Default primary column name.
+         */
+        protected function get_default_primary_column_name() {
+                return 'email';
+        }
+
+        /**
+         * Count number of requests for each status.
+         *
+         * @since 4.9.6
+         *
+         * @return object Number of posts for each status.
+         */
+        protected function get_request_counts() {
+                global $wpdb;
+
+                $cache_key = $this->post_type . '-' . $this->request_type;
+                $counts    = wp_cache_get( $cache_key, 'counts' );
+
+                if ( false !== $counts ) {
+                        return $counts;
+                }
+
+                $query = "
+                        SELECT post_status, COUNT( * ) AS num_posts
+                        FROM {$wpdb->posts}
+                        WHERE post_type = %s
+                        AND post_name = %s
+                        GROUP BY post_status";
+
+                $results = (array) $wpdb->get_results( $wpdb->prepare( $query, $this->post_type, $this->request_type ), ARRAY_A );
+                $counts  = array_fill_keys( get_post_stati(), 0 );
+
+                foreach ( $results as $row ) {
+                        $counts[ $row['post_status'] ] = $row['num_posts'];
+                }
+
+                $counts = (object) $counts;
+                wp_cache_set( $cache_key, $counts, 'counts' );
+
+                return $counts;
+        }
+
+        /**
+         * Get an associative array ( id => link ) with the list of views available on this table.
+         *
+         * @since 4.9.6
+         *
+         * @return array Associative array of views in the format of $view_name => $view_markup.
+         */
+        protected function get_views() {
+                $current_status = isset( $_REQUEST['filter-status'] ) ? sanitize_text_field( $_REQUEST['filter-status'] ) : '';
+                $statuses       = _wp_privacy_statuses();
+                $views          = array();
+                $admin_url      = admin_url( 'tools.php?page=' . $this->request_type );
+                $counts         = $this->get_request_counts();
+                $total_requests = absint( array_sum( (array) $counts ) );
+
+                $current_link_attributes = empty( $current_status ) ? ' class="current" aria-current="page"' : '';
+                $status_label            = sprintf(
+                        /* translators: %s: all requests count */
+                        _nx(
+                                'All <span class="count">(%s)</span>',
+                                'All <span class="count">(%s)</span>',
+                                $total_requests,
+                                'requests'
+                        ),
+                        number_format_i18n( $total_requests )
+                );
+
+                $views['all'] = sprintf(
+                        '<a href="%s"%s>%s</a>',
+                        esc_url( $admin_url ),
+                        $current_link_attributes,
+                        $status_label
+                );
+
+                foreach ( $statuses as $status => $label ) {
+                        $post_status = get_post_status_object( $status );
+                        if ( ! $post_status ) {
+                                continue;
+                        }
+
+                        $current_link_attributes = $status === $current_status ? ' class="current" aria-current="page"' : '';
+                        $total_status_requests   = absint( $counts->{$status} );
+                        $status_label            = sprintf(
+                                translate_nooped_plural( $post_status->label_count, $total_status_requests ),
+                                number_format_i18n( $total_status_requests )
+                        );
+                        $status_link             = add_query_arg( 'filter-status', $status, $admin_url );
+
+                        $views[ $status ] = sprintf(
+                                '<a href="%s"%s>%s</a>',
+                                esc_url( $status_link ),
+                                $current_link_attributes,
+                                $status_label
+                        );
+                }
+
+                return $views;
+        }
+
+        /**
+         * Get bulk actions.
+         *
+         * @since 4.9.6
+         *
+         * @return array List of bulk actions.
+         */
+        protected function get_bulk_actions() {
+                return array(
+                        'delete' => __( 'Remove' ),
+                        'resend' => __( 'Resend email' ),
+                );
+        }
+
+        /**
+         * Process bulk actions.
+         *
+         * @since 4.9.6
+         */
+        public function process_bulk_action() {
+                $action      = $this->current_action();
+                $request_ids = isset( $_REQUEST['request_id'] ) ? wp_parse_id_list( wp_unslash( $_REQUEST['request_id'] ) ) : array();
+
+                $count = 0;
+
+                if ( $request_ids ) {
+                        check_admin_referer( 'bulk-privacy_requests' );
+                }
+
+                switch ( $action ) {
+                        case 'delete':
+                                foreach ( $request_ids as $request_id ) {
+                                        if ( wp_delete_post( $request_id, true ) ) {
+                                                $count ++;
+                                        }
+                                }
+
+                                add_settings_error(
+                                        'bulk_action',
+                                        'bulk_action',
+                                        /* translators: %d: number of requests */
+                                        sprintf( _n( 'Deleted %d request', 'Deleted %d requests', $count ), $count ),
+                                        'updated'
+                                );
+                                break;
+                        case 'resend':
+                                foreach ( $request_ids as $request_id ) {
+                                        $resend = _wp_privacy_resend_request( $request_id );
+
+                                        if ( $resend && ! is_wp_error( $resend ) ) {
+                                                $count++;
+                                        }
+                                }
+
+                                add_settings_error(
+                                        'bulk_action',
+                                        'bulk_action',
+                                        /* translators: %d: number of requests */
+                                        sprintf( _n( 'Re-sent %d request', 'Re-sent %d requests', $count ), $count ),
+                                        'updated'
+                                );
+                                break;
+                }
+        }
+
+        /**
+         * Prepare items to output.
+         *
+         * @since 4.9.6
+         * @since 5.1.0 Added support for column sorting.
+         */
+        public function prepare_items() {
+                global $wpdb;
+
+                $this->items    = array();
+                $posts_per_page = $this->get_items_per_page( $this->request_type . '_requests_per_page' );
+                $args           = array(
+                        'post_type'      => $this->post_type,
+                        'post_name__in'  => array( $this->request_type ),
+                        'posts_per_page' => $posts_per_page,
+                        'offset'         => isset( $_REQUEST['paged'] ) ? max( 0, absint( $_REQUEST['paged'] ) - 1 ) * $posts_per_page : 0,
+                        'post_status'    => 'any',
+                        's'              => isset( $_REQUEST['s'] ) ? sanitize_text_field( $_REQUEST['s'] ) : '',
+                );
+
+                $orderby_mapping = array(
+                        'requester' => 'post_title',
+                        'requested' => 'post_date',
+                );
+
+                if ( isset( $_REQUEST['orderby'] ) && isset( $orderby_mapping[ $_REQUEST['orderby'] ] ) ) {
+                        $args['orderby'] = $orderby_mapping[ $_REQUEST['orderby'] ];
+                }
+
+                if ( isset( $_REQUEST['order'] ) && in_array( strtoupper( $_REQUEST['order'] ), array( 'ASC', 'DESC' ), true ) ) {
+                        $args['order'] = strtoupper( $_REQUEST['order'] );
+                }
+
+                if ( ! empty( $_REQUEST['filter-status'] ) ) {
+                        $filter_status       = isset( $_REQUEST['filter-status'] ) ? sanitize_text_field( $_REQUEST['filter-status'] ) : '';
+                        $args['post_status'] = $filter_status;
+                }
+
+                $requests_query = new WP_Query( $args );
+                $requests       = $requests_query->posts;
+
+                foreach ( $requests as $request ) {
+                        $this->items[] = wp_get_user_request_data( $request->ID );
+                }
+
+                $this->items = array_filter( $this->items );
+
+                $this->set_pagination_args(
+                        array(
+                                'total_items' => $requests_query->found_posts,
+                                'per_page'    => $posts_per_page,
+                        )
+                );
+        }
+
+        /**
+         * Checkbox column.
+         *
+         * @since 4.9.6
+         *
+         * @param WP_User_Request $item Item being shown.
+         * @return string Checkbox column markup.
+         */
+        public function column_cb( $item ) {
+                return sprintf( '<input type="checkbox" name="request_id[]" value="%1$s" /><span class="spinner"></span>', esc_attr( $item->ID ) );
+        }
+
+        /**
+         * Status column.
+         *
+         * @since 4.9.6
+         *
+         * @param WP_User_Request $item Item being shown.
+         * @return string Status column markup.
+         */
+        public function column_status( $item ) {
+                $status        = get_post_status( $item->ID );
+                $status_object = get_post_status_object( $status );
+
+                if ( ! $status_object || empty( $status_object->label ) ) {
+                        return '-';
+                }
+
+                $timestamp = false;
+
+                switch ( $status ) {
+                        case 'request-confirmed':
+                                $timestamp = $item->confirmed_timestamp;
+                                break;
+                        case 'request-completed':
+                                $timestamp = $item->completed_timestamp;
+                                break;
+                }
+
+                echo '<span class="status-label status-' . esc_attr( $status ) . '">';
+                echo esc_html( $status_object->label );
+
+                if ( $timestamp ) {
+                        echo ' (' . $this->get_timestamp_as_date( $timestamp ) . ')';
+                }
+
+                echo '</span>';
+        }
+
+        /**
+         * Convert timestamp for display.
+         *
+         * @since 4.9.6
+         *
+         * @param int $timestamp Event timestamp.
+         * @return string Human readable date.
+         */
+        protected function get_timestamp_as_date( $timestamp ) {
+                if ( empty( $timestamp ) ) {
+                        return '';
+                }
+
+                $time_diff = time() - $timestamp;
+
+                if ( $time_diff >= 0 && $time_diff < DAY_IN_SECONDS ) {
+                        /* translators: human readable timestamp */
+                        return sprintf( __( '%s ago' ), human_time_diff( $timestamp ) );
+                }
+
+                return date_i18n( get_option( 'date_format' ), $timestamp );
+        }
+
+        /**
+         * Default column handler.
+         *
+         * @since 4.9.6
+         *
+         * @param WP_User_Request $item        Item being shown.
+         * @param string          $column_name Name of column being shown.
+         * @return string Default column output.
+         */
+        public function column_default( $item, $column_name ) {
+                $cell_value = $item->$column_name;
+
+                if ( in_array( $column_name, array( 'created_timestamp' ), true ) ) {
+                        return $this->get_timestamp_as_date( $cell_value );
+                }
+
+                return $cell_value;
+        }
+
+        /**
+         * Actions column. Overridden by children.
+         *
+         * @since 4.9.6
+         *
+         * @param WP_User_Request $item Item being shown.
+         * @return string Email column markup.
+         */
+        public function column_email( $item ) {
+                return sprintf( '<a href="%1$s">%2$s</a> %3$s', esc_url( 'mailto:' . $item->email ), $item->email, $this->row_actions( array() ) );
+        }
+
+        /**
+         * Next steps column. Overridden by children.
+         *
+         * @since 4.9.6
+         *
+         * @param WP_User_Request $item Item being shown.
+         */
+        public function column_next_steps( $item ) {}
+
+        /**
+         * Generates content for a single row of the table,
+         *
+         * @since 4.9.6
+         *
+         * @param WP_User_Request $item The current item.
+         */
+        public function single_row( $item ) {
+                $status = $item->status;
+
+                echo '<tr id="request-' . esc_attr( $item->ID ) . '" class="status-' . esc_attr( $status ) . '">';
+                $this->single_row_columns( $item );
+                echo '</tr>';
+        }
+
+        /**
+         * Embed scripts used to perform actions. Overridden by children.
+         *
+         * @since 4.9.6
+         */
+        public function embed_scripts() {}
+}

new file src/wp-admin/includes/privacy.php

@@ +1 @@
+<?php
+
+/**
+ * Resend an existing request and return the result.
+ *
+ * @since 4.9.6
+ * @access private
+ *
+ * @param int $request_id Request ID.
+ * @return bool|WP_Error Returns true/false based on the success of sending the email, or a WP_Error object.
+ */
+function _wp_privacy_resend_request( $request_id ) {
+        $request_id = absint( $request_id );
+        $request    = get_post( $request_id );
+
+        if ( ! $request || 'user_request' !== $request->post_type ) {
+                return new WP_Error( 'privacy_request_error', __( 'Invalid request.' ) );
+        }
+
+        $result = wp_send_user_request( $request_id );
+
+        if ( is_wp_error( $result ) ) {
+                return $result;
+        } elseif ( ! $result ) {
+                return new WP_Error( 'privacy_request_error', __( 'Unable to initiate confirmation request.' ) );
+        }
+
+        return true;
+}
+
+/**
+ * Marks a request as completed by the admin and logs the current timestamp.
+ *
+ * @since 4.9.6
+ * @access private
+ *
+ * @param  int          $request_id Request ID.
+ * @return int|WP_Error $result Request ID on success or WP_Error.
+ */
+function _wp_privacy_completed_request( $request_id ) {
+        $request_id = absint( $request_id );
+        $request    = wp_get_user_request_data( $request_id );
+
+        if ( ! $request ) {
+                return new WP_Error( 'privacy_request_error', __( 'Invalid request.' ) );
+        }
+
+        update_post_meta( $request_id, '_wp_user_request_completed_timestamp', time() );
+
+        $result = wp_update_post(
+                array(
+                        'ID'          => $request_id,
+                        'post_status' => 'request-completed',
+                )
+        );
+
+        return $result;
+}
+
+/**
+ * Handle list table actions.
+ *
+ * @since 4.9.6
+ * @access private
+ */
+function _wp_personal_data_handle_actions() {
+        if ( isset( $_POST['privacy_action_email_retry'] ) ) {
+                check_admin_referer( 'bulk-privacy_requests' );
+
+                $request_id = absint( current( array_keys( (array) wp_unslash( $_POST['privacy_action_email_retry'] ) ) ) );
+                $result     = _wp_privacy_resend_request( $request_id );
+
+                if ( is_wp_error( $result ) ) {
+                        add_settings_error(
+                                'privacy_action_email_retry',
+                                'privacy_action_email_retry',
+                                $result->get_error_message(),
+                                'error'
+                        );
+                } else {
+                        add_settings_error(
+                                'privacy_action_email_retry',
+                                'privacy_action_email_retry',
+                                __( 'Confirmation request sent again successfully.' ),
+                                'updated'
+                        );
+                }
+        } elseif ( isset( $_POST['action'] ) ) {
+                $action = isset( $_POST['action'] ) ? sanitize_key( wp_unslash( $_POST['action'] ) ) : '';
+
+                switch ( $action ) {
+                        case 'add_export_personal_data_request':
+                        case 'add_remove_personal_data_request':
+                                check_admin_referer( 'personal-data-request' );
+
+                                if ( ! isset( $_POST['type_of_action'], $_POST['username_or_email_for_privacy_request'] ) ) {
+                                        add_settings_error(
+                                                'action_type',
+                                                'action_type',
+                                                __( 'Invalid action.' ),
+                                                'error'
+                                        );
+                                }
+                                $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             = '';
+
+                                if ( ! in_array( $action_type, _wp_privacy_action_request_types(), true ) ) {
+                                        add_settings_error(
+                                                'action_type',
+                                                'action_type',
+                                                __( 'Invalid action.' ),
+                                                'error'
+                                        );
+                                }
+
+                                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'
+                                                );
+                                        } else {
+                                                $email_address = $user->user_email;
+                                        }
+                                } else {
+                                        $email_address = $username_or_email_address;
+                                }
+
+                                if ( empty( $email_address ) ) {
+                                        break;
+                                }
+
+                                $request_id = wp_create_user_request( $email_address, $action_type );
+
+                                if ( is_wp_error( $request_id ) ) {
+                                        add_settings_error(
+                                                'username_or_email_for_privacy_request',
+                                                'username_or_email_for_privacy_request',
+                                                $request_id->get_error_message(),
+                                                'error'
+                                        );
+                                        break;
+                                } elseif ( ! $request_id ) {
+                                        add_settings_error(
+                                                'username_or_email_for_privacy_request',
+                                                'username_or_email_for_privacy_request',
+                                                __( 'Unable to initiate confirmation request.' ),
+                                                'error'
+                                        );
+                                        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;
+                }
+        }
+}
+
+/**
+ * Cleans up failed and expired requests before displaying the list table.
+ *
+ * @since 4.9.6
+ * @access private
+ */
+function _wp_personal_data_cleanup_requests() {
+        /** This filter is documented in wp-includes/user.php */
+        $expires = (int) apply_filters( 'user_request_key_expiration', DAY_IN_SECONDS );
+
+        $requests_query = new WP_Query(
+                array(
+                        'post_type'      => 'user_request',
+                        'posts_per_page' => -1,
+                        'post_status'    => 'request-pending',
+                        'fields'         => 'ids',
+                        'date_query'     => array(
+                                array(
+                                        'column' => 'post_modified_gmt',
+                                        'before' => $expires . ' seconds ago',
+                                ),
+                        ),
+                )
+        );
+
+        $request_ids = $requests_query->posts;
+
+        foreach ( $request_ids as $request_id ) {
+                wp_update_post(
+                        array(
+                                'ID'            => $request_id,
+                                'post_status'   => 'request-failed',
+                                'post_password' => '',
+                        )
+                );
+        }
+}
+
+/**
+ * Add options for the privacy requests screens.
+ *
+ * @since 4.9.8
+ * @access private
+ */
+function _wp_privacy_requests_screen_options() {
+        $args = array(
+                'option' => str_replace( 'tools_page_', '', get_current_screen()->id ) . '_requests_per_page',
+        );
+        add_screen_option( 'per_page', $args );
+}
+
+/**
+ * Mark erasure requests as completed after processing is finished.
+ *
+ * This intercepts the Ajax responses to personal data eraser page requests, and
+ * monitors the status of a request. Once all of the processing has finished, the
+ * request is marked as completed.
+ *
+ * @since 4.9.6
+ *
+ * @see wp_privacy_personal_data_erasure_page
+ *
+ * @param array  $response      The response from the personal data eraser for
+ *                              the given page.
+ * @param int    $eraser_index  The index of the personal data eraser. Begins
+ *                              at 1.
+ * @param string $email_address The email address of the user whose personal
+ *                              data this is.
+ * @param int    $page          The page of personal data for this eraser.
+ *                              Begins at 1.
+ * @param int    $request_id    The request ID for this personal data erasure.
+ * @return array The filtered response.
+ */
+function wp_privacy_process_personal_data_erasure_page( $response, $eraser_index, $email_address, $page, $request_id ) {
+        /*
+         * If the eraser response is malformed, don't attempt to consume it; let it
+         * pass through, so that the default Ajax processing will generate a warning
+         * to the user.
+         */
+        if ( ! is_array( $response ) ) {
+                return $response;
+        }
+
+        if ( ! array_key_exists( 'done', $response ) ) {
+                return $response;
+        }
+
+        if ( ! array_key_exists( 'items_removed', $response ) ) {
+                return $response;
+        }
+
+        if ( ! array_key_exists( 'items_retained', $response ) ) {
+                return $response;
+        }
+
+        if ( ! array_key_exists( 'messages', $response ) ) {
+                return $response;
+        }
+
+        $request = wp_get_user_request_data( $request_id );
+
+        if ( ! $request || 'remove_personal_data' !== $request->action_name ) {
+                wp_send_json_error( __( 'Invalid request ID when processing eraser data.' ) );
+        }
+
+        /** This filter is documented in wp-admin/includes/ajax-actions.php */
+        $erasers        = apply_filters( 'wp_privacy_personal_data_erasers', array() );
+        $is_last_eraser = count( $erasers ) === $eraser_index;
+        $eraser_done    = $response['done'];
+
+        if ( ! $is_last_eraser || ! $eraser_done ) {
+                return $response;
+        }
+
+        _wp_privacy_completed_request( $request_id );
+
+        /**
+         * Fires immediately after a personal data erasure request has been marked completed.
+         *
+         * @since 4.9.6
+         *
+         * @param int $request_id The privacy request post ID associated with this request.
+         */
+        do_action( 'wp_privacy_personal_data_erased', $request_id );
+
+        return $response;
+}

src/wp-admin/includes/user.php

@@ -582 +582 @@
                 wp_specialchars_decode( translate_user_role( $role['name'] ) )
         );
 }
-
-/**
- * Resend an existing request and return the result.
- *
- * @since 4.9.6
- * @access private
- *
- * @param int $request_id Request ID.
- * @return bool|WP_Error Returns true/false based on the success of sending the email, or a WP_Error object.
- */
-function _wp_privacy_resend_request( $request_id ) {
-        $request_id = absint( $request_id );
-        $request    = get_post( $request_id );
-
-        if ( ! $request || 'user_request' !== $request->post_type ) {
-                return new WP_Error( 'privacy_request_error', __( 'Invalid request.' ) );
-        }
-
-        $result = wp_send_user_request( $request_id );
-
-        if ( is_wp_error( $result ) ) {
-                return $result;
-        } elseif ( ! $result ) {
-                return new WP_Error( 'privacy_request_error', __( 'Unable to initiate confirmation request.' ) );
-        }
-
-        return true;
-}
-
-/**
- * Marks a request as completed by the admin and logs the current timestamp.
- *
- * @since 4.9.6
- * @access private
- *
- * @param  int          $request_id Request ID.
- * @return int|WP_Error $result Request ID on success or WP_Error.
- */
-function _wp_privacy_completed_request( $request_id ) {
-        $request_id = absint( $request_id );
-        $request    = wp_get_user_request_data( $request_id );
-
-        if ( ! $request ) {
-                return new WP_Error( 'privacy_request_error', __( 'Invalid request.' ) );
-        }
-
-        update_post_meta( $request_id, '_wp_user_request_completed_timestamp', time() );
-
-        $result = wp_update_post(
-                array(
-                        'ID'          => $request_id,
-                        'post_status' => 'request-completed',
-                )
-        );
-
-        return $result;
-}
-
-/**
- * Handle list table actions.
- *
- * @since 4.9.6
- * @access private
- */
-function _wp_personal_data_handle_actions() {
-        if ( isset( $_POST['privacy_action_email_retry'] ) ) {
-                check_admin_referer( 'bulk-privacy_requests' );
-
-                $request_id = absint( current( array_keys( (array) wp_unslash( $_POST['privacy_action_email_retry'] ) ) ) );
-                $result     = _wp_privacy_resend_request( $request_id );
-
-                if ( is_wp_error( $result ) ) {
-                        add_settings_error(
-                                'privacy_action_email_retry',
-                                'privacy_action_email_retry',
-                                $result->get_error_message(),
-                                'error'
-                        );
-                } else {
-                        add_settings_error(
-                                'privacy_action_email_retry',
-                                'privacy_action_email_retry',
-                                __( 'Confirmation request sent again successfully.' ),
-                                'updated'
-                        );
-                }
-        } elseif ( isset( $_POST['action'] ) ) {
-                $action = isset( $_POST['action'] ) ? sanitize_key( wp_unslash( $_POST['action'] ) ) : '';
-
-                switch ( $action ) {
-                        case 'add_export_personal_data_request':
-                        case 'add_remove_personal_data_request':
-                                check_admin_referer( 'personal-data-request' );
-
-                                if ( ! isset( $_POST['type_of_action'], $_POST['username_or_email_for_privacy_request'] ) ) {
-                                        add_settings_error(
-                                                'action_type',
-                                                'action_type',
-                                                __( 'Invalid action.' ),
-                                                'error'
-                                        );
-                                }
-                                $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             = '';
-
-                                if ( ! in_array( $action_type, _wp_privacy_action_request_types(), true ) ) {
-                                        add_settings_error(
-                                                'action_type',
-                                                'action_type',
-                                                __( 'Invalid action.' ),
-                                                'error'
-                                        );
-                                }
-
-                                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'
-                                                );
-                                        } else {
-                                                $email_address = $user->user_email;
-                                        }
-                                } else {
-                                        $email_address = $username_or_email_address;
-                                }
-
-                                if ( empty( $email_address ) ) {
-                                        break;
-                                }
-
-                                $request_id = wp_create_user_request( $email_address, $action_type );
-
-                                if ( is_wp_error( $request_id ) ) {
-                                        add_settings_error(
-                                                'username_or_email_for_privacy_request',
-                                                'username_or_email_for_privacy_request',
-                                                $request_id->get_error_message(),
-                                                'error'
-                                        );
-                                        break;
-                                } elseif ( ! $request_id ) {
-                                        add_settings_error(
-                                                'username_or_email_for_privacy_request',
-                                                'username_or_email_for_privacy_request',
-                                                __( 'Unable to initiate confirmation request.' ),
-                                                'error'
-                                        );
-                                        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;
-                }
-        }
-}
-
-/**
- * Cleans up failed and expired requests before displaying the list table.
- *
- * @since 4.9.6
- * @access private
- */
-function _wp_personal_data_cleanup_requests() {
-        /** This filter is documented in wp-includes/user.php */
-        $expires = (int) apply_filters( 'user_request_key_expiration', DAY_IN_SECONDS );
-
-        $requests_query = new WP_Query(
-                array(
-                        'post_type'      => 'user_request',
-                        'posts_per_page' => -1,
-                        'post_status'    => 'request-pending',
-                        'fields'         => 'ids',
-                        'date_query'     => array(
-                                array(
-                                        'column' => 'post_modified_gmt',
-                                        'before' => $expires . ' seconds ago',
-                                ),
-                        ),
-                )
-        );
-
-        $request_ids = $requests_query->posts;
-
-        foreach ( $request_ids as $request_id ) {
-                wp_update_post(
-                        array(
-                                'ID'            => $request_id,
-                                'post_status'   => 'request-failed',
-                                'post_password' => '',
-                        )
-                );
-        }
-}
-
-/**
- * Personal data export.
- *
- * @since 4.9.6
- * @access private
- */
-function _wp_personal_data_export_page() {
-        if ( ! current_user_can( 'export_others_personal_data' ) ) {
-                wp_die( __( 'Sorry, you are not allowed to export personal data on this site.' ) );
-        }
-
-        _wp_personal_data_handle_actions();
-        _wp_personal_data_cleanup_requests();
-
-        // "Borrow" xfn.js for now so we don't have to create new files.
-        wp_enqueue_script( 'xfn' );
-
-        $requests_table = new WP_Privacy_Data_Export_Requests_Table(
-                array(
-                        'plural'   => 'privacy_requests',
-                        'singular' => 'privacy_request',
-                        'screen'   => 'export_personal_data',
-                )
-        );
-
-        $requests_table->screen->set_screen_reader_content(
-                array(
-                        'heading_views'      => __( 'Filter export personal data list' ),
-                        'heading_pagination' => __( 'Export personal data list navigation' ),
-                        'heading_list'       => __( 'Export personal data list' ),
-                )
-        );
-
-        $requests_table->process_bulk_action();
-        $requests_table->prepare_items();
-        ?>
-        <div class="wrap nosubsub">
-                <h1><?php esc_html_e( 'Export Personal Data' ); ?></h1>
-                <hr class="wp-header-end" />
-
-                <?php settings_errors(); ?>
-
-                <form action="<?php echo esc_url( admin_url( 'tools.php?page=export_personal_data' ) ); ?>" 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>
-
-                        <div class="wp-privacy-request-form-field">
-                                <label for="username_or_email_for_privacy_request"><?php esc_html_e( 'Username or email address' ); ?></label>
-                                <input type="text" required class="regular-text" id="username_or_email_for_privacy_request" name="username_or_email_for_privacy_request" />
-                                <?php submit_button( __( 'Send Request' ), 'secondary', 'submit', false ); ?>
-                        </div>
-                        <?php wp_nonce_field( 'personal-data-request' ); ?>
-                        <input type="hidden" name="action" value="add_export_personal_data_request" />
-                        <input type="hidden" name="type_of_action" value="export_personal_data" />
-                </form>
-                <hr />
-
-                <?php $requests_table->views(); ?>
-
-                <form class="search-form wp-clearfix">
-                        <?php $requests_table->search_box( __( 'Search Requests' ), 'requests' ); ?>
-                        <input type="hidden" name="page" value="export_personal_data" />
-                        <input type="hidden" name="filter-status" value="<?php echo isset( $_REQUEST['filter-status'] ) ? esc_attr( sanitize_text_field( $_REQUEST['filter-status'] ) ) : ''; ?>" />
-                        <input type="hidden" name="orderby" value="<?php echo isset( $_REQUEST['orderby'] ) ? esc_attr( sanitize_text_field( $_REQUEST['orderby'] ) ) : ''; ?>" />
-                        <input type="hidden" name="order" value="<?php echo isset( $_REQUEST['order'] ) ? esc_attr( sanitize_text_field( $_REQUEST['order'] ) ) : ''; ?>" />
-                </form>
-
-                <form method="post">
-                        <?php
-                        $requests_table->display();
-                        $requests_table->embed_scripts();
-                        ?>
-                </form>
-        </div>
-        <?php
-}
-
-/**
- * Personal data anonymization.
- *
- * @since 4.9.6
- * @access private
- */
-function _wp_personal_data_removal_page() {
-        /*
-         * Require both caps in order to make it explicitly clear that delegating
-         * erasure from network admins to single-site admins will give them the
-         * ability to affect global users, rather than being limited to the site
-         * that they administer.
-         */
-        if ( ! current_user_can( 'erase_others_personal_data' ) || ! current_user_can( 'delete_users' ) ) {
-                wp_die( __( 'Sorry, you are not allowed to erase data on this site.' ) );
-        }
-
-        _wp_personal_data_handle_actions();
-        _wp_personal_data_cleanup_requests();
-
-        // "Borrow" xfn.js for now so we don't have to create new files.
-        wp_enqueue_script( 'xfn' );
-
-        $requests_table = new WP_Privacy_Data_Removal_Requests_Table(
-                array(
-                        'plural'   => 'privacy_requests',
-                        'singular' => 'privacy_request',
-                        'screen'   => 'remove_personal_data',
-                )
-        );
-
-        $requests_table->screen->set_screen_reader_content(
-                array(
-                        'heading_views'      => __( 'Filter erase personal data list' ),
-                        'heading_pagination' => __( 'Erase personal data list navigation' ),
-                        'heading_list'       => __( 'Erase personal data list' ),
-                )
-        );
-
-        $requests_table->process_bulk_action();
-        $requests_table->prepare_items();
-
-        ?>
-        <div class="wrap nosubsub">
-                <h1><?php esc_html_e( 'Erase Personal Data' ); ?></h1>
-                <hr class="wp-header-end" />
-
-                <?php settings_errors(); ?>
-
-                <form action="<?php echo esc_url( admin_url( 'tools.php?page=remove_personal_data' ) ); ?>" 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>
-
-                        <div class="wp-privacy-request-form-field">
-                                <label for="username_or_email_for_privacy_request"><?php esc_html_e( 'Username or email address' ); ?></label>
-                                <input type="text" required class="regular-text" id="username_or_email_for_privacy_request" name="username_or_email_for_privacy_request" />
-                                <?php submit_button( __( 'Send Request' ), 'secondary', 'submit', false ); ?>
-                        </div>
-                        <?php wp_nonce_field( 'personal-data-request' ); ?>
-                        <input type="hidden" name="action" value="add_remove_personal_data_request" />
-                        <input type="hidden" name="type_of_action" value="remove_personal_data" />
-                </form>
-                <hr />
-
-                <?php $requests_table->views(); ?>
-
-                <form class="search-form wp-clearfix">
-                        <?php $requests_table->search_box( __( 'Search Requests' ), 'requests' ); ?>
-                        <input type="hidden" name="page" value="remove_personal_data" />
-                        <input type="hidden" name="filter-status" value="<?php echo isset( $_REQUEST['filter-status'] ) ? esc_attr( sanitize_text_field( $_REQUEST['filter-status'] ) ) : ''; ?>" />
-                        <input type="hidden" name="orderby" value="<?php echo isset( $_REQUEST['orderby'] ) ? esc_attr( sanitize_text_field( $_REQUEST['orderby'] ) ) : ''; ?>" />
-                        <input type="hidden" name="order" value="<?php echo isset( $_REQUEST['order'] ) ? esc_attr( sanitize_text_field( $_REQUEST['order'] ) ) : ''; ?>" />
-                </form>
-
-                <form method="post">
-                        <?php
-                        $requests_table->display();
-                        $requests_table->embed_scripts();
-                        ?>
-                </form>
-        </div>
-        <?php
-}
-
-/**
- * Mark erasure requests as completed after processing is finished.
- *
- * This intercepts the Ajax responses to personal data eraser page requests, and
- * monitors the status of a request. Once all of the processing has finished, the
- * request is marked as completed.
- *
- * @since 4.9.6
- *
- * @see wp_privacy_personal_data_erasure_page
- *
- * @param array  $response      The response from the personal data eraser for
- *                              the given page.
- * @param int    $eraser_index  The index of the personal data eraser. Begins
- *                              at 1.
- * @param string $email_address The email address of the user whose personal
- *                              data this is.
- * @param int    $page          The page of personal data for this eraser.
- *                              Begins at 1.
- * @param int    $request_id    The request ID for this personal data erasure.
- * @return array The filtered response.
- */
-function wp_privacy_process_personal_data_erasure_page( $response, $eraser_index, $email_address, $page, $request_id ) {
-        /*
-         * If the eraser response is malformed, don't attempt to consume it; let it
-         * pass through, so that the default Ajax processing will generate a warning
-         * to the user.
-         */
-        if ( ! is_array( $response ) ) {
-                return $response;
-        }
-
-        if ( ! array_key_exists( 'done', $response ) ) {
-                return $response;
-        }
-
-        if ( ! array_key_exists( 'items_removed', $response ) ) {
-                return $response;
-        }
-
-        if ( ! array_key_exists( 'items_retained', $response ) ) {
-                return $response;
-        }
-
-        if ( ! array_key_exists( 'messages', $response ) ) {
-                return $response;
-        }
-
-        $request = wp_get_user_request_data( $request_id );
-
-        if ( ! $request || 'remove_personal_data' !== $request->action_name ) {
-                wp_send_json_error( __( 'Invalid request ID when processing eraser data.' ) );
-        }
-
-        /** This filter is documented in wp-admin/includes/ajax-actions.php */
-        $erasers        = apply_filters( 'wp_privacy_personal_data_erasers', array() );
-        $is_last_eraser = count( $erasers ) === $eraser_index;
-        $eraser_done    = $response['done'];
-
-        if ( ! $is_last_eraser || ! $eraser_done ) {
-                return $response;
-        }
-
-        _wp_privacy_completed_request( $request_id );
-
-        /**
-         * Fires immediately after a personal data erasure request has been marked completed.
-         *
-         * @since 4.9.6
-         *
-         * @param int $request_id The privacy request post ID associated with this request.
-         */
-        do_action( 'wp_privacy_personal_data_erased', $request_id );
-
-        return $response;
-}
-
-/**
- * Add requests pages.
- *
- * @since 4.9.6
- * @access private
- */
-function _wp_privacy_hook_requests_page() {
-        add_submenu_page( 'tools.php', __( 'Export Personal Data' ), __( 'Export Personal Data' ), 'export_others_personal_data', 'export_personal_data', '_wp_personal_data_export_page' );
-        add_submenu_page( 'tools.php', __( 'Erase Personal Data' ), __( 'Erase Personal Data' ), 'erase_others_personal_data', 'remove_personal_data', '_wp_personal_data_removal_page' );
-}
-
-/**
- * Add options for the privacy requests screens.
- *
- * @since 4.9.8
- * @access private
- */
-function _wp_privacy_requests_screen_options() {
-        $args = array(
-                'option' => str_replace( 'tools_page_', '', get_current_screen()->id ) . '_requests_per_page',
-        );
-        add_screen_option( 'per_page', $args );
-}
-
-// TODO: move the following classes in new files.
-if ( ! class_exists( 'WP_List_Table' ) ) {
-        require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
-}
-
-/**
- * WP_Privacy_Requests_Table class.
- *
- * @since 4.9.6
- */
-abstract class WP_Privacy_Requests_Table extends WP_List_Table {
-
-        /**
-         * Action name for the requests this table will work with. Classes
-         * which inherit from WP_Privacy_Requests_Table should define this.
-         *
-         * Example: 'export_personal_data'.
-         *
-         * @since 4.9.6
-         *
-         * @var string $request_type Name of action.
-         */
-        protected $request_type = 'INVALID';
-
-        /**
-         * Post type to be used.
-         *
-         * @since 4.9.6
-         *
-         * @var string $post_type The post type.
-         */
-        protected $post_type = 'INVALID';
-
-        /**
-         * Get columns to show in the list table.
-         *
-         * @since 4.9.6
-         *
-         * @return array Array of columns.
-         */
-        public function get_columns() {
-                $columns = array(
-                        'cb'                => '<input type="checkbox" />',
-                        'email'             => __( 'Requester' ),
-                        'status'            => __( 'Status' ),
-                        'created_timestamp' => __( 'Requested' ),
-                        'next_steps'        => __( 'Next Steps' ),
-                );
-                return $columns;
-        }
-
-        /**
-         * Get a list of sortable columns.
-         *
-         * @since 4.9.6
-         *
-         * @return array Default sortable columns.
-         */
-        protected function get_sortable_columns() {
-                // The initial sorting is by 'Requested' (post_date) and descending.
-                // With initial sorting, the first click on 'Requested' should be ascending.
-                // With 'Requester' sorting active, the next click on 'Requested' should be descending.
-                $desc_first = isset( $_GET['orderby'] );
-
-                return array(
-                        'email'             => 'requester',
-                        'created_timestamp' => array( 'requested', $desc_first ),
-                );
-        }
-
-        /**
-         * Default primary column.
-         *
-         * @since 4.9.6
-         *
-         * @return string Default primary column name.
-         */
-        protected function get_default_primary_column_name() {
-                return 'email';
-        }
-
-        /**
-         * Count number of requests for each status.
-         *
-         * @since 4.9.6
-         *
-         * @return object Number of posts for each status.
-         */
-        protected function get_request_counts() {
-                global $wpdb;
-
-                $cache_key = $this->post_type . '-' . $this->request_type;
-                $counts    = wp_cache_get( $cache_key, 'counts' );
-
-                if ( false !== $counts ) {
-                        return $counts;
-                }
-
-                $query = "
-                        SELECT post_status, COUNT( * ) AS num_posts
-                        FROM {$wpdb->posts}
-                        WHERE post_type = %s
-                        AND post_name = %s
-                        GROUP BY post_status";
-
-                $results = (array) $wpdb->get_results( $wpdb->prepare( $query, $this->post_type, $this->request_type ), ARRAY_A );
-                $counts  = array_fill_keys( get_post_stati(), 0 );
-
-                foreach ( $results as $row ) {
-                        $counts[ $row['post_status'] ] = $row['num_posts'];
-                }
-
-                $counts = (object) $counts;
-                wp_cache_set( $cache_key, $counts, 'counts' );
-
-                return $counts;
-        }
-
-        /**
-         * Get an associative array ( id => link ) with the list of views available on this table.
-         *
-         * @since 4.9.6
-         *
-         * @return array Associative array of views in the format of $view_name => $view_markup.
-         */
-        protected function get_views() {
-                $current_status = isset( $_REQUEST['filter-status'] ) ? sanitize_text_field( $_REQUEST['filter-status'] ) : '';
-                $statuses       = _wp_privacy_statuses();
-                $views          = array();
-                $admin_url      = admin_url( 'tools.php?page=' . $this->request_type );
-                $counts         = $this->get_request_counts();
-                $total_requests = absint( array_sum( (array) $counts ) );
-
-                $current_link_attributes = empty( $current_status ) ? ' class="current" aria-current="page"' : '';
-                $status_label            = sprintf(
-                        /* translators: %s: all requests count */
-                        _nx(
-                                'All <span class="count">(%s)</span>',
-                                'All <span class="count">(%s)</span>',
-                                $total_requests,
-                                'requests'
-                        ),
-                        number_format_i18n( $total_requests )
-                );
-
-                $views['all'] = sprintf(
-                        '<a href="%s"%s>%s</a>',
-                        esc_url( $admin_url ),
-                        $current_link_attributes,
-                        $status_label
-                );
-
-                foreach ( $statuses as $status => $label ) {
-                        $post_status = get_post_status_object( $status );
-                        if ( ! $post_status ) {
-                                continue;
-                        }
-
-                        $current_link_attributes = $status === $current_status ? ' class="current" aria-current="page"' : '';
-                        $total_status_requests   = absint( $counts->{$status} );
-                        $status_label            = sprintf(
-                                translate_nooped_plural( $post_status->label_count, $total_status_requests ),
-                                number_format_i18n( $total_status_requests )
-                        );
-                        $status_link             = add_query_arg( 'filter-status', $status, $admin_url );
-
-                        $views[ $status ] = sprintf(
-                                '<a href="%s"%s>%s</a>',
-                                esc_url( $status_link ),
-                                $current_link_attributes,
-                                $status_label
-                        );
-                }
-
-                return $views;
-        }
-
-        /**
-         * Get bulk actions.
-         *
-         * @since 4.9.6
-         *
-         * @return array List of bulk actions.
-         */
-        protected function get_bulk_actions() {
-                return array(
-                        'delete' => __( 'Remove' ),
-                        'resend' => __( 'Resend email' ),
-                );
-        }
-
-        /**
-         * Process bulk actions.
-         *
-         * @since 4.9.6
-         */
-        public function process_bulk_action() {
-                $action      = $this->current_action();
-                $request_ids = isset( $_REQUEST['request_id'] ) ? wp_parse_id_list( wp_unslash( $_REQUEST['request_id'] ) ) : array();
-
-                $count = 0;
-
-                if ( $request_ids ) {
-                        check_admin_referer( 'bulk-privacy_requests' );
-                }
-
-                switch ( $action ) {
-                        case 'delete':
-                                foreach ( $request_ids as $request_id ) {
-                                        if ( wp_delete_post( $request_id, true ) ) {
-                                                $count ++;
-                                        }
-                                }
-
-                                add_settings_error(
-                                        'bulk_action',
-                                        'bulk_action',
-                                        /* translators: %d: number of requests */
-                                        sprintf( _n( 'Deleted %d request', 'Deleted %d requests', $count ), $count ),
-                                        'updated'
-                                );
-                                break;
-                        case 'resend':
-                                foreach ( $request_ids as $request_id ) {
-                                        $resend = _wp_privacy_resend_request( $request_id );
-
-                                        if ( $resend && ! is_wp_error( $resend ) ) {
-                                                $count++;
-                                        }
-                                }
-
-                                add_settings_error(
-                                        'bulk_action',
-                                        'bulk_action',
-                                        /* translators: %d: number of requests */
-                                        sprintf( _n( 'Re-sent %d request', 'Re-sent %d requests', $count ), $count ),
-                                        'updated'
-                                );
-                                break;
-                }
-        }
-
-        /**
-         * Prepare items to output.
-         *
-         * @since 4.9.6
-         * @since 5.1.0 Added support for column sorting.
-         */
-        public function prepare_items() {
-                global $wpdb;
-
-                $this->items    = array();
-                $posts_per_page = $this->get_items_per_page( $this->request_type . '_requests_per_page' );
-                $args           = array(
-                        'post_type'      => $this->post_type,
-                        'post_name__in'  => array( $this->request_type ),
-                        'posts_per_page' => $posts_per_page,
-                        'offset'         => isset( $_REQUEST['paged'] ) ? max( 0, absint( $_REQUEST['paged'] ) - 1 ) * $posts_per_page : 0,
-                        'post_status'    => 'any',
-                        's'              => isset( $_REQUEST['s'] ) ? sanitize_text_field( $_REQUEST['s'] ) : '',
-                );
-
-                $orderby_mapping = array(
-                        'requester' => 'post_title',
-                        'requested' => 'post_date',
-                );
-
-                if ( isset( $_REQUEST['orderby'] ) && isset( $orderby_mapping[ $_REQUEST['orderby'] ] ) ) {
-                        $args['orderby'] = $orderby_mapping[ $_REQUEST['orderby'] ];
-                }
-
-                if ( isset( $_REQUEST['order'] ) && in_array( strtoupper( $_REQUEST['order'] ), array( 'ASC', 'DESC' ), true ) ) {
-                        $args['order'] = strtoupper( $_REQUEST['order'] );
-                }
-
-                if ( ! empty( $_REQUEST['filter-status'] ) ) {
-                        $filter_status       = isset( $_REQUEST['filter-status'] ) ? sanitize_text_field( $_REQUEST['filter-status'] ) : '';
-                        $args['post_status'] = $filter_status;
-                }
-
-                $requests_query = new WP_Query( $args );
-                $requests       = $requests_query->posts;
-
-                foreach ( $requests as $request ) {
-                        $this->items[] = wp_get_user_request_data( $request->ID );
-                }
-
-                $this->items = array_filter( $this->items );
-
-                $this->set_pagination_args(
-                        array(
-                                'total_items' => $requests_query->found_posts,
-                                'per_page'    => $posts_per_page,
-                        )
-                );
-        }
-
-        /**
-         * Checkbox column.
-         *
-         * @since 4.9.6
-         *
-         * @param WP_User_Request $item Item being shown.
-         * @return string Checkbox column markup.
-         */
-        public function column_cb( $item ) {
-                return sprintf( '<input type="checkbox" name="request_id[]" value="%1$s" /><span class="spinner"></span>', esc_attr( $item->ID ) );
-        }
-
-        /**
-         * Status column.
-         *
-         * @since 4.9.6
-         *
-         * @param WP_User_Request $item Item being shown.
-         * @return string Status column markup.
-         */
-        public function column_status( $item ) {
-                $status        = get_post_status( $item->ID );
-                $status_object = get_post_status_object( $status );
-
-                if ( ! $status_object || empty( $status_object->label ) ) {
-                        return '-';
-                }
-
-                $timestamp = false;
-
-                switch ( $status ) {
-                        case 'request-confirmed':
-                                $timestamp = $item->confirmed_timestamp;
-                                break;
-                        case 'request-completed':
-                                $timestamp = $item->completed_timestamp;
-                                break;
-                }
-
-                echo '<span class="status-label status-' . esc_attr( $status ) . '">';
-                echo esc_html( $status_object->label );
-
-                if ( $timestamp ) {
-                        echo ' (' . $this->get_timestamp_as_date( $timestamp ) . ')';
-                }
-
-                echo '</span>';
-        }
-
-        /**
-         * Convert timestamp for display.
-         *
-         * @since 4.9.6
-         *
-         * @param int $timestamp Event timestamp.
-         * @return string Human readable date.
-         */
-        protected function get_timestamp_as_date( $timestamp ) {
-                if ( empty( $timestamp ) ) {
-                        return '';
-                }
-
-                $time_diff = time() - $timestamp;
-
-                if ( $time_diff >= 0 && $time_diff < DAY_IN_SECONDS ) {
-                        /* translators: human readable timestamp */
-                        return sprintf( __( '%s ago' ), human_time_diff( $timestamp ) );
-                }
-
-                return date_i18n( get_option( 'date_format' ), $timestamp );
-        }
-
-        /**
-         * Default column handler.
-         *
-         * @since 4.9.6
-         *
-         * @param WP_User_Request $item        Item being shown.
-         * @param string          $column_name Name of column being shown.
-         * @return string Default column output.
-         */
-        public function column_default( $item, $column_name ) {
-                $cell_value = $item->$column_name;
-
-                if ( in_array( $column_name, array( 'created_timestamp' ), true ) ) {
-                        return $this->get_timestamp_as_date( $cell_value );
-                }
-
-                return $cell_value;
-        }
-
-        /**
-         * Actions column. Overridden by children.
-         *
-         * @since 4.9.6
-         *
-         * @param WP_User_Request $item Item being shown.
-         * @return string Email column markup.
-         */
-        public function column_email( $item ) {
-                return sprintf( '<a href="%1$s">%2$s</a> %3$s', esc_url( 'mailto:' . $item->email ), $item->email, $this->row_actions( array() ) );
-        }
-
-        /**
-         * Next steps column. Overridden by children.
-         *
-         * @since 4.9.6
-         *
-         * @param WP_User_Request $item Item being shown.
-         */
-        public function column_next_steps( $item ) {}
-
-        /**
-         * Generates content for a single row of the table,
-         *
-         * @since 4.9.6
-         *
-         * @param WP_User_Request $item The current item.
-         */
-        public function single_row( $item ) {
-                $status = $item->status;
-
-                echo '<tr id="request-' . esc_attr( $item->ID ) . '" class="status-' . esc_attr( $status ) . '">';
-                $this->single_row_columns( $item );
-                echo '</tr>';
-        }
-
-        /**
-         * Embed scripts used to perform actions. Overridden by children.
-         *
-         * @since 4.9.6
-         */
-        public function embed_scripts() {}
-}
-
-/**
- * WP_Privacy_Data_Export_Requests_Table class.
- *
- * @since 4.9.6
- */
-class WP_Privacy_Data_Export_Requests_Table extends WP_Privacy_Requests_Table {
-        /**
-         * Action name for the requests this table will work with.
-         *
-         * @since 4.9.6
-         *
-         * @var string $request_type Name of action.
-         */
-        protected $request_type = 'export_personal_data';
-
-        /**
-         * Post type for the requests.
-         *
-         * @since 4.9.6
-         *
-         * @var string $post_type The post type.
-         */
-        protected $post_type = 'user_request';
-
-        /**
-         * Actions column.
-         *
-         * @since 4.9.6
-         *
-         * @param WP_User_Request $item Item being shown.
-         * @return string Email column markup.
-         */
-        public function column_email( $item ) {
-                /** This filter is documented in wp-admin/includes/ajax-actions.php */
-                $exporters       = apply_filters( 'wp_privacy_personal_data_exporters', array() );
-                $exporters_count = count( $exporters );
-                $request_id      = $item->ID;
-                $nonce           = wp_create_nonce( 'wp-privacy-export-personal-data-' . $request_id );
-
-                $download_data_markup = '<div class="export-personal-data" ' .
-                        'data-exporters-count="' . esc_attr( $exporters_count ) . '" ' .
-                        'data-request-id="' . esc_attr( $request_id ) . '" ' .
-                        'data-nonce="' . esc_attr( $nonce ) .
-                        '">';
-
-                $download_data_markup .= '<span class="export-personal-data-idle"><button type="button" class="button-link export-personal-data-handle">' . __( 'Download Personal Data' ) . '</button></span>' .
-                        '<span style="display:none" class="export-personal-data-processing" >' . __( 'Downloading Data...' ) . '</span>' .
-                        '<span style="display:none" class="export-personal-data-success"><button type="button" class="button-link export-personal-data-handle">' . __( 'Download Personal Data Again' ) . '</button></span>' .
-                        '<span style="display:none" class="export-personal-data-failed">' . __( 'Download failed.' ) . ' <button type="button" class="button-link">' . __( 'Retry' ) . '</button></span>';
-
-                $download_data_markup .= '</div>';
-
-                $row_actions = array(
-                        'download-data' => $download_data_markup,
-                );
-
-                return sprintf( '<a href="%1$s">%2$s</a> %3$s', esc_url( 'mailto:' . $item->email ), $item->email, $this->row_actions( $row_actions ) );
-        }
-
-        /**
-         * Displays the next steps column.
-         *
-         * @since 4.9.6
-         *
-         * @param WP_User_Request $item Item being shown.
-         */
-        public function column_next_steps( $item ) {
-                $status = $item->status;
-
-                switch ( $status ) {
-                        case 'request-pending':
-                                esc_html_e( 'Waiting for confirmation' );
-                                break;
-                        case 'request-confirmed':
-                                /** This filter is documented in wp-admin/includes/ajax-actions.php */
-                                $exporters       = apply_filters( 'wp_privacy_personal_data_exporters', array() );
-                                $exporters_count = count( $exporters );
-                                $request_id      = $item->ID;
-                                $nonce           = wp_create_nonce( 'wp-privacy-export-personal-data-' . $request_id );
-
-                                echo '<div class="export-personal-data" ' .
-                                        'data-send-as-email="1" ' .
-                                        'data-exporters-count="' . esc_attr( $exporters_count ) . '" ' .
-                                        'data-request-id="' . esc_attr( $request_id ) . '" ' .
-                                        'data-nonce="' . esc_attr( $nonce ) .
-                                        '">';
-
-                                ?>
-                                <span class="export-personal-data-idle"><button type="button" class="button export-personal-data-handle"><?php _e( 'Send Export Link' ); ?></button></span>
-                                <span style="display:none" class="export-personal-data-processing button updating-message" ><?php _e( 'Sending Email...' ); ?></span>
-                                <span style="display:none" class="export-personal-data-success success-message" ><?php _e( 'Email sent.' ); ?></span>
-                                <span style="display:none" class="export-personal-data-failed"><?php _e( 'Email could not be sent.' ); ?> <button type="button" class="button export-personal-data-handle"><?php _e( 'Retry' ); ?></button></span>
-                                <?php
-
-                                echo '</div>';
-                                break;
-                        case 'request-failed':
-                                submit_button( __( 'Retry' ), 'secondary', 'privacy_action_email_retry[' . $item->ID . ']', false );
-                                break;
-                        case 'request-completed':
-                                echo '<a href="' . esc_url(
-                                        wp_nonce_url(
-                                                add_query_arg(
-                                                        array(
-                                                                'action'     => 'delete',
-                                                                'request_id' => array( $item->ID ),
-                                                        ),
-                                                        admin_url( 'tools.php?page=export_personal_data' )
-                                                ),
-                                                'bulk-privacy_requests'
-                                        )
-                                ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
-                                break;
-                }
-        }
-}
-
-/**
- * WP_Privacy_Data_Removal_Requests_Table class.
- *
- * @since 4.9.6
- */
-class WP_Privacy_Data_Removal_Requests_Table extends WP_Privacy_Requests_Table {
-        /**
-         * Action name for the requests this table will work with.
-         *
-         * @since 4.9.6
-         *
-         * @var string $request_type Name of action.
-         */
-        protected $request_type = 'remove_personal_data';
-
-        /**
-         * Post type for the requests.
-         *
-         * @since 4.9.6
-         *
-         * @var string $post_type The post type.
-         */
-        protected $post_type = 'user_request';
-
-        /**
-         * Actions column.
-         *
-         * @since 4.9.6
-         *
-         * @param WP_User_Request $item Item being shown.
-         * @return string Email column markup.
-         */
-        public function column_email( $item ) {
-                $row_actions = array();
-
-                // Allow the administrator to "force remove" the personal data even if confirmation has not yet been received.
-                $status = $item->status;
-                if ( 'request-confirmed' !== $status ) {
-                        /** This filter is documented in wp-admin/includes/ajax-actions.php */
-                        $erasers       = apply_filters( 'wp_privacy_personal_data_erasers', array() );
-                        $erasers_count = count( $erasers );
-                        $request_id    = $item->ID;
-                        $nonce         = wp_create_nonce( 'wp-privacy-erase-personal-data-' . $request_id );
-
-                        $remove_data_markup = '<div class="remove-personal-data force-remove-personal-data" ' .
-                                'data-erasers-count="' . esc_attr( $erasers_count ) . '" ' .
-                                'data-request-id="' . esc_attr( $request_id ) . '" ' .
-                                'data-nonce="' . esc_attr( $nonce ) .
-                                '">';
-
-                        $remove_data_markup .= '<span class="remove-personal-data-idle"><button type="button" class="button-link remove-personal-data-handle">' . __( 'Force Erase Personal Data' ) . '</button></span>' .
-                                '<span style="display:none" class="remove-personal-data-processing" >' . __( 'Erasing Data...' ) . '</span>' .
-                                '<span style="display:none" class="remove-personal-data-failed">' . __( 'Force Erase has failed.' ) . ' <button type="button" class="button-link remove-personal-data-handle">' . __( 'Retry' ) . '</button></span>';
-
-                        $remove_data_markup .= '</div>';
-
-                        $row_actions = array(
-                                'remove-data' => $remove_data_markup,
-                        );
-                }
-
-                return sprintf( '<a href="%1$s">%2$s</a> %3$s', esc_url( 'mailto:' . $item->email ), $item->email, $this->row_actions( $row_actions ) );
-        }
-
-        /**
-         * Next steps column.
-         *
-         * @since 4.9.6
-         *
-         * @param WP_User_Request $item Item being shown.
-         */
-        public function column_next_steps( $item ) {
-                $status = $item->status;
-
-                switch ( $status ) {
-                        case 'request-pending':
-                                esc_html_e( 'Waiting for confirmation' );
-                                break;
-                        case 'request-confirmed':
-                                /** This filter is documented in wp-admin/includes/ajax-actions.php */
-                                $erasers       = apply_filters( 'wp_privacy_personal_data_erasers', array() );
-                                $erasers_count = count( $erasers );
-                                $request_id    = $item->ID;
-                                $nonce         = wp_create_nonce( 'wp-privacy-erase-personal-data-' . $request_id );
-
-                                echo '<div class="remove-personal-data" ' .
-                                        'data-force-erase="1" ' .
-                                        'data-erasers-count="' . esc_attr( $erasers_count ) . '" ' .
-                                        'data-request-id="' . esc_attr( $request_id ) . '" ' .
-                                        'data-nonce="' . esc_attr( $nonce ) .
-                                        '">';
-
-                                ?>
-                                <span class="remove-personal-data-idle"><button type="button" class="button remove-personal-data-handle"><?php _e( 'Erase Personal Data' ); ?></button></span>
-                                <span style="display:none" class="remove-personal-data-processing button updating-message" ><?php _e( 'Erasing Data...' ); ?></span>
-                                <span style="display:none" class="remove-personal-data-failed"><?php _e( 'Erasing Data has failed.' ); ?> <button type="button" class="button remove-personal-data-handle"><?php _e( 'Retry' ); ?></button></span>
-                                <?php
-
-                                echo '</div>';
-
-                                break;
-                        case 'request-failed':
-                                submit_button( __( 'Retry' ), 'secondary', 'privacy_action_email_retry[' . $item->ID . ']', false );
-                                break;
-                        case 'request-completed':
-                                echo '<a href="' . esc_url(
-                                        wp_nonce_url(
-                                                add_query_arg(
-                                                        array(
-                                                                'action'     => 'delete',
-                                                                'request_id' => array( $item->ID ),
-                                                        ),
-                                                        admin_url( 'tools.php?page=remove_personal_data' )
-                                                ),
-                                                'bulk-privacy_requests'
-                                        )
-                                ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
-                                break;
-                }
-        }
-
-}

src/wp-admin/menu.php

@@ -264 +264 @@
         $submenu['tools.php'][10] = array( __( 'Import' ), 'import', 'import.php' );
         $submenu['tools.php'][15] = array( __( 'Export' ), 'export', 'export.php' );
         $submenu['tools.php'][20] = array( __( 'Site Health' ), 'install_plugins', 'site-health.php' );
+        $submenu['tools.php'][25] = array( __( 'Export Personal Data' ), 'export_others_personal_data', 'export-personal-data.php' );
+        $submenu['tools.php'][30] = array( __( 'Erase Personal Data' ), 'erase_others_personal_data', 'erase-personal-data.php' );
 if ( is_multisite() && ! is_main_site() ) {
-        $submenu['tools.php'][25] = array( __( 'Delete Site' ), 'delete_site', 'ms-delete-site.php' );
+        $submenu['tools.php'][35] = array( __( 'Delete Site' ), 'delete_site', 'ms-delete-site.php' );
 }
 if ( ! is_multisite() && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
         $submenu['tools.php'][50] = array( __( 'Network Setup' ), 'setup_network', 'network.php' );

src/wp-includes/script-loader.php

@@ -1542 +1542 @@
                 );
 
                 $scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array( 'jquery' ), false, 1 );
-                did_action( 'init' ) && $scripts->localize(
-                        'xfn',
-                        'privacyToolsL10n',
-                        array(
-                                'noDataFound'     => __( 'No personal data was found for this user.' ),
-                                'foundAndRemoved' => __( 'All of the personal data found for this user was erased.' ),
-                                'noneRemoved'     => __( 'Personal data was found for this user but was not erased.' ),
-                                'someNotRemoved'  => __( 'Personal data was found for this user but some of the personal data found was not erased.' ),
-                                'removalError'    => __( 'An error occurred while attempting to find and erase personal data.' ),
-                                'noExportFile'    => __( 'No personal data export file was generated.' ),
-                                'exportError'     => __( 'An error occurred while attempting to export personal data.' ),
-                        )
-                );
 
                 $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array( 'jquery-ui-sortable' ), false, 1 );
                 did_action( 'init' ) && $scripts->localize(
@@ -1693 +1680 @@
                 $scripts->add( 'site-health', "/wp-admin/js/site-health$suffix.js", array( 'clipboard', 'jquery', 'wp-util', 'wp-a11y', 'wp-i18n' ), false, 1 );
                 $scripts->set_translations( 'site-health' );
 
+                $scripts->add( 'privacy', "/wp-admin/js/privacy$suffix.js", array( 'jquery' ), false, 1 );
+                did_action( 'init' ) && $scripts->localize(
+                        'privacy',
+                        'privacyToolsL10n',
+                        array(
+                                'noDataFound'     => __( 'No personal data was found for this user.' ),
+                                'foundAndRemoved' => __( 'All of the personal data found for this user was erased.' ),
+                                'noneRemoved'     => __( 'Personal data was found for this user but was not erased.' ),
+                                'someNotRemoved'  => __( 'Personal data was found for this user but some of the personal data found was not erased.' ),
+                                'removalError'    => __( 'An error occurred while attempting to find and erase personal data.' ),
+                                'noExportFile'    => __( 'No personal data export file was generated.' ),
+                                'exportError'     => __( 'An error occurred while attempting to export personal data.' ),
+                        )
+                );
+
                 $scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y' ), false, 1 );
                 did_action( 'init' ) && $scripts->localize(
                         'updates',