Skip to content

Cherry picked develop to master #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
a6software merged 5 commits into from
Feb 8, 2019
Merged

Cherry picked develop to master #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
91ca4ce
Adds escaping of some uncommon but valid email characters
a6software Feb 7, 2019
5e0491f
Adds data attribute with function to call to close notification modal
a6software Feb 7, 2019
994d1cd
Fix for success handler for gdpr-privacy-preferences-frm submission
a6software Feb 7, 2019
8e47213
Dispatch custom event when user accepts the policy
a6software Feb 7, 2019
704d16b
Fix: Use single quotes
a6software Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 43 additions & 7 deletions public/class-gdpr-requests-public.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function delete_user( $user, $index ) {

if ( parent::remove_from_requests( $index ) ) {
$token = GDPR::generate_pin();
GDPR_Email::send( $user->user_email, 'delete-resolved', array( 'token' => $token ) );
GDPR_Email::send( $this->get_escaped_user_email_address( $user ), 'delete-resolved', array( 'token' => $token ) );
GDPR_Audit_Log::log( $user->ID, esc_html__( 'User was removed from the site.', 'gdpr' ) );
GDPR_Audit_Log::export_log( $user->ID, $token );
wp_delete_user( $user->ID );
Expand Down Expand Up @@ -194,14 +194,15 @@ public function send_request_email() {
break;
}

$key = parent::add_to_requests( $user->user_email, $type, $data );
$escaped_user_email = $this->get_escaped_user_email_address( $user );
$key = parent::add_to_requests( $escaped_user_email, $type, $data );

if ( 'export-data' !== $type ) {
$email_args['confirm_url'] = add_query_arg(
array(
'type' => $type,
'key' => $key,
'email' => $user->user_email,
'email' => $escaped_user_email,
),
home_url()
);
Expand All @@ -210,7 +211,7 @@ public function send_request_email() {
array(
'type' => $type,
'key' => $key,
'email' => $user->user_email,
'email' => $escaped_user_email,
'format' => 'xml',
),
home_url()
Expand All @@ -219,15 +220,15 @@ public function send_request_email() {
array(
'type' => $type,
'key' => $key,
'email' => $user->user_email,
'email' => $escaped_user_email,
'format' => 'json',
),
home_url()
);
}

if ( GDPR_Email::send(
$user->user_email,
$escaped_user_email,
"{$type}-request",
$email_args
) ) {
Expand Down Expand Up @@ -376,7 +377,7 @@ public function request_confirmed() {
$format = isset( $_GET['format'] ) ? sanitize_text_field( wp_unslash( $_GET['format'] ) ) : 'xml'; // WPCS: Input var ok, CSRF ok.
/* translators: File format. Can be XML or JSON */
GDPR_Audit_Log::log( $user->ID, sprintf( esc_html__( 'User downloaded all their data in %s format.', 'gdpr' ), $format ) );
$this->file_export_data( $user->user_email, $format, $key );
$this->file_export_data( $this->get_escaped_user_email_address( $user ), $format, $key );
break;
}
}
Expand Down Expand Up @@ -404,4 +405,39 @@ private function file_export_data( $email, $format, $key ) {
}
die();
}

/**
* Provides escaping for uncommon, yet valid email address characters.
*
* @param string $email_in The starting email address.
*
* @return mixed|string
*/
private function escape_email_address( $email_in = '' ) {
$email_out = '';
$email_string_length = \strlen( $email_in );

for ( $i = 0; $i < $email_string_length; $i++ ) {
$hex = dechex( ord( $email_in[ $i ] ) );
if ('' === $hex) {
$email_out .= rawurlencode( $email_in[ $i ] );
} else {
$email_out = $email_out . '%' . ( ( 1 === strlen( $hex ) ) ? ( '0' . strtoupper( $hex ) ) : strtoupper( $hex ) );
}
}
$email_out = str_replace( array( '+', '_', '.', '-' ), array( '%20', '%5F', '%2E', '%2D' ), $email_out );

return $email_out;
}

/**
* Get the escpaed user email address.
*
* @param WP_User $user the User object.
*
* @return mixed|string
*/
private function get_escaped_user_email_address( WP_User $user ) {
return $this->escape_email_address( $user->user_email );
}
}
2 changes: 1 addition & 1 deletion public/partials/confirmation-screens.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<p><?php echo esc_html( $text ); ?></p>
</div>
<footer>
<button class="gdpr-ok"><?php esc_html_e( 'OK', 'gdpr' ); ?></button>
<button class="gdpr-ok" data-callback="closeNotification"><?php esc_html_e( 'OK', 'gdpr' ); ?></button>
</footer>
</div>
</div>
8 changes: 4 additions & 4 deletions src/js/public/gdpr-public.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,24 +98,24 @@

$(document).on('submit', '.gdpr-privacy-preferences-frm', function(e) {
e.preventDefault();
var that = $(this);
var formData = $(this).serialize();

$.post(
GDPR.ajaxurl,
formData,
function(response) {
if ( response.success ) {
function(response, textStatus, xhr) {
if ( 200 === xhr.status ) {
Cookies.set('gdpr[privacy_bar]', 1, { expires: 365 });
if ( GDPR.refresh ) {
window.location.reload();
window.location.reload( true );
} else {
var scrollDistance = $('body').css('top');
$('.gdpr-overlay').fadeOut();
$('body').removeClass('gdpr-noscroll');
$(window).scrollTop(Math.abs( parseInt( scrollDistance, 10 ) ) );
$('.gdpr.gdpr-privacy-preferences .gdpr-wrapper').fadeOut();
$('.gdpr-privacy-bar').fadeOut();
$( document ).trigger( 'updatedPrivacyPreferences' );
}
} else {
displayNotification( response.data.title, response.data.content );
Expand Down