Skip to content

fix: network admin Automatic mode always resets to manual (CMS-1503) #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabianwgl merged 1 commit into from
May 5, 2026
Merged

fix: network admin Automatic mode always resets to manual (CMS-1503) #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/settings/Network_Menu_Settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,13 @@ public function network_settings_save() {
'cookiebot-nooutput-admin',
! empty( $_POST['cookiebot-nooutput-admin'] ) ? $_POST['cookiebot-nooutput-admin'] : ''
);
$allowed_blocking_modes = array( 'auto', 'manual' );
$blocking_mode = isset( $_POST['cookiebot-cookie-blocking-mode'] )
? sanitize_key( $_POST['cookiebot-cookie-blocking-mode'] )
: 'manual';
update_site_option(
'cookiebot-cookie-blocking-mode',
'manual'
in_array( $blocking_mode, $allowed_blocking_modes, true ) ? $blocking_mode : 'manual'
);

wp_safe_redirect(
Expand Down
8 changes: 4 additions & 4 deletions src/view/admin/cb_frame/network-settings-page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<?php esc_html_e( 'Are you sure?', 'cookiebot' ); ?>
</h3>
<p class="cb-general__info__text">
<?php esc_html_e( 'You will need to add a new ID before updating other network settings. If any subsite is using its own account disconnecting this account won’t affect it.', 'cookiebot' ); ?>
<?php esc_html_e( 'You will need to add a new ID before updating other network settings. If any subsite is using its own account disconnecting this account won\'t affect it.', 'cookiebot' ); ?>
</p>
<div class="new-account-actions">
<div id="cookiebot-cbid-cancel" class="cb-btn cb-white-btn">
Expand Down Expand Up @@ -74,11 +74,11 @@ class="cb-btn cb-main-btn"><?php esc_html_e( 'Disconnect account', 'cookiebot' )
</div>
</div>

<!-- <div class="cb-settings__config__item">
<div class="cb-settings__config__item">
<div class="cb-settings__config__content">
<h3 class="cb-settings__config__subtitle"><?php esc_html_e( 'Cookie-blocking', 'cookiebot' ); ?></h3>
<p class="cb-general__info__text">
<?php esc_html_e( 'Select your cookie-blocking mode here. Auto cookie-blocking mode will automatically block all cookies (except for ‘strictly necessary’ cookies) until a user has given consent. Manual cookie-blocking mode requests manual adjustments to the cookie-setting scripts. Please find our implementation guides below:', 'cookiebot' ); ?>
<?php esc_html_e( 'Select your cookie-blocking mode here. Auto cookie-blocking mode will automatically block all cookies (except for \'strictly necessary\' cookies) until a user has given consent. Manual cookie-blocking mode requests manual adjustments to the cookie-setting scripts. Please find our implementation guides below:', 'cookiebot' ); ?>
</p>
</div>
<div class="cb-settings__config__data">
Expand All @@ -102,7 +102,7 @@ class="cb-btn cb-main-btn"><?php esc_html_e( 'Disconnect account', 'cookiebot' )
</label>
</div>
</div>
</div> -->
</div>

<div class="cb-settings__config__item secondary__item" id="declaration-tag">
<div class="cb-settings__config__content">
Expand Down
10 changes: 5 additions & 5 deletions src/view/admin/uc_frame/network-settings-page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<?php esc_html_e( 'Are you sure?', 'cookiebot' ); ?>
</h3>
<p class="cb-general__info__text">
<?php esc_html_e( 'You will need to add a new ID before updating other network settings. If any subsite is using its own account disconnecting this account won’t affect it.', 'cookiebot' ); ?>
<?php esc_html_e( 'You will need to add a new ID before updating other network settings. If any subsite is using its own account disconnecting this account won\'t affect it.', 'cookiebot' ); ?>
</p>
<div class="new-account-actions">
<div id="cookiebot-cbid-cancel" class="cb-btn cb-white-btn">
Expand Down Expand Up @@ -84,7 +84,7 @@ class="cb-btn cb-main-btn"><?php esc_html_e( 'Disconnect account', 'cookiebot' )
<div id="cookiebot-ruleset-id-selector" class="cb-settings__config__item">
<div class="cb-settings__config__content">
<p class="cb-general__info__text">
<?php esc_html_e( 'Let us know if your account is set for compliance with a single privacy law (e.g. GDPR) or multiple laws (e.g. GDPR and CCPA) based on user’s location. The default is a single privacy law, so this is likely your setting unless modified.', 'cookiebot' ); ?>
<?php esc_html_e( 'Let us know if your account is set for compliance with a single privacy law (e.g. GDPR) or multiple laws (e.g. GDPR and CCPA) based on user\'s location. The default is a single privacy law, so this is likely your setting unless modified.', 'cookiebot' ); ?>
</p>
</div>
<div class="cb-settings__config__data">
Expand All @@ -110,11 +110,11 @@ class="cb-btn cb-main-btn"><?php esc_html_e( 'Disconnect account', 'cookiebot' )
</div>
</div>

<!-- <div class="cb-settings__config__item">
<div class="cb-settings__config__item">
<div class="cb-settings__config__content">
<h3 class="cb-settings__config__subtitle"><?php esc_html_e( 'Cookie-blocking', 'cookiebot' ); ?></h3>
<p class="cb-general__info__text">
<?php esc_html_e( 'Choose the type of your cookie-blocking mode. Select automatic to automatically block all cookies except those strictly necessary to use before user gives consent. Manual mode lets you adjust your cookie settings within your website’s HTML.', 'cookiebot' ); ?>
<?php esc_html_e( 'Choose the type of your cookie-blocking mode. Select automatic to automatically block all cookies except those strictly necessary to use before user gives consent. Manual mode lets you adjust your cookie settings within your website\'s HTML.', 'cookiebot' ); ?>
</p>
</div>
<div class="cb-settings__config__data">
Expand All @@ -138,7 +138,7 @@ class="cb-btn cb-main-btn"><?php esc_html_e( 'Disconnect account', 'cookiebot' )
</label>
</div>
</div>
</div> -->
</div>

<div class="cb-settings__config__item">
<div class="cb-settings__config__content">
Expand Down
Loading