Cookiebot | GDPR Compliant Cookie Consent and Notice - Version 3.1.0

Version Description

Download this release

Release Info

Developer cookiebot
Plugin Icon 128x128 Cookiebot | GDPR Compliant Cookie Consent and Notice
Version 3.1.0
Comparing to
See all releases

Code changes from version 3.0.1 to 3.1.0

Files changed (4) hide show
  1. addons/controller/plugin-controller.php +4 -0
  2. addons/cookiebot-addons-init.php +1 -2
  3. cookiebot.php +23 -11
  4. readme.txt +5 -1
addons/controller/plugin-controller.php CHANGED
@@ -60,6 +60,10 @@ class Plugin_Controller {
60
  return;
61
  }
62
 
 
 
 
 
63
  /**
64
  * Check plugins one by one and load configuration if it is active
65
  *
60
  return;
61
  }
62
 
63
+ if( \Cookiebot_WP::cookiebot_disabled_in_admin() === true && is_admin() ) {
64
+ return;
65
+ }
66
+
67
  /**
68
  * Check plugins one by one and load configuration if it is active
69
  *
addons/cookiebot-addons-init.php CHANGED
@@ -23,7 +23,7 @@ define( 'COOKIEBOT_ADDONS_BASE_NAME', dirname( plugin_basename( __FILE__ ) ) );
23
  /**
24
  * Same version as the CookiebotWP
25
  */
26
- define( 'COOKIEBOT_ADDONS_VERSION', '3.0.1' );
27
 
28
  /**
29
  * Register autoloader to load files/classes dynamically
@@ -117,7 +117,6 @@ class Cookiebot_Addons {
117
  new Plugin_Controller( $this->container->get( 'Settings_Service_Interface' ) ),
118
  'load_active_addons',
119
  ) );
120
-
121
  /**
122
  * Load settings config
123
  *
23
  /**
24
  * Same version as the CookiebotWP
25
  */
26
+ define( 'COOKIEBOT_ADDONS_VERSION', '3.1.0' );
27
 
28
  /**
29
  * Register autoloader to load files/classes dynamically
117
  new Plugin_Controller( $this->container->get( 'Settings_Service_Interface' ) ),
118
  'load_active_addons',
119
  ) );
 
120
  /**
121
  * Load settings config
122
  *
cookiebot.php CHANGED
@@ -4,7 +4,7 @@ Plugin Name: Cookiebot | GDPR Compliant Cookie Consent and Notice
4
  Plugin URI: https://cookiebot.com/
5
  Description: Cookiebot is a fully GDPR & ePrivacy compliant cookie consent solution supporting prior consent, cookie declaration, and documentation of consents. Easy to install, implement and configure.
6
  Author: Cybot A/S
7
- Version: 3.0.1
8
  Author URI: http://cookiebot.com
9
  Text Domain: cookiebot
10
  Domain Path: /langs
@@ -75,9 +75,11 @@ final class Cookiebot_WP {
75
  if($this->get_cbid() == '') {
76
  if(is_multisite()) {
77
  update_site_option('cookiebot-cookie-blocking-mode','auto');
 
78
  }
79
  else {
80
  update_option('cookiebot-cookie-blocking-mode','auto');
 
81
  }
82
  }
83
  }
@@ -150,14 +152,7 @@ final class Cookiebot_WP {
150
  add_action('admin_init', array($this,'save_notice_link'));
151
 
152
  //Check if we should show cookie consent banner on admin pages
153
- $addJSAdmin = true;
154
- if(is_multisite() && get_site_option('cookiebot-nooutput-admin',false)) {
155
- $addJSAdmin = false;
156
- }
157
- elseif(get_option('cookiebot-nooutput-admin',false)) {
158
- $addJSAdmin = false;
159
- }
160
- if($addJSAdmin) {
161
  //adding cookie banner in admin area too
162
  add_action('admin_head', array($this,'add_js'),-9999);
163
  }
@@ -683,7 +678,7 @@ final class Cookiebot_WP {
683
  </td>
684
  </tr>
685
  <tr valign="top">
686
- <th scope="row"><?php _e('Hide Cookie Popup in WP Admin','cookiebot'); ?></th>
687
  <td>
688
  <?php
689
  $disabled = false;
@@ -699,7 +694,7 @@ final class Cookiebot_WP {
699
  ?>
700
  <p class="description">
701
  <?php if($disabled) { echo '<b>'._('Network setting applied. Please contact website administrator to change this setting.').'</b><br />'; } ?>
702
- <b><?php _e('This checkbox will remove the cookie consent banner the Wordpress Admin area.','cookiebot') ?></b>
703
  </p>
704
  </td>
705
  </tr>
@@ -1115,6 +1110,23 @@ final class Cookiebot_WP {
1115
  return $cbm;
1116
  }
1117
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1118
  /**
1119
  * Cookiebot_WP Get the language code for Cookiebot
1120
  *
4
  Plugin URI: https://cookiebot.com/
5
  Description: Cookiebot is a fully GDPR & ePrivacy compliant cookie consent solution supporting prior consent, cookie declaration, and documentation of consents. Easy to install, implement and configure.
6
  Author: Cybot A/S
7
+ Version: 3.1.0
8
  Author URI: http://cookiebot.com
9
  Text Domain: cookiebot
10
  Domain Path: /langs
75
  if($this->get_cbid() == '') {
76
  if(is_multisite()) {
77
  update_site_option('cookiebot-cookie-blocking-mode','auto');
78
+ update_site_option('cookiebot-nooutput-admin',true);
79
  }
80
  else {
81
  update_option('cookiebot-cookie-blocking-mode','auto');
82
+ update_option('cookiebot-nooutput-admin',true);
83
  }
84
  }
85
  }
152
  add_action('admin_init', array($this,'save_notice_link'));
153
 
154
  //Check if we should show cookie consent banner on admin pages
155
+ if(!$this->cookiebot_disabled_in_admin()) {
 
 
 
 
 
 
 
156
  //adding cookie banner in admin area too
157
  add_action('admin_head', array($this,'add_js'),-9999);
158
  }
678
  </td>
679
  </tr>
680
  <tr valign="top">
681
+ <th scope="row"><?php _e('Disable Cookiebot in WP Admin','cookiebot'); ?></th>
682
  <td>
683
  <?php
684
  $disabled = false;
694
  ?>
695
  <p class="description">
696
  <?php if($disabled) { echo '<b>'._('Network setting applied. Please contact website administrator to change this setting.').'</b><br />'; } ?>
697
+ <b><?php _e('This checkbox will disable Cookiebot in the Wordpress Admin area.','cookiebot') ?></b>
698
  </p>
699
  </td>
700
  </tr>
1110
  return $cbm;
1111
  }
1112
 
1113
+
1114
+ /**
1115
+ * Cookiebot_WP Check if Cookiebot is active in admin
1116
+ *
1117
+ * @version 3.1.0
1118
+ * @since 3.1.0
1119
+ */
1120
+ public static function cookiebot_disabled_in_admin() {
1121
+ if(is_multisite() && get_site_option('cookiebot-nooutput-admin',false)) {
1122
+ return true;
1123
+ }
1124
+ elseif(get_option('cookiebot-nooutput-admin',false)) {
1125
+ return true;
1126
+ }
1127
+ return false;
1128
+ }
1129
+
1130
  /**
1131
  * Cookiebot_WP Get the language code for Cookiebot
1132
  *
readme.txt CHANGED
@@ -3,7 +3,7 @@
3
  * Tags: cookie, compliance, eu, gdpr, europe, cookie consent, consent
4
  * Requires at least: 4.4
5
  * Tested up to: 5.2
6
- * Stable tag: 3.0.1
7
  * Requires PHP: 5.6
8
  * License: GPLv2 or later
9
 
@@ -164,6 +164,10 @@ Cookiebot works with GTM, however you need to enable the "Hide Cookie Popup" opt
164
 
165
  ## Changelog ##
166
 
 
 
 
 
167
  ### 3.0.1 - 2019-09-17 ###
168
  * Clean up setting page
169
  * Fixing failing addons after plugin updates
3
  * Tags: cookie, compliance, eu, gdpr, europe, cookie consent, consent
4
  * Requires at least: 4.4
5
  * Tested up to: 5.2
6
+ * Stable tag: 3.1.0
7
  * Requires PHP: 5.6
8
  * License: GPLv2 or later
9
 
164
 
165
  ## Changelog ##
166
 
167
+ ### 3.1.0 - 2019-09-24 ###
168
+ * Change option to hide cookie banner in WP Admin to instead disabling Cookiebot
169
+ * Set option to disable Cookiebot banner as default for new installs
170
+
171
  ### 3.0.1 - 2019-09-17 ###
172
  * Clean up setting page
173
  * Fixing failing addons after plugin updates