Skip to content

Tkgdpr 43 policy page url #270

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

Open
moutushi82 wants to merge 5 commits into
base: develop
Choose a base branch
from
+15 −7
Open

Tkgdpr 43 policy page url #270

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
ddd75db
Merge pull request #262 from trewknowledge/develop
fclaussen May 13, 2020
a429f66
Merge branch 'develop'
fclaussen May 13, 2020
5d0aa1d
Merge branch 'develop'
fclaussen May 14, 2020
abc1275
Merge branch 'develop'
fclaussen May 14, 2020
8cfd45c
Added policy page url for consent
moutushi82 Jun 2, 2020
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
10 changes: 6 additions & 4 deletions admin/class-gdpr-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,13 @@ public function sanitize_consents( $consents ) {
unset( $consents[ $key ] );
continue;
}

$output[ $key ] = array(
'name' => sanitize_text_field( wp_unslash( $props['name'] ) ),
'policy-page' => isset( $props['policy-page'] ) ? absint( $props['policy-page'] ) : 0,
'description' => isset( $props['description'] ) ? wp_kses( wp_unslash( $props['description'] ), $this->allowed_html ) : '',
'registration' => isset( $props['registration'] ) ? wp_kses( wp_unslash( $props['registration'] ), $this->allowed_html ) : '',
'name' => sanitize_text_field( wp_unslash( $props['name'] ) ),
'policy-page' => isset( $props['policy-page'] ) ? absint( $props['policy-page'] ) : 0,
'policy-page-url' => isset( $props['policy-page-url'] ) ? sanitize_text_field( $props['policy-page-url'] ) : '',
'description' => isset( $props['description'] ) ? wp_kses( wp_unslash( $props['description'] ), $this->allowed_html ) : '',
'registration' => isset( $props['registration'] ) ? wp_kses( wp_unslash( $props['registration'] ), $this->allowed_html ) : '',
);
}
return $output;
Expand Down
3 changes: 3 additions & 0 deletions admin/partials/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,12 +382,15 @@
</label>
</th>
<td>
<input type="text" placeholder="Policy Page URL" name="gdpr_consent_types[<?php echo esc_attr( $consent_id ); ?>][policy-page-url]" id="consent-policy-page-url-<?php echo esc_attr( $consent_id ); ?>" value="<?php echo esc_attr( $consent['policy-page-url'] ); ?>" />
OR
<select name="gdpr_consent_types[<?php echo esc_attr( $consent_id ); ?>][policy-page]" id="consent-policy-page-<?php echo esc_attr( $consent_id ); ?>">
<option value=""></option>
<?php foreach ( $pages as $page ) : ?>
<option value="<?php echo esc_attr( $page->ID ); ?>" <?php selected( $consent['policy-page'], $page->ID ); ?>><?php echo esc_html( $page->post_title ); ?></option>
<?php endforeach ?>
</select>

</td>
</tr>
<tr>
Expand Down
2 changes: 2 additions & 0 deletions admin/partials/templates/tmpl-consents.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
</label>
</th>
<td>
<input type="text" placeholder="Policy Page URL" name="gdpr_consent_types[{{data.key}}][policy-page-url]" />
OR
<select name="gdpr_consent_types[{{data.key}}][policy-page]" id="consent-policy-page-{{data.key}}">
<option value=""></option>
<?php foreach ( $pages as $cpage ) : ?>
Expand Down
7 changes: 4 additions & 3 deletions templates/privacy-preferences-modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,12 @@
<?php if ( ! empty( $args['consent_types'] ) ) : ?>
<?php foreach ( $args['consent_types'] as $consent_key => $gdpr_type ) : ?>
<?php
if ( ! $gdpr_type['policy-page'] ) {
if ( ! $gdpr_type['policy-page'] && ! $gdpr_type['policy-page-url'] ) {
continue;
}
$policy_page = ( ! empty ( $gdpr_type['policy-page-url'] ) ) ? $gdpr_type['policy-page-url'] : get_permalink( $gdpr_type['policy-page'] );
?>
<li><a href="<?php echo esc_url( get_permalink( $gdpr_type['policy-page'] ) ); ?>" target="_blank"><?php echo esc_html( $gdpr_type['name'] ); ?></a></li>
<li><a href="<?php echo esc_url( $policy_page ); ?>" target="_blank"><?php echo esc_html( $gdpr_type['name'] ); ?></a></li>
<?php endforeach; ?>
<?php endif; ?>
</ul>
Expand All @@ -71,7 +72,7 @@
<div class="gdpr-cookies-used">
<div class="gdpr-cookie-title">
<p><?php echo esc_html( $gdpr_type['name'] ); ?></p>
<?php if ( $gdpr_type['policy-page'] ) : ?>
<?php if ( $gdpr_type['policy-page'] || $gdpr_type['policy-page-url'] ) : ?>
<span class="gdpr-always-active"><?php esc_html_e( 'Required', 'gdpr' ); ?></span>
<input type="hidden" name="user_consents[]" value="<?php echo esc_attr( $consent_key ); ?>" style="display:none;">
<?php else : ?>
Expand Down