From d1e14bb3196e62b7c4c18e9c3da9710c8457f5e1 Mon Sep 17 00:00:00 2001
From: Fernando Claussen <fernandoclaussen@gmail.com>
Date: Tue, 5 Jun 2018 10:23:07 -0400
Subject: [PATCH 1/2] Adding a soft opt-in cookie status option.

---
 admin/partials/settings.php               | 9 +++++----
 admin/partials/templates/tmpl-cookies.php | 9 +++++----
 public/class-gdpr-public.php              | 2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/admin/partials/settings.php b/admin/partials/settings.php
index 4a09fabc..dd21a6f9 100755
--- a/admin/partials/settings.php
+++ b/admin/partials/settings.php
@@ -234,8 +234,8 @@
 								<th>
 									<label for="status-<?php echo esc_attr( $cat_id ); ?>">
 										<?php esc_html_e( 'Status', 'gdpr' ); ?>:<span class="gdpr-required">*</span>
-										<span class="screen-reader-text"><?php esc_attr_e( 'Required cookies are cookies that cannot be opted out of and need to be created for the site to function properly. The ON status means that the cookie preference for this category will be enabled by default. The OFF status means the user needs to manually turn these cookies on to opt into these cookies.', 'gdpr' ); ?></span>
-										<span data-tooltip="<?php esc_attr_e( 'Required cookies are cookies that cannot be opted out of and need to be created for the site to function properly. The ON status means that the cookie preference for this category will be enabled by default. The OFF status means the user needs to manually turn these cookies on to opt into these cookies.', 'gdpr' ); ?>">
+										<span class="screen-reader-text"><?php esc_attr_e( 'Required cookies are cookies that cannot be opt out. They need to be created for the site to function properly. Soft opt-in will be allow cookies on first landing but can be opted-out. Checked means that the cookie category will be checked and will be set after agreement. Unchecked means the user needs to manually toggle the category on to allow these cookies.', 'gdpr' ); ?></span>
+										<span data-tooltip="<?php esc_attr_e( 'Required cookies are cookies that cannot be opt out. They need to be created for the site to function properly. Soft opt-in will be allow cookies on first landing but can be opted-out. Checked means that the cookie category will be checked and will be set after agreement. Unchecked means the user needs to manually toggle the category on to allow these cookies.', 'gdpr' ); ?>">
 											<span class="dashicons dashicons-info"></span>
 										</span>
 									</label>
@@ -244,8 +244,9 @@
 									<select name="gdpr_cookie_popup_content[<?php echo esc_attr( $cat_id ); ?>][status]" id="status-<?php echo esc_attr( $cat_id ); ?>" required>
 										<option value=""></option>
 										<option value="required" <?php selected( isset( $registered_cookies[ $cat_id ]['status'] ) ? $registered_cookies[ $cat_id ]['status'] : '', 'required' ); ?>><?php esc_html_e( 'Required', 'gdpr' ); ?></option>
-										<option value="on" <?php selected( isset( $registered_cookies[ $cat_id ]['status'] ) ? $registered_cookies[ $cat_id ]['status'] : '', 'on' ); ?>><?php esc_html_e( 'ON', 'gdpr' ); ?></option>
-										<option value="off" <?php selected( isset( $registered_cookies[ $cat_id ]['status'] ) ? $registered_cookies[ $cat_id ]['status'] : '', 'off' ); ?>><?php esc_html_e( 'OFF', 'gdpr' ); ?></option>
+										<option value="soft" <?php selected( isset( $registered_cookies[ $cat_id ]['status'] ) ? $registered_cookies[ $cat_id ]['status'] : '', 'soft' ); ?>><?php esc_html_e( 'Soft Opt-in', 'gdpr' ); ?></option>
+										<option value="on" <?php selected( isset( $registered_cookies[ $cat_id ]['status'] ) ? $registered_cookies[ $cat_id ]['status'] : '', 'on' ); ?>><?php esc_html_e( 'Checked', 'gdpr' ); ?></option>
+										<option value="off" <?php selected( isset( $registered_cookies[ $cat_id ]['status'] ) ? $registered_cookies[ $cat_id ]['status'] : '', 'off' ); ?>><?php esc_html_e( 'Unchecked', 'gdpr' ); ?></option>
 									</select>
 								</td>
 							</tr>
diff --git a/admin/partials/templates/tmpl-cookies.php b/admin/partials/templates/tmpl-cookies.php
index 162c454a..937970bc 100644
--- a/admin/partials/templates/tmpl-cookies.php
+++ b/admin/partials/templates/tmpl-cookies.php
@@ -21,8 +21,8 @@
 					<th>
 						<label for="status-{{data.key}}">
 							<?php esc_html_e( 'Status', 'gdpr' ); ?>:<span class="gdpr-required">*</span>
-							<span class="screen-reader-text"><?php esc_attr_e( 'Required cookies are cookies that cannot be opt out. They need to be created for the site to function properly. Status ON means that the cookie will be set after agreement. Status OFF means the user needs to check the checkbox to activate this category.', 'gdpr' ); ?></span>
-							<span data-tooltip="<?php esc_attr_e( 'Required cookies are cookies that cannot be opt out. They need to be created for the site to function properly. Status ON means that the cookie will be set after agreement. Status OFF means the user needs to check the checkbox to activate this category.', 'gdpr' ); ?>">
+							<span class="screen-reader-text"><?php esc_attr_e( 'Required cookies are cookies that cannot be opt out. They need to be created for the site to function properly. Soft opt-in will be allow cookies on first landing but can be opted-out. Checked means that the cookie category will be checked and will be set after agreement. Unchecked means the user needs to manually toggle the category on to allow these cookies.', 'gdpr' ); ?></span>
+							<span data-tooltip="<?php esc_attr_e( 'Required cookies are cookies that cannot be opt out. They need to be created for the site to function properly. Soft opt-in will be allow cookies on first landing but can be opted-out. Checked means that the cookie category will be checked and will be set after agreement. Unchecked means the user needs to manually toggle the category on to allow these cookies.', 'gdpr' ); ?>">
 								<span class="dashicons dashicons-info"></span>
 							</span>
 						</label>
@@ -31,8 +31,9 @@
 						<select name="gdpr_cookie_popup_content[{{data.key}}][status]" id="status-{{data.key}}" required>
 							<option value=""></option>
 							<option value="required"><?php esc_html_e( 'Required', 'gdpr' ); ?></option>
-							<option value="on"><?php esc_html_e( 'ON', 'gdpr' ); ?></option>
-							<option value="off"><?php esc_html_e( 'OFF', 'gdpr' ); ?></option>
+							<option value="soft"><?php esc_html_e( 'Soft Opt-in', 'gdpr' ); ?></option>
+							<option value="on"><?php esc_html_e( 'Checked', 'gdpr' ); ?></option>
+							<option value="off"><?php esc_html_e( 'Unchecked', 'gdpr' ); ?></option>
 						</select>
 					</td>
 				</tr>
diff --git a/public/class-gdpr-public.php b/public/class-gdpr-public.php
index 03792f70..aedb37af 100755
--- a/public/class-gdpr-public.php
+++ b/public/class-gdpr-public.php
@@ -352,7 +352,7 @@ public function set_plugin_cookies() {
 			if ( ! empty( $registered_cookies ) ) {
 				$required_cookies = array_filter(
 					$registered_cookies, function( $item ) {
-						return 'required' === $item['status'];
+						return 'required' === $item['status'] || 'soft' === $item['status'];
 					}
 				);
 				if ( ! empty( $required_cookies ) ) {

From 41bf4066f2204e6870b9194b07ac9799c4ed95e7 Mon Sep 17 00:00:00 2001
From: Fernando Claussen <fernandoclaussen@gmail.com>
Date: Tue, 5 Jun 2018 10:26:17 -0400
Subject: [PATCH 2/2] Text revision

---
 admin/partials/settings.php               | 4 ++--
 admin/partials/templates/tmpl-cookies.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/partials/settings.php b/admin/partials/settings.php
index dd21a6f9..8f8ccd02 100755
--- a/admin/partials/settings.php
+++ b/admin/partials/settings.php
@@ -234,8 +234,8 @@
 								<th>
 									<label for="status-<?php echo esc_attr( $cat_id ); ?>">
 										<?php esc_html_e( 'Status', 'gdpr' ); ?>:<span class="gdpr-required">*</span>
-										<span class="screen-reader-text"><?php esc_attr_e( 'Required cookies are cookies that cannot be opt out. They need to be created for the site to function properly. Soft opt-in will be allow cookies on first landing but can be opted-out. Checked means that the cookie category will be checked and will be set after agreement. Unchecked means the user needs to manually toggle the category on to allow these cookies.', 'gdpr' ); ?></span>
-										<span data-tooltip="<?php esc_attr_e( 'Required cookies are cookies that cannot be opt out. They need to be created for the site to function properly. Soft opt-in will be allow cookies on first landing but can be opted-out. Checked means that the cookie category will be checked and will be set after agreement. Unchecked means the user needs to manually toggle the category on to allow these cookies.', 'gdpr' ); ?>">
+										<span class="screen-reader-text"><?php esc_attr_e( 'Required cookies are cookies that cannot be opted out of and are needed for the site to function properly. Soft opt-in will allow cookies on first landing but can be opted-out of. Checked means that the cookie category will be checked by default and will be set after the user agrees to them. Unchecked means the user needs to manually toggle the category on to allow these cookies.', 'gdpr' ); ?></span>
+										<span data-tooltip="<?php esc_attr_e( 'Required cookies are cookies that cannot be opted out of and are needed for the site to function properly. Soft opt-in will allow cookies on first landing but can be opted-out of. Checked means that the cookie category will be checked by default and will be set after the user agrees to them. Unchecked means the user needs to manually toggle the category on to allow these cookies.', 'gdpr' ); ?>">
 											<span class="dashicons dashicons-info"></span>
 										</span>
 									</label>
diff --git a/admin/partials/templates/tmpl-cookies.php b/admin/partials/templates/tmpl-cookies.php
index 937970bc..790d45fa 100644
--- a/admin/partials/templates/tmpl-cookies.php
+++ b/admin/partials/templates/tmpl-cookies.php
@@ -21,8 +21,8 @@
 					<th>
 						<label for="status-{{data.key}}">
 							<?php esc_html_e( 'Status', 'gdpr' ); ?>:<span class="gdpr-required">*</span>
-							<span class="screen-reader-text"><?php esc_attr_e( 'Required cookies are cookies that cannot be opt out. They need to be created for the site to function properly. Soft opt-in will be allow cookies on first landing but can be opted-out. Checked means that the cookie category will be checked and will be set after agreement. Unchecked means the user needs to manually toggle the category on to allow these cookies.', 'gdpr' ); ?></span>
-							<span data-tooltip="<?php esc_attr_e( 'Required cookies are cookies that cannot be opt out. They need to be created for the site to function properly. Soft opt-in will be allow cookies on first landing but can be opted-out. Checked means that the cookie category will be checked and will be set after agreement. Unchecked means the user needs to manually toggle the category on to allow these cookies.', 'gdpr' ); ?>">
+							<span class="screen-reader-text"><?php esc_attr_e( 'Required cookies are cookies that cannot be opted out of and are needed for the site to function properly. Soft opt-in will allow cookies on first landing but can be opted-out of. Checked means that the cookie category will be checked by default and will be set after the user agrees to them. Unchecked means the user needs to manually toggle the category on to allow these cookies.', 'gdpr' ); ?></span>
+							<span data-tooltip="<?php esc_attr_e( 'Required cookies are cookies that cannot be opted out of and are needed for the site to function properly. Soft opt-in will allow cookies on first landing but can be opted-out of. Checked means that the cookie category will be checked by default and will be set after the user agrees to them. Unchecked means the user needs to manually toggle the category on to allow these cookies.', 'gdpr' ); ?>">
 								<span class="dashicons dashicons-info"></span>
 							</span>
 						</label>