Changeset 3473643

Timestamp:

03/03/2026 12:50:38 PM (4 weeks ago)

Author:

cookiebot

Message:

Releasing version 4.6.5

Location:

cookiebot/trunk

Files:

• README.md (modified) (1 diff)
• assets/css/backend/cookiebot_admin_main.css (modified) (3 diffs)
• assets/css/backend/dashboard-old.css (modified) (2 diffs)
• assets/css/backend/ppg_page.css (added)
• assets/img/ppg-hero.png (added)
• assets/js/backend/ppg-page.js (added)
• readme.txt (modified) (1 diff)
• src/addons/Cookiebot_Addons.php (modified) (2 diffs)
• src/addons/addons.php (modified) (2 diffs)
• src/addons/controller/addons/Base_Cookiebot_Addon.php (modified) (1 diff)
• src/addons/controller/addons/woocommerce (added)
• src/addons/controller/addons/woocommerce/WooCommerce.php (added)
• src/admin_notices/Cookiebot_Base_Notice.php (modified) (2 diffs)
• src/lib/Account_Service.php (modified) (10 diffs)
• src/lib/Cookie_Consent.php (modified) (1 diff)
• src/lib/Cookiebot_Review.php (modified) (2 diffs)
• src/lib/Cookiebot_WP.php (modified) (3 diffs)
• src/lib/Dependency_Container.php (modified) (2 diffs)
• src/lib/helper.php (modified) (5 diffs)
• src/lib/traits/Class_Constant_Override_Validator_Trait.php (modified) (5 diffs)
• src/settings/Menu_Settings.php (modified) (2 diffs)
• src/settings/Network_Menu_Settings.php (modified) (1 diff)
• src/settings/pages/PPG_Page.php (added)
• src/view/admin/cb_frame/dashboard-page.php (modified) (3 diffs)
• src/view/admin/cb_frame/settings-page.php (modified) (1 diff)
• src/view/admin/common/dashboard-page-old.php (modified) (3 diffs)
• src/view/admin/common/ppg-page.php (added)
• src/view/admin/common/settings-page.php (modified) (1 diff)
• src/view/admin/common/templates/main-tabs.php (modified) (2 diffs)
• src/view/admin/common/templates/ppg-banner.php (added)
• src/view/admin/uc_frame/dashboard-page.php (modified) (2 diffs)
• src/view/admin/uc_frame/settings-page.php (modified) (1 diff)
• tests/integration/addons/Test_Custom_Facebook_Feed.php (modified) (1 diff)
• tests/integration/addons/Test_Instagram_Feed.php (modified) (1 diff)
• tests/integration/addons/Test_Official_Facebook_Pixel.php (modified) (1 diff)
• tests/integration/addons/Test_Wp_Seopress.php (modified) (1 diff)

cookiebot/trunk/README.md

@@ -8 +8 @@
 https://core.trac.wordpress.org/ticket/44043 
 
-# Travis CI Status 
+# CI Status
 
-[![Build Status](https://travis-ci.com/CybotAS/CookiebotWP.svg?branch=master)](https://app.travis-ci.com/github/CybotAS/CookiebotWP)
+[![Test](https://github.com/CybotAS/CookiebotWP/actions/workflows/test.yml/badge.svg)](https://github.com/CybotAS/CookiebotWP/actions/workflows/test.yml)
 
 # Sonarcloud status

cookiebot/trunk/assets/css/backend/cookiebot_admin_main.css

@@ -56 +56 @@
     text-decoration: none;
     display: grid;
-    grid-template-columns: 1fr 8fr;
+    grid-template-columns: auto 1fr auto;
     grid-column-gap: 5px;
     align-items: center;
@@ -93 +93 @@
 }
 
+.cb-feedback_link a {
+    font-size: 15px;
+    font-weight: 600;
+    line-height: 1.6;
+    letter-spacing: 0.1px;
+    color:#1032CF;
+    text-decoration: none;
+}
+.cb-feedback_link a:hover {
+    text-decoration: underline;
+}
+
 .dashboard-icon {
     -webkit-mask-image: url(../../img/icons/dashboard.svg);
@@ -121 +133 @@
     -webkit-mask-image: url(../../img/icons/debug.svg);
     mask-image: url(../../img/icons/debug.svg);
+}
+
+.cb-main__tabs_separator {
+    height: 1px;
+    width: 100%;
+    background-color: #D6D6D6;
+    margin: 14px 0;
+}
+
+.cb-main__tabs__badge {
+    display: inline-block;
+    background-color: #4C2293;
+    color: #ffffff;
+    font-size: 10px;
+    font-weight: 700;
+    line-height: 1.4;
+    padding: 3px 8px;
+    border-radius: 100px;
+    text-transform: uppercase;
+    white-space: nowrap;
 }
 

cookiebot/trunk/assets/css/backend/dashboard-old.css

@@ -170 +170 @@
 }
 
+/* Side-by-side card row (e.g. "Your opinion matters" + "Learn more") */
+.cb-main__dashboard__card--row {
+    display: flex;
+    gap: 24px;
+    align-items: stretch;
+    width: 100%;
+}
+
+.cb-main__dashboard__card--row .cb-main__dashboard__card {
+    flex: 1 0 0;
+    margin-bottom: 0;
+}
+
+.cb-main__card__inner.bordered_card {
+    background-color: #ffffff;
+    border: 1px solid #d6d6d6;
+    border-radius: 16px;
+    padding: 32px;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    height: 100%;
+    box-sizing: border-box;
+}
+
+.cb-main__card__inner.bordered_card .cb-main__card__subtitle {
+    font-size: 21px;
+    font-weight: 600;
+    color: #141414;
+    line-height: 1.4;
+    margin: 0;
+}
+
+.cb-main__card__inner.bordered_card .cb-main__review__text {
+    font-size: 15px;
+    font-weight: 400;
+    color: #141414;
+    line-height: 1.6;
+    letter-spacing: 0.3px;
+    margin: 0;
+}
+
+.cb-main__card__inner.bordered_card .cb-btn.cb-link-btn {
+    margin: auto 0 0 0;
+    font-size: 15px;
+    font-weight: 600;
+    text-decoration: underline;
+    letter-spacing: 0.1px;
+}
+
 .cb-main__card__content {
     align-self: end;
@@ -307 +357 @@
 .legislations_card .cb-btn.cb-right-btn {
     justify-self: end;
+}
+
+/* PPG Banner Section */
+.cb-ppg-section {
+    padding:40px 0;
+    margin: 10px 0;
+    border-top: 1px solid #D6D6D6;
+    border-bottom: 1px solid #D6D6D6;
+}
+
+.cb-ppg-section__title {
+    font-size: 21px;
+    font-weight: 700;
+    color: #141414;
+    line-height: 1.4;
+    margin: 0 0 16px;
+}
+
+.cb-ppg-banner {
+    display: flex;
+    align-items: center;
+    gap: 32px;
+    padding: 32px 40px;
+    border-radius: 16px;
+    background:
+        radial-gradient(ellipse at 95% 105%, rgba(0, 125, 212, 0.48) 0%, rgba(128, 190, 234, 0.24) 30%, rgba(255, 255, 255, 0) 60%),
+        radial-gradient(ellipse at -10% -5%, rgba(0, 125, 212, 0.64) 0%, rgba(128, 190, 234, 0.32) 30%, rgba(255, 255, 255, 0) 60%),
+        #eff2f5;
+    overflow: hidden;
+    flex-wrap: wrap;
+}
+
+.cb-ppg-banner__icon {
+    width: 80px;
+    height: 80px;
+    flex-shrink: 0;
+}
+
+.cb-ppg-banner__icon img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    border-radius: 12px;
+}
+
+.cb-ppg-banner__content {
+    flex: 1;
+    min-width: 200px;
+}
+
+.cb-ppg-banner__headline {
+    font-size: 21px;
+    font-weight: 600;
+    color: #141414;
+    line-height: 1.4;
+    margin: 0 0 4px;
+}
+
+.cb-ppg-banner__description {
+    font-size: 15px;
+    font-weight: 400;
+    color: #595959;
+    line-height: 1.6;
+    letter-spacing: 0.3px;
+    margin: 0;
+}
+
+.cb-ppg-banner__cta {
+    flex-shrink: 0;
+}
+
+.cb-btn.cb-ppg-btn {
+    min-width: 132px;
+    text-align: center;
 }
 

cookiebot/trunk/readme.txt

@@ -163 +163 @@
 ## Changelog ##
 **Cookiebot by Usercentrics 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 by Usercentrics offers.**
+
+
+### 4.6.5 ###
+Release date: March 3rd 2026
+
+Cookiebot by Usercentrics version 4.6.5 is out! This release adds new features and improvements.
+
+####New Features####
+
+* Added Privacy Policy Generator (PPG) plugin page — install and activate the Usercentrics Privacy Policy Generator directly from the Cookiebot admin
+* Added PPG promotional banner to dashboard pages for connected accounts
+* Added WooCommerce addon to block Order Attribution Tracking scripts (SourceBuster) until consent is given
+* Added "NEW" badge and separator to the sidebar navigation for the Policy Generator Plugin tab
+
+####Improvements####
+
+* Added user capability checks for admin actions in notices, network settings, and survey submissions
+* Sanitized and unslashed all input data across settings, cookie consent, and AJAX handlers
+* Escaped dynamic values in error and exception messages to prevent potential XSS
+* Added JSON validation for user data payloads before storing
+* Redesigned dashboard cards into a side-by-side layout with bordered styling for connected accounts
+* Updated feedback link styling
 
 ### 4.6.4 ###

cookiebot/trunk/src/addons/Cookiebot_Addons.php

@@ -181 +181 @@
                 if ( ! is_a( $addon, Base_Cookiebot_Addon::class ) ) {
                     throw new InvalidAddonClassException(
-                        sprintf( 'Class %s could not be instantiated', $addon_class )
+                        sprintf( 'Class %s could not be instantiated', esc_html( $addon_class ) )
                     );
                 }
@@ -187 +187 @@
             } else {
                 throw new InvalidAddonClassException(
-                    sprintf( 'Class %s not found', $addon_class )
+                    sprintf( 'Class %s not found', esc_html( $addon_class ) )
                 );
             }

cookiebot/trunk/src/addons/addons.php

@@ -30 +30 @@
     use cybot\cookiebot\addons\controller\addons\simple_share_buttons_adder\Simple_Share_Buttons_Adder;
     use cybot\cookiebot\addons\controller\addons\wd_google_analytics\Wd_Google_Analytics;
+    use cybot\cookiebot\addons\controller\addons\woocommerce\WooCommerce;
     use cybot\cookiebot\addons\controller\addons\woocommerce_google_analytics_pro\Woocommerce_Google_Analytics_Pro;
     use cybot\cookiebot\addons\controller\addons\wp_analytify\Wp_Analytify;
@@ -58 +59 @@
         Optinmonster::class,
         Pixel_Caffeine::class,
+        WooCommerce::class,
         Woocommerce_Google_Analytics_Pro::class,
         Wp_Analytify::class,

cookiebot/trunk/src/addons/controller/addons/Base_Cookiebot_Addon.php

@@ -124 +124 @@
         foreach ( static::ALTERNATIVE_ADDON_VERSIONS as $version_string => $alternative_version_addon_class ) {
             if ( ! version_compare( $version_string, '0.0.1', '>=' ) ) {
-                throw new InvalidArgumentException( 'Invalid version number "' . $version_string . '"' );
+                throw new InvalidArgumentException( 'Invalid version number "' . esc_html( $version_string ) . '"' );
             }
             if ( ! class_exists( $alternative_version_addon_class ) ) {
-                throw new InvalidArgumentException( 'Class not found at "' . $alternative_version_addon_class . '"' );
+                throw new InvalidArgumentException( 'Class not found at "' . esc_html( $alternative_version_addon_class ) . '"' );
             }
             if ( ! is_subclass_of( $alternative_version_addon_class, self::class ) ) {
-                throw new InvalidArgumentException( 'Class "' . $alternative_version_addon_class . '" is not a subclass of "' . self::class . '"' );
+                throw new InvalidArgumentException( 'Class "' . esc_html( $alternative_version_addon_class ) . '" is not a subclass of "' . esc_html( self::class ) . '"' );
             }
         }

cookiebot/trunk/src/admin_notices/Cookiebot_Base_Notice.php

@@ -60 +60 @@
      */
     private function save_notice_link() {
+        if ( ! current_user_can( 'manage_options' ) ) {
+            return;
+        }
         if ( isset( $_GET[ static::COOKIEBOT_NOTICE_OPTION_KEY ] ) ) {
             foreach ( static::COOKIEBOT_NOTICE_TIMES as $item ) {
                 if ( isset( $_GET[ $item['name'] ] ) &&
-                    wp_verify_nonce( $_GET[ $item['name'] ], $item['action'] ) ) {
+                    // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- Nonce value verified by wp_verify_nonce().
+                    wp_verify_nonce( wp_unslash( $_GET[ $item['name'] ] ), $item['action'] ) ) {
                     $option = $item['time'];
                     if ( isset( $item['str'] ) && $item['str'] === true ) {
@@ -91 +95 @@
             // "Never show again" is clicked
             if ( array_key_exists( $option, static::COOKIEBOT_NOTICE_TIMES ) ) {
-                throw new LogicException( static::COOKIEBOT_NOTICE_TIMES[ $option ]['msg'] );
+                throw new LogicException( esc_html( static::COOKIEBOT_NOTICE_TIMES[ $option ]['msg'] ) );
             } elseif ( is_numeric( $option ) ) {
                 if ( ! self::notice_check_option_date( $option ) ) {

cookiebot/trunk/src/lib/Account_Service.php

@@ -110 +110 @@
         }
 
-        $cbid = isset( $_POST['cbid'] ) ? sanitize_text_field( $_POST['cbid'] ) : '';
+        $cbid = isset( $_POST['cbid'] ) ? sanitize_text_field( wp_unslash( $_POST['cbid'] ) ) : '';
 
         if ( empty( $cbid ) ) {
@@ -127 +127 @@
         }
 
-        $scan_id = isset( $_POST['scan_id'] ) ? sanitize_text_field( $_POST['scan_id'] ) : '';
+        $scan_id = isset( $_POST['scan_id'] ) ? sanitize_text_field( wp_unslash( $_POST['scan_id'] ) ) : '';
 
         if ( empty( $scan_id ) ) {
@@ -143 +143 @@
         }
 
+        // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- JSON payload validated by json_decode() below.
         $raw_data = isset( $_POST['data'] ) ? wp_unslash( $_POST['data'] ) : '';
 
@@ -151 +152 @@
 
         $data = json_decode( $raw_data, true );
+        if ( json_last_error() !== JSON_ERROR_NONE ) {
+            wp_send_json_error( 'Invalid user data format', 400 );
+            return;
+        }
         update_option( 'cookiebot-user-data', $data );
 
@@ -172 +177 @@
         }
 
-        $scan_id     = isset( $_POST['scan_id'] ) ? sanitize_text_field( $_POST['scan_id'] ) : '';
-        $scan_status = isset( $_POST['scan_status'] ) ? wp_unslash( $_POST['scan_status'] ) : '';
+        $scan_id     = isset( $_POST['scan_id'] ) ? sanitize_text_field( wp_unslash( $_POST['scan_id'] ) ) : '';
+        $scan_status = isset( $_POST['scan_status'] ) ? sanitize_text_field( wp_unslash( $_POST['scan_status'] ) ) : '';
 
         update_option( 'cookiebot-scan-id', $scan_id );
@@ -187 +192 @@
         }
 
-        $value = isset( $_POST['value'] ) ? trim( $_POST['value'] ) : '';
+        $value = isset( $_POST['value'] ) ? sanitize_text_field( wp_unslash( $_POST['value'] ) ) : '';
 
         // Save option value
@@ -200 +205 @@
         }
 
-        $value = isset( $_POST['value'] ) ? trim( $_POST['value'] ) : '';
+        $value = isset( $_POST['value'] ) ? sanitize_text_field( wp_unslash( $_POST['value'] ) ) : '';
 
         // Save option value
@@ -222 +227 @@
         }
 
-        $value = isset( $_POST['value'] ) ? trim( $_POST['value'] ) : '';
+        $value = isset( $_POST['value'] ) ? sanitize_text_field( wp_unslash( $_POST['value'] ) ) : '';
 
         // Save option value
@@ -259 +264 @@
         }
 
-        $code = isset( $_POST['code'] ) ? sanitize_text_field( $_POST['code'] ) : '';
+        $code = isset( $_POST['code'] ) ? sanitize_text_field( wp_unslash( $_POST['code'] ) ) : '';
 
         if ( empty( $code ) ) {
@@ -336 +341 @@
         }
 
+        // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- JSON payload validated by json_decode() below.
         $configuration = isset( $_POST['configuration'] ) ? wp_unslash( $_POST['configuration'] ) : '';
 

cookiebot/trunk/src/lib/Cookie_Consent.php

@@ -35 +35 @@
      */
     public function __construct( $default_cookie = null ) {
-        $this->cookie = ( isset( $_COOKIE['CookieConsent'] ) ) ? $_COOKIE['CookieConsent'] : $default_cookie;
+        $this->cookie = ( isset( $_COOKIE['CookieConsent'] ) ) ? sanitize_text_field( wp_unslash( $_COOKIE['CookieConsent'] ) ) : $default_cookie;
 
         $this->scan_cookie();

cookiebot/trunk/src/lib/Cookiebot_Review.php

@@ -138 +138 @@
     public function send_uninstall_survey() {
         global $wpdb;
-        if ( ! check_ajax_referer( 'cookiebot_survey_nonce', 'survey_nonce', false ) ) {
+        if ( ! check_ajax_referer( 'cookiebot_survey_nonce', 'survey_nonce', false ) || ! current_user_can( 'manage_options' ) ) {
             wp_send_json_error( esc_html__( 'Sorry you are not allowed to do this.', 'cookiebot' ), 401 );
         }
@@ -145 +145 @@
         }
         $data = array(
-            'survey_check'   => sanitize_text_field( wp_unslash( $_POST['survey_check'] ) ),
+            'survey_check'   => isset( $_POST['survey_check'] ) ? sanitize_text_field( wp_unslash( $_POST['survey_check'] ) ) : '',
             'reason_slug'    => sanitize_text_field( wp_unslash( $_POST['reason_id'] ) ),
             'reason_detail'  => ! empty( $_POST['reason_text'] ) ? sanitize_text_field( wp_unslash( $_POST['reason_text'] ) ) : null,

cookiebot/trunk/src/lib/Cookiebot_WP.php

@@ -12 +12 @@
 use cybot\cookiebot\widgets\Dashboard_Widget_Cookiebot_Status;
 use cybot\cookiebot\lib\Account_Service;
+use cybot\cookiebot\settings\pages\PPG_Page;
 use DomainException;
 use RuntimeException;
@@ -86 +87 @@
                 self::COOKIEBOT_MIN_PHP_VERSION
             );
-            throw new DomainException( $message );
+            throw new DomainException( esc_html( $message ) );
         }
     }
@@ -102 +103 @@
             ( new Cookiebot_Notices() )->register_hooks();
             ( new Cookiebot_Review() )->register_hooks();
+            ( new PPG_Page() )->register_ajax_hooks();
         }
 

cookiebot/trunk/src/lib/Dependency_Container.php

@@ -31 +31 @@
     public function set( $key, $dependency ) {
         if ( isset( $this->dependencies[ $key ] ) ) {
-            throw new InvalidArgumentException( 'Dependency key ' . $key . ' already exists' );
+            throw new InvalidArgumentException( 'Dependency key ' . esc_html( $key ) . ' already exists' );
         }
         $this->dependencies[ $key ] = $dependency;
@@ -44 +44 @@
     public function get( $key ) {
         if ( ! isset( $this->dependencies[ $key ] ) ) {
-            throw new InvalidArgumentException( 'Dependency key ' . $key . ' does not exists' );
+            throw new InvalidArgumentException( 'Dependency key ' . esc_html( $key ) . ' does not exist' );
         }
 

cookiebot/trunk/src/lib/helper.php

@@ -512 +512 @@
     function cookiebot_get_local_file_contents( $file_path ) {
         if ( ! file_exists( $file_path ) ) {
-            throw new InvalidArgumentException( 'File ' . $file_path . ' does not exist' );
+            throw new InvalidArgumentException( 'File ' . esc_html( $file_path ) . ' does not exist' );
         }
 
@@ -531 +531 @@
         $absolute_path = CYBOT_COOKIEBOT_PLUGIN_DIR . 'src/view/' . $relative_path;
         if ( ! file_exists( $absolute_path ) ) {
-            throw new InvalidArgumentException( 'View could not be loaded from "' . $absolute_path . '"' );
+            throw new InvalidArgumentException( 'View could not be loaded from "' . esc_html( $absolute_path ) . '"' );
         }
         // phpcs:ignore WordPress.PHP.DontExtract.extract_extract
@@ -557 +557 @@
         $absolute_path = CYBOT_COOKIEBOT_PLUGIN_DIR . CYBOT_COOKIEBOT_PLUGIN_ASSETS_DIR . $relative_path;
         if ( ! file_exists( $absolute_path ) ) {
-            throw new InvalidArgumentException( 'Asset could not be loaded from "' . $absolute_path . '"' );
+            throw new InvalidArgumentException( 'Asset could not be loaded from "' . esc_html( $absolute_path ) . '"' );
         }
         return $absolute_path;
@@ -572 +572 @@
         $url           = esc_url( CYBOT_COOKIEBOT_PLUGIN_URL . CYBOT_COOKIEBOT_PLUGIN_ASSETS_DIR . $relative_path );
         if ( ! file_exists( $absolute_path ) || empty( $url ) ) {
-            throw new InvalidArgumentException( 'Asset could not be loaded from "' . $absolute_path . '"' );
+            throw new InvalidArgumentException( 'Asset could not be loaded from "' . esc_html( $absolute_path ) . '"' );
         }
         return $url;
@@ -585 +585 @@
         $url           = esc_url( CYBOT_COOKIEBOT_PLUGIN_URL . CYBOT_COOKIEBOT_PLUGIN_LOGO_FILE );
         if ( ! file_exists( $absolute_path ) || empty( $url ) ) {
-            throw new InvalidArgumentException( 'Asset could not be loaded from "' . $absolute_path . '"' );
+            throw new InvalidArgumentException( 'Asset could not be loaded from "' . esc_html( $absolute_path ) . '"' );
         }
         return $url;

cookiebot/trunk/src/lib/traits/Class_Constant_Override_Validator_Trait.php

@@ -34 +34 @@
                 sprintf(
                     'Class constant "%s" should be changed by %s',
-                    $fixed_class_constant_name,
-                    static::class
+                    esc_html( $fixed_class_constant_name ),
+                    esc_html( static::class )
                 )
             );
@@ -66 +66 @@
                 sprintf(
                     'Class constant "%s" must be a non-empty string in %s',
-                    $required_string_constant_name,
-                    static::class
+                    esc_html( $required_string_constant_name ),
+                    esc_html( static::class )
                 )
             );
@@ -98 +98 @@
                 sprintf(
                     'Class constant "%s" must be a boolean in %s',
-                    $required_boolean_constant_name,
-                    static::class
+                    esc_html( $required_boolean_constant_name ),
+                    esc_html( static::class )
                 )
             );
@@ -131 +131 @@
                 sprintf(
                     'Class constant "%s" must be an array in %s',
-                    $required_array_constant_name,
-                    static::class
+                    esc_html( $required_array_constant_name ),
+                    esc_html( static::class )
                 )
             );
@@ -142 +142 @@
                         sprintf(
                             'Class constant "%s" array items should be one of "%s" in %s',
-                            $required_array_constant_name,
-                            implode( ', ', $allowed_item_values ),
-                            static::class
+                            esc_html( $required_array_constant_name ),
+                            esc_html( implode( ', ', $allowed_item_values ) ),
+                            esc_html( static::class )
                         )
                     );

cookiebot/trunk/src/settings/Menu_Settings.php

@@ -9 +9 @@
 use cybot\cookiebot\settings\pages\Settings_Page;
 use cybot\cookiebot\settings\pages\Support_Page;
+use cybot\cookiebot\settings\pages\PPG_Page;
 use cybot\cookiebot\lib\Cookiebot_WP;
 
@@ -18 +19 @@
         Support_Page::class,
         Settings_Page::class,
+        PPG_Page::class,
     );
 

cookiebot/trunk/src/settings/Network_Menu_Settings.php

@@ -69 +69 @@
         check_admin_referer( 'cookiebot-network-settings' );
 
+        if ( ! current_user_can( 'manage_network_options' ) ) {
+            wp_die( esc_html__( 'You do not have permission to manage network options.', 'cookiebot' ), 403 );
+        }
+
         update_site_option(
             'cookiebot-cbid',
-            ! empty( $_POST['cookiebot-cbid'] ) ? $_POST['cookiebot-cbid'] : ''
+            ! empty( $_POST['cookiebot-cbid'] ) ? sanitize_text_field( wp_unslash( $_POST['cookiebot-cbid'] ) ) : ''
         );
         update_site_option(
             'cookiebot-ruleset-id',
-            ! empty( $_POST['cookiebot-ruleset-id'] ) ? $_POST['cookiebot-ruleset-id'] : ''
+            ! empty( $_POST['cookiebot-ruleset-id'] ) ? sanitize_text_field( wp_unslash( $_POST['cookiebot-ruleset-id'] ) ) : ''
         );
         update_site_option(
             'cookiebot-script-tag-uc-attribute',
-            ! empty( $_POST['cookiebot-script-tag-uc-attribute'] ) ? $_POST['cookiebot-script-tag-uc-attribute'] : ''
+            ! empty( $_POST['cookiebot-script-tag-uc-attribute'] ) ? sanitize_text_field( wp_unslash( $_POST['cookiebot-script-tag-uc-attribute'] ) ) : ''
         );
         update_site_option(
             'cookiebot-script-tag-cd-attribute',
-            ! empty( $_POST['cookiebot-script-tag-cd-attribute'] ) ? $_POST['cookiebot-script-tag-cd-attribute'] : ''
+            ! empty( $_POST['cookiebot-script-tag-cd-attribute'] ) ? sanitize_text_field( wp_unslash( $_POST['cookiebot-script-tag-cd-attribute'] ) ) : ''
         );
         update_site_option(
             'cookiebot-autoupdate',
-            ! empty( $_POST['cookiebot-autoupdate'] ) ? $_POST['cookiebot-autoupdate'] : ''
+            ! empty( $_POST['cookiebot-autoupdate'] ) ? sanitize_text_field( wp_unslash( $_POST['cookiebot-autoupdate'] ) ) : ''
         );
         update_site_option(
             'cookiebot-nooutput',
-            ! empty( $_POST['cookiebot-nooutput'] ) ? $_POST['cookiebot-nooutput'] : ''
+            ! empty( $_POST['cookiebot-nooutput'] ) ? sanitize_text_field( wp_unslash( $_POST['cookiebot-nooutput'] ) ) : ''
         );
         update_site_option(
             'cookiebot-nooutput-admin',
-            ! empty( $_POST['cookiebot-nooutput-admin'] ) ? $_POST['cookiebot-nooutput-admin'] : ''
+            ! empty( $_POST['cookiebot-nooutput-admin'] ) ? sanitize_text_field( wp_unslash( $_POST['cookiebot-nooutput-admin'] ) ) : ''
         );
         update_site_option(

cookiebot/trunk/src/view/admin/cb_frame/dashboard-page.php

@@ -56 +56 @@
                 </div>
 
-                <?php if ( $cbid ) : ?>
+            <?php if ( $cbid ) : ?>
+                <div class="cb-main__dashboard__card--row">
                     <div class="cb-main__dashboard__card">
-                        <div class="cb-main__card__inner  <?php echo $cbid ? 'start_card' : 'new_card'; ?>">
+                        <div class="cb-main__card__inner bordered_card">
                             <h3 class="cb-main__card__subtitle">
                                 <?php echo esc_html__( 'Your opinion matters', 'cookiebot' ); ?>
@@ -71 +72 @@
                         </div>
                     </div>
-                <?php endif; ?>
-
-                <div class="cb-main__dashboard__card">
-                    <div class="cb-main__card__inner  <?php echo $cbid ? 'start_card' : 'new_card'; ?>">
-                        <?php if ( ! $cbid ) : ?>
-                            <div class="cb-main__card__content">
-                                <p class="cb-main__card__label">
-                                    <?php echo esc_html__( 'Get started', 'cookiebot' ); ?>
-                                </p>
-                                <h2 class="cb-main__card__title">
-                                    <?php echo esc_html__( 'Create a new Cookiebot CMP account', 'cookiebot' ); ?>
-                                </h2>
-                                <a href="https://admin.cookiebot.com/signup/?utm_source=wordpress&utm_medium=referral&utm_campaign=banner"
-                                    target="_blank" class="cb-btn cb-white-btn" rel="noopener">
-                                    <?php echo esc_html__( 'Create a new account', 'cookiebot' ); ?>
-                                </a>
-                            </div>
-                        <?php else : ?>
+                    <div class="cb-main__dashboard__card">
+                        <div class="cb-main__card__inner bordered_card">
                             <h3 class="cb-main__card__subtitle">
                                 <?php echo esc_html__( 'Learn more about how to optimize your Cookiebot CMP setup?', 'cookiebot' ); ?>
@@ -96 +81 @@
                                 <?php echo esc_html__( 'Visit Help Center', 'cookiebot' ); ?>
                             </a>
-                        <?php endif; ?>
+                        </div>
                     </div>
                 </div>
+            <?php else : ?>
+                <div class="cb-main__dashboard__card">
+                    <div class="cb-main__card__inner new_card">
+                        <div class="cb-main__card__content">
+                            <p class="cb-main__card__label">
+                                <?php echo esc_html__( 'Get started', 'cookiebot' ); ?>
+                            </p>
+                            <h2 class="cb-main__card__title">
+                                <?php echo esc_html__( 'Create a new Cookiebot CMP account', 'cookiebot' ); ?>
+                            </h2>
+                            <a href="https://admin.cookiebot.com/signup/?utm_source=wordpress&utm_medium=referral&utm_campaign=banner"
+                                target="_blank" class="cb-btn cb-white-btn" rel="noopener">
+                                <?php echo esc_html__( 'Create a new account', 'cookiebot' ); ?>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            <?php endif; ?>
             </div>
 
-            <div class="cb-main__dashboard__card--container">
-                <div class="cb-main__dashboard__card">
-                    <div class="cb-main__card__inner start_card">
-                        <div class="cb-main__video">
+        <?php if ( $cbid ) : ?>
+            <?php include CYBOT_COOKIEBOT_PLUGIN_DIR . 'src/view/admin/common/templates/ppg-banner.php'; ?>
+        <?php endif; ?>
+
+        <div class="cb-main__dashboard__card--container">
+            <div class="cb-main__dashboard__card">
+                <div class="cb-main__card__inner start_card">
+                    <div class="cb-main__video">
                             <iframe src="https://www.youtube.com/embed/1-lvuJa42P0"
                                     title="Cookiebot WordPress Installation"

cookiebot/trunk/src/view/admin/cb_frame/settings-page.php

@@ -34 +34 @@
 
 // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-$active_tab = ! empty( $_GET['tab'] ) ? $_GET['tab'] : false;
+$active_tab = ! empty( $_GET['tab'] ) ? sanitize_text_field( wp_unslash( $_GET['tab'] ) ) : false;
 
 $header->display();

cookiebot/trunk/src/view/admin/common/dashboard-page-old.php

@@ -53 +53 @@
                     </div>
 
-                    <?php if ( ! empty( $template_args['cbid'] ) ) : ?>
+                <?php if ( ! empty( $template_args['cbid'] ) ) : ?>
+                    <div class="cb-main__dashboard__card--row">
                         <div class="cb-main__dashboard__card">
-                            <div class="cb-main__card__inner  <?php echo ! empty( $template_args['cbid'] ) ? 'start_card' : 'new_card'; ?>">
+                            <div class="cb-main__card__inner bordered_card">
                                 <h3 class="cb-main__card__subtitle">
                                     <?php echo esc_html__( 'Your opinion matters', 'cookiebot' ); ?>
@@ -68 +69 @@
                             </div>
                         </div>
-                    <?php endif; ?>
-
-                    <div class="cb-main__dashboard__card">
-                        <div class="cb-main__card__inner  <?php echo ! empty( $template_args['cbid'] ) ? 'start_card' : 'new_card'; ?>">
-                            <?php if ( empty( $template_args['cbid'] ) ) : ?>
-                                <div class="cb-main__card__content">
-                                    <p class="cb-main__card__label">
-                                        <?php echo esc_html__( 'Get started', 'cookiebot' ); ?>
-                                    </p>
-                                    <h2 class="cb-main__card__title">
-                                        <?php echo esc_html__( 'Create a new Cookiebot CMP account', 'cookiebot' ); ?>
-                                    </h2>
-                                    <a href="https://admin.cookiebot.com/signup/?utm_source=wordpress&utm_medium=referral&utm_campaign=banner"
-                                        target="_blank" class="cb-btn cb-white-btn" rel="noopener">
-                                        <?php echo esc_html__( 'Create a new account', 'cookiebot' ); ?>
-                                    </a>
-                                </div>
-                            <?php else : ?>
+                        <div class="cb-main__dashboard__card">
+                            <div class="cb-main__card__inner bordered_card">
                                 <h3 class="cb-main__card__subtitle">
                                     <?php echo esc_html__( 'Learn more about how to optimize your Cookiebot CMP setup?', 'cookiebot' ); ?>
@@ -93 +78 @@
                                     <?php echo esc_html__( 'Visit Help Center', 'cookiebot' ); ?>
                                 </a>
-                            <?php endif; ?>
+                            </div>
                         </div>
                     </div>
+                <?php else : ?>
+                    <div class="cb-main__dashboard__card">
+                        <div class="cb-main__card__inner new_card">
+                            <div class="cb-main__card__content">
+                                <p class="cb-main__card__label">
+                                    <?php echo esc_html__( 'Get started', 'cookiebot' ); ?>
+                                </p>
+                                <h2 class="cb-main__card__title">
+                                    <?php echo esc_html__( 'Create a new Cookiebot CMP account', 'cookiebot' ); ?>
+                                </h2>
+                                <a href="https://admin.cookiebot.com/signup/?utm_source=wordpress&utm_medium=referral&utm_campaign=banner"
+                                    target="_blank" class="cb-btn cb-white-btn" rel="noopener">
+                                    <?php echo esc_html__( 'Create a new account', 'cookiebot' ); ?>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                <?php endif; ?>
                 </div>
             </div>
 
-            <div class="cb-main__dashboard__card--container">
-                <div class="cb-main__dashboard__card">
-                    <div class="cb-main__card__inner start_card">
-                        <div class="cb-main__video">
+        <?php if ( ! empty( $template_args['cbid'] ) ) : ?>
+            <?php include __DIR__ . '/templates/ppg-banner.php'; ?>
+        <?php endif; ?>
+
+        <div class="cb-main__dashboard__card--container">
+            <div class="cb-main__dashboard__card">
+                <div class="cb-main__card__inner start_card">
+                    <div class="cb-main__video">
                             <iframe src="https://www.youtube.com/embed/1-lvuJa42P0"
                                     title="Cookiebot WordPress Installation"

cookiebot/trunk/src/view/admin/common/settings-page.php

@@ -16 +16 @@
 
 // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-$active_tab = ! empty( $_GET['tab'] ) ? $_GET['tab'] : false;
+$active_tab = ! empty( $_GET['tab'] ) ? sanitize_text_field( wp_unslash( $_GET['tab'] ) ) : false;
 
 $header->display();

cookiebot/trunk/src/view/admin/common/templates/main-tabs.php

@@ -7 +7 @@
 use cybot\cookiebot\addons\config\Settings_Config;
 use cybot\cookiebot\settings\pages\Support_Page;
+use cybot\cookiebot\settings\pages\PPG_Page;
 
 /**
@@ -80 +81 @@
     <?php endif; ?>
 
+    <div class="cb-main__tabs_separator"></div>
+
+    <div class="cb-main__tabs_item <?php echo $active_tab === 'ppg' ? 'active-item' : ''; ?>">
+        <a href="<?php echo esc_url( add_query_arg( 'page', PPG_Page::ADMIN_SLUG, admin_url( 'admin.php' ) ) ); ?>"
+            class="cb-main__tabs__link">
+            <div class="cb-main__tabs__icon plugins-icon"></div>
+            <span><?php esc_html_e( 'Policy Generator Plugin', 'cookiebot' ); ?></span>
+            <span class="cb-main__tabs__badge"><?php esc_html_e( 'NEW', 'cookiebot' ); ?></span>
+        </a>
+    </div>
+
     <div class="cb-feedback_link">
         <a href="<?php echo esc_url( $feedback_url ); ?>" target="_blank"><?php echo esc_html__( 'Help us improve', 'cookiebot' ); ?></a>

cookiebot/trunk/src/view/admin/uc_frame/dashboard-page.php

@@ -42 +42 @@
                 </div>
 
-                <?php if ( $cbid ) : ?>
+            <?php if ( $cbid ) : ?>
+                <div class="cb-main__dashboard__card--row">
                     <div class="cb-main__dashboard__card">
-                        <div class="cb-main__card__inner  <?php echo $cbid ? 'start_card' : 'new_card'; ?>">
+                        <div class="cb-main__card__inner bordered_card">
                             <h3 class="cb-main__card__subtitle">
                                 <?php echo esc_html__( 'Your opinion matters', 'cookiebot' ); ?>
@@ -57 +58 @@
                         </div>
                     </div>
-
                     <div class="cb-main__dashboard__card">
-                        <div class="cb-main__card__inner start_card">
-                            <div class="cb-main__card--content">
-                                <h3 class="cb-main__card__subtitle">
-                                    <?php echo esc_html__( 'How to set up Cookiebot by Usercentrics WordPress Plugin', 'cookiebot' ); ?>
-                                </h3>
-                                <a href="https://support.cookiebot.com/hc/en-us/articles/4408356523282-Getting-started"
-                                    target="_blank" class="cb-btn cb-link-btn" rel="noopener">
-                                    <?php echo esc_html__( 'Learn more', 'cookiebot' ); ?>
-                                </a>
-                            </div>
+                        <div class="cb-main__card__inner bordered_card">
+                            <h3 class="cb-main__card__subtitle">
+                                <?php echo esc_html__( 'How to set up Cookiebot by Usercentrics WordPress Plugin', 'cookiebot' ); ?>
+                            </h3>
+                            <a href="https://support.cookiebot.com/hc/en-us/articles/4408356523282-Getting-started"
+                                target="_blank" class="cb-btn cb-link-btn" rel="noopener">
+                                <?php echo esc_html__( 'Learn more', 'cookiebot' ); ?>
+                            </a>
                         </div>
                     </div>
-                <?php endif; ?>
+                </div>
+            <?php endif; ?>
             </div>
 
-            <div class="cb-main__dashboard__card--container">
-                <div class="cb-main__dashboard__card">
-                </div>
-                <div class="cb-main__dashboard__card">
-                    <div class="cb-main__card__inner legislations_card">
+        <?php if ( $cbid ) : ?>
+            <?php include CYBOT_COOKIEBOT_PLUGIN_DIR . 'src/view/admin/common/templates/ppg-banner.php'; ?>
+        <?php endif; ?>
+
+        <div class="cb-main__dashboard__card--container">
+            <div class="cb-main__dashboard__card">
+            </div>
+            <div class="cb-main__dashboard__card">
+                <div class="cb-main__card__inner legislations_card">
                         <div class="cb-main__legislation__item">
                             <div class="cb-main__legislation____icon">

cookiebot/trunk/src/view/admin/uc_frame/settings-page.php

@@ -34 +34 @@
 
 // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-$active_tab = ! empty( $_GET['tab'] ) ? $_GET['tab'] : false;
+$active_tab = ! empty( $_GET['tab'] ) ? sanitize_text_field( wp_unslash( $_GET['tab'] ) ) : false;
 
 // Check if user was onboarded via signup

cookiebot/trunk/tests/integration/addons/Test_Custom_Facebook_Feed.php

@@ -20 +20 @@
 
         $this->assertNotFalse( strpos( $content, 'echo \'var cfflinkhashtags = "\' . $cff_link_hashtags . \'";\';' ) );
-        $this->assertNotFalse( strpos( $content, 'wp_enqueue_script( \'cffscripts\' );' ) );
-        $this->assertNotFalse( strpos( $content, 'add_action( \'wp_footer\', [ self::$instance, \'cff_js\' ] );' ) );
+        $this->assertNotFalse( strpos( $content, 'wp_enqueue_script(\'cffscripts\');' ) );
+        $this->assertNotFalse( strpos( $content, 'add_action(\'wp_footer\', [ self::$instance, \'cff_js\' ]);' ) );
     }
 }

cookiebot/trunk/tests/integration/addons/Test_Instagram_Feed.php

@@ -19 +19 @@
         $content = Instagram_Feed::get_svn_file_content( 'inc/if-functions.php' );
 
-        $this->assertNotFalse( strpos( $content, 'add_action( \'wp_enqueue_scripts\', \'sb_instagram_scripts_enqueue\', 2 );' ) );
+        $this->assertNotFalse( strpos( $content, '\'sb_instagram_scripts_enqueue\'' ) );
     }
 }

cookiebot/trunk/tests/integration/addons/Test_Official_Facebook_Pixel.php

@@ -25 +25 @@
 n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
 t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
-document,'script','https://connect.facebook.net/en_US/fbevents.js?v=next');
+document,'script','https://connect.facebook.net/en_US/fbevents.js');
 </script>
 <!-- End Meta Pixel Code -->

cookiebot/trunk/tests/integration/addons/Test_Wp_Seopress.php

@@ -20 +20 @@
 
         // test the content
-        $this->assertNotFalse( strpos( $content, "add_action('seopress_google_analytics_html', 'seopress_google_analytics_js', 10, 1);" ) );
+        $this->assertNotFalse( strpos( $content, "add_action( 'seopress_google_analytics_html', 'seopress_google_analytics_js', 10, 1 );" ) );
     }
 }