Changeset 3170069

Timestamp:

10/16/2024 11:04:37 AM (16 months ago)

Author:

wiredmindshelp

Message:

Updated from GitLab CI 1.6.1

Location:

ip2ga/trunk

Files:

• README.txt (modified) (4 diffs)
• admin-script.js (modified) (1 diff)
• ip2ga-event-tracking.js (modified) (2 diffs)
• ip2ga-plugin.php (modified) (7 diffs)

ip2ga/trunk/README.txt

@@ -6 +6 @@
 Tested up to: 6.6  
 Requires PHP: 7.4  
-Stable tag: 1.6  
+Stable tag: 1.6.1  
 License: GPLv2 or later  
 License URI: https://www.gnu.org/licenses/gpl-2.0.html  
@@ -60 +60 @@
 2. Go to the **Admin** section (gear icon at the bottom left).
 3. Under the Account column, select your account or create a new one if you don't have it.
-4. In the top left, click + **Create Property**.
-5. Follow the steps to set up your new property. Make sure to select **Other** as the business objective during the setup.
+4. In the top left, click + **Create Property** or use existing Property .
+5. Follow the steps to set up your  **only for new property**. Make sure to select **All** as the business objective during the setup.
 6. Note down the **Measurement ID** (it starts with "G-").
 7. Click on **Measurement Protocol API secrets** and create a new secret. Name it, and then copy the **API Secret**.
@@ -211 +211 @@
 Ensure that your marketing URLs include UTM parameters. The plugin will automatically capture and send these parameters to GA4, allowing you to track the performance of your campaigns directly in Google Analytics.
 
+= I detected a provider / ISP - how can I hide them? =
+
+Here is a link where you can report providers, which will be hidden from our side. :[Tracking – Providercheck](https://help.wiredminds.de/tracking-providercheck/).
+
 == Screenshots ==
 
@@ -216 +220 @@
 
 == Changelog ==
+
+= 1.6.1 =
+* Updated AJAX tracking for link click event.
+* Added company name check before sending to GA4.
 
 = 1.6 =

ip2ga/trunk/admin-script.js

@@ -30 +30 @@
         }
     }
+
+    // Initial nav-tab
+    $('.nav-tab').on('click', function(e) {
+        e.preventDefault();
+        $('.nav-tab').removeClass('nav-tab-active');
+        $(this).addClass('nav-tab-active');
+        $('.tab-content').hide();
+        $($(this).attr('href')).show();
+    });
+
+    // Show Consent Settings only when GA4 Tracking Code is enabled
+    $('#enable_ga_tracking').on('change', function() {
+        if ($(this).is(':checked')) {
+            $('a[href="#consent-settings"]').show();
+        } else {
+            $('a[href="#consent-settings"]').hide();
+            $('#consent-settings').hide();
+        }
+     }).trigger('change'); // Trigger change on page load to ensure correct state
+
 });

ip2ga/trunk/ip2ga-event-tracking.js

@@ -114 +114 @@
     // Event handler for general link clicks
     $('a').on('click', function(event) {
-        event.preventDefault();
-
-        var eventData = {
-            action: 'ga_ip2c_event',
-            type: 'link_click',
-            category: 'Link Click',
-            label: $(this).text() || $(this).attr('href'),
-            page: window.location.pathname,
-            title: document.title,
-            additional: {
-                url: $(this).attr('href')
-            }
-        };
-
-        enqueueRequest({
-            url: ga_ip2c_ajax.ajax_url,
-            method: 'POST',
-            data: $.extend(eventData, { security: ga_ip2c_ajax.nonce }),
-            success: function() {
-                window.location.href = eventData.additional.url; // Redirect after tracking
-            },
-            error: function() {
-                window.location.href = eventData.additional.url; // Redirect even on error
-            }
-        });
+        var href = $(this).attr('href');
+        if (href && href.startsWith('#')) {
+            // Track the click on the anchor link
+            var eventData = {
+                action: 'ga_ip2c_event',
+                type: 'anchor_click',
+                category: 'Anchor Link Click',
+                label: $(this).text() || href,
+                page: window.location.pathname,
+                title: document.title,
+                additional: {
+                    anchor: href
+                }
+            };
+           
+            enqueueRequest({
+                url: ga_ip2c_ajax.ajax_url,
+                method: 'POST',
+                data: $.extend(eventData, { security: ga_ip2c_ajax.nonce })
+            });
+
+
+        }
+        else if (href && href.match(/\.(pdf|docx|xlsx|zip|rar|jpg|png)$/i)) {
+            // Prevent default behavior to allow tracking before redirecting            
+            event.preventDefault();
+
+            // Track the click on file downloads
+            var eventData = {
+                action: 'ga_ip2c_event',
+                type: 'download',
+                category: 'Download',
+                label: href,
+                page: window.location.pathname,
+                title: document.title
+            };
+
+            enqueueRequest({
+                url: ga_ip2c_ajax.ajax_url,
+                method: 'POST',
+                data: $.extend(eventData, { security: ga_ip2c_ajax.nonce }),
+                success: function() {
+                    window.location.href = href; // Redirect after tracking
+                },
+                error: function() {                    
+                    window.location.href = href; // Redirect even on error
+                }
+            });
+        } 
+        else {
+            // Prevent default behavior to allow tracking before redirecting            
+            event.preventDefault();
+            
+            // Track the click on general links
+            var eventData = {
+                action: 'ga_ip2c_event',
+                type: 'link_click',
+                category: 'Link Click',
+                label: $(this).text() || href,
+                page: window.location.pathname,
+                title: document.title,
+                additional: {
+                    url: href
+                }
+            };
+
+            enqueueRequest({
+                url: ga_ip2c_ajax.ajax_url,
+                method: 'POST',
+                data: $.extend(eventData, { security: ga_ip2c_ajax.nonce }),
+                success: function() {
+                    window.location.href = href; // Redirect after tracking
+                },
+                error: function() {
+                    window.location.href = href; // Redirect even on error
+                }
+            });
+        }           
     });
 
@@ -218 +271 @@
     firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
 
-    // Event handler for file downloads
-    $('a').on('click', function(event) {
-        var href = $(this).attr('href');
-        if (href && href.match(/\.(pdf|docx|xlsx|zip|rar|jpg|png)$/i)) {
-            var eventData = {
-                action: 'ga_ip2c_event',
-                type: 'download',
-                category: 'Download',
-                label: href,
-                page: window.location.pathname,
-                title: document.title
-            };
-
-            enqueueRequest({
-                url: ga_ip2c_ajax.ajax_url,
-                method: 'POST',
-                data: $.extend(eventData, { security: ga_ip2c_ajax.nonce })
-            });
-        }
-    });
+
+
 
     // Other event handlers can be added here

ip2ga/trunk/ip2ga-plugin.php

@@ -3 +3 @@
 Plugin Name: IP2GA
 Description: Track all user activities on the site, including page views, button clicks, and form submissions, and send them to Google Analytics 4.
-Version: 1.6
+Version: 1.6.1
 Author: Wiredminds GmbH
 Author URI: https://wiredminds.de
@@ -154 +154 @@
 // Function to send data to Google Analytics 4
 function ip2ga_send_data_to_ga($data, $event_data) {
+
+    // If company_name is empty, do not send data
+    if (empty($data['name'])) {
+        return;
+    }
+
     $tracking_id = get_option('ga_ip2c_ga_id');
     $api_secret = get_option('ga_ip2c_api_secret');
@@ -421 +427 @@
 function ip2ga_settings_page() {
     ?>
-    <div class="wrap">
-        <h1>IP2GA Integration Settings</h1>
-        <form method="post" action="options.php">
-            <?php settings_fields('ga_ip2c_settings_group'); ?>
-            <?php do_settings_sections('ga_ip2c_settings_group'); ?>
+<div class="wrap">
+    <h1>IP2GA Integration Settings</h1>
+    <h2 class="nav-tab-wrapper">
+        <a href="#general-settings" class="nav-tab nav-tab-active">General Settings</a>
+        <a href="#tracking-settings" class="nav-tab">Tracking Settings</a>
+        <a href="#consent-settings" class="nav-tab" style="display: none;">Consent Settings</a>
+    </h2>
+    <form method="post" action="options.php">
+        <?php settings_fields('ga_ip2c_settings_group'); ?>
+        <?php do_settings_sections('ga_ip2c_settings_group'); ?>
+        
+        <!-- General Settings Tab -->
+        <div id="general-settings" class="tab-content" style="display: block;">
             <table class="form-table">
                 <tr valign="top">
@@ -431 +445 @@
                     <td>
                       <input id="rapidapi_token" type="text" name="ga_ip2c_rapid_token" value="<?php echo esc_attr(get_option('ga_ip2c_rapid_token')); ?>" />
-                      <p>Enter your RapidAPI Token. If you fill this field, leave the <b>WiredMinds API Token</b> field empty.</p>
+                      <p>Enter your <a href="https://rapidapi.com/wiredminds-gmbh-wiredminds-gmbh-default/api/ip2company3" target="_blank"><b>RapidAPI Token</b></a>. If you fill this field, leave the <b>WiredMinds API Token</b> field empty.</p>
+                    </td>
+                </tr>
+                <tr valign="top">
+                    <th scope="row"><span class="dashicons dashicons-rest-api"></span> WiredMinds API Token</th>
+                    <td>
+                      <input id="ip2c_token" type="text" name="ga_ip2c_token" value="<?php echo esc_attr(get_option('ga_ip2c_token')); ?>" />
+                      <p>Enter the API Token provided by WiredMinds GmbH. If you fill this field, leave the <b>RapidAPI Token</b> field empty.</p>
                     </td>
                 </tr>
@@ -448 +469 @@
                     </td>
                 </tr>
+            </table>
+        </div>
+        
+        <!-- Tracking Settings Tab -->
+        <div id="tracking-settings" class="tab-content" style="display: none;">
+            <table class="form-table">
                 <tr valign="top">
                     <th scope="row"><span class="dashicons dashicons-welcome-view-site"></span> Enable AJAX Event Tracking</th>
                     <td>
                       <input type="checkbox" name="ga_ip2c_enable_ajax_tracking" value="1" <?php checked(1, get_option('ga_ip2c_enable_ajax_tracking'), true); ?> />
-                      <p>Enable or disable event tracking via AJAX requests.</p>
+                      <p>Enable JavaScript to track GA4 events if a visitor rejects cookies.</p>
                     </td>
                 </tr>
@@ -458 +485 @@
                     <th scope="row"><span class="dashicons dashicons-visibility"></span> Enable GA4 Tracking Code</th>
                     <td>
-                      <input type="checkbox" name="ga_ip2c_enable_ga_tracking" value="1" <?php checked(1, get_option('ga_ip2c_enable_ga_tracking'), true); ?> />
-                      <p>Enable or disable embedding the GA4 tracking script on your site.</p>
-                    </td>
-                </tr>               
-                <tr valign="top">
-                    <th scope="row"><span class="dashicons dashicons-rest-api"></span> WiredMinds API Token</th>
-                    <td>
-                      <input id="ip2c_token" type="text" name="ga_ip2c_token" value="<?php echo esc_attr(get_option('ga_ip2c_token')); ?>" />
-                      <p>Enter the API Token provided by WiredMinds GmbH. If you fill this field, leave the <b>RapidAPI Token</b> field empty.</p>
-                    </td>
-                </tr>
+                      <input id="enable_ga_tracking" type="checkbox" name="ga_ip2c_enable_ga_tracking" value="1" <?php checked(1, get_option('ga_ip2c_enable_ga_tracking'), true); ?> />
+                      <p>Enable GA4 tracking only if you're not using other methods to add Google Analytics or Tag Manager code.</p>
+                    </td>
+                </tr>
+            </table>
+        </div>
+
+        <!-- Consent Settings Tab -->
+        <div id="consent-settings" class="tab-content" style="display: none;">
+            <table class="form-table">
                 <tr valign="top">
                     <th scope="row"><span class="dashicons dashicons-format-aside"></span> Consent Banner Text</th>
@@ -482 +508 @@
                         <p>Enter the URL of your privacy policy page (e.g., <code>/privacy-policy</code>).</p>
                     </td>
-                </tr>                
+                </tr>
             </table>
+        </div>
+
             <?php submit_button(); ?>
         </form>