From 4306d30d766c71f8b84f3133e9f7c9e7a57f2938 Mon Sep 17 00:00:00 2001 From: andrestamayo Date: Tue, 28 Jan 2025 12:02:46 +0100 Subject: [PATCH] Sonarcloud Audit --- assets/js/backend/network-settings-page.js | 2 +- assets/js/backend/settings-page.js | 2 +- src/lib/Consent_API_Helper.php | 33 ++++++++++++------- .../prior-consent/consent-api/tab.php | 24 ++++++++++++-- .../uc_frame/settings/embeddings-page.php | 2 +- 5 files changed, 46 insertions(+), 17 deletions(-) diff --git a/assets/js/backend/network-settings-page.js b/assets/js/backend/network-settings-page.js index cb657439..7ffb2f3d 100644 --- a/assets/js/backend/network-settings-page.js +++ b/assets/js/backend/network-settings-page.js @@ -40,7 +40,7 @@ jQuery( document ).ready( function ( $ ) { } ) function check_id_frame(){ - let cbFrameReg = new RegExp("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"); + const cbFrameReg = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/; return cbFrameReg.test(jQuery( '#cookiebot-cbid' ).val()) } diff --git a/assets/js/backend/settings-page.js b/assets/js/backend/settings-page.js index f90e245d..a95c4afc 100644 --- a/assets/js/backend/settings-page.js +++ b/assets/js/backend/settings-page.js @@ -68,7 +68,7 @@ function show_ruleset_selector() { } function check_id_frame(){ - let cbFrameReg = new RegExp("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"); + const cbFrameReg = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/; return cbFrameReg.test(jQuery( '#cookiebot-cbid' ).val()) } diff --git a/src/lib/Consent_API_Helper.php b/src/lib/Consent_API_Helper.php index d2779dbb..234e3d2b 100644 --- a/src/lib/Consent_API_Helper.php +++ b/src/lib/Consent_API_Helper.php @@ -86,18 +86,27 @@ public function get_wp_consent_api_mapping() { if ( Cookiebot_Frame::is_cb_frame_type() === false ) { $mapping = get_option( 'cookiebot-uc-consent-mapping', $default_wp_consent_api_mapping ); } else { - $mapping = get_option( 'cookiebot-consent-mapping', $default_wp_consent_api_mapping ); - - $mapping = ( '' === $mapping ) ? $default_wp_consent_api_mapping : $mapping; - - foreach ( $default_wp_consent_api_mapping as $k => $v ) { - if ( ! isset( $mapping[ $k ] ) ) { - $mapping[ $k ] = $v; - } else { - foreach ( $v as $vck => $vcv ) { - if ( ! isset( $mapping[ $k ][ $vck ] ) ) { - $mapping[ $k ][ $vck ] = $vcv; - } + $mapping = $this->get_cb_mapping( $default_wp_consent_api_mapping ); + } + + return $mapping; + } + + /** + * Return CB Frame WP Consent API mapping + */ + private function get_cb_mapping( $default_wp_consent_api_mapping ) { + $mapping = get_option( 'cookiebot-consent-mapping', $default_wp_consent_api_mapping ); + + $mapping = ( '' === $mapping ) ? $default_wp_consent_api_mapping : $mapping; + + foreach ( $default_wp_consent_api_mapping as $k => $v ) { + if ( ! isset( $mapping[ $k ] ) ) { + $mapping[ $k ] = $v; + } else { + foreach ( $v as $vck => $vcv ) { + if ( ! isset( $mapping[ $k ][ $vck ] ) ) { + $mapping[ $k ][ $vck ] = $vcv; } } } diff --git a/src/view/admin/uc_frame/prior-consent/consent-api/tab.php b/src/view/admin/uc_frame/prior-consent/consent-api/tab.php index 9d004f83..9133251d 100644 --- a/src/view/admin/uc_frame/prior-consent/consent-api/tab.php +++ b/src/view/admin/uc_frame/prior-consent/consent-api/tab.php @@ -78,7 +78,17 @@ @@ -95,7 +105,17 @@ diff --git a/src/view/admin/uc_frame/settings/embeddings-page.php b/src/view/admin/uc_frame/settings/embeddings-page.php index 1d30839a..f2531ef9 100644 --- a/src/view/admin/uc_frame/settings/embeddings-page.php +++ b/src/view/admin/uc_frame/settings/embeddings-page.php @@ -8,7 +8,7 @@

"> -
+