Fix: Consent Mode v2 flags without default values

duracelltomi · Jan 15, 2024 · cbdf800 · cbdf800
1 parent e7e3d9f
commit cbdf800
Showing 1 changed file with 95 additions and 93 deletions.
diff --git a/common/readoptions.php b/common/readoptions.php
@@ -115,99 +115,101 @@
 $gtm4wp_options = array();
 
 $gtm4wp_defaultoptions = array(
-	GTM4WP_OPTION_GTM_CODE                        => '',
-	GTM4WP_OPTION_DATALAYER_NAME                  => '',
-	GTM4WP_OPTION_GTM_PLACEMENT                   => GTM4WP_PLACEMENT_FOOTER,
-	GTM4WP_OPTION_ENV_GTM_AUTH                    => '',
-	GTM4WP_OPTION_ENV_GTM_PREVIEW                 => '',
-	GTM4WP_OPTION_LOADEARLY                       => false,
-	GTM4WP_OPTION_GTMDOMAIN                       => '',
-	GTM4WP_OPTION_GTMCUSTOMPATH                   => '',
-	GTM4WP_OPTION_NOGTMFORLOGGEDIN                => '',
-	GTM4WP_OPTION_NOCONSOLELOG                    => false,
-
-	GTM4WP_OPTION_INCLUDE_LOGGEDIN                => false,
-	GTM4WP_OPTION_INCLUDE_USERROLE                => false,
-	GTM4WP_OPTION_INCLUDE_USERID                  => false,
-	GTM4WP_OPTION_INCLUDE_USEREMAIL               => false,
-	GTM4WP_OPTION_INCLUDE_USERREGDATE             => false,
-	GTM4WP_OPTION_INCLUDE_USERNAME                => false,
-	GTM4WP_OPTION_INCLUDE_VISITOR_IP              => false,
-	GTM4WP_OPTION_INCLUDE_POSTTYPE                => true,
-	GTM4WP_OPTION_INCLUDE_CATEGORIES              => true,
-	GTM4WP_OPTION_INCLUDE_TAGS                    => true,
-	GTM4WP_OPTION_INCLUDE_AUTHOR                  => true,
-	GTM4WP_OPTION_INCLUDE_AUTHORID                => false,
-	GTM4WP_OPTION_INCLUDE_POSTDATE                => false,
-	GTM4WP_OPTION_INCLUDE_POSTTITLE               => false,
-	GTM4WP_OPTION_INCLUDE_POSTCOUNT               => false,
-	GTM4WP_OPTION_INCLUDE_POSTID                  => false,
-	GTM4WP_OPTION_INCLUDE_POSTFORMAT              => false,
-	GTM4WP_OPTION_INCLUDE_POSTTERMLIST            => false,
-	GTM4WP_OPTION_INCLUDE_SEARCHDATA              => false,
-	GTM4WP_OPTION_INCLUDE_BROWSERDATA             => false,
-	GTM4WP_OPTION_INCLUDE_OSDATA                  => false,
-	GTM4WP_OPTION_INCLUDE_DEVICEDATA              => false,
-	GTM4WP_OPTION_INCLUDE_MISCGEO                 => false,
-	GTM4WP_OPTION_INCLUDE_MISCGEOAPI              => '',
-	GTM4WP_OPTION_INCLUDE_MISCGEOCF               => false,
-	GTM4WP_OPTION_INCLUDE_WEATHER                 => false,
-	GTM4WP_OPTION_INCLUDE_WEATHERUNITS            => 0,
-	GTM4WP_OPTION_INCLUDE_WEATHEROWMAPI           => '',
-	GTM4WP_OPTION_INCLUDE_SITEID                  => false,
-	GTM4WP_OPTION_INCLUDE_SITENAME                => false,
-
-	GTM4WP_OPTION_EVENTS_FORMMOVE                 => false,
-	GTM4WP_OPTION_EVENTS_NEWUSERREG               => false,
-	GTM4WP_OPTION_EVENTS_USERLOGIN                => false,
-
-	GTM4WP_OPTION_EVENTS_YOUTUBE                  => false,
-	GTM4WP_OPTION_EVENTS_VIMEO                    => false,
-	GTM4WP_OPTION_EVENTS_SOUNDCLOUD               => false,
-
-	GTM4WP_OPTION_SCROLLER_ENABLED                => false,
-	GTM4WP_OPTION_SCROLLER_DEBUGMODE              => false,
-	GTM4WP_OPTION_SCROLLER_CALLBACKTIME           => 100,
-	GTM4WP_OPTION_SCROLLER_DISTANCE               => 150,
-	GTM4WP_OPTION_SCROLLER_CONTENTID              => 'content',
-	GTM4WP_OPTION_SCROLLER_READERTIME             => 60,
-
-	GTM4WP_OPTION_BLACKLIST_ENABLE                => 0,
-	GTM4WP_OPTION_BLACKLIST_SANDBOXED             => false,
-	GTM4WP_OPTION_BLACKLIST_STATUS                => '',
-
-	GTM4WP_OPTION_INTEGRATE_WPCF7                 => false,
-
-	GTM4WP_OPTION_INTEGRATE_WCTRACKECOMMERCE      => false,
-	GTM4WP_OPTION_INTEGRATE_WCPRODPERIMPRESSION   => 10,
-	GTM4WP_OPTION_INTEGRATE_WCEINCLUDECARTINDL    => false,
-	GTM4WP_OPTION_INTEGRATE_WCEECBRANDTAXONOMY    => '',
-	GTM4WP_OPTION_INTEGRATE_WCBUSINESSVERTICAL    => 'retail',
-	GTM4WP_OPTION_INTEGRATE_WCUSESKU              => false,
-	GTM4WP_OPTION_INTEGRATE_WCUSEFULLCATEGORYPATH => false,
-	GTM4WP_OPTION_INTEGRATE_WCREMPRODIDPREFIX     => '',
-	GTM4WP_OPTION_INTEGRATE_WCCUSTOMERDATA        => false,
-	GTM4WP_OPTION_INTEGRATE_WCORDERDATA           => false,
-	GTM4WP_OPTION_INTEGRATE_WCORDERMAXAGE         => 30,
-	GTM4WP_OPTION_INTEGRATE_WCEXCLUDETAX          => false,
-	GTM4WP_OPTION_INTEGRATE_WCEXCLUDESHIPPING     => false,
-	GTM4WP_OPTION_INTEGRATE_WCNOORDERTRACKEDFLAG  => false,
-	GTM4WP_OPTION_INTEGRATE_WCCLEARECOMMERCEDL    => false,
-
-	GTM4WP_OPTION_INTEGRATE_WPECOMMERCE           => false,
-
-	GTM4WP_OPTION_INTEGRATE_AMPID                 => '',
-
-	GTM4WP_OPTION_INTEGRATE_COOKIEBOT             => false,
-
-	GTM4WP_OPTION_INTEGRATE_WEBTOFFEE_GDPR        => false,
-
-	GTM4WP_OPTION_INTEGRATE_CONSENTMODE           => false,
-	GTM4WP_OPTION_INTEGRATE_CONSENTMODE_ADS       => false,
-	GTM4WP_OPTION_INTEGRATE_CONSENTMODE_ANALYTICS => false,
-	GTM4WP_OPTION_INTEGRATE_CONSENTMODE_PERSO     => false,
-	GTM4WP_OPTION_INTEGRATE_CONSENTMODE_FUNC      => false,
-	GTM4WP_OPTION_INTEGRATE_CONSENTMODE_SECURUTY  => false,
+	GTM4WP_OPTION_GTM_CODE                           => '',
+	GTM4WP_OPTION_DATALAYER_NAME                     => '',
+	GTM4WP_OPTION_GTM_PLACEMENT                      => GTM4WP_PLACEMENT_FOOTER,
+	GTM4WP_OPTION_ENV_GTM_AUTH                       => '',
+	GTM4WP_OPTION_ENV_GTM_PREVIEW                    => '',
+	GTM4WP_OPTION_LOADEARLY                          => false,
+	GTM4WP_OPTION_GTMDOMAIN                          => '',
+	GTM4WP_OPTION_GTMCUSTOMPATH                      => '',
+	GTM4WP_OPTION_NOGTMFORLOGGEDIN                   => '',
+	GTM4WP_OPTION_NOCONSOLELOG                       => false,
+
+	GTM4WP_OPTION_INCLUDE_LOGGEDIN                   => false,
+	GTM4WP_OPTION_INCLUDE_USERROLE                   => false,
+	GTM4WP_OPTION_INCLUDE_USERID                     => false,
+	GTM4WP_OPTION_INCLUDE_USEREMAIL                  => false,
+	GTM4WP_OPTION_INCLUDE_USERREGDATE                => false,
+	GTM4WP_OPTION_INCLUDE_USERNAME                   => false,
+	GTM4WP_OPTION_INCLUDE_VISITOR_IP                 => false,
+	GTM4WP_OPTION_INCLUDE_POSTTYPE                   => true,
+	GTM4WP_OPTION_INCLUDE_CATEGORIES                 => true,
+	GTM4WP_OPTION_INCLUDE_TAGS                       => true,
+	GTM4WP_OPTION_INCLUDE_AUTHOR                     => true,
+	GTM4WP_OPTION_INCLUDE_AUTHORID                   => false,
+	GTM4WP_OPTION_INCLUDE_POSTDATE                   => false,
+	GTM4WP_OPTION_INCLUDE_POSTTITLE                  => false,
+	GTM4WP_OPTION_INCLUDE_POSTCOUNT                  => false,
+	GTM4WP_OPTION_INCLUDE_POSTID                     => false,
+	GTM4WP_OPTION_INCLUDE_POSTFORMAT                 => false,
+	GTM4WP_OPTION_INCLUDE_POSTTERMLIST               => false,
+	GTM4WP_OPTION_INCLUDE_SEARCHDATA                 => false,
+	GTM4WP_OPTION_INCLUDE_BROWSERDATA                => false,
+	GTM4WP_OPTION_INCLUDE_OSDATA                     => false,
+	GTM4WP_OPTION_INCLUDE_DEVICEDATA                 => false,
+	GTM4WP_OPTION_INCLUDE_MISCGEO                    => false,
+	GTM4WP_OPTION_INCLUDE_MISCGEOAPI                 => '',
+	GTM4WP_OPTION_INCLUDE_MISCGEOCF                  => false,
+	GTM4WP_OPTION_INCLUDE_WEATHER                    => false,
+	GTM4WP_OPTION_INCLUDE_WEATHERUNITS               => 0,
+	GTM4WP_OPTION_INCLUDE_WEATHEROWMAPI              => '',
+	GTM4WP_OPTION_INCLUDE_SITEID                     => false,
+	GTM4WP_OPTION_INCLUDE_SITENAME                   => false,
+
+	GTM4WP_OPTION_EVENTS_FORMMOVE                    => false,
+	GTM4WP_OPTION_EVENTS_NEWUSERREG                  => false,
+	GTM4WP_OPTION_EVENTS_USERLOGIN                   => false,
+
+	GTM4WP_OPTION_EVENTS_YOUTUBE                     => false,
+	GTM4WP_OPTION_EVENTS_VIMEO                       => false,
+	GTM4WP_OPTION_EVENTS_SOUNDCLOUD                  => false,
+
+	GTM4WP_OPTION_SCROLLER_ENABLED                   => false,
+	GTM4WP_OPTION_SCROLLER_DEBUGMODE                 => false,
+	GTM4WP_OPTION_SCROLLER_CALLBACKTIME              => 100,
+	GTM4WP_OPTION_SCROLLER_DISTANCE                  => 150,
+	GTM4WP_OPTION_SCROLLER_CONTENTID                 => 'content',
+	GTM4WP_OPTION_SCROLLER_READERTIME                => 60,
+
+	GTM4WP_OPTION_BLACKLIST_ENABLE                   => 0,
+	GTM4WP_OPTION_BLACKLIST_SANDBOXED                => false,
+	GTM4WP_OPTION_BLACKLIST_STATUS                   => '',
+
+	GTM4WP_OPTION_INTEGRATE_WPCF7                    => false,
+
+	GTM4WP_OPTION_INTEGRATE_WCTRACKECOMMERCE         => false,
+	GTM4WP_OPTION_INTEGRATE_WCPRODPERIMPRESSION      => 10,
+	GTM4WP_OPTION_INTEGRATE_WCEINCLUDECARTINDL       => false,
+	GTM4WP_OPTION_INTEGRATE_WCEECBRANDTAXONOMY       => '',
+	GTM4WP_OPTION_INTEGRATE_WCBUSINESSVERTICAL       => 'retail',
+	GTM4WP_OPTION_INTEGRATE_WCUSESKU                 => false,
+	GTM4WP_OPTION_INTEGRATE_WCUSEFULLCATEGORYPATH    => false,
+	GTM4WP_OPTION_INTEGRATE_WCREMPRODIDPREFIX        => '',
+	GTM4WP_OPTION_INTEGRATE_WCCUSTOMERDATA           => false,
+	GTM4WP_OPTION_INTEGRATE_WCORDERDATA              => false,
+	GTM4WP_OPTION_INTEGRATE_WCORDERMAXAGE            => 30,
+	GTM4WP_OPTION_INTEGRATE_WCEXCLUDETAX             => false,
+	GTM4WP_OPTION_INTEGRATE_WCEXCLUDESHIPPING        => false,
+	GTM4WP_OPTION_INTEGRATE_WCNOORDERTRACKEDFLAG     => false,
+	GTM4WP_OPTION_INTEGRATE_WCCLEARECOMMERCEDL       => false,
+
+	GTM4WP_OPTION_INTEGRATE_WPECOMMERCE              => false,
+
+	GTM4WP_OPTION_INTEGRATE_AMPID                    => '',
+
+	GTM4WP_OPTION_INTEGRATE_COOKIEBOT                => false,
+
+	GTM4WP_OPTION_INTEGRATE_WEBTOFFEE_GDPR           => false,
+
+	GTM4WP_OPTION_INTEGRATE_CONSENTMODE              => false,
+	GTM4WP_OPTION_INTEGRATE_CONSENTMODE_ADS          => false,
+	GTM4WP_OPTION_INTEGRATE_CONSENTMODE_AD_USER_DATA => false,
+	GTM4WP_OPTION_INTEGRATE_CONSENTMODE_AD_PERSO     => false,
+	GTM4WP_OPTION_INTEGRATE_CONSENTMODE_ANALYTICS    => false,
+	GTM4WP_OPTION_INTEGRATE_CONSENTMODE_PERSO        => false,
+	GTM4WP_OPTION_INTEGRATE_CONSENTMODE_FUNC         => false,
+	GTM4WP_OPTION_INTEGRATE_CONSENTMODE_SECURUTY     => false,
 );
 
 $gtm4wp_business_verticals = array(