Skip to content

Commit eba576d

Browse files
authored
Merge pull request #354 from CybotAS/v4.6.1
v4.6.1
2 parents ff950d1 + 94fbdb0 commit eba576d

File tree

17 files changed

+202
-48
lines changed

17 files changed

+202
-48
lines changed

assets/css/backend/addons_page.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
text-align: center;
5252
line-height: initial;
5353
cursor: pointer;
54+
white-space: normal;
55+
word-wrap: break-word;
56+
overflow-wrap: break-word;
5457
}
5558

5659
.cb-settings__tabs__item.nav-tab-active:hover {

assets/css/backend/dashboard-old.css

Lines changed: 78 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,33 @@
2727

2828
.cb-main__dashboard__card:not(:last-child) {
2929
width: 100%;
30-
display: grid;
3130
margin-bottom: 30px;
3231
}
3332

3433
.cb-main__dashboard__card__cookiebot {
3534
width: 100%;
36-
display: grid;
35+
}
36+
.cb-main__dashboard__card__cookiebot--flex {
37+
display: flex;
38+
flex-direction: column;
39+
height: 100%;
40+
width: 100%;
41+
}
42+
43+
.cb-main__dashboard__card__cookiebot--flex .cb-main__card__inner {
44+
flex: 1;
45+
}
46+
.cb-main__dashboard__card__cookiebot--flex .cb-main__card__subtitle {
47+
margin-top: 16px;
48+
font-size: 18px;
49+
}
50+
.cb-main__dashboard__card__cookiebot--flex .cb-main__card__subtitle a{
51+
font-weight: 700;
52+
font-size: 18px;
53+
margin-top: 0;
54+
}
55+
.cb-main__dashboard__card__cookiebot--flex .cb-main__card__subtitle a:hover{
56+
text-decoration: underline;
3757
}
3858

3959
.cb-main__card__inner {
@@ -52,6 +72,57 @@
5272
padding: 0;
5373
}
5474

75+
.cb-main__card__inner.setup-steps {
76+
background-color: #efefef;
77+
padding: 30px;
78+
}
79+
80+
.setup-steps-title {
81+
color: #141414 !important;
82+
font-size: 24px !important;
83+
line-height: 1.3;
84+
margin-bottom: 20px !important;
85+
max-width: 100% !important;
86+
}
87+
88+
.cb-setup-steps-list {
89+
margin: 0;
90+
padding-left: 0;
91+
list-style: none;
92+
counter-reset: step-counter;
93+
}
94+
95+
.cb-setup-steps-list li {
96+
font-size: 16px;
97+
line-height: 1.6;
98+
color: #141414;
99+
margin-bottom: 16px;
100+
padding-left: 45px;
101+
position: relative;
102+
counter-increment: step-counter;
103+
}
104+
105+
.cb-setup-steps-list li:last-child {
106+
margin-bottom: 0;
107+
}
108+
109+
.cb-setup-steps-list li::before {
110+
content: counter(step-counter);
111+
position: absolute;
112+
left: 0;
113+
top: -0.2em;
114+
width: 30px;
115+
height: 30px;
116+
background-color: #1032cf;
117+
color: #ffffff;
118+
border-radius: 50%;
119+
display: flex;
120+
align-items: center;
121+
justify-content: center;
122+
font-weight: 700;
123+
font-size: 14px;
124+
}
125+
55126
.cb-main__card__inner.account_card {
56127
position: relative;
57128
background-image: url(../../img/existing-account.png);
@@ -156,6 +227,11 @@
156227
color: #ffffff;
157228
}
158229

230+
.account_card .cb-main__card__label {
231+
background-color: #1032cf;
232+
color: #ffffff;
233+
}
234+
159235
.start_card .cb-main__card__label {
160236
background-color: #00C6FB;
161237
color: #141414;

assets/css/backend/settings-page.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@
6969
font-weight: 600;
7070
text-align: center;
7171
cursor: pointer;
72+
white-space: normal;
73+
word-wrap: break-word;
74+
overflow-wrap: break-word;
7275
}
7376

7477
.cb-settings__tabs__item.active-item, .cb-settings__tabs__item:hover {

assets/js/backend/network-settings-page.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ function show_ruleset_selector() {
6666
const cbidCheck = jQuery( '.cookiebot-cbid-check' );
6767
const cbidRulesetSelector = jQuery('#cookiebot-ruleset-id-selector');
6868
const cbidSubmit = jQuery('.cookiebot-cbid-container p.submit #submit');
69+
const cbidError = jQuery('.cookiebot-cbid-error');
6970

7071
cbidCheck.removeClass('check-progress');
7172
cbidField.removeClass('check-progress');
@@ -74,9 +75,23 @@ function show_ruleset_selector() {
7475
cbidCheck.removeClass('check-pass');
7576
cbidRulesetSelector.addClass('hidden');
7677
cbidSubmit.addClass('disabled');
78+
cbidError.addClass('hidden');
7779
return;
7880
}
7981

82+
// Validate that the field has exactly 14 or 36 characters
83+
const fieldLength = cbidField.val().length;
84+
if(fieldLength !== 14 && fieldLength !== 36){
85+
cbidCheck.removeClass('check-pass');
86+
cbidRulesetSelector.addClass('hidden');
87+
cbidSubmit.addClass('disabled');
88+
cbidError.removeClass('hidden');
89+
return;
90+
}
91+
92+
// Valid input - hide error message
93+
cbidError.addClass('hidden');
94+
8095
!check_id_frame() ? cbidRulesetSelector.removeClass('hidden') : cbidRulesetSelector.addClass('hidden');
8196

8297
cbidSubmit.removeClass('disabled');

assets/js/backend/settings-page.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,32 @@ function show_ruleset_selector() {
5151
const cbidField = jQuery( '#cookiebot-cbid' );
5252
const cbidCheck = jQuery( '.cookiebot-cbid-check' );
5353
const cbidRulesetSelector = jQuery('#cookiebot-ruleset-id-selector');
54+
const cbidError = jQuery('.cookiebot-cbid-error');
5455

5556
cbidCheck.removeClass('check-progress');
5657
cbidField.removeClass('check-progress');
5758

5859
if(!cbidField.val()){
5960
cbidCheck.removeClass('check-pass');
6061
cbidRulesetSelector.addClass('hidden');
62+
cbidError.addClass('hidden');
6163
jQuery('.cookiebot-cbid-container p.submit #submit').addClass('disabled');
6264
return;
6365
}
6466

67+
// Validate that the field has exactly 14 or 36 characters
68+
const fieldLength = cbidField.val().length;
69+
if(fieldLength !== 14 && fieldLength !== 36){
70+
cbidCheck.removeClass('check-pass');
71+
cbidRulesetSelector.addClass('hidden');
72+
cbidError.removeClass('hidden');
73+
jQuery('.cookiebot-cbid-container p.submit #submit').addClass('disabled');
74+
return;
75+
}
76+
77+
// Valid input - hide error message
78+
cbidError.addClass('hidden');
79+
6580
!check_id_frame() ? cbidRulesetSelector.removeClass('hidden') : cbidRulesetSelector.addClass('hidden');
6681

6782
jQuery('.cookiebot-cbid-container p.submit #submit').removeClass('disabled');

cookiebot.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Plugin URI: https://www.cookiebot.com/
66
Description: Install your cookie banner in minutes. Automatically scan and block cookies to comply with the GDPR, CCPA, Google Consent Mode v2. Free plan option.
77
Author: Usercentrics A/S
8-
Version: 4.6.0
8+
Version: 4.6.1
99
Author URI: https://www.cookiebot.com/
1010
Text Domain: cookiebot
1111
Domain Path: /langs

readme.txt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Tags: cookie banner, cookie consent, cookie notice, GDPR, privacy, cmp, consent‑management‑platform, google‑consent‑mode, compliance, gdpr‑compliance, ccpa, dma
44
* Requires at least: 4.4
55
* Tested up to: 6.8
6-
* Stable tag: 4.6.0
6+
* Stable tag: 4.6.1
77
* Requires PHP: 5.6
88
* License: GPLv2 or later
99

@@ -197,6 +197,21 @@ Usercentrics Cookiebot is fully integrated with the WP Consent API. When your vi
197197
## Changelog ##
198198
**Cookiebot CMP Plugin will soon no longer support PHP 5. If your website still runs on this version we recommend upgrading so you can continue enjoying the features Cookiebot CMP offers.**
199199

200+
### 4.6.1 ###
201+
Release date: November 20th 2025
202+
203+
Cookiebot CMP version 4.6.1 is out! This release has some bugfixes and new features
204+
205+
####What's new####
206+
207+
* Improved dashboard with clearer information on how to complete the configuration
208+
209+
####Bugfixes####
210+
211+
* Improved validation of field “Settings ID / Domain Group ID” when connecting to an existing account
212+
* Fixed issue detected when using option: Compliance with multiple privacy laws (geolocation)
213+
* Added missing language translations for FAQ article
214+
200215
### 4.6.0 ###
201216
Release date: September 23rd 2025
202217

src/lib/Cookiebot_Javascript_Helper.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public function include_uc_cmp_js( $return_html = false ) {
8787

8888
if ( $return_html ) {
8989
$this->debug_log( 'Returning HTML' );
90-
return wp_kses_post( $banner_script );
90+
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Script HTML is generated internally and is safe
91+
return $banner_script;
9192
} else {
9293
$this->debug_log( 'Echoing HTML' );
9394
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Script HTML is generated internally and is safe

src/lib/Cookiebot_WP.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static function debug_log( $message ) {
2727
}
2828
}
2929

30-
const COOKIEBOT_PLUGIN_VERSION = '4.6.0';
30+
const COOKIEBOT_PLUGIN_VERSION = '4.6.1';
3131
const COOKIEBOT_MIN_PHP_VERSION = '5.6.0';
3232

3333
/**
@@ -573,10 +573,12 @@ public static function get_banner_script() {
573573
);
574574
}
575575

576+
$data_label = ! empty( get_option( 'cookiebot-ruleset-id' ) ) ? get_option( 'cookiebot-ruleset-id' ) : 'settings';
576577
// Add main banner script
577578
// phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
578579
$script_html .= sprintf(
579-
'<script id="usercentrics-cmp" data-settings-id="%s" data-usercentrics="%s" src="%s" async></script>',
580+
'<script id="usercentrics-cmp" data-%s-id="%s" data-usercentrics="%s" src="%s" async></script>',
581+
esc_attr( $data_label ),
580582
esc_attr( $cbid ),
581583
esc_attr( 'Usercentrics Consent Management Platform' ),
582584
esc_url( 'https://web.cmp.usercentrics.eu/ui/loader.js' )

src/settings/pages/Support_Page.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public function prepare_debug_data() {
124124
$debug_output .= 'Banner tag: ' . "\n" . $cookiebot_javascript_helper->include_cookiebot_js( true ) . "\n";
125125
$debug_output .= 'Declaration tag: ' . Cookiebot_Declaration_Shortcode::show_declaration() . "\n";
126126
} else {
127-
$debug_output .= 'Banner tag: ' . "\n" . $cookiebot_javascript_helper->include_uc_cmp_js( true ) . "\n";
127+
$debug_output .= 'Banner tag: ' . "\n" . $cookiebot_javascript_helper->include_uc_cmp_js( true ) . "\n\n";
128128
}
129129

130130
if ( get_option( 'cookiebot-gtm' ) !== false ) {

0 commit comments

Comments
 (0)