Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorLukas Winkler <git@lw1.at>2021-03-10 00:31:57 +0300
committerGitHub <noreply@github.com>2021-03-10 00:31:57 +0300
commitb17616097d6b353dc65b0d77773d0c78977646e8 (patch)
tree26ac2d5bf52b7fd11d49261aa5b6dd0056c26199 /js
parenta02715472f746a40a36a8a3b45b31bf2b28be5bc (diff)
rename testcookie to make it clear it is created by Matomo (#17243)
* rename testcookie to make it clear it is created by Matomo * rebuilt piwik.js * rename testcookie everywhere * rebuilt piwik.js Co-authored-by: Findus23 <Findus23@users.noreply.github.com>
Diffstat (limited to 'js')
-rw-r--r--js/piwik.js7
-rw-r--r--js/piwik.min.js4
2 files changed, 6 insertions, 5 deletions
diff --git a/js/piwik.js b/js/piwik.js
index 0a94b71449..2a50dd4c1e 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -3381,11 +3381,12 @@ if (typeof window.Matomo !== 'object') {
function isPossibleToSetCookieOnDomain(domainToTest)
{
+ var testCookieName = configCookieNamePrefix + 'testcookie_domain';
var valueToSet = 'testvalue';
- setCookie('test', valueToSet, 10000, null, domainToTest, configCookieIsSecure, configCookieSameSite);
+ setCookie(testCookieName, valueToSet, 10000, null, domainToTest, configCookieIsSecure, configCookieSameSite);
- if (getCookie('test') === valueToSet) {
- deleteCookie('test', null, domainToTest);
+ if (getCookie(testCookieName) === valueToSet) {
+ deleteCookie(testCookieName, null, domainToTest);
return true;
}
diff --git a/js/piwik.min.js b/js/piwik.min.js
index cecc0b6f7b..6fcc68b27d 100644
--- a/js/piwik.min.js
+++ b/js/piwik.min.js
@@ -37,8 +37,8 @@ try{bk=G.title}catch(cy){bk=""}function dd(dq,dn,dm,dp,dl,dk,dj){if(bn&&dq!==cM)
an(S,"blur",az);ab++;t.addPlugin("HeartBeat"+ab,{unload:function(){if(aO&&dc()){bS()}}})}function cC(dm){var dj=new Date();var di=dj.getTime();cY=di;if(cB&&di<cB){var dk=cB-di;setTimeout(dm,dk);cg(dk+50);cB+=50;return}if(cB===false){var dl=800;cB=di+dl}dm()}function aP(){if(aD(cM)){bD=false}else{if(aD(be)){bD=true}}}function bH(dj,di,dk){aP();if(!bD){cL.push(dj);return}aw=true;if(!cQ&&dj){if(cA&&bD){dj+="&consent=1"}cC(function(){if(cW&&a7(dj,dk,true)){cg(100);return}if(cE(dj)){c4(dj,dk)}else{co(dj,dk)}cg(di)})}if(!aO){df()}}function ck(di){if(cQ){return false}return(di&&di.length)}function c3(di,dm){if(!dm||dm>=di.length){return[di]}var dj=0;var dk=di.length;var dl=[];for(dj;dj<dk;dj+=dm){dl.push(di.slice(dj,dj+dm))}return dl}function de(dj,di){if(!ck(dj)){return}if(!bD){cL.push(dj);return}aw=true;cC(function(){var dm=c3(dj,50);var dk=0,dl;for(dk;dk<dm.length;dk++){dl='{"requests":["?'+dm[dk].join('","?')+'"],"send_image":0}';if(cW&&a7(dl,null,false)){cg(100)}else{c4(dl,null,false)}}cg(di)
})}function aU(di){return bl+di+"."+b7+"."+bq}function bZ(dk,dj,di){dd(dk,"",-86400,dj,di)}function b6(){if(bn){return"0"}if(!J(S.showModalDialog)&&J(g.cookieEnabled)){return g.cookieEnabled?"1":"0"}var di=bl+"testcookie";dd(di,"1",undefined,br,cX,bT,aJ);var dj=aD(di)==="1"?"1":"0";bZ(di);return dj}function bj(){bq=b8((cX||cU)+(br||"/")).slice(0,4)}function cI(){if(J(c7.res)){return c7}var dj,dl,dm={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",fla:"application/x-shockwave-flash",java:"application/x-java-vm",ag:"application/x-silverlight"};if(!((new RegExp("MSIE")).test(g.userAgent))){if(g.mimeTypes&&g.mimeTypes.length){for(dj in dm){if(Object.prototype.hasOwnProperty.call(dm,dj)){dl=g.mimeTypes[dm[dj]];c7[dj]=(dl&&dl.enabledPlugin)?"1":"0"}}}if(!((new RegExp("Edge[ /](\\d+[\\.\\d]+)")).test(g.userAgent))&&typeof navigator.javaEnabled!=="unknown"&&J(g.javaEnabled)&&g.javaEnabled()){c7.java="1"}if(!J(S.showModalDialog)&&J(g.cookieEnabled)){c7.cookie=g.cookieEnabled?"1":"0"
}else{c7.cookie=b6()}}var dk=parseInt(X.width,10);var di=parseInt(X.height,10);c7.res=parseInt(dk,10)+"x"+parseInt(di,10);return c7}function bY(){var dj=aU("cvar"),di=aD(dj);if(di&&di.length){di=S.JSON.parse(di);if(V(di)){return di}}return{}}function cF(){if(aR===false){aR=bY()}}function cR(){var di=cI();return b8((g.userAgent||"")+(g.platform||"")+S.JSON.stringify(di)+(new Date()).getTime()+Math.random()).slice(0,16)}function aB(){var di=cI();return b8((g.userAgent||"")+(g.platform||"")+S.JSON.stringify(di)).slice(0,6)}function bg(){return Math.floor((new Date()).getTime()/1000)}function aK(){var dj=bg();var dk=aB();var di=String(dj)+dk;return di}function c2(dk){dk=String(dk);var dn=aB();var dl=dn.length;var dm=dk.substr(-1*dl,dl);var dj=parseInt(dk.substr(0,dk.length-dl),10);if(dj&&dm&&dm===dn){var di=bg();if(a0<=0){return true}if(di>=dj&&di<=(dj+a0)){return true}}return false}function dg(di){if(!cN){return""}var dm=e(di,av);if(!dm){return""}dm=String(dm);var dk=new RegExp("^[a-zA-Z0-9]+$");
-if(dm.length===32&&dk.test(dm)){var dj=dm.substr(16,32);if(c2(dj)){var dl=dm.substr(0,16);return dl}}return""}function cO(){if(!bP){bP=dg(bO)}var dk=new Date(),di=Math.round(dk.getTime()/1000),dj=aU("id"),dn=aD(dj),dm,dl;if(dn){dm=dn.split(".");dm.unshift("0");if(bP.length){dm[1]=bP}return dm}if(bP.length){dl=bP}else{if("0"===b6()){dl=""}else{dl=cR()}}dm=["1",dl,di];return dm}function aZ(){var dl=cO(),dj=dl[0],dk=dl[1],di=dl[2];return{newVisitor:dj,uuid:dk,createTs:di}}function aH(){var dl=new Date(),dj=dl.getTime(),dm=aZ().createTs;var di=parseInt(dm,10);var dk=(di*1000)+cK-dj;return dk}function aN(di){if(!b7){return}var dk=new Date(),dj=Math.round(dk.getTime()/1000);if(!J(di)){di=aZ()}var dl=di.uuid+"."+di.createTs+".";dd(aU("id"),dl,aH(),br,cX,bT,aJ)}function bN(){var di=aD(aU("ref"));if(di.length){try{di=S.JSON.parse(di);if(V(di)){return di}}catch(dj){}}return["","",0,""]}function by(dj){var di="testvalue";dd("test",di,10000,null,dj,bT,aJ);if(aD("test")===di){bZ("test",null,dj);return true
-}return false}function aF(){var dj=bn;bn=false;var di,dk;for(di=0;di<bw.length;di++){dk=aU(bw[di]);if(dk!==cM&&dk!==be&&0!==aD(dk)){bZ(dk,br,cX)}}bn=dj}function b4(di){b7=di}function dh(dm){if(!dm||!V(dm)){return}var dl=[];var dk;for(dk in dm){if(Object.prototype.hasOwnProperty.call(dm,dk)){dl.push(dk)}}var dn={};dl.sort();var di=dl.length;var dj;for(dj=0;dj<di;dj++){dn[dl[dj]]=dm[dl[dj]]}return dn}function cd(){dd(aU("ses"),"1",cn,br,cX,bT,aJ)}function bh(){var dl="";var dj="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";var dk=dj.length;var di;for(di=0;di<6;di++){dl+=dj.charAt(Math.floor(Math.random()*dk))}return dl}function aA(dj){if(!h){return dj}var dk=(typeof h.getEntriesByType==="function")&&h.getEntriesByType("navigation")?h.getEntriesByType("navigation")[0]:h.timing;if(!dk){return dj}var di="";if(dk.connectEnd&&dk.fetchStart){if(dk.connectEnd<dk.fetchStart){return}di+="&pf_net="+(dk.connectEnd-dk.fetchStart)}if(dk.responseStart&&dk.requestStart){if(dk.responseStart<dk.requestStart){return
+if(dm.length===32&&dk.test(dm)){var dj=dm.substr(16,32);if(c2(dj)){var dl=dm.substr(0,16);return dl}}return""}function cO(){if(!bP){bP=dg(bO)}var dk=new Date(),di=Math.round(dk.getTime()/1000),dj=aU("id"),dn=aD(dj),dm,dl;if(dn){dm=dn.split(".");dm.unshift("0");if(bP.length){dm[1]=bP}return dm}if(bP.length){dl=bP}else{if("0"===b6()){dl=""}else{dl=cR()}}dm=["1",dl,di];return dm}function aZ(){var dl=cO(),dj=dl[0],dk=dl[1],di=dl[2];return{newVisitor:dj,uuid:dk,createTs:di}}function aH(){var dl=new Date(),dj=dl.getTime(),dm=aZ().createTs;var di=parseInt(dm,10);var dk=(di*1000)+cK-dj;return dk}function aN(di){if(!b7){return}var dk=new Date(),dj=Math.round(dk.getTime()/1000);if(!J(di)){di=aZ()}var dl=di.uuid+"."+di.createTs+".";dd(aU("id"),dl,aH(),br,cX,bT,aJ)}function bN(){var di=aD(aU("ref"));if(di.length){try{di=S.JSON.parse(di);if(V(di)){return di}}catch(dj){}}return["","",0,""]}function by(dk){var dj=bl+"testcookie_domain";var di="testvalue";dd(dj,di,10000,null,dk,bT,aJ);if(aD(dj)===di){bZ(dj,null,dk);
+return true}return false}function aF(){var dj=bn;bn=false;var di,dk;for(di=0;di<bw.length;di++){dk=aU(bw[di]);if(dk!==cM&&dk!==be&&0!==aD(dk)){bZ(dk,br,cX)}}bn=dj}function b4(di){b7=di}function dh(dm){if(!dm||!V(dm)){return}var dl=[];var dk;for(dk in dm){if(Object.prototype.hasOwnProperty.call(dm,dk)){dl.push(dk)}}var dn={};dl.sort();var di=dl.length;var dj;for(dj=0;dj<di;dj++){dn[dl[dj]]=dm[dl[dj]]}return dn}function cd(){dd(aU("ses"),"1",cn,br,cX,bT,aJ)}function bh(){var dl="";var dj="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";var dk=dj.length;var di;for(di=0;di<6;di++){dl+=dj.charAt(Math.floor(Math.random()*dk))}return dl}function aA(dj){if(!h){return dj}var dk=(typeof h.getEntriesByType==="function")&&h.getEntriesByType("navigation")?h.getEntriesByType("navigation")[0]:h.timing;if(!dk){return dj}var di="";if(dk.connectEnd&&dk.fetchStart){if(dk.connectEnd<dk.fetchStart){return}di+="&pf_net="+(dk.connectEnd-dk.fetchStart)}if(dk.responseStart&&dk.requestStart){if(dk.responseStart<dk.requestStart){return
}di+="&pf_srv="+(dk.responseStart-dk.requestStart)}if(dk.responseStart&&dk.responseEnd){if(dk.responseEnd<dk.responseStart){return}di+="&pf_tfr="+(dk.responseEnd-dk.responseStart)}if(dk.domInteractive&&dk.domLoading){if(dk.domInteractive<dk.domLoading){return}di+="&pf_dm1="+(dk.domInteractive-dk.domLoading)}if(dk.domComplete&&dk.domInteractive){if(dk.domComplete<dk.domInteractive){return}di+="&pf_dm2="+(dk.domComplete-dk.domInteractive)}if(dk.loadEventEnd&&dk.loadEventStart){if(dk.loadEventEnd<dk.loadEventStart){return}di+="&pf_onl="+(dk.loadEventEnd-dk.loadEventStart)}return dj+di}function cr(dk,dF,dG){var dE,dj=new Date(),ds=Math.round(dj.getTime()/1000),dp,dC,dl=1024,dL,dt,dB=aR,dm=aU("ses"),dz=aU("ref"),dw=aU("cvar"),dx=aD(dm),dD=bN(),dH=a5||bO,dq,di;if(bn){aF()}if(cQ){return""}var dy=aZ();var dv=G.characterSet||G.charset;if(!dv||dv.toLowerCase()==="utf-8"){dv=null}dq=dD[0];di=dD[1];dp=dD[2];dC=dD[3];if(!dx){if(!bx||!dq.length){for(dE in cp){if(Object.prototype.hasOwnProperty.call(cp,dE)){dq=e(dH,cp[dE]);
if(dq.length){break}}}for(dE in bI){if(Object.prototype.hasOwnProperty.call(bI,dE)){di=e(dH,bI[dE]);if(di.length){break}}}}dL=d(bp);dt=dC.length?d(dC):"";if(dL.length&&!aW(dL)&&(!bx||!dt.length||aW(dt))){dC=bp}if(dC.length||dq.length){dp=ds;dD=[dq,di,dp,b3(dC.slice(0,dl))];dd(dz,S.JSON.stringify(dD),c5,br,cX,bT,aJ)}}dk+="&idsite="+b7+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+dj.getHours()+"&m="+dj.getMinutes()+"&s="+dj.getSeconds()+"&url="+s(b3(dH))+(bp.length?"&urlref="+s(b3(bp)):"")+(Y(bA)?"&uid="+s(bA):"")+"&_id="+dy.uuid+"&_idn="+dy.newVisitor+(dq.length?"&_rcn="+s(dq):"")+(di.length?"&_rck="+s(di):"")+"&_refts="+dp+(String(dC).length?"&_ref="+s(b3(dC.slice(0,dl))):"")+(dv?"&cs="+s(dv):"")+"&send_image=0";var dK=cI();for(dE in dK){if(Object.prototype.hasOwnProperty.call(dK,dE)){dk+="&"+dE+"="+dK[dE]}}var dJ=[];if(dF){for(dE in dF){if(Object.prototype.hasOwnProperty.call(dF,dE)&&/^dimension\d+$/.test(dE)){var dn=dE.replace("dimension","");dJ.push(parseInt(dn,10));dJ.push(String(dn));
dk+="&"+dE+"="+s(dF[dE]);delete dF[dE]}}}if(dF&&B(dF)){dF=null}for(dE in cs){if(Object.prototype.hasOwnProperty.call(cs,dE)){dk+="&"+dE+"="+s(cs[dE])}}for(dE in bo){if(Object.prototype.hasOwnProperty.call(bo,dE)){var du=(-1===M(dJ,dE));if(du){dk+="&dimension"+dE+"="+s(bo[dE])}}}if(dF){dk+="&data="+s(S.JSON.stringify(dF))}else{if(ao){dk+="&data="+s(S.JSON.stringify(ao))}}function dr(dM,dN){var dO=S.JSON.stringify(dM);if(dO.length>2){return"&"+dN+"="+s(dO)}return""}var dI=dh(bX);var dA=dh(cm);dk+=dr(dI,"cvar");dk+=dr(dA,"e_cvar");if(aR){dk+=dr(aR,"_cvar");for(dE in dB){if(Object.prototype.hasOwnProperty.call(dB,dE)){if(aR[dE][0]===""||aR[dE][1]===""){delete aR[dE]}}}if(bR){dd(dw,S.JSON.stringify(aR),cn,br,cX,bT,aJ)}}if(a3&&bG&&!bi){dk=aA(dk);bi=true}if(aM){dk+="&pv_id="+aM}aN(dy);cd();dk+=ac(dG,{tracker:bK,request:dk});if(cZ.length){dk+="&"+cZ}if(A(cc)){dk=cc(dk)}return dk}bS=function a8(){var di=new Date();di=di.getTime();if(!cY){return false}if(cY+a6<=di){bK.ping();return true}return false