From cfac2e6b96b6b1a17e93261120096bcb5a64cab8 Mon Sep 17 00:00:00 2001
From: Dan0sz <18595395+Dan0sz@users.noreply.github.com>
Date: Tue, 8 Oct 2024 09:27:57 +0200
Subject: [PATCH] Fixed: Cloudflare, WPFC, LiteSpeed and Autoptimize
 compatibility for Minimal Analytics. Removed caos_script_custom_attributes
 filter, because it's no longer used in the plugin.

---
 includes/compatibility/class-autoptimize.php       | 3 ++-
 includes/compatibility/class-cloudflare.php        | 3 ++-
 includes/compatibility/class-litespeed.php         | 3 ++-
 includes/compatibility/class-wp-fastest-cache.php  | 3 ++-
 includes/frontend/class-tracking.php               | 4 ----
 templates/frontend-tracking-code-minimal-ga4.phtml | 7 ++++---
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/includes/compatibility/class-autoptimize.php b/includes/compatibility/class-autoptimize.php
index 1eaf1df..775de71 100644
--- a/includes/compatibility/class-autoptimize.php
+++ b/includes/compatibility/class-autoptimize.php
@@ -27,7 +27,8 @@ public function __construct() {
 	 * @return void
 	 */
 	private function init() {
-		add_filter( 'caos_script_custom_attributes', [ $this, 'exclude_from_autoptimize' ] );
+		add_filter( 'caos_gtag_custom_attributes', [ $this, 'exclude_from_autoptimize' ] );
+		add_filter( 'caos_ma4_custom_attributes', [ $this, 'exclude_from_autoptimize' ] );
 	}
 
 	/**
diff --git a/includes/compatibility/class-cloudflare.php b/includes/compatibility/class-cloudflare.php
index c789b1a..b4ea036 100644
--- a/includes/compatibility/class-cloudflare.php
+++ b/includes/compatibility/class-cloudflare.php
@@ -27,7 +27,8 @@ public function __construct() {
 	 * @return void
 	 */
 	private function init() {
-		add_filter( 'caos_script_custom_attributes', [ $this, 'exclude_from_cloudflare' ] );
+		add_filter( 'caos_gtag_custom_attributes', [ $this, 'exclude_from_cloudflare' ] );
+		add_filter( 'caos_ma4_custom_attributes', [ $this, 'exclude_from_cloudflare' ] );
 	}
 
 	/**
diff --git a/includes/compatibility/class-litespeed.php b/includes/compatibility/class-litespeed.php
index 73ace82..376d25e 100644
--- a/includes/compatibility/class-litespeed.php
+++ b/includes/compatibility/class-litespeed.php
@@ -27,7 +27,8 @@ public function __construct() {
 	 * @return void
 	 */
 	private function init() {
-		add_filter( 'caos_script_custom_attributes', [ $this, 'exclude_from_litespeed' ] );
+		add_filter( 'caos_gtag_custom_attributes', [ $this, 'exclude_from_litespeed' ] );
+		add_filter( 'caos_ma4_custom_attributes', [ $this, 'exclude_from_litespeed' ] );
 	}
 
 	/**
diff --git a/includes/compatibility/class-wp-fastest-cache.php b/includes/compatibility/class-wp-fastest-cache.php
index 503a73b..c7cd01d 100644
--- a/includes/compatibility/class-wp-fastest-cache.php
+++ b/includes/compatibility/class-wp-fastest-cache.php
@@ -27,7 +27,8 @@ public function __construct() {
 	 * @return void
 	 */
 	private function init() {
-		add_filter( 'caos_script_custom_attributes', [ $this, 'exclude_from_wpfc' ] );
+		add_filter( 'caos_gtag_custom_attributes', [ $this, 'exclude_from_wpfc' ] );
+		add_filter( 'caos_ma4_custom_attributes', [ $this, 'exclude_from_wpfc' ] );
 	}
 
 	/**
diff --git a/includes/frontend/class-tracking.php b/includes/frontend/class-tracking.php
index 583c999..09c2cb3 100644
--- a/includes/frontend/class-tracking.php
+++ b/includes/frontend/class-tracking.php
@@ -444,10 +444,6 @@ public function add_attributes( $tag, $handle ) {
 			$tag = str_replace( 'script src', 'script async src', $tag );
 		}
 
-		if ( $handle === $this->handle && $custom_attributes = apply_filters( 'caos_script_custom_attributes', '' ) ) {
-			return str_replace( '<script ', "<script $custom_attributes ", $tag );
-		}
-
 		return $tag;
 	}
 
diff --git a/templates/frontend-tracking-code-minimal-ga4.phtml b/templates/frontend-tracking-code-minimal-ga4.phtml
index 526fed4..e0eabcf 100644
--- a/templates/frontend-tracking-code-minimal-ga4.phtml
+++ b/templates/frontend-tracking-code-minimal-ga4.phtml
@@ -13,13 +13,14 @@
  * @license  : GPL2v2 or later
  * * * * * * * * * * * * * * * * * * * */
 
-$endpoint = apply_filters( 'caos_minimal_analytics_ga4_endpoint', 'https://www.google-analytics.com/g/collect' );
+$endpoint          = apply_filters( 'caos_minimal_analytics_ga4_endpoint', 'https://www.google-analytics.com/g/collect' );
+$custom_attributes = apply_filters( 'caos_ma4_custom_attributes', '' );
 
 /**
  * The below script is maintained by: https://github.com/jahilldev/minimal-analytics/tree/main/packages/ga4
  */
 ?>
-    <script>
+    <script<?php echo $custom_attributes ? ' ' . $custom_attributes : ''; ?>>
         window.minimalAnalytics = {
             trackingId: '<?php echo CAOS::get( CAOS_Admin_Settings::CAOS_BASIC_SETTING_MEASUREMENT_ID ); ?>',
 			<?php echo ( CAOS::get( CAOS_Admin_Settings::CAOS_BASIC_SETTING_ALLOW_TRACKING ) !== '' &&
@@ -28,7 +29,7 @@ $endpoint = apply_filters( 'caos_minimal_analytics_ga4_endpoint', 'https://www.g
         }
     </script>
 
-    <script>
+    <script<?php echo $custom_attributes ? ' ' . $custom_attributes : ''; ?>>
 		<?php // @formatter:off ?>
         !function(e,t){if("object"==typeof exports&&"object"==typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var n=t();for(var o in n)("object"==typeof exports?exports:e)[o]=n[o]}}(this,(()=>(()=>{"use strict";var e={508:(e,t,n)=>{function o(e,t=300,n=0){return(...o)=>(clearTimeout(n),n=setTimeout(e,t,...o))}function i(e=16){return e=e>16?16:e,`${Math.floor(1e16*Math.random())}`.padStart(e,"0").substring(-1,e)}function s(e,t=16){let n=0;for(let t=0;t<e.length;t++)n=(n<<5)-n+e.charCodeAt(t),n&=n;return n=Math.abs(n),`${n}`.padStart(t,"0").substring(-1,t)}function r(){const e=document.body,t=window.pageYOffset||e.scrollTop,{scrollHeight:n,offsetHeight:o,clientHeight:i}=document.documentElement,s=Math.max(e.scrollHeight,n,e.offsetHeight,o,e.clientHeight,i)-window.innerHeight;return Math.floor(100*Math.abs(t/s))}function a(e,t){let n=e;for(;n&&(!(null==n?void 0:n.matches)||!(null==n?void 0:n.matches(t)));)n=null==n?void 0:n.parentNode;return n}function c(e){let t,n,o=!1;try{({hostname:t,pathname:n}=e&&new URL(e)||{})}catch(e){}return t&&(o=t!==window.location.host),{t:o,hostname:t,pathname:n}}n.r(t),n.d(t,{o:()=>u,i:()=>d,u:()=>o,l:()=>m,m:()=>f,g:()=>p,v:()=>s,p:()=>i,h:()=>r,_:()=>g,$:()=>v,S:()=>c,j:()=>a,I:()=>l});const u="clientId",l="sessionId",d="sessionCount";function f(){const{hostname:e,origin:t,pathname:n,search:o}=document.location,i=document.title;return{location:t+n+o,hostname:e,pathname:n,referrer:document.referrer,title:i}}function m(e=u){const t=i(),n=localStorage.getItem(e);return n||(localStorage.setItem(e,t),t)}function g(e=l){const t=i(),n=sessionStorage.getItem(e);return n||(sessionStorage.setItem(e,t),t)}function v(e){const t=localStorage.getItem(u)?void 0:"1",n=sessionStorage.getItem(l)?void 0:"1";let o=sessionStorage.getItem(d)||"1";return e&&(o=function(e=d){let t="1";const n=sessionStorage.getItem(e);return n&&(t=""+(+n+1)),sessionStorage.setItem(e,t),t}()),{firstVisit:t,sessionStart:n,sessionCount:o}}function p(e){return Array.isArray(e)?e.map((e=>e.map((e=>null==e?void 0:e.toString())))):Object.keys(e).map((t=>[t,`${e[t]}`]))}},209:(e,t)=>{Object.defineProperty(t,"M",{value:!0}),t.files=t.k=void 0;t.k={protocolVersion:"v",trackingId:"<?php echo apply_filters('caos_tracking_id_param_name', "tid"); ?>",pageId:"_p",language:"ul",clientId:"cid",firstVisit:"_fv",hitCount:"_s",sessionId:"sid",sessionCount:"sct",sessionEngagement:"seg",sessionStart:"_ss",debug:"_dbg",referrer:"dr",location:"dl",title:"dt",eventName:"en",eventParam:"ep",eventParamNumber:"epn",screenResolution:"sr",enagementTime:"_et"};t.files=["pdf|xlsx?|docx?|txt|rtf|csv|exe|key|pp(s|t|tx)|7z|pkg|rar|gz|zip|avi","mov|mp4|mpe?g|wmv|midi?|mp3|wav|wma"]}},t={};function n(o){var i=t[o];if(void 0!==i)return i.exports;var s=t[o]={exports:{}};return e[o](s,s.exports,n),s.exports}n.d=(e,t)=>{for(var o in t)n.D(t,o)&&!n.D(e,o)&&Object.defineProperty(e,o,{O:!0,get:t[o]})},n.D=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),n.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"M",{value:!0})};var o={};return(()=>{var e=o;Object.defineProperty(e,"M",{value:!0}),e.track=void 0;const t=n(508),i=n(209),s="undefined"!=typeof window,r=s&&window.minimalAnalytics?.defineGlobal,a=s&&window.minimalAnalytics?.autoTrack,c=["q","s","search","query","keyword"];let u,l,d,f=[[Date.now()]],m=!1;const g="page_view",v="scroll",p="click",w="view_search_results",h="user_engagement",y="file_download";function b(e,{type:n,event:o,debug:s}){const{location:r,referrer:a,title:u}=(0,t.m)(),{firstVisit:l,sessionStart:d,sessionCount:f}=(0,t.$)(!m),g=self.screen||{};let v=[[i.k.protocolVersion,"2"],[i.k.trackingId,e],[i.k.pageId,(0,t.p)()],[i.k.language,(navigator.language||"").toLowerCase()],[i.k.clientId,(0,t.l)()],[i.k.firstVisit,l],[i.k.hitCount,"1"],[i.k.sessionId,(0,t._)()],[i.k.sessionCount,f],[i.k.sessionEngagement,"1"],[i.k.sessionStart,d],[i.k.debug,s?"1":""],[i.k.referrer,a],[i.k.location,r],[i.k.title,u],[i.k.screenResolution,`${g.width}x${g.height}`]];return v=v.concat(function({type:e="",event:n}){const o=document.location.search,s=new URLSearchParams(o),r=c.some((e=>new RegExp(`[?|&]${e}=`,"g").test(o)))?w:e,a=c.find((e=>s.get(e)));let u=[[i.k.eventName,r],[`${i.k.eventParam}.search_term`,a||""]];return n&&(u=u.concat((0,t.g)(n))),u}({type:n,event:o})),v=v.filter((([,e])=>e)),new URLSearchParams(v)}function _(){return f.reduce(((e,[t,n=Date.now()])=>e+(n-t)),0).toString()}function $(e,n){const o=(0,t.j)(n.target,"a, button, input[type=submit], input[type=button]"),s=o?.tagName?.toLowerCase(),r="a"===s?"link":s,a=o?.getAttribute("href")||void 0,c=o?.getAttribute("download")||void 0||a,{t:u,hostname:l,pathname:d}=(0,t.S)(c),f="link"===r&&!u,[m]=c?.match(new RegExp(i.files.join("|"),"g"))||[],g=m?y:p,v=`${i.k.eventParam}.${r}`;if(!o||f&&!m)return;let w=[[`${v}_id`,o.id],[`${v}_classes`,o.className],[`${v}_name`,o?.getAttribute("name")?.trim()],[`${v}_text`,o.textContent?.trim()],[`${v}_value`,o?.getAttribute("value")?.trim()],[`${v}_url`,a],[`${v}_domain`,l],[`${i.k.eventParam}.outbound`,`${u}`],[i.k.enagementTime,_()]];m&&(w=w.concat([[`${i.k.eventParam}.file_name`,d||c],[`${i.k.eventParam}.file_extension`,m]])),D(e,{type:g,event:w})}function S(){const e=f.length-1,[,t]=f[e];t||f[e].push(Date.now())}function x(){const e=f.length-1,[,t]=f[e];t&&f.push([Date.now()])}function j(){const e=f.length-1,[,t]=f[e],n=["hidden","visible"].indexOf(document.visibilityState),o=Boolean(n);-1!==n&&(o?t&&f.push([Date.now()]):!t&&f[e].push(Date.now()))}const I=(0,t.u)((e=>{if((0,t.h)()<90)return;const n=[[`${i.k.eventParamNumber}.percent_scrolled`,90]];D(e,{type:v,event:n}),document.removeEventListener("scroll",l)}));function M(e){const t=[[i.k.enagementTime,_()]];D(e,{type:h,event:t})}function k(e){m||(u=$.bind(null,e),l=I.bind(null,e),d=M.bind(null,e),document.addEventListener("visibilitychange",j),document.addEventListener("scroll",l),document.addEventListener("click",u),window.addEventListener("blur",S),window.addEventListener("focus",x),window.addEventListener("beforeunload",d))}function D(...e){const[t,{type:n,event:o,debug:i}]=function(e){const t=window.minimalAnalytics?.trackingId,n="string"==typeof e[0]?e[0]:t,o="object"==typeof e[0]?e[0]:e[1]||{};return[n,{type:g,...o}]}(e);if(!t)return void console.error("GA4: Tracking ID is missing or undefined");const s=b(t,{type:n,event:o,debug:i}),r=window.minimalAnalytics?.analyticsEndpoint||"<?php echo $endpoint; ?>";navigator.sendBeacon(`${r}?${s}`),k(t),m=!0}e.track=D,r&&(window.track=D),a&&D()})(),o})()));
         <?php // @formatter:on ?>