Skip to content

Commit

Permalink
Merge branch 'master' into fix/unprotected_headers_ip_address
Browse files Browse the repository at this point in the history
  • Loading branch information
@duracelltomi
duracelltomi authored Jan 23, 2024
2 parents 37d34d8 + cbdf800 commit 3975941
Show file tree
Hide file tree
Showing 13 changed files with 260 additions and 209 deletions.
20 changes: 15 additions & 5 deletions admin/admin-tab-integrate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,14 @@
GTM4WP_OPTION_INTEGRATE_CONSENTMODE => array(
'label' => esc_html__( 'Google Consent Mode', 'duracelltomi-google-tag-manager' ),
'description' => sprintf(
// translators: 1: opening anchor tag linking to Google's documentation about the consent mode command. 2: Closing anchor tag.
gtm4wp_safe_admin_html(
'Enable this checkbox if you wish to execute the "default" command of %1$sGoogle Consent Mode%2$s before the container loads.
The "update" command needs to be executed from your consent management tool.<br /><br />
DO NOT enable this feature if your consent manager tool supports firing both the "default" and the "update" command.',
'duracelltomi-google-tag-manager'
// translators: 1: opening anchor tag linking to Google's documentation about the consent mode command. 2: Closing anchor tag.
__(
'Enable this checkbox if you wish to execute the "default" command of %1$sGoogle Consent Mode%2$s before the container loads.
The "update" command needs to be executed from your consent management tool.<br /><br />
DO NOT enable this feature if your consent manager tool supports firing both the "default" and the "update" command.',
'duracelltomi-google-tag-manager'
)
),
'<a href="https://developers.google.com/tag-platform/gtagjs/reference#consent" target="_blank" rel="noopener">',
'</a>'
Expand Down Expand Up @@ -255,4 +257,12 @@
),
'phase' => GTM4WP_PHASE_STABLE,
),

GTM4WP_OPTION_INTEGRATE_WEBTOFFEE_GDPR => array(
'label' => esc_html__( 'WebToffee GDPR Cookie Consent', 'duracelltomi-google-tag-manager' ),
'description' => esc_html__( 'Enabling this feature will fire a GTM event (cookie_consent_update) when the consent banner has been closed with consents being set or during pageload when previously set consents have been found.', 'duracelltomi-google-tag-manager' ),
'phase' => GTM4WP_PHASE_STABLE,
'plugintocheck' => 'webtoffee-gdpr-cookie-consent/cookie-law-info.php',
),

);
43 changes: 25 additions & 18 deletions admin/admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,13 @@ function gtm4wp_admin_init() {
GTM4WP_ADMIN_GROUP_GENERAL,
array(
'label_for' => GTM4WP_ADMIN_GROUP_CONTAINERON,
'description' => gtm4wp_safe_admin_html( 'Turning OFF the Google Tag Manager container itself will remove both the head and the body part of the container code but leave data layer codes working.<br/>This should be only used in specific cases where you need to place the container code manually or using another tool.', 'duracelltomi-google-tag-manager' ),
'description' => gtm4wp_safe_admin_html(
__(
'Turning OFF the Google Tag Manager container itself will remove both the head and the body part of the container code but leave data layer codes working.<br/>
This should be only used in specific cases where you need to place the container code manually or using another tool.',
'duracelltomi-google-tag-manager'
)
),
)
);

Expand Down Expand Up @@ -1029,23 +1035,24 @@ function gtm4wp_add_admin_js( $hook ) {
wp_register_script( 'admin-subtabs', $gtp4wp_plugin_url . 'js/admin-subtabs.js', array(), GTM4WP_VERSION ); // phpcs:ignore

$subtabtexts = array(
'posttabtitle' => esc_html__( 'Posts', 'duracelltomi-google-tag-manager' ),
'searchtabtitle' => esc_html__( 'Search', 'duracelltomi-google-tag-manager' ),
'visitortabtitle' => esc_html__( 'Visitors', 'duracelltomi-google-tag-manager' ),
'browsertabtitle' => esc_html__( 'Browser/OS/Device', 'duracelltomi-google-tag-manager' ),
'blocktagstabtitle' => esc_html__( 'Blacklist tags', 'duracelltomi-google-tag-manager' ),
'blocktriggerstabtitle' => esc_html__( 'Blacklist triggers', 'duracelltomi-google-tag-manager' ),
'blockmacrostabtitle' => esc_html__( 'Blacklist variables', 'duracelltomi-google-tag-manager' ),
'wpcf7tabtitle' => esc_html__( 'Contact Form 7', 'duracelltomi-google-tag-manager' ),
'wctabtitle' => esc_html__( 'WooCommerce', 'duracelltomi-google-tag-manager' ),
'amptabtitle' => esc_html__( 'Accelerated Mobile Pages', 'duracelltomi-google-tag-manager' ),
'cookiebottabtitle' => esc_html__( 'Cookiebot', 'duracelltomi-google-tag-manager' ),
'weathertabtitle' => esc_html__( 'Weather & geo data', 'duracelltomi-google-tag-manager' ),
'generaleventstabtitle' => esc_html__( 'General events', 'duracelltomi-google-tag-manager' ),
'mediaeventstabtitle' => esc_html__( 'Media events', 'duracelltomi-google-tag-manager' ),
'sitetabtitle' => esc_html__( 'Site', 'duracelltomi-google-tag-manager' ),
'misctabtitle' => esc_html__( 'Misc', 'duracelltomi-google-tag-manager' ),
'consentmodetabtitle' => esc_html__( 'Google Consent Mode', 'duracelltomi-google-tag-manager' ),
'posttabtitle' => esc_html__( 'Posts', 'duracelltomi-google-tag-manager' ),
'searchtabtitle' => esc_html__( 'Search', 'duracelltomi-google-tag-manager' ),
'visitortabtitle' => esc_html__( 'Visitors', 'duracelltomi-google-tag-manager' ),
'browsertabtitle' => esc_html__( 'Browser/OS/Device', 'duracelltomi-google-tag-manager' ),
'blocktagstabtitle' => esc_html__( 'Blacklist tags', 'duracelltomi-google-tag-manager' ),
'blocktriggerstabtitle' => esc_html__( 'Blacklist triggers', 'duracelltomi-google-tag-manager' ),
'blockmacrostabtitle' => esc_html__( 'Blacklist variables', 'duracelltomi-google-tag-manager' ),
'wpcf7tabtitle' => esc_html__( 'Contact Form 7', 'duracelltomi-google-tag-manager' ),
'wctabtitle' => esc_html__( 'WooCommerce', 'duracelltomi-google-tag-manager' ),
'amptabtitle' => esc_html__( 'Accelerated Mobile Pages', 'duracelltomi-google-tag-manager' ),
'cookiebottabtitle' => esc_html__( 'Cookiebot', 'duracelltomi-google-tag-manager' ),
'weathertabtitle' => esc_html__( 'Weather & geo data', 'duracelltomi-google-tag-manager' ),
'generaleventstabtitle' => esc_html__( 'General events', 'duracelltomi-google-tag-manager' ),
'mediaeventstabtitle' => esc_html__( 'Media events', 'duracelltomi-google-tag-manager' ),
'sitetabtitle' => esc_html__( 'Site', 'duracelltomi-google-tag-manager' ),
'misctabtitle' => esc_html__( 'Misc', 'duracelltomi-google-tag-manager' ),
'consentmodetabtitle' => esc_html__( 'Google Consent Mode', 'duracelltomi-google-tag-manager' ),
'webtoffeetabtitle' => esc_html__( 'WebToffee GDPR Cookie Consent', 'duracelltomi-google-tag-manager' ),
);
wp_localize_script( 'admin-subtabs', 'gtm4wp', $subtabtexts );

Expand Down
Binary file removed admin/images/tag_manager-32.png
View file
Binary file not shown.
Binary file removed admin/images/tag_manager-64.png
View file
Binary file not shown.
190 changes: 98 additions & 92 deletions common/readoptions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@

define( 'GTM4WP_OPTION_INTEGRATE_COOKIEBOT', 'integrate-cookiebot' );

define( 'GTM4WP_OPTION_INTEGRATE_WEBTOFFEE_GDPR', 'integrate-webtoffee-gdpr' );

define( 'GTM4WP_OPTION_INTEGRATE_CONSENTMODE', 'integrate-consent-mode' );
define( 'GTM4WP_OPTION_INTEGRATE_CONSENTMODE_ADS', 'integrate-consent-mode-ads' );
define( 'GTM4WP_OPTION_INTEGRATE_CONSENTMODE_AD_USER_DATA', 'integrate-consent-mode-ad-user-data' );
Expand All @@ -114,98 +116,102 @@
$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_VISITOR_IP_HEADER => '',
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_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_VISITOR_IP_HEADER => '',
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(
Expand Down
2 changes: 1 addition & 1 deletion dist/js/admin-subtabs.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions duracelltomi-google-tag-manager-for-wordpress.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @license GNU General Public License, version 3
*
* @wordpress-plugin
* Plugin Name: GTM4WP
* Plugin Name: GTM4WP - A Google Tag Manager (GTM) plugin for WordPress
* Plugin URI: https://gtm4wp.com/
* Description: The first Google Tag Manager plugin for WordPress with business goals in mind
* Version: 1.20-beta.1
Expand All @@ -22,7 +22,7 @@
* Domain Path: /languages
* WC requires at least: 5.0
* WC tested up to: 8.3
* WC tested up to: 8.5
*/

define( 'GTM4WP_VERSION', '1.20-beta.1' );
Expand Down
Loading

0 comments on commit 3975941

Please sign in to comment.