Sonarcloud Audit

CybotAS · Jan 28, 2025 · 4306d30 · 4306d30
1 parent 872ed97
commit 4306d30
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -78,7 +78,17 @@
 					<div class="consent_mapping">
 						<select class="cb-category-selectors" name="cookiebot-uc-consent-mapping[functional]"
 								id="cookiebot-uc-consent-mapping-functional" data-default="preferences">
-							<?php echo esc_html( Settings_Config::get_wp_consent_values( 'functional', $m ) ); ?>
+							<?php
+							echo wp_kses(
+								Settings_Config::get_wp_consent_values( 'functional', $m ),
+								array(
+									'option' => array(
+										'selected' => true,
+										'value'    => array(),
+									),
+								)
+							);
+							?>
 						</select>
 					</div>
 				</td>
@@ -95,7 +105,17 @@
 					<div class="consent_mapping">
 						<select class="cb-category-selectors" name="cookiebot-uc-consent-mapping[marketing]"
 								id="cookiebot-uc-consent-mapping-marketing" data-default="marketing">
-							<?php echo esc_html( Settings_Config::get_wp_consent_values( 'marketing', $m ) ); ?>
+							<?php
+							echo wp_kses(
+								Settings_Config::get_wp_consent_values( 'marketing', $m ),
+								array(
+									'option' => array(
+										'selected' => true,
+										'value'    => array(),
+									),
+								)
+							);
+							?>
 						</select>
 					</div>
 				</td>

diff --git a/src/view/admin/uc_frame/settings/embeddings-page.php b/src/view/admin/uc_frame/settings/embeddings-page.php
@@ -8,7 +8,7 @@
 		</p>
 		<input type="text" id="embedding-shortcode"
 				value="<?php echo esc_attr( '[uc_embedding class="gdpr" show-toggle="false" type="all"]' ); ?>">
-		<div class="cb-btn cb-main-btn" onclick="copyEmbedShortcode();">
+		<div class="cb-btn cb-main-btn" onclick="copyEmbedShortcode();" role="button">
 			<?php
 			esc_html_e(
 				'Copy shortcode',