Changeset 3295607

Timestamp:

05/18/2025 07:43:47 AM (7 months ago)

Author:

deconf

Message:

6.3.11 (2025.05.18)

• Bug Fixes:
  • bugfix for Google Analytics opt-out feature
• Enhancements:
  • drop support for DNT (Do Not Track) header, since it is deprecated

Location:

analytics-insights/trunk

Files:

• admin/settings.php (modified) (4 diffs)
• analytics-insights.php (modified) (2 diffs)
• config.php (modified) (3 diffs)
• front/tracking-analytics.php (modified) (1 diff)
• front/tracking-tagmanager.php (modified) (1 diff)
• front/views/analytics-optout-code.php (modified) (1 diff)
• install/install.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)

analytics-insights/trunk/admin/settings.php

@@ -27 +27 @@
                 $options['ga_anonymize_ip'] = 0;
                 $options['ga_optout'] = 0;
-                $options['ga_dnt_optout'] = 0;
                 $options['ga_event_tracking'] = 0;
                 $options['ga_enhanced_links'] = 0;
@@ -41 +40 @@
                 $options['tm_pagescrolldepth_tracking'] = 0;
                 $options['tm_optout'] = 0;
-                $options['tm_dnt_optout'] = 0;
                 $options['amp_tracking_analytics'] = 0;
                 $options['amp_tracking_clientidapi'] = 0;
@@ -578 +576 @@
         <?php self::html_switch_button('options[ga_enhanced_links]', 1, 'ga_enhanced_links', $options['ga_enhanced_links'], __( "enable enhanced link attribution", 'analytics-insights') ); ?>
         <?php self::html_switch_button('options[ga_event_precision]', 1, 'ga_event_precision', $options['ga_event_precision'], __( "use hitCallback to increase event tracking accuracy", 'analytics-insights') ); ?>
+        <?php self::html_switch_button('options[ga_optout]', 1, 'ga_optout', $options['ga_optout'], __( "enable support for user opt-out", 'analytics-insights') ); ?>
         <?php self::html_section_delimiter(__( "Cross-domain Tracking", 'analytics-insights' ), false); ?>
         <?php self::html_switch_button('options[ga_crossdomain_tracking]', 1, 'ga_crossdomain_tracking', $options['ga_crossdomain_tracking'], __( "enable cross domain tracking", 'analytics-insights') ); ?>
@@ -650 +649 @@
         <?php self::html_section_delimiter(__( "Advanced Tracking", 'analytics-insights' ), false); ?>
         <?php self::html_switch_button('options[tm_optout]', 1, 'tm_optout', $options['tm_optout'], __( "enable support for user opt-out", 'analytics-insights') ); ?>
-        <?php self::html_switch_button('options[tm_dnt_optout]', 1, 'tm_dnt_optout', $options['tm_dnt_optout'], __( "exclude tracking for users sending Do Not Track header", 'analytics-insights') ); ?>
     </table>
 </div>

analytics-insights/trunk/analytics-insights.php

@@ -5 +5 @@
  * Description: Displays Google Analytics Reports and Real-Time Statistics in your Dashboard. Automatically inserts the tracking code in every page of your website.
  * Author: DeConf
- * Version: 6.3.10
+ * Version: 6.3.11
  * Author URI: https://deconf.com
  * Text Domain: analytics-insights
@@ -15 +15 @@
 // Plugin Version
 if ( ! defined( 'AIWP_CURRENT_VERSION' ) ) {
-    define( 'AIWP_CURRENT_VERSION', '6.3.10' );
+    define( 'AIWP_CURRENT_VERSION', '6.3.11' );
 }
 if ( ! defined( 'AIWP_ENDPOINT_URL' ) ) {

analytics-insights/trunk/config.php

@@ -102 +102 @@
                                 'ga_event_precision',
                                 'ga_optout',
-                                'ga_dnt_optout',
                                 'tm_optout',
-                                'tm_dnt_optout',
             );
             foreach ( $numerics as $key ) {
@@ -285 +283 @@
                                 'ga_force_ssl', //v5.1.2
                                 'ga_optout', //v5.2.3
-                                'ga_dnt_optout', //v5.2.3
                                 'frontend_item_reports',
                                 'tm_optout', //v5.3.1.2
-                                'tm_dnt_optout', //v5.3.1.2
             );
             foreach ( $zeros as $key ) {
@@ -329 +325 @@
                                 'site_jail', //v6.0.3
                                 'sites_list', //v6.0.3
-                                'backend_realtime_report', //v6.4
+                                'backend_realtime_report', //v6.0.4
+                                'ga_dnt_optout', //v6.3.10
+                                'tm_dnt_optout', //v6.3.10
             );
             foreach ( $unsets as $key ) {

analytics-insights/trunk/front/tracking-analytics.php

@@ -343 +343 @@
             }
             $tracking_script_path = apply_filters( 'aiwp_gtag_script_path', 'https://www.googletagmanager.com/gtag/js' );
-            if ( $this->aiwp->config->options['ga_optout'] || $this->aiwp->config->options['ga_dnt_optout'] ) {
-                AIWP_Tools::load_view( 'front/views/analytics-optout-code.php', array( 'gaid' => $this->gaid, 'gaDntOptout' => $this->aiwp->config->options['ga_dnt_optout'], 'gaOptout' => $this->aiwp->config->options['ga_optout'] ) );
+            if ( $this->aiwp->config->options['ga_optout'] ) {
+                AIWP_Tools::load_view( 'front/views/analytics-optout-code.php', array( 'gaid' => $this->gaid, 'gaOptout' => $this->aiwp->config->options['ga_optout'] ) );
             }
             AIWP_Tools::load_view( 'front/views/analytics-code.php', array( 'trackingcode' => $trackingcode, 'tracking_script_path' => $tracking_script_path, 'gaid' => $this->gaid ) );

analytics-insights/trunk/front/tracking-tagmanager.php

@@ -138 +138 @@
                 $vars = "{}";
             }
-            if ( ( $this->aiwp->config->options['tm_optout'] || $this->aiwp->config->options['tm_dnt_optout'] ) && ! empty( $this->gaid ) ) {
-                AIWP_Tools::load_view( 'front/views/analytics-optout-code.php', array( 'gaid' => $this->gaid, 'gaDntOptout' => $this->aiwp->config->options['tm_dnt_optout'], 'gaOptout' => $this->aiwp->config->options['tm_optout'] ) );
+            if ( ( $this->aiwp->config->options['tm_optout'] ) && ! empty( $this->gaid ) ) {
+                AIWP_Tools::load_view( 'front/views/analytics-optout-code.php', array( 'gaid' => $this->gaid, 'gaOptout' => $this->aiwp->config->options['tm_optout'] ) );
             }
             AIWP_Tools::load_view( 'front/views/tagmanager-code.php', array( 'containerid' => $this->aiwp->config->options['web_containerid'], 'vars' => $vars ) );

analytics-insights/trunk/front/views/analytics-optout-code.php

@@ -9 +9 @@
 ?>
 <script>
-var aiwpDnt = false;
 var aiwpProperty = '<?php echo esc_js ( $data['gaid'] )?>';
-var aiwpDntFollow = <?php echo $data['gaDntOptout'] ? 'true' : 'false'?>;
 var aiwpOptout = <?php echo $data['gaOptout'] ? 'true' : 'false'?>;
 var disableStr = 'ga-disable-' + aiwpProperty;
-if(aiwpDntFollow && (window.doNotTrack === "1" || navigator.doNotTrack === "1" || navigator.doNotTrack === "yes" || navigator.msDoNotTrack === "1")) {
-    aiwpDnt = true;
-}
-if (aiwpDnt || (document.cookie.indexOf(disableStr + '=true') > -1 && aiwpOptout)) {
+if (document.cookie.indexOf(disableStr + '=true') > -1 && aiwpOptout) {
     window[disableStr] = true;
 }

analytics-insights/trunk/install/install.php

@@ -83 +83 @@
             $options['ga_force_ssl'] = 0;
             $options['ga_optout'] = 0;
-            $options['ga_dnt_optout'] = 0;
             $options['tm_optout'] = 0;
-            $options['tm_dnt_optout'] = 0;
 
             add_option( 'aiwp_options', json_encode( $options ) );

analytics-insights/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.5
 Tested up to: 6.8
-Stable tag: 6.3.10
+Stable tag: 6.3.11
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -141 +141 @@
 
 == Changelog ==
+
+= 6.3.11 (2025.04.27) =
+* Bug Fixes:
+    * bugfix for Google Analytics opt-out feature
+* Enhancements:
+    * drop support for DNT (Do Not Track) header, since it is deprecated
 
 = 6.3.10 (2025.04.27) =