Changeset 3291964

Timestamp:

05/12/2025 02:42:45 PM (9 months ago)

Author:

raptive

Message:

Updated to 40e5823

Location:

adthrive-ads/trunk

Files:

• js/adblock-detection.js (modified) (1 diff)
• js/email-detection-helpers.js (modified) (3 diffs)
• js/min/adblock-detection.min.js (modified) (1 diff)
• js/min/email-detection.min.js (modified) (1 diff)
• readme.txt (modified) (1 diff)

adthrive-ads/trunk/js/adblock-detection.js

@@ -1 @@
-(function(doc) {
-    var adBlockerCookieKey = '__adblocker';
-    if(doc.cookie.indexOf(adBlockerCookieKey) === -1) {
-        doc.cookie = adBlockerCookieKey + "=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/";
-        var request = new XMLHttpRequest();
-        request.open('GET', 'https://ads.adthrive.com/abd/abd.js', true);
-        request.onreadystatechange = function() {
-            if(XMLHttpRequest.DONE === request.readyState) {
-                if(request.status === 200) {
-                    var script = doc.createElement("script");
-                    script.innerHTML = request.responseText;
-                    doc.getElementsByTagName("head")[0].appendChild(script);
-                } else {
-                    var date = new Date();
-                    date.setTime(date.getTime() + 60 * 5 * 1000);
-                    doc.cookie = adBlockerCookieKey + "=true; expires=" + date.toUTCString() + "; path=/";
-                }
-            }
-        };
-        request.send();
-    }
+(function (doc) {
+  const timeZoneToRegulationMap = {
+    'Europe/Brussels': 'gdpr', // Belgium
+    'Europe/Sofia': 'gdpr', // Bulgaria
+    'Europe/Prague': 'gdpr', // Czech Republic
+    'Europe/Copenhagen': 'gdpr', // Denmark
+    'Europe/Berlin': 'gdpr', // Germany
+    'Europe/Tallinn': 'gdpr', // Estonia
+    'Europe/Dublin': 'gdpr', // Ireland
+    'Europe/Athens': 'gdpr', // Greece
+    'Europe/Madrid': 'gdpr', // Spain
+    'Africa/Ceuta': 'gdpr', // Spain (excl. Canary Islands)
+    'Europe/Paris': 'gdpr', // France
+    'Europe/Zagreb': 'gdpr', // Croatia
+    'Europe/Rome': 'gdpr', // Italy
+    'Asia/Nicosia': 'gdpr', // Cyprus
+    'Europe/Nicosia': 'gdpr', // Cyprus (Europe TZ)
+    'Europe/Riga': 'gdpr', // Latvia
+    'Europe/Vilnius': 'gdpr', // Lithuania
+    'Europe/Luxembourg': 'gdpr', // Luxembourg
+    'Europe/Budapest': 'gdpr', // Hungary
+    'Europe/Malta': 'gdpr', // Malta
+    'Europe/Amsterdam': 'gdpr', // Netherlands
+    'Europe/Vienna': 'gdpr', // Austria
+    'Europe/Warsaw': 'gdpr', // Poland
+    'Europe/Lisbon': 'gdpr', // Portugal (mainland)
+    'Atlantic/Madeira': 'gdpr', // Portugal (Madeira)
+    'Europe/Bucharest': 'gdpr', // Romania
+    'Europe/Ljubljana': 'gdpr', // Slovenia
+    'Europe/Bratislava': 'gdpr', // Slovakia
+    'Europe/Helsinki': 'gdpr', // Finland
+    'Europe/Stockholm': 'gdpr', // Sweden
+    'Europe/London': 'gdpr', // United Kingdom / Great Britain
+    'Europe/Vaduz': 'gdpr', // Liechtenstein
+    'Atlantic/Reykjavik': 'gdpr', // Iceland
+    'Europe/Oslo': 'gdpr', // Norway
+    'Europe/Istanbul': 'gdpr', // Turkey
+    'Europe/Zurich': 'gdpr', // Switzerland
+  };
+
+  const inferRegulation = () => {
+    const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+    return timeZoneToRegulationMap[timeZone] || null;
+  };
+
+  const regulation = inferRegulation();
+  if (regulation === null || regulation !== 'gdpr') {
+    const adBlockerCookieKey = '__adblocker';
+    if (doc.cookie.indexOf(adBlockerCookieKey) === -1) {
+      const request = new XMLHttpRequest();
+      request.open('GET', 'https://ads.adthrive.com/abd/abd.js', true);
+      request.onreadystatechange = function () {
+        if (XMLHttpRequest.DONE === request.readyState) {
+          if (request.status === 200) {
+            const script = doc.createElement('script');
+            script.innerHTML = request.responseText;
+            doc.getElementsByTagName('head')[0].appendChild(script);
+          } else {
+            const date = new Date();
+            date.setTime(date.getTime() + 60 * 5 * 1000);
+            doc.cookie = adBlockerCookieKey + '=true; expires=' + date.toUTCString() + '; path=/';
+          }
+        }
+      };
+      request.send();
+    }
+  }
 })(document);

adthrive-ads/trunk/js/email-detection-helpers.js

@@ -101 +101 @@
     });
 
+    window.adthrive = window.adthrive || {};
+    window.adthrive.cmd = window.adthrive.cmd || [];
     if (plainTextQueryParam) {
         if (validateEmail(plainTextQueryParam.value)) {
@@ -109 +111 @@
                         created: Date.now(),
                     };
-                    localStorage.setItem(localStorageKey, JSON.stringify(data));
-                    localStorage.setItem(
-                        localStorageSrcKey,
-                        plainTextQueryParam.emsrc
-                    );
+                    window.adthrive.cmd.push(function () {
+                        window.adthrive.api.browserStorage.setInternalLocalStorage(
+                            localStorageKey,
+                            JSON.stringify(data)
+                        );
+                        window.adthrive.api.browserStorage.setInternalLocalStorage(
+                            localStorageSrcKey,
+                            plainTextQueryParam.emsrc
+                        );
+                    });
                 }
             });
@@ -125 +132 @@
             created: Date.now(),
         };
-
-        localStorage.setItem(localStorageKey, JSON.stringify(data));
-        localStorage.setItem(localStorageSrcKey, hashedQueryParam.emsrc);
+        window.adthrive.cmd.push(function () {
+            window.adthrive.api.browserStorage.setInternalLocalStorage(
+                localStorageKey,
+                JSON.stringify(data)
+            );
+            window.adthrive.api.browserStorage.setInternalLocalStorage(
+                localStorageSrcKey,
+                hashedQueryParam.emsrc
+            );
+        });
     }
 

adthrive-ads/trunk/js/min/adblock-detection.min.js

@@ -1 @@
-!function(){"use strict";!function(e){if(-1===e.cookie.indexOf("__adblocker")){e.cookie="__adblocker=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/";var t=new XMLHttpRequest;t.open("GET","https://ads.adthrive.com/abd/abd.js",!0),t.onreadystatechange=function(){if(XMLHttpRequest.DONE===t.readyState)if(200===t.status){var a=e.createElement("script");a.innerHTML=t.responseText,e.getElementsByTagName("head")[0].appendChild(a)}else{var n=new Date;n.setTime(n.getTime()+3e5),e.cookie="__adblocker=true; expires="+n.toUTCString()+"; path=/"}},t.send()}}(document)}();
+!function(){"use strict";!function(e){const r={"Europe/Brussels":"gdpr","Europe/Sofia":"gdpr","Europe/Prague":"gdpr","Europe/Copenhagen":"gdpr","Europe/Berlin":"gdpr","Europe/Tallinn":"gdpr","Europe/Dublin":"gdpr","Europe/Athens":"gdpr","Europe/Madrid":"gdpr","Africa/Ceuta":"gdpr","Europe/Paris":"gdpr","Europe/Zagreb":"gdpr","Europe/Rome":"gdpr","Asia/Nicosia":"gdpr","Europe/Nicosia":"gdpr","Europe/Riga":"gdpr","Europe/Vilnius":"gdpr","Europe/Luxembourg":"gdpr","Europe/Budapest":"gdpr","Europe/Malta":"gdpr","Europe/Amsterdam":"gdpr","Europe/Vienna":"gdpr","Europe/Warsaw":"gdpr","Europe/Lisbon":"gdpr","Atlantic/Madeira":"gdpr","Europe/Bucharest":"gdpr","Europe/Ljubljana":"gdpr","Europe/Bratislava":"gdpr","Europe/Helsinki":"gdpr","Europe/Stockholm":"gdpr","Europe/London":"gdpr","Europe/Vaduz":"gdpr","Atlantic/Reykjavik":"gdpr","Europe/Oslo":"gdpr","Europe/Istanbul":"gdpr","Europe/Zurich":"gdpr"},p=(()=>{const e=Intl.DateTimeFormat().resolvedOptions().timeZone;return r[e]||null})();if(null===p||"gdpr"!==p){const r="__adblocker";if(-1===e.cookie.indexOf(r)){const p=new XMLHttpRequest;p.open("GET","https://ads.adthrive.com/abd/abd.js",!0),p.onreadystatechange=function(){if(XMLHttpRequest.DONE===p.readyState)if(200===p.status){const r=e.createElement("script");r.innerHTML=p.responseText,e.getElementsByTagName("head")[0].appendChild(r)}else{const p=new Date;p.setTime(p.getTime()+3e5),e.cookie=r+"=true; expires="+p.toUTCString()+"; path=/"}},p.send()}}}(document)}();

adthrive-ads/trunk/js/min/email-detection.min.js

@@ -1 @@
-!function(){"use strict";function e(e){const t=e.match(/((?=([a-z0-9._!#$%+^&*()[\]<>-]+))\2@[a-z0-9._-]+\.[a-z0-9._-]+)/gi);return t?t[0]:""}function t(t){return e(a(t.toLowerCase()))}function a(e){return e.replace(/\s/g,"")}async function n(e){const t={sha256Hash:"",sha1Hash:""};if(!("msCrypto"in window)&&"https:"===location.protocol&&"crypto"in window&&"TextEncoder"in window){const a=(new TextEncoder).encode(e),[n,c]=await Promise.all([s("SHA-256",a),s("SHA-1",a)]);t.sha256Hash=n,t.sha1Hash=c}return t}async function s(e,t){const a=await crypto.subtle.digest(e,t);return Array.from(new Uint8Array(a)).map(e=>("00"+e.toString(16)).slice(-2)).join("")}function c(e){let t=!0;return Object.keys(e).forEach(a=>{0===e[a].length&&(t=!1)}),t}function i(e,t,a){e.splice(t,1);const n="?"+e.join("&")+a.hash;history.replaceState(null,"",n)}var o={checkEmail:e,validateEmail:t,trimInput:a,hashEmail:n,hasHashes:c,removeEmailAndReplaceHistory:i,detectEmails:async function(){const e=new URL(window.location.href),a=Array.from(e.searchParams.entries()).map(e=>`${e[0]}=${e[1]}`);let s,o;const r=["adt_eih","sh_kit"];if(a.forEach((e,t)=>{const a=decodeURIComponent(e),[n,c]=a.split("=");if("adt_ei"===n&&(s={value:c,index:t,emsrc:"url"}),r.includes(n)){o={value:c,index:t,emsrc:"sh_kit"===n?"urlhck":"urlh"}}}),s)t(s.value)&&n(s.value).then(e=>{if(c(e)){const t={value:e,created:Date.now()};localStorage.setItem("adt_ei",JSON.stringify(t)),localStorage.setItem("adt_emsrc",s.emsrc)}});else if(o){const e={value:{sha256Hash:o.value,sha1Hash:""},created:Date.now()};localStorage.setItem("adt_ei",JSON.stringify(e)),localStorage.setItem("adt_emsrc",o.emsrc)}s&&i(a,s.index,e),o&&i(a,o.index,e)},cb:"adthrive"};const{detectEmails:r,cb:l}=o;r()}();
+!function(){"use strict";function e(e){const t=e.match(/((?=([a-z0-9._!#$%+^&*()[\]<>-]+))\2@[a-z0-9._-]+\.[a-z0-9._-]+)/gi);return t?t[0]:""}function t(t){return e(a(t.toLowerCase()))}function a(e){return e.replace(/\s/g,"")}async function n(e){const t={sha256Hash:"",sha1Hash:""};if(!("msCrypto"in window)&&"https:"===location.protocol&&"crypto"in window&&"TextEncoder"in window){const a=(new TextEncoder).encode(e),[n,r]=await Promise.all([i("SHA-256",a),i("SHA-1",a)]);t.sha256Hash=n,t.sha1Hash=r}return t}async function i(e,t){const a=await crypto.subtle.digest(e,t);return Array.from(new Uint8Array(a)).map(e=>("00"+e.toString(16)).slice(-2)).join("")}function r(e){let t=!0;return Object.keys(e).forEach(a=>{0===e[a].length&&(t=!1)}),t}function o(e,t,a){e.splice(t,1);const n="?"+e.join("&")+a.hash;history.replaceState(null,"",n)}var s={checkEmail:e,validateEmail:t,trimInput:a,hashEmail:n,hasHashes:r,removeEmailAndReplaceHistory:o,detectEmails:async function(){const e=new URL(window.location.href),a=Array.from(e.searchParams.entries()).map(e=>`${e[0]}=${e[1]}`);let i,s;const c=["adt_eih","sh_kit"];if(a.forEach((e,t)=>{const a=decodeURIComponent(e),[n,r]=a.split("=");if("adt_ei"===n&&(i={value:r,index:t,emsrc:"url"}),c.includes(n)){s={value:r,index:t,emsrc:"sh_kit"===n?"urlhck":"urlh"}}}),window.adthrive=window.adthrive||{},window.adthrive.cmd=window.adthrive.cmd||[],i)t(i.value)&&n(i.value).then(e=>{if(r(e)){const t={value:e,created:Date.now()};window.adthrive.cmd.push((function(){window.adthrive.api.browserStorage.setInternalLocalStorage("adt_ei",JSON.stringify(t)),window.adthrive.api.browserStorage.setInternalLocalStorage("adt_emsrc",i.emsrc)}))}});else if(s){const e={value:{sha256Hash:s.value,sha1Hash:""},created:Date.now()};window.adthrive.cmd.push((function(){window.adthrive.api.browserStorage.setInternalLocalStorage("adt_ei",JSON.stringify(e)),window.adthrive.api.browserStorage.setInternalLocalStorage("adt_emsrc",s.emsrc)}))}i&&o(a,i.index,e),s&&o(a,s.index,e)},cb:"adthrive"};const{detectEmails:c,cb:d}=s;c()}();

adthrive-ads/trunk/readme.txt

@@ -34 +34 @@
 
 == Changelog ==
+= 3.7.6 =
+* Ensure browser storage use with user consent
+
 = 3.7.5 =
 * Tested up to 6.8