From 8cfd45c71efd08cd5f887d3b407888b47811a8ce Mon Sep 17 00:00:00 2001
From: Moutushi <mmandal@trewknowledge.com>
Date: Tue, 2 Jun 2020 13:38:57 -0400
Subject: [PATCH] Added policy page url for consent

---
 admin/class-gdpr-admin.php                 | 10 ++++++----
 admin/partials/settings.php                |  3 +++
 admin/partials/templates/tmpl-consents.php |  2 ++
 templates/privacy-preferences-modal.php    |  7 ++++---
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/admin/class-gdpr-admin.php b/admin/class-gdpr-admin.php
index 87011773..e1fc8f10 100755
--- a/admin/class-gdpr-admin.php
+++ b/admin/class-gdpr-admin.php
@@ -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;
diff --git a/admin/partials/settings.php b/admin/partials/settings.php
index 38247013..76cc4263 100755
--- a/admin/partials/settings.php
+++ b/admin/partials/settings.php
@@ -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>
diff --git a/admin/partials/templates/tmpl-consents.php b/admin/partials/templates/tmpl-consents.php
index 0985ac56..d8e2d7ef 100644
--- a/admin/partials/templates/tmpl-consents.php
+++ b/admin/partials/templates/tmpl-consents.php
@@ -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 ) : ?>
diff --git a/templates/privacy-preferences-modal.php b/templates/privacy-preferences-modal.php
index 287fd757..4bb0ae8f 100755
--- a/templates/privacy-preferences-modal.php
+++ b/templates/privacy-preferences-modal.php
@@ -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>
@@ -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 : ?>