Changeset 49090
- Timestamp:
- 10/04/2020 03:21:38 AM (4 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/erase-personal-data.php
r48468 r49090 11 11 12 12 if ( ! current_user_can( 'erase_others_personal_data' ) || ! current_user_can( 'delete_users' ) ) { 13 wp_die( __( 'Sorry, you are not allowed to erase data on this site.' ) );13 wp_die( __( 'Sorry, you are not allowed to erase personal data on this site.' ) ); 14 14 } 15 15 -
trunk/src/wp-admin/includes/privacy-tools.php
r49026 r49090 21 21 22 22 if ( ! $request || 'user_request' !== $request->post_type ) { 23 return new WP_Error( 'privacy_request_error', __( 'Invalid request.' ) );23 return new WP_Error( 'privacy_request_error', __( 'Invalid user privacy request.' ) ); 24 24 } 25 25 … … 29 29 return $result; 30 30 } elseif ( ! $result ) { 31 return new WP_Error( 'privacy_request_error', __( 'Unable to initiate confirmation request.' ) );31 return new WP_Error( 'privacy_request_error', __( 'Unable to initiate user privacy confirmation request.' ) ); 32 32 } 33 33 … … 50 50 51 51 if ( ! $request ) { 52 return new WP_Error( 'privacy_request_error', __( 'Invalid request.' ) );52 return new WP_Error( 'privacy_request_error', __( 'Invalid user privacy request.' ) ); 53 53 } 54 54 … … 105 105 'action_type', 106 106 'action_type', 107 __( 'Invalid action.' ),107 __( 'Invalid user privacy action.' ), 108 108 'error' 109 109 ); … … 117 117 'action_type', 118 118 'action_type', 119 __( 'Invalid action.' ),119 __( 'Invalid user privacy action.' ), 120 120 'error' 121 121 ); … … 298 298 function wp_privacy_generate_personal_data_export_file( $request_id ) { 299 299 if ( ! class_exists( 'ZipArchive' ) ) { 300 wp_send_json_error( __( 'Unable to generate export file. ZipArchive not available.' ) );300 wp_send_json_error( __( 'Unable to generate user privacy export file. ZipArchive not available.' ) ); 301 301 } 302 302 … … 305 305 306 306 if ( ! $request || 'export_personal_data' !== $request->action_name ) { 307 wp_send_json_error( __( 'Invalid request ID when generating export file.' ) );307 wp_send_json_error( __( 'Invalid request ID when generating user privacy export file.' ) ); 308 308 } 309 309 … … 311 311 312 312 if ( ! is_email( $email_address ) ) { 313 wp_send_json_error( __( 'Invalid email address when generating export file.' ) );313 wp_send_json_error( __( 'Invalid email address when generating user privacy export file.' ) ); 314 314 } 315 315 … … 319 319 320 320 if ( ! wp_mkdir_p( $exports_dir ) ) { 321 wp_send_json_error( __( 'Unable to create export folder.' ) );321 wp_send_json_error( __( 'Unable to create user privacy export folder.' ) ); 322 322 } 323 323 … … 327 327 $file = fopen( $index_pathname, 'w' ); 328 328 if ( false === $file ) { 329 wp_send_json_error( __( 'Unable to protect export folder from browsing.' ) );329 wp_send_json_error( __( 'Unable to protect user privacy export folder from browsing.' ) ); 330 330 } 331 331 fwrite( $file, '<!-- Silence is golden. -->' ); … … 396 396 397 397 if ( false === $file ) { 398 wp_send_json_error( __( 'Unable to open export file (JSON report) for writing.' ) );398 wp_send_json_error( __( 'Unable to open user privacy export file (JSON report) for writing.' ) ); 399 399 } 400 400 … … 411 411 412 412 if ( false === $file ) { 413 wp_send_json_error( __( 'Unable to open export file (HTML report) for writing.' ) );413 wp_send_json_error( __( 'Unable to open user privacy export file (HTML report) for writing.' ) ); 414 414 } 415 415 … … 505 505 if ( true === $zip->open( $archive_pathname, ZipArchive::CREATE ) ) { 506 506 if ( ! $zip->addFile( $json_report_pathname, 'export.json' ) ) { 507 $error = __( 'Unable to add data to JSON file.' );507 $error = __( 'Unable to add data to user privacy export file (JSON format).' ); 508 508 } 509 509 510 510 if ( ! $zip->addFile( $html_report_pathname, 'index.html' ) ) { 511 $error = __( 'Unable to add data to HTML file.' );511 $error = __( 'Unable to add data to user privacy export file (HTML format).' ); 512 512 } 513 513 … … 530 530 } 531 531 } else { 532 $error = __( 'Unable to open export file (archive) for writing.' );532 $error = __( 'Unable to open user privacy export file (archive) for writing.' ); 533 533 } 534 534 … … 759 759 760 760 if ( ! $request || 'export_personal_data' !== $request->action_name ) { 761 wp_send_json_error( __( 'Invalid request ID when merging exporter data.' ) );761 wp_send_json_error( __( 'Invalid request ID when merging user privacy exporter data.' ) ); 762 762 } 763 763 … … 910 910 911 911 if ( ! $request || 'remove_personal_data' !== $request->action_name ) { 912 wp_send_json_error( __( 'Invalid request ID when processing eraser data.' ) );912 wp_send_json_error( __( 'Invalid request ID when processing user privacy eraser data.' ) ); 913 913 } 914 914 -
trunk/src/wp-admin/options-privacy.php
r48965 r49090 11 11 12 12 if ( ! current_user_can( 'manage_privacy_options' ) ) { 13 wp_die( __( 'Sorry, you are not allowed to manage privacy o n this site.' ) );13 wp_die( __( 'Sorry, you are not allowed to manage privacy options on this site.' ) ); 14 14 } 15 15 -
trunk/src/wp-admin/privacy-policy-guide.php
r47198 r49090 11 11 12 12 if ( ! current_user_can( 'manage_privacy_options' ) ) { 13 wp_die( __( 'Sorry, you are not allowed to manage privacy o n this site.' ) );13 wp_die( __( 'Sorry, you are not allowed to manage privacy options on this site.' ) ); 14 14 } 15 15 -
trunk/src/wp-includes/user.php
r49036 r49090 3613 3613 3614 3614 if ( $requests_query->found_posts ) { 3615 return new WP_Error( 'duplicate_request', __( 'An incomplete request for this email address already exists.' ) );3615 return new WP_Error( 'duplicate_request', __( 'An incomplete user privacy request for this email address already exists.' ) ); 3616 3616 } 3617 3617 … … 3681 3681 3682 3682 if ( ! $request ) { 3683 return new WP_Error( 'invalid_request', __( 'Invalid user request.' ) );3683 return new WP_Error( 'invalid_request', __( 'Invalid user privacy request.' ) ); 3684 3684 } 3685 3685 … … 3863 3863 global $wp_hasher; 3864 3864 3865 $request_id = absint( $request_id ); 3866 $request = wp_get_user_request( $request_id ); 3867 3868 if ( ! $request ) { 3869 return new WP_Error( 'invalid_request', __( 'Invalid request.' ) ); 3865 $request_id = absint( $request_id ); 3866 $request = wp_get_user_request( $request_id ); 3867 $saved_key = $request->confirm_key; 3868 $key_request_time = $request->modified_timestamp; 3869 3870 if ( ! $request || ! $saved_key || ! $key_request_time ) { 3871 return new WP_Error( 'invalid_request', __( 'Invalid user privacy request.' ) ); 3870 3872 } 3871 3873 3872 3874 if ( ! in_array( $request->status, array( 'request-pending', 'request-failed' ), true ) ) { 3873 return new WP_Error( 'expired_ link', __( 'This linkhas expired.' ) );3875 return new WP_Error( 'expired_request', __( 'This user privacy request has expired.' ) ); 3874 3876 } 3875 3877 3876 3878 if ( empty( $key ) ) { 3877 return new WP_Error( 'missing_key', __( ' Missing confirmkey.' ) );3879 return new WP_Error( 'missing_key', __( 'This user privacy request is missing the confirmation key.' ) ); 3878 3880 } 3879 3881 … … 3883 3885 } 3884 3886 3885 $key_request_time = $request->modified_timestamp;3886 $saved_key = $request->confirm_key;3887 3888 if ( ! $saved_key ) {3889 return new WP_Error( 'invalid_key', __( 'Invalid key.' ) );3890 }3891 3892 if ( ! $key_request_time ) {3893 return new WP_Error( 'invalid_key', __( 'Invalid action.' ) );3894 }3895 3896 3887 /** 3897 3888 * Filters the expiration time of confirm keys. … … 3905 3896 3906 3897 if ( ! $wp_hasher->CheckPassword( $key, $saved_key ) ) { 3907 return new WP_Error( 'invalid_key', __( ' Invalid key.' ) );3898 return new WP_Error( 'invalid_key', __( 'This user privacy request confirmation key is invalid.' ) ); 3908 3899 } 3909 3900 3910 3901 if ( ! $expiration_time || time() > $expiration_time ) { 3911 return new WP_Error( 'expired_key', __( 'Th e confirmation emailhas expired.' ) );3902 return new WP_Error( 'expired_key', __( 'This user privacy request confirmation key has expired.' ) ); 3912 3903 } 3913 3904 -
trunk/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php
r48996 r49090 165 165 166 166 $this->expectException( 'WPDieException' ); 167 $this->expectOutputString( '{"success":false,"data":"Invalid request ID when generating export file."}' );167 $this->expectOutputString( '{"success":false,"data":"Invalid request ID when generating user privacy export file."}' ); 168 168 wp_privacy_generate_personal_data_export_file( $request_id ); 169 169 } … … 176 176 public function test_invalid_request_id() { 177 177 $this->expectException( 'WPDieException' ); 178 $this->expectOutputString( '{"success":false,"data":"Invalid request ID when generating export file."}' );178 $this->expectOutputString( '{"success":false,"data":"Invalid request ID when generating user privacy export file."}' ); 179 179 wp_privacy_generate_personal_data_export_file( 123456789 ); 180 180 } … … 196 196 197 197 $this->expectException( 'WPDieException' ); 198 $this->expectOutputString( '{"success":false,"data":"Invalid email address when generating export file."}' );198 $this->expectOutputString( '{"success":false,"data":"Invalid email address when generating user privacy export file."}' ); 199 199 wp_privacy_generate_personal_data_export_file( $request_id ); 200 200 } … … 210 210 211 211 $this->expectException( 'WPDieException' ); 212 $this->expectOutputString( '{"success":false,"data":"Unable to create export folder."}' );212 $this->expectOutputString( '{"success":false,"data":"Unable to create user privacy export folder."}' ); 213 213 wp_privacy_generate_personal_data_export_file( self::$export_request_id ); 214 214 } -
trunk/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php
r48996 r49090 368 368 369 369 // Process data, given the last exporter, on the last page and send as email. 370 $this->_setup_expected_failure( '{"success":false,"data":"Invalid request ID when merging exporter data."}' );370 $this->_setup_expected_failure( '{"success":false,"data":"Invalid request ID when merging user privacy exporter data."}' ); 371 371 372 372 wp_privacy_process_personal_data_export_page( … … 400 400 401 401 // Process data, given the last exporter, on the last page and send as email. 402 $this->_setup_expected_failure( '{"success":false,"data":"Invalid request ID when merging exporter data."}' );402 $this->_setup_expected_failure( '{"success":false,"data":"Invalid request ID when merging user privacy exporter data."}' ); 403 403 404 404 wp_privacy_process_personal_data_export_page(
Note: See TracChangeset
for help on using the changeset viewer.