From a780db04665f4cf88853d5110e2e8505afafbf74 Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Tue, 30 Jun 2020 09:26:16 +1200 Subject: Better detection for cookies for browser plugins report for hybrid consent (#16101) --- matomo.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'matomo.js') diff --git a/matomo.js b/matomo.js index 131a4f7468..fa093a5122 100644 --- a/matomo.js +++ b/matomo.js @@ -45,9 +45,9 @@ var dk=new Image(1,1);dk.onload=function(){E=0;if(typeof dl==="function"){dl({re dn.open("POST",aD,true);dn.onreadystatechange=function(){if(this.readyState===4&&!(this.status>=200&&this.status<300)){var dq=m&&a6(dk,dl,dj);if(!dq&&dj){cp(dk,dl)}else{if(typeof dl==="function"){dl({request:dk,trackerUrl:aD,success:false,xhr:this})}}}else{if(this.readyState===4&&(typeof dl==="function")){dl({request:dk,trackerUrl:aD,success:true,xhr:this})}}};dn.setRequestHeader("Content-Type",cw);dn.withCredentials=true;dn.send(dk)}catch(dm){dp=m&&a6(dk,dl,dj);if(!dp&&dj){cp(dk,dl)}else{if(typeof dl==="function"){dl({request:dk,trackerUrl:aD,success:false})}}}},50)}function cf(dk){var dj=new Date();var dl=dj.getTime()+dk;if(!r||dl>r){r=dl}}function cn(dj){if(cb||!a5||!bA){return}cb=setTimeout(function dk(){cb=null;if(!bc){bc=(!G.hasFocus||G.hasFocus())}if(!bc){cn(a5);return}if(bQ()){return}var dl=new Date(),dm=a5-(dl.getTime()-cY);dm=Math.min(a5,dm);cn(dm)},dj||a5)}function bJ(){if(!cb){return}clearTimeout(cb);cb=null}function ba(){bc=true;cR=new Date().getTime()}function dd(){var dj=new Date().getTime(); return !cR||(dj-cR)>a5}function ay(){if(dd()){bQ()}bJ()}function dg(){if(aN||!a5){return}aN=true;an(T,"focus",ba);an(T,"blur",ay);ab++;e.addPlugin("HeartBeat"+ab,{unload:function(){if(aN&&dd()){bQ()}}})}function cB(dn){var dk=new Date();var dj=dk.getTime();cY=dj;if(cA&&dj=dj.length){return[dj]}var dk=0;var dl=dj.length;var dm=[];for(dk;dk=dk&&dj<=(dk+aZ)){return true}}return false}function dh(dj){if(!cM){return""}var dn=f(dj,av);if(!dn){return""}dn=String(dn); -var dl=new RegExp("^[a-zA-Z0-9]+$");if(dn.length===32&&dl.test(dn)){var dk=dn.substr(16,32);if(c2(dk)){var dm=dn.substr(0,16);return dm}}return""}function cN(){if(!bN){bN=dh(bM)}var dl=new Date(),dj=Math.round(dl.getTime()/1000),dk=aT("id"),dp=aC(dk),dn,dm;if(dp){dn=dp.split(".");dn.unshift("0");if(bN.length){dn[1]=bN}return dn}if(bN.length){dm=bN}else{if("0"===b4()){dm=""}else{dm=cQ()}}dn=["1",dm,dj,0,dj,"",""];return dn}function aY(){var dr=cN(),dm=dr[0],dn=dr[1],dk=dr[2],dj=dr[3],dp=dr[4],dl=dr[5];if(!J(dr[6])){dr[6]=""}var dq=dr[6];return{newVisitor:dm,uuid:dn,createTs:dk,visitCount:dj,currentVisitTs:dp,lastVisitTs:dl,lastEcommerceOrderTs:dq}}function aG(){var dm=new Date(),dk=dm.getTime(),dn=aY().createTs;var dj=parseInt(dn,10);var dl=(dj*1000)+cI-dk;return dl}function aL(dj){if(!b5){return}var dl=new Date(),dk=Math.round(dl.getTime()/1000);if(!J(dj)){dj=aY()}var dm=dj.uuid+"."+dj.createTs+"."+dj.visitCount+"."+dk+"."+dj.lastVisitTs+"."+dj.lastEcommerceOrderTs;de(aT("id"),dm,aG(),bo,cX,bR) -}function bL(){var dj=aC(aT("ref"));if(dj.length){try{dj=JSON_PIWIK.parse(dj);if(W(dj)){return dj}}catch(dk){}}return["","",0,""]}function bv(dk){var dj="testvalue";de("test",dj,10000,null,dk);if(aC("test")===dj){bX("test",null,dk);return true}return false}function aE(){var dk=bk;bk=false;var dj,dl;for(dj=0;dj=dk&&dj<=(dk+aZ)){return true}}return false +}function dh(dj){if(!cM){return""}var dn=f(dj,av);if(!dn){return""}dn=String(dn);var dl=new RegExp("^[a-zA-Z0-9]+$");if(dn.length===32&&dl.test(dn)){var dk=dn.substr(16,32);if(c2(dk)){var dm=dn.substr(0,16);return dm}}return""}function cN(){if(!bN){bN=dh(bM)}var dl=new Date(),dj=Math.round(dl.getTime()/1000),dk=aT("id"),dp=aC(dk),dn,dm;if(dp){dn=dp.split(".");dn.unshift("0");if(bN.length){dn[1]=bN}return dn}if(bN.length){dm=bN}else{if("0"===b4()){dm=""}else{dm=cQ()}}dn=["1",dm,dj,0,dj,"",""];return dn}function aY(){var dr=cN(),dm=dr[0],dn=dr[1],dk=dr[2],dj=dr[3],dp=dr[4],dl=dr[5];if(!J(dr[6])){dr[6]=""}var dq=dr[6];return{newVisitor:dm,uuid:dn,createTs:dk,visitCount:dj,currentVisitTs:dp,lastVisitTs:dl,lastEcommerceOrderTs:dq}}function aG(){var dm=new Date(),dk=dm.getTime(),dn=aY().createTs;var dj=parseInt(dn,10);var dl=(dj*1000)+cI-dk;return dl}function aL(dj){if(!b5){return}var dl=new Date(),dk=Math.round(dl.getTime()/1000);if(!J(dj)){dj=aY()}var dm=dj.uuid+"."+dj.createTs+"."+dj.visitCount+"."+dk+"."+dj.lastVisitTs+"."+dj.lastEcommerceOrderTs; +de(aT("id"),dm,aG(),bo,cX,bR)}function bL(){var dj=aC(aT("ref"));if(dj.length){try{dj=JSON_PIWIK.parse(dj);if(W(dj)){return dj}}catch(dk){}}return["","",0,""]}function bv(dk){var dj="testvalue";de("test",dj,10000,null,dk);if(aC("test")===dj){bX("test",null,dk);return true}return false}function aE(){var dk=bk;bk=false;var dj,dl;for(dj=0;djdJ){dA.visitCount++;dA.lastVisitTs=dA.currentVisitTs}if(!bu||!ds.length){for(dG in cq){if(Object.prototype.hasOwnProperty.call(cq,dG)){ds=f(dK,cq[dG]);if(ds.length){break}}}for(dG in bF){if(Object.prototype.hasOwnProperty.call(bF,dG)){dj=f(dK,bF[dG]);if(dj.length){break}}}}dO=d(bm);dv=dF.length?d(dF):"";if(dO.length&&!aV(dO)&&(!bu||!dv.length||aV(dv))){dF=bm}if(dF.length||ds.length){dr=du;dE=[ds,dj,dr,b1(dF.slice(0,dn))];de(dB,JSON_PIWIK.stringify(dE),c5,bo,cX)}}dl+="&idsite="+b5+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+dk.getHours()+"&m="+dk.getMinutes()+"&s="+dk.getSeconds()+"&url="+t(b1(dK))+(bm.length?"&urlref="+t(b1(bm)):"")+((bx&&bx.length)?"&uid="+t(bx):"")+"&_id="+dA.uuid+"&_idts="+dA.createTs+"&_idvc="+dA.visitCount+"&_idn="+dA.newVisitor+(ds.length?"&_rcn="+t(ds):"")+(dj.length?"&_rck="+t(dj):"")+"&_refts="+dr+"&_viewts="+dA.lastVisitTs+(String(dA.lastEcommerceOrderTs).length?"&_ects="+dA.lastEcommerceOrderTs:"")+(String(dF).length?"&_ref="+t(b1(dF.slice(0,dn))):"")+(dx?"&cs="+t(dx):"")+"&send_image=0"; var dN=cG();for(dG in dN){if(Object.prototype.hasOwnProperty.call(dN,dG)){dl+="&"+dG+"="+dN[dG]}}var dM=[];if(dH){for(dG in dH){if(Object.prototype.hasOwnProperty.call(dH,dG)&&/^dimension\d+$/.test(dG)){var dq=dG.replace("dimension","");dM.push(parseInt(dq,10));dM.push(String(dq));dl+="&"+dG+"="+t(dH[dG]);delete dH[dG]}}}if(dH&&B(dH)){dH=null}for(dG in bl){if(Object.prototype.hasOwnProperty.call(bl,dG)){var dw=(-1===M(dM,dG));if(dw){dl+="&dimension"+dG+"="+t(bl[dG])}}}if(dH){dl+="&data="+t(JSON_PIWIK.stringify(dH))}else{if(ao){dl+="&data="+t(JSON_PIWIK.stringify(ao))}}function dt(dP,dQ){var dR=JSON_PIWIK.stringify(dP);if(dR.length>2){return"&"+dQ+"="+t(dR)}return""}var dL=di(bV);var dC=di(cl);dl+=dt(dL,"cvar");dl+=dt(dC,"e_cvar");if(aQ){dl+=dt(aQ,"_cvar");for(dG in dD){if(Object.prototype.hasOwnProperty.call(dD,dG)){if(aQ[dG][0]===""||aQ[dG][1]===""){delete aQ[dG]}}}if(bP){de(dy,JSON_PIWIK.stringify(aQ),co,bo,cX)}}if(a2){if(cm){dl+=">_ms="+cm}else{if(i&&i.timing&&i.timing.requestStart&&i.timing.responseEnd){dl+=">_ms="+(i.timing.responseEnd-i.timing.requestStart) }}}if(aK){dl+="&pv_id="+aK}dA.lastEcommerceOrderTs=J(dm)&&String(dm).length?dm:dA.lastEcommerceOrderTs;aL(dA);cc();dl+=ac(dI,{tracker:bH,request:dl});if(cZ.length){dl+="&"+cZ}if(A(ca)){dl=ca(dl)}return dl}bQ=function a7(){var dj=new Date();dj=dj.getTime();if(!cY){return false}if((cY+(1000*c7))<=dj){return false}if(cY+a5<=dj){bH.ping();return true}return false};function bp(dm,dl,ds,dn,dj,dv){var dq="idgoal=0",dr,dk=new Date(),dt=[],du,dp=String(dm).length;if(dp){dq+="&ec_id="+t(dm);dr=Math.round(dk.getTime()/1000)}dq+="&revenue="+dl;if(String(ds).length){dq+="&ec_st="+ds}if(String(dn).length){dq+="&ec_tx="+dn}if(String(dj).length){dq+="&ec_sh="+dj}if(String(dv).length){dq+="&ec_dt="+dv}if(c0){for(du in c0){if(Object.prototype.hasOwnProperty.call(c0,du)){if(!J(c0[du][1])){c0[du][1]=""}if(!J(c0[du][2])){c0[du][2]=""}if(!J(c0[du][3])||String(c0[du][3]).length===0){c0[du][3]=0}if(!J(c0[du][4])||String(c0[du][4]).length===0){c0[du][4]=1}dt.push(c0[du])}}dq+="&ec_items="+t(JSON_PIWIK.stringify(dt)) @@ -64,7 +64,7 @@ if(!dk||aU(dk)){return}dk=k(dk,av);var dl=bq();dk=F(dk,av,dl);ae.setAnyAttribute }};this.getUserId=function(){return bx};this.setCustomData=function(dj,dk){if(W(dj)){ao=dj}else{if(!ao){ao={}}ao[dj]=dk}};this.getCustomData=function(){return ao};this.setCustomRequestProcessing=function(dj){ca=dj};this.appendToTrackingUrl=function(dj){cZ=dj};this.getRequest=function(dj){return cs(dj)};this.addPlugin=function(dj,dk){b[dj]=dk};this.setCustomDimension=function(dj,dk){dj=parseInt(dj,10);if(dj>0){if(!J(dk)){dk=""}if(!w(dk)){dk=String(dk)}bl[dj]=dk}};this.getCustomDimension=function(dj){dj=parseInt(dj,10);if(dj>0&&Object.prototype.hasOwnProperty.call(bl,dj)){return bl[dj]}};this.deleteCustomDimension=function(dj){dj=parseInt(dj,10);if(dj>0){delete bl[dj]}};this.setCustomVariable=function(dk,dj,dn,dl){var dm;if(!J(dl)){dl="visit"}if(!J(dj)){return}if(!J(dn)){dn=""}if(dk>0){dj=!w(dj)?String(dj):dj;dn=!w(dn)?String(dn):dn;dm=[dj.slice(0,bs),dn.slice(0,bs)];if(dl==="visit"||dl===2){cD();aQ[dk]=dm}else{if(dl==="page"||dl===3){bV[dk]=dm}else{if(dl==="event"){cl[dk]=dm}}}}};this.getCustomVariable=function(dk,dl){var dj; if(!J(dl)){dl="visit"}if(dl==="page"||dl===3){dj=bV[dk]}else{if(dl==="event"){dj=cl[dk]}else{if(dl==="visit"||dl===2){cD();dj=aQ[dk]}}}if(!J(dj)||(dj&&dj[0]==="")){return false}return dj};this.deleteCustomVariable=function(dj,dk){if(this.getCustomVariable(dj,dk)){this.setCustomVariable(dj,"","",dk)}};this.deleteCustomVariables=function(dj){if(dj==="page"||dj===3){bV={}}else{if(dj==="event"){cl={}}else{if(dj==="visit"||dj===2){aQ={}}}}};this.storeCustomVariablesInCookie=function(){bP=true};this.setLinkTrackingTimer=function(dj){bI=dj};this.getLinkTrackingTimer=function(){return bI};this.setDownloadExtensions=function(dj){if(w(dj)){dj=dj.split("|")}c6=dj};this.addDownloadExtensions=function(dk){var dj;if(w(dk)){dk=dk.split("|")}for(dj=0;dj