WordPress.org

Make WordPress Core

Ticket #43925: 43925.3.diff

File 43925.3.diff, 7.1 KB (added by audrasjb, 2 years ago)

@presskop enhancements + some "XXX failed!" fixes

  • src/wp-admin/includes/file.php

    diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php
    index 9f404e3..32448c8 100644
    a b function wp_privacy_generate_personal_data_export_file( $request_id ) { 
    20132013        $request = wp_get_user_request_data( $request_id );
    20142014
    20152015        if ( ! $request || 'export_personal_data' !== $request->action_name ) {
    2016                 wp_send_json_error( __( 'Invalid request ID when generating export file' ) );
     2016                wp_send_json_error( __( 'Invalid request ID when generating export file.' ) );
    20172017        }
    20182018
    20192019        $email_address = $request->email;
    20202020
    20212021        if ( ! is_email( $email_address ) ) {
    2022                 wp_send_json_error( __( 'Invalid email address when generating export file' ) );
     2022                wp_send_json_error( __( 'Invalid email address when generating export file.' ) );
    20232023        }
    20242024
    20252025        // Create the exports folder if needed.
    function wp_privacy_generate_personal_data_export_file( $request_id ) { 
    20372037        if ( ! file_exists( $index_pathname ) ) {
    20382038                $file = fopen( $index_pathname, 'w' );
    20392039                if ( false === $file ) {
    2040                         wp_send_json_error( __( 'Unable to protect export folder from browsing' ) );
     2040                        wp_send_json_error( __( 'Unable to protect export folder from browsing.' ) );
    20412041                }
    20422042                fwrite( $file, 'Silence is golden.' );
    20432043                fclose( $file );
    function wp_privacy_generate_personal_data_export_file( $request_id ) { 
    20512051        $html_report_pathname = $exports_dir . $html_report_filename;
    20522052        $file = fopen( $html_report_pathname, 'w' );
    20532053        if ( false === $file ) {
    2054                 wp_send_json_error( __( 'Unable to open export file (HTML report) for writing' ) );
     2054                wp_send_json_error( __( 'Unable to open export file (HTML report) for writing.' ) );
    20552055        }
    20562056
    20572057        $title = sprintf(
    function wp_privacy_process_personal_data_export_page( $response, $exporter_inde 
    22892289        $request = wp_get_user_request_data( $request_id );
    22902290
    22912291        if ( ! $request || 'export_personal_data' !== $request->action_name ) {
    2292                 wp_send_json_error( __( 'Invalid request ID when merging exporter data' ) );
     2292                wp_send_json_error( __( 'Invalid request ID when merging exporter data.' ) );
    22932293        }
    22942294
    22952295        $export_data = array();
  • src/wp-admin/includes/user.php

    diff --git a/src/wp-admin/includes/user.php b/src/wp-admin/includes/user.php
    index 939ad16..0ae15bc 100644
    a b class WP_Privacy_Data_Export_Requests_Table extends WP_Privacy_Requests_Table { 
    13521352                $download_data_markup .= '<span class="export_personal_data_idle"><a href="#" >' . __( 'Download Personal Data' ) . '</a></span>' .
    13531353                        '<span style="display:none" class="export_personal_data_processing" >' . __( 'Downloading Data...' ) . '</span>' .
    13541354                        '<span style="display:none" class="export_personal_data_success"><a href="#" >' . __( 'Download Personal Data Again' ) . '</a></span>' .
    1355                         '<span style="display:none" class="export_personal_data_failed">' . __( 'Download Failed!' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
     1355                        '<span style="display:none" class="export_personal_data_failed">' . __( 'Download could not complete.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
    13561356
    13571357                $download_data_markup .= '</div>';
    13581358
    class WP_Privacy_Data_Export_Requests_Table extends WP_Privacy_Requests_Table { 
    13931393                                ?>
    13941394                                <span class="export_personal_data_idle"><a class="button" href="#" ><?php _e( 'Email Data' ); ?></a></span>
    13951395                                <span style="display:none" class="export_personal_data_processing button updating-message" ><?php _e( 'Sending Email...' ); ?></span>
    1396                                 <span style="display:none" class="export_personal_data_success success-message" ><?php _e( 'Email Sent!' ); ?></span>
    1397                                 <span style="display:none" class="export_personal_data_failed"><?php _e( 'Email Failed!' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
     1396                                <span style="display:none" class="export_personal_data_success success-message" ><?php _e( 'Email Sent.' ); ?></span>
     1397                                <span style="display:none" class="export_personal_data_failed"><?php _e( 'Email could not be send.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
    13981398                                <?php
    13991399
    14001400                                echo '</div>';
    class WP_Privacy_Data_Removal_Requests_Table extends WP_Privacy_Requests_Table { 
    14631463
    14641464                        $remove_data_markup .= '<span class="remove_personal_data_idle"><a href="#" >' . __( 'Force Remove Personal Data' ) . '</a></span>' .
    14651465                                '<span style="display:none" class="remove_personal_data_processing" >' . __( 'Removing Data...' ) . '</span>' .
    1466                                 '<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Remove Failed!' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
     1466                                '<span style="display:none" class="remove_personal_data_failed">' . __( 'Force Remove could not complete.' ) . ' <a href="#" >' . __( 'Retry' ) . '</a></span>';
    14671467
    14681468                        $remove_data_markup .= '</div>';
    14691469
    class WP_Privacy_Data_Removal_Requests_Table extends WP_Privacy_Requests_Table { 
    15051505                                ?>
    15061506                                <span class="remove_personal_data_idle"><a class="button" href="#" ><?php _e( 'Remove Personal Data' ); ?></a></span>
    15071507                                <span style="display:none" class="remove_personal_data_processing button updating-message" ><?php _e( 'Removing Data...' ); ?></span>
    1508                                 <span style="display:none" class="remove_personal_data_failed"><?php _e( 'Removing Data Failed!' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
     1508                                <span style="display:none" class="remove_personal_data_failed"><?php _e( 'Removing Data could not complete.' ); ?> <a class="button" href="#" ><?php _e( 'Retry' ); ?></a></span>
    15091509                                <?php
    15101510
    15111511                                echo '</div>';
  • src/wp-admin/privacy.php

    diff --git a/src/wp-admin/privacy.php b/src/wp-admin/privacy.php
    index e16db91..1d17f0f 100644
    a b require_once( ABSPATH . 'wp-admin/admin-header.php' ); 
    201201                                <form method="post" action="">
    202202                                        <input type="hidden" name="action" value="create-privacy-page" />
    203203                                        <span>
    204                                                 <?php _e( 'Or create a new page: ' ); ?>
     204                                                <?php _e( 'Or create a new page:' ); ?>
    205205                                        </span>
    206206                                        <?php
    207207                                        wp_nonce_field( 'create-privacy-page' );
  • src/wp-includes/user.php

    diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
    index 621544e..1d86629 100644
    a b function wp_create_user_request( $email_address = '', $action_name = '', $reques 
    29872987        $action_name   = sanitize_key( $action_name );
    29882988
    29892989        if ( ! is_email( $email_address ) ) {
    2990                 return new WP_Error( 'invalid_email', __( 'Invalid email address' ) );
     2990                return new WP_Error( 'invalid_email', __( 'Invalid email address.' ) );
    29912991        }
    29922992
    29932993        if ( ! $action_name ) {
    2994                 return new WP_Error( 'invalid_action', __( 'Invalid action name' ) );
     2994                return new WP_Error( 'invalid_action', __( 'Invalid action name.' ) );
    29952995        }
    29962996
    29972997        $user    = get_user_by( 'email', $email_address );
  • src/wp-login.php

    diff --git a/src/wp-login.php b/src/wp-login.php
    index 4bdd831..9a73c4e 100644
    a b switch ( $action ) { 
    860860
    861861        case 'confirmaction' :
    862862                if ( ! isset( $_GET['request_id'] ) ) {
    863                         wp_die( __( 'Invalid request' ) );
     863                        wp_die( __( 'Invalid request.' ) );
    864864                }
    865865
    866866                $request_id = (int) $_GET['request_id'];