Changeset 3199876

Timestamp:

11/30/2024 01:02:14 PM (13 months ago)

Author:

deconf

Message:

• a new option to set SameSite attribute on Cookie Customization section

Location:

analytics-insights/trunk

Files:

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

analytics-insights/trunk/admin/settings.php

@@ -38 +38 @@
                 $options['ga_force_ssl'] = 0;
                 $options['ga_pagescrolldepth_tracking'] = 0;
+                $options['ga_samesite'] = '';
                 $options['tm_pagescrolldepth_tracking'] = 0;
                 $options['tm_optout'] = 0;
@@ -47 +48 @@
                 $options['optimize_tracking'] = 0;
                 $options['trackingcode_infooter'] = 0;
-                $options['trackingevents_infooter'] = 0;
                 if ( isset( $_REQUEST['options']['ga_tracking_code'] ) ) {
                     $new_options['ga_tracking_code'] = trim( $new_options['ga_tracking_code'], "\t" );
@@ -612 +612 @@
                 <input type="text" id="ga_cookieexpires" name="options[ga_cookieexpires]" value="<?php echo esc_attr($options['ga_cookieexpires']); ?>" size="10">
                                         <?php _e("seconds", 'analytics-insights' ); ?>
+            </td>
+        </tr>
+        <tr>
+            <td class="aiwp-settings-title">
+                <label for="ga_samesite"><?php _e("SameSite Attribute:", 'analytics-insights' ); ?></label>
+            </td>
+            <td>
+                <select id="ga_samesite" name="options[ga_samesite]">
+                    <option value="" <?php selected( $options['ga_samesite'], '' ); ?>><?php _e("Disabled", 'analytics-insights');?></option>
+                    <option value="Strict" <?php selected( $options['ga_samesite'], 'Strict' ); ?>><?php _e("Strict", 'analytics-insights');?></option>
+                    <option value="Lax" <?php selected( $options['ga_samesite'], 'Lax' ); ?>><?php _e("Lax", 'analytics-insights');?></option>
+                    <option value="None" <?php selected( $options['ga_samesite'], 'None' ); ?>><?php _e("None", 'analytics-insights');?></option>
+                </select>
             </td>
         </tr>

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.8
+ * Version: 6.3.9
  * Author URI: https://deconf.com
  * Text Domain: analytics-insights
@@ -15 +15 @@
 // Plugin Version
 if ( ! defined( 'AIWP_CURRENT_VERSION' ) ) {
-    define( 'AIWP_CURRENT_VERSION', '6.3.8' );
+    define( 'AIWP_CURRENT_VERSION', '6.3.9' );
 }
 if ( ! defined( 'AIWP_ENDPOINT_URL' ) ) {

analytics-insights/trunk/config.php

@@ -128 +128 @@
                             'ecommerce_mode',
                             'tracking_type',
+                            'ga_samesite',
             );
             foreach ( $texts as $key ) {
@@ -412 +413 @@
             }
 
+            if ( ! isset( $this->options['ga_samesite'] ) ) { // v6.3.9
+                $this->options['ga_samesite'] = '';
+                $flag = true;
+            }
+
             if ( '' == $this->options['ga_target_geomap'] ) {
                 $this->options['ga_target_geomap'] = 'None';

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

@@ -252 +252 @@
                 $fieldsobject['cookie_expires'] = (int) $this->aiwp->config->options['ga_cookieexpires'];
             }
+
+            switch ( $this->aiwp->config->options['ga_samesite'] ) { // make sure we have a valid request
+                case 'Strict' :
+                    $fieldsobject['cookie_flags'] = 'SameSite=Strict';
+                    break;
+                case 'Lax' :
+                    $fieldsobject['cookie_flags'] = 'SameSite=Lax';
+                    break;
+                case 'None' :
+                    $fieldsobject['cookie_flags'] = 'SameSite=None;Secure';
+                    break;
+            }
+
             if ( $this->aiwp->config->options['ga_crossdomain_tracking'] && '' != $this->aiwp->config->options['ga_crossdomain_list'] ) {
                 $domains = '';

analytics-insights/trunk/install/install.php

@@ -56 +56 @@
             $options['ga_cookiename'] = '';
             $options['ga_cookieexpires'] = '';
+            $options['ga_cookieexpires'] = 'ga_samesite';
             $options['pagetitle_404'] = 'Page Not Found';
             $options['maps_api_key'] = '';

analytics-insights/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.5
 Tested up to: 6.7
-Stable tag: 6.3.8
+Stable tag: 6.3.9
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -142 +142 @@
 == Changelog ==
 
+= 6.3.9 (2024.11.30) =
+* Enhancements:
+    * a new option to set SameSite attribute on Cookie Customization section
+    
 = 6.3.8 (2024.09.21) =
 * Bug Fixes: