From 0536a9d6cf956b8a19302fe01ca18058db3613fa Mon Sep 17 00:00:00 2001
From: stodorovic <sasa.todorovic@gmx.com>
Date: Fri, 21 Sep 2018 09:05:34 +0200
Subject: [PATCH 1/2] [Testing] Support for plugin GDPR

---
 plugins/gdpr.php | 110 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 plugins/gdpr.php

diff --git a/plugins/gdpr.php b/plugins/gdpr.php
new file mode 100644
index 00000000..94152996
--- /dev/null
+++ b/plugins/gdpr.php
@@ -0,0 +1,110 @@
+<?php
+
+global $cache_gdpr, $wp_cache_not_logged_in, $wp_cache_saved_not_logged_in;
+
+if ( 1 === $cache_gdpr ) {
+	add_cacheaction( 'wp_cache_get_cookies_values', 'wpsc_gdpr_get_cookies_values' );
+
+	/**
+	 * Forces caching (for "known" users) because it doesn't work if get_cookies returns non-empty string.
+	 * PR #616 fixes this issue. It's temporary workaround for testing purpose.
+	 */
+	if ( ! is_admin() && isset( $_COOKIE['gdpr'] ) ) {
+		$wp_cache_saved_not_logged_in = $wp_cache_not_logged_in;
+		$wp_cache_not_logged_in       = 0;
+	}
+}
+
+function wpsc_gdpr_actions() {
+	global $cache_gdpr, $wp_cache_not_logged_in, $wp_cache_saved_not_logged_in;
+
+	if ( 1 !== $cache_gdpr ) {
+		return;
+	}
+
+	// Set previous value - caching for "know" users.
+	if ( is_user_logged_in() && ! empty( $wp_cache_saved_not_logged_in ) ) {
+		$wp_cache_not_logged_in = $wp_cache_saved_not_logged_in;
+	}
+}
+add_cacheaction( 'add_cacheaction', 'wpsc_gdpr_actions' );
+
+function wpsc_gdpr_get_cookies_values( $string ) {
+	global $super_cache_enabled;
+
+	// Extracts consent_types.
+	if ( isset( $_COOKIE['gdpr']['consent_types'] ) ) {
+		$cookie_consents = (array) json_decode( stripslashes( $_COOKIE['gdpr']['consent_types'] ) ); // WPCS: Input var ok, sanitization ok.
+
+		if ( ! empty( $cookie_consents ) ) {
+			$string             .= 'gdpr_consents_types=' . implode( '|', $cookie_consents );
+			$super_cache_enabled = false; // Create only wp-cache file.
+		}
+	}
+
+	// Extracts allowed_cookies.
+	if ( isset( $_COOKIE['gdpr']['allowed_cookies'] ) ) {
+		$allowed_cookies = (array) json_decode( stripslashes( $_COOKIE['gdpr']['allowed_cookies'] ) ); // WPCS: Input var ok, sanitization ok.
+
+		if ( ! empty( $allowed_cookies ) ) {
+			$string             .= 'gdpr_allowed_cookies =' . implode( '|', $allowed_cookies );
+			$super_cache_enabled = false; // Create only wp-cache file.
+		}
+	}
+
+	return $string;
+}
+
+function wp_supercache_gdpr_admin() {
+	global $cache_gdpr, $wp_cache_config_file, $valid_nonce;
+
+	$requested_state = isset( $_POST['cache_gdpr'] ) ? (int) $_POST['cache_gdpr'] : null; // WPCS: CSRF ok.
+	$cache_gdpr      = (int) $cache_gdpr;
+
+	$changed = false;
+	if ( null !== $requested_state && $valid_nonce ) {
+		$cache_gdpr = $requested_state;
+
+		wp_cache_replace_line( '^\s*\$cache_gdpr\s*=', '$cache_gdpr = ' . intval( $cache_gdpr ) . ';', $wp_cache_config_file );
+		$changed = true;
+	}
+
+	$id = 'gdpr-section';
+	?>
+	<fieldset id="<?php echo esc_attr( $id ); ?>" class="options">
+
+		<h4><?php esc_html_e( 'GDPR', 'wp-super-cache' ); ?></h4>
+
+		<form name="wp_manager" action="" method="post">
+		<label><input type="radio" name="cache_gdpr" value="1" <?php checked( $cache_gdpr ); ?>/> <?php esc_html_e( 'Enabled', 'wp-super-cache' ); ?></label>
+		<label><input type="radio" name="cache_gdpr" value="0" <?php checked( ! $cache_gdpr ); ?>/> <?php esc_html_e( 'Disabled', 'wp-super-cache' ); ?></label>
+		<?php
+		echo '<p>' . esc_html__( 'Provides support for GDPR plugin', 'wp-super-cache' ) . '</p>';
+
+		if ( $changed ) {
+			echo '<p><strong>' . sprintf(
+				esc_html__( 'GDPR support is now %s', 'wp-super-cache' ),
+				esc_html( $cache_gdpr ? __( 'enabled', 'wp-super-cache' ) : __( 'disabled', 'wp-super-cache' ) )
+			) . '</strong></p>';
+		}
+
+		echo '<div class="submit"><input class="button-primary" ' . SUBMITDISABLED . 'type="submit" value="' . esc_html__( 'Update', 'wp-super-cache' ) . '" /></div>';
+		wp_nonce_field( 'wp-cache' );
+		?>
+		</form>
+
+	</fieldset>
+	<?php
+}
+add_cacheaction( 'cache_admin_page', 'wp_supercache_gdpr_admin' );
+
+function wpsc_gdpr_list( $list ) {
+	$list['gdpr'] = array(
+		'key'   => 'gdpr',
+		'url'   => 'https://wordpress.org/plugins/gdpr/',
+		'title' => esc_html__( 'GDPR', 'wp-super-cache' ),
+		'desc'  => esc_html__( 'Provides support for GDPR plugin', 'wp-super-cache' ),
+	);
+	return $list;
+}
+add_cacheaction( 'wpsc_filter_list', 'wpsc_gdpr_list' );

From 1268566d1941e538276c811ed735b31cb265cf04 Mon Sep 17 00:00:00 2001
From: stodorovic <sasa.todorovic@gmx.com>
Date: Fri, 21 Sep 2018 14:22:07 +0200
Subject: [PATCH 2/2] Adds support for wp-gdpr-compliance

---
 plugins/gdpr.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/plugins/gdpr.php b/plugins/gdpr.php
index 94152996..de710726 100644
--- a/plugins/gdpr.php
+++ b/plugins/gdpr.php
@@ -9,7 +9,7 @@
 	 * Forces caching (for "known" users) because it doesn't work if get_cookies returns non-empty string.
 	 * PR #616 fixes this issue. It's temporary workaround for testing purpose.
 	 */
-	if ( ! is_admin() && isset( $_COOKIE['gdpr'] ) ) {
+	if ( ! is_admin() && ( isset( $_COOKIE['gdpr'] ) || isset( $_COOKIE['wpgdprc-consent'] ) ) ) {
 		$wp_cache_saved_not_logged_in = $wp_cache_not_logged_in;
 		$wp_cache_not_logged_in       = 0;
 	}
@@ -37,7 +37,7 @@ function wpsc_gdpr_get_cookies_values( $string ) {
 		$cookie_consents = (array) json_decode( stripslashes( $_COOKIE['gdpr']['consent_types'] ) ); // WPCS: Input var ok, sanitization ok.
 
 		if ( ! empty( $cookie_consents ) ) {
-			$string             .= 'gdpr_consents_types=' . implode( '|', $cookie_consents );
+			$string             .= 'gdpr_consents_types=' . implode( '|', $cookie_consents ) . ',';
 			$super_cache_enabled = false; // Create only wp-cache file.
 		}
 	}
@@ -47,7 +47,17 @@ function wpsc_gdpr_get_cookies_values( $string ) {
 		$allowed_cookies = (array) json_decode( stripslashes( $_COOKIE['gdpr']['allowed_cookies'] ) ); // WPCS: Input var ok, sanitization ok.
 
 		if ( ! empty( $allowed_cookies ) ) {
-			$string             .= 'gdpr_allowed_cookies =' . implode( '|', $allowed_cookies );
+			$string             .= 'gdpr_allowed_cookies=' . implode( '|', $allowed_cookies ) . ',';
+			$super_cache_enabled = false; // Create only wp-cache file.
+		}
+	}
+
+	// Extracts wpgdprc-consent.
+	if ( isset( $_COOKIE['wpgdprc-consent'] ) ) {
+		$consents = is_string( $_COOKIE['wpgdprc-consent'] ) ? stripslashes( $_COOKIE['wpgdprc-consent'] ) : ''; // WPCS: Input var ok, sanitization ok.
+
+		if ( ! empty( $consents ) ) {
+			$string             .= 'gdpr_consents=' . $consents . ',';
 			$super_cache_enabled = false; // Create only wp-cache file.
 		}
 	}