vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-08 22:54:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Privacy: Improve clarity of privacy error strings.

Browse Source 
Primarily this adds "user privacy" to the strings for privacy requests, so they are more easily distinguished from other system actions within logs.

Props garrett-eclipse, carike, birgire.
Fixes #51351.

git-svn-id: https://develop.svn.wordpress.org/trunk@49090 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2020-10-04 03:21:38 +00:00
parent 64e937d66c
commit c8ed3ebb30
7 changed files with 38 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/wp-includes/user.php
View File

@@ -3612,7 +3612,7 @@ function wp_create_user_request( $email_address = '', $action_name = '', $reques
);
if ( $requests_query->found_posts ) {
return new WP_Error( 'duplicate_request', __( 'An incomplete request for this email address already exists.' ) );
return new WP_Error( 'duplicate_request', __( 'An incomplete user privacy request for this email address already exists.' ) );
}
$request_id = wp_insert_post(
@@ -3680,7 +3680,7 @@ function wp_send_user_request( $request_id ) {
$request = wp_get_user_request( $request_id );
if ( ! $request ) {
return new WP_Error( 'invalid_request', __( 'Invalid user request.' ) );
return new WP_Error( 'invalid_request', __( 'Invalid user privacy request.' ) );
}
// Localize message content for user; fallback to site default for visitors.
@@ -3862,19 +3862,21 @@ function wp_generate_user_request_key( $request_id ) {
function wp_validate_user_request_key( $request_id, $key ) {
global $wp_hasher;
$request_id = absint( $request_id );
$request = wp_get_user_request( $request_id );
$request_id = absint( $request_id );
$request = wp_get_user_request( $request_id );
$saved_key = $request->confirm_key;
$key_request_time = $request->modified_timestamp;
if ( ! $request ) {
return new WP_Error( 'invalid_request', __( 'Invalid request.' ) );
if ( ! $request || ! $saved_key || ! $key_request_time ) {
return new WP_Error( 'invalid_request', __( 'Invalid user privacy request.' ) );
}
if ( ! in_array( $request->status, array( 'request-pending', 'request-failed' ), true ) ) {
return new WP_Error( 'expired_link', __( 'This link has expired.' ) );
return new WP_Error( 'expired_request', __( 'This user privacy request has expired.' ) );
}
if ( empty( $key ) ) {
return new WP_Error( 'missing_key', __( 'Missing confirm key.' ) );
return new WP_Error( 'missing_key', __( 'This user privacy request is missing the confirmation key.' ) );
}
if ( empty( $wp_hasher ) ) {
@@ -3882,17 +3884,6 @@ function wp_validate_user_request_key( $request_id, $key ) {
$wp_hasher = new PasswordHash( 8, true );
}
$key_request_time = $request->modified_timestamp;
$saved_key = $request->confirm_key;
if ( ! $saved_key ) {
return new WP_Error( 'invalid_key', __( 'Invalid key.' ) );
}
if ( ! $key_request_time ) {
return new WP_Error( 'invalid_key', __( 'Invalid action.' ) );
}
/**
* Filters the expiration time of confirm keys.
*
@@ -3904,11 +3895,11 @@ function wp_validate_user_request_key( $request_id, $key ) {
$expiration_time = $key_request_time + $expiration_duration;
if ( ! $wp_hasher->CheckPassword( $key, $saved_key ) ) {
return new WP_Error( 'invalid_key', __( 'Invalid key.' ) );
return new WP_Error( 'invalid_key', __( 'This user privacy request confirmation key is invalid.' ) );
}
if ( ! $expiration_time || time() > $expiration_time ) {
return new WP_Error( 'expired_key', __( 'The confirmation email has expired.' ) );
return new WP_Error( 'expired_key', __( 'This user privacy request confirmation key has expired.' ) );
}
return true;