Fixes #4248 this should help with making segments visitCount and daysSinceLastVisit more accurate!

1 files changed, 3 insertions, 3 deletions

diff --git a/piwik.js b/piwik.js
index 27511da4e4..794a9b53b0 100644
--- a/piwik.js
+++ b/piwik.js
@@ -17,9 +17,9 @@ break;case 3:ah=ae.charCodeAt(O-3)<<24|ae.charCodeAt(O-2)<<16|ae.charCodeAt(O-1)
 }O=B(O,"u");Q=b(O)}else{if(Q==="cc.bingj.com"||Q==="webcache.googleusercontent.com"||Q.slice(0,5)==="74.6."){O=q.links[0].href;Q=b(O)}}return[Q,O,P]}function u(P){var O=P.length;if(P.charAt(--O)==="."){P=P.slice(0,O)}if(P.slice(0,2)==="*."){P=P.slice(1)}return P}function N(P){P=P&&P.text?P.text:P;if(!k(P)){var O=q.getElementsByTagName("title");if(O&&s(O[0])){P=O[0].text}}return P}function w(O,P){if(P){return P}if(O.slice(-9)==="piwik.php"){O=O.slice(0,O.length-9)}return O}function v(S){var O="Piwik_Overlay";var V=new RegExp("index\\.php\\?module=Overlay&action=startOverlaySession&idsite=([0-9]+)&period=([^&]+)&date=([^&]+)$");var Q=V.exec(q.referrer);if(Q){var R=Q[1];if(R!==String(S)){return false}var U=Q[2],P=Q[3];A.name=O+"###"+U+"###"+P}var T=A.name.split("###");return T.length===3&&T[0]===O}function F(P,U,R){var T=A.name.split("###"),S=T[1],O=T[2],Q=w(P,U);g(Q+"plugins/Overlay/client/client.js?v=1",function(){Piwik_Overlay_Client.initialize(Q,R,S,O)})}function x(am,aN){var U=G(q.domain,A.location.href,t()),a7=u(U[0]),bl=U[1],aU=U[2],aS="GET",S=am||"",aj="",aP="",bb=aN||"",aE,au=q.title,aw="7z|aac|apk|ar[cj]|as[fx]|avi|bin|csv|deb|dmg|docx?|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|ms[ip]|od[bfgpst]|og[gv]|pdf|phps|png|pptx?|qtm?|ra[mr]?|rpm|sea|sit|tar|t?bz2?|tgz|torrent|txt|wav|wm[av]|wpd||xlsx?|xml|z|zip",aQ=[a7],X=[],aI=[],al=[],aO=500,Y,an,Z,ab,ay=["pk_campaign","piwik_campaign","utm_campaign","utm_source","utm_medium"],at=["pk_kwd","piwik_kwd","utm_term"],bj="_pk_",ae,bk,ac=false,be,aA,aD,ai=63072000000,ak=1800000,aF=15768000000,aB=true,ap=0,W=false,aJ={},T={},bf=200,a0={},bc={},aX=false,aV=false,aT,aK,af,ax=L,aW,aC;
 function a2(bu,br,bq,bt,bp,bs){if(ac){return}var bo;if(bq){bo=new Date();bo.setTime(bo.getTime()+bq)}q.cookie=bu+"="+j(br)+(bq?";expires="+bo.toGMTString():"")+";path="+(bt||"/")+(bp?";domain="+bp:"")+(bs?";secure":"")}function ah(bq){if(ac){return 0}var bo=new RegExp("(^|;)[ ]*"+bq+"=([^;]*)"),bp=bo.exec(q.cookie);return bp?z(bp[2]):0}function bg(bo){var bp;if(Z){bp=new RegExp("#.*");return bo.replace(bp,"")}return bo}function a6(bq,bo){var br=i(bo),bp;if(br){return bo}if(bo.slice(0,1)==="/"){return i(bq)+"://"+b(bq)+bo}bq=bg(bq);bp=bq.indexOf("?");if(bp>=0){bq=bq.slice(0,bp)}bp=bq.lastIndexOf("/");if(bp!==bq.length-1){bq=bq.slice(0,bp+1)}return bq+bo}function aR(br){var bp,bo,bq;for(bp=0;bp<aQ.length;bp++){bo=u(aQ[bp].toLowerCase());if(br===bo){return true}if(bo.slice(0,1)==="."){if(br===bo.slice(1)){return true}bq=br.length-bo.length;if((bq>0)&&(br.slice(bq)===bo)){return true}}}return false}function bn(bo){var bp=new Image(1,1);bp.onload=function(){p=0};bp.src=S+(S.indexOf("?")<0?"?":"&")+bo
 }function a3(bo){try{var bq=A.XMLHttpRequest?new A.XMLHttpRequest():A.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;bq.open("POST",S,true);bq.onreadystatechange=function(){if(this.readyState===4&&this.status!==200){bn(bo)}};bq.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");bq.send(bo)}catch(bp){bn(bo)}}function az(bq,bp){var bo=new Date();if(!be){if(aS==="POST"){a3(bq)}else{bn(bq)}h=bo.getTime()+bp}}function a1(bo){return bj+bo+"."+bb+"."+aW}function V(){if(ac){return"0"}if(!s(d.cookieEnabled)){var bo=a1("testcookie");a2(bo,"1");return ah(bo)==="1"?"1":"0"}return d.cookieEnabled?"1":"0"}function aL(){aW=ax((ae||a7)+(bk||"/")).slice(0,4)}function ag(){var bp=a1("cvar"),bo=ah(bp);if(bo.length){bo=JSON2.parse(bo);if(C(bo)){return bo}}return{}}function R(){if(W===false){W=ag()}}function ba(){var bo=new Date();aT=bo.getTime()}function ad(bs,bp,bo,br,bq,bt){a2(a1("id"),bs+"."+bp+"."+bo+"."+br+"."+bq+"."+bt,ai,bk,ae)}function Q(){var bp=new Date(),bo=Math.round(bp.getTime()/1000),br=ah(a1("id")),bq;
-if(br){bq=br.split(".");bq.unshift("0")}else{if(!aC){aC=ax((d.userAgent||"")+(d.platform||"")+JSON2.stringify(bc)+bo).slice(0,16)}bq=["1",aC,bo,0,bo,"",""]}return bq}function O(){var bo=ah(a1("ref"));if(bo.length){try{bo=JSON2.parse(bo);if(C(bo)){return bo}}catch(bp){}}return["","",0,""]}function P(){var bo=ac;ac=false;a2(a1("id"),"",-86400,bk,ae);a2(a1("ses"),"",-86400,bk,ae);a2(a1("cvar"),"",-86400,bk,ae);a2(a1("ref"),"",-86400,bk,ae);ac=bo}function av(bq,bN,bO,br){var bL,bp=new Date(),by=Math.round(bp.getTime()/1000),bQ,bM,bt,bE,bI,bx,bG,bu,bK,bs=1024,bR,bB,bH=W,bz=a1("ses"),bA=a1("ref"),bS=a1("cvar"),bF=Q(),bD=ah(bz),bJ=O(),bP=aE||bl,bv,bo;if(ac){P()}if(be){return""}bQ=bF[0];bM=bF[1];bE=bF[2];bt=bF[3];bI=bF[4];bx=bF[5];if(!s(bF[6])){bF[6]=""}bG=bF[6];if(!s(br)){br=""}var bC=q.characterSet||q.charset;if(!bC||bC.toLowerCase()==="utf-8"){bC=null}bv=bJ[0];bo=bJ[1];bu=bJ[2];bK=bJ[3];if(!bD){bt++;bx=bI;if(!aD||!bv.length){for(bL in ay){if(Object.prototype.hasOwnProperty.call(ay,bL)){bv=B(bP,ay[bL]);
-if(bv.length){break}}}for(bL in at){if(Object.prototype.hasOwnProperty.call(at,bL)){bo=B(bP,at[bL]);if(bo.length){break}}}}bR=b(aU);bB=bK.length?b(bK):"";if(bR.length&&!aR(bR)&&(!aD||!bB.length||aR(bB))){bK=aU}if(bK.length||bv.length){bu=by;bJ=[bv,bo,bu,bg(bK.slice(0,bs))];a2(bA,JSON2.stringify(bJ),aF,bk,ae)}}bq+="&idsite="+bb+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+bp.getHours()+"&m="+bp.getMinutes()+"&s="+bp.getSeconds()+"&url="+j(bg(bP))+(aU.length?"&urlref="+j(bg(aU)):"")+"&_id="+bM+"&_idts="+bE+"&_idvc="+bt+"&_idn="+bQ+(bv.length?"&_rcn="+j(bv):"")+(bo.length?"&_rck="+j(bo):"")+"&_refts="+bu+"&_viewts="+bx+(String(bG).length?"&_ects="+bG:"")+(String(bK).length?"&_ref="+j(bg(bK.slice(0,bs))):"")+(bC?"&cs="+j(bC):"");for(bL in bc){if(Object.prototype.hasOwnProperty.call(bc,bL)){bq+="&"+bL+"="+bc[bL]}}if(bN){bq+="&data="+j(JSON2.stringify(bN))}else{if(ab){bq+="&data="+j(JSON2.stringify(ab))}}function bw(bT,bU){var bV=JSON2.stringify(bT);if(bV.length>2){return"&"+bU+"="+j(bV)
-}return""}bq+=bw(aJ,"cvar");bq+=bw(T,"e_cvar");if(W){bq+=bw(W,"_cvar");for(bL in bH){if(Object.prototype.hasOwnProperty.call(bH,bL)){if(W[bL][0]===""||W[bL][1]===""){delete W[bL]}}}a2(bS,JSON2.stringify(W),ak,bk,ae)}if(aB){if(ap){bq+="&gt_ms="+ap}else{if(e&&e.timing&&e.timing.requestStart&&e.timing.responseEnd){bq+="&gt_ms="+(e.timing.responseEnd-e.timing.requestStart)}}}ad(bM,bE,bt,by,bx,s(br)&&String(br).length?br:bG);a2(bz,"*",ak,bk,ae);bq+=H(bO);if(aP.length){bq+="&"+aP}return bq}function a5(br,bq,bv,bs,bo,by){var bt="idgoal=0",bu,bp=new Date(),bw=[],bx;if(String(br).length){bt+="&ec_id="+j(br);bu=Math.round(bp.getTime()/1000)}bt+="&revenue="+bq;if(String(bv).length){bt+="&ec_st="+bv}if(String(bs).length){bt+="&ec_tx="+bs}if(String(bo).length){bt+="&ec_sh="+bo}if(String(by).length){bt+="&ec_dt="+by}if(a0){for(bx in a0){if(Object.prototype.hasOwnProperty.call(a0,bx)){if(!s(a0[bx][1])){a0[bx][1]=""}if(!s(a0[bx][2])){a0[bx][2]=""}if(!s(a0[bx][3])||String(a0[bx][3]).length===0){a0[bx][3]=0
+if(br){bq=br.split(".");bq.unshift("0")}else{if(!aC){aC=ax((d.userAgent||"")+(d.platform||"")+JSON2.stringify(bc)+bo).slice(0,16)}bq=["1",aC,bo,0,bo,"",""]}return bq}function O(){var bo=ah(a1("ref"));if(bo.length){try{bo=JSON2.parse(bo);if(C(bo)){return bo}}catch(bp){}}return["","",0,""]}function P(){var bo=ac;ac=false;a2(a1("id"),"",-86400,bk,ae);a2(a1("ses"),"",-86400,bk,ae);a2(a1("cvar"),"",-86400,bk,ae);a2(a1("ref"),"",-86400,bk,ae);ac=bo}function av(bq,bN,bO,br){var bL,bp=new Date(),by=Math.round(bp.getTime()/1000),bR,bM,bt,bE,bI,bx,bG,bu,bK,bs=1024,bS,bB,bH=W,bz=a1("ses"),bA=a1("ref"),bT=a1("cvar"),bF=Q(),bD=ah(bz),bJ=O(),bQ=aE||bl,bv,bo;if(ac){P()}if(be){return""}bR=bF[0];bM=bF[1];bE=bF[2];bt=bF[3];bI=bF[4];bx=bF[5];if(!s(bF[6])){bF[6]=""}bG=bF[6];if(!s(br)){br=""}var bC=q.characterSet||q.charset;if(!bC||bC.toLowerCase()==="utf-8"){bC=null}bv=bJ[0];bo=bJ[1];bu=bJ[2];bK=bJ[3];if(!bD){var bP=ak/1000;if(!bx||(by-bx)>bP){bt++;bx=bI}if(!aD||!bv.length){for(bL in ay){if(Object.prototype.hasOwnProperty.call(ay,bL)){bv=B(bQ,ay[bL]);
+if(bv.length){break}}}for(bL in at){if(Object.prototype.hasOwnProperty.call(at,bL)){bo=B(bQ,at[bL]);if(bo.length){break}}}}bS=b(aU);bB=bK.length?b(bK):"";if(bS.length&&!aR(bS)&&(!aD||!bB.length||aR(bB))){bK=aU}if(bK.length||bv.length){bu=by;bJ=[bv,bo,bu,bg(bK.slice(0,bs))];a2(bA,JSON2.stringify(bJ),aF,bk,ae)}}bq+="&idsite="+bb+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+bp.getHours()+"&m="+bp.getMinutes()+"&s="+bp.getSeconds()+"&url="+j(bg(bQ))+(aU.length?"&urlref="+j(bg(aU)):"")+"&_id="+bM+"&_idts="+bE+"&_idvc="+bt+"&_idn="+bR+(bv.length?"&_rcn="+j(bv):"")+(bo.length?"&_rck="+j(bo):"")+"&_refts="+bu+"&_viewts="+bx+(String(bG).length?"&_ects="+bG:"")+(String(bK).length?"&_ref="+j(bg(bK.slice(0,bs))):"")+(bC?"&cs="+j(bC):"");for(bL in bc){if(Object.prototype.hasOwnProperty.call(bc,bL)){bq+="&"+bL+"="+bc[bL]}}if(bN){bq+="&data="+j(JSON2.stringify(bN))}else{if(ab){bq+="&data="+j(JSON2.stringify(ab))}}function bw(bU,bV){var bW=JSON2.stringify(bU);if(bW.length>2){return"&"+bV+"="+j(bW)
+}return""}bq+=bw(aJ,"cvar");bq+=bw(T,"e_cvar");if(W){bq+=bw(W,"_cvar");for(bL in bH){if(Object.prototype.hasOwnProperty.call(bH,bL)){if(W[bL][0]===""||W[bL][1]===""){delete W[bL]}}}a2(bT,JSON2.stringify(W),ak,bk,ae)}if(aB){if(ap){bq+="&gt_ms="+ap}else{if(e&&e.timing&&e.timing.requestStart&&e.timing.responseEnd){bq+="&gt_ms="+(e.timing.responseEnd-e.timing.requestStart)}}}ad(bM,bE,bt,by,bx,s(br)&&String(br).length?br:bG);a2(bz,"*",ak,bk,ae);bq+=H(bO);if(aP.length){bq+="&"+aP}return bq}function a5(br,bq,bv,bs,bo,by){var bt="idgoal=0",bu,bp=new Date(),bw=[],bx;if(String(br).length){bt+="&ec_id="+j(br);bu=Math.round(bp.getTime()/1000)}bt+="&revenue="+bq;if(String(bv).length){bt+="&ec_st="+bv}if(String(bs).length){bt+="&ec_tx="+bs}if(String(bo).length){bt+="&ec_sh="+bo}if(String(by).length){bt+="&ec_dt="+by}if(a0){for(bx in a0){if(Object.prototype.hasOwnProperty.call(a0,bx)){if(!s(a0[bx][1])){a0[bx][1]=""}if(!s(a0[bx][2])){a0[bx][2]=""}if(!s(a0[bx][3])||String(a0[bx][3]).length===0){a0[bx][3]=0
 }if(!s(a0[bx][4])||String(a0[bx][4]).length===0){a0[bx][4]=1}bw.push(a0[bx])}}bt+="&ec_items="+j(JSON2.stringify(bw))}bt=av(bt,ab,"ecommerce",bu);az(bt,aO)}function a4(bo,bs,br,bq,bp,bt){if(String(bo).length&&s(bs)){a5(bo,bs,br,bq,bp,bt)}}function bi(bo){if(s(bo)){a5("",bo,"","","","")}}function aH(br,bs){var bo=new Date(),bq=av("action_name="+j(N(br||au)),bs,"log");az(bq,aO);if(Y&&an&&!aV){aV=true;M(q,"click",ba);M(q,"mouseup",ba);M(q,"mousedown",ba);M(q,"mousemove",ba);M(q,"mousewheel",ba);M(A,"DOMMouseScroll",ba);M(A,"scroll",ba);M(q,"keypress",ba);M(q,"keydown",ba);M(q,"keyup",ba);M(A,"resize",ba);M(A,"focus",ba);M(A,"blur",ba);aT=bo.getTime();setTimeout(function bp(){var bt;bo=new Date();if((aT+an)>bo.getTime()){if(Y<bo.getTime()){bt=av("ping=1",bs,"ping");az(bt,aO)}setTimeout(bp,an)}},an)}}function aa(bq,bs,bo,br,bt){if(String(bq).length===0||String(bs).length===0){return false}var bp=av("e_c="+j(bq)+"&e_a="+j(bs)+(s(bo)?"&e_n="+j(bo):"")+(s(br)?"&e_v="+j(br):""),bt,"event");az(bp,aO)
 }function ar(bo,br,bp,bs){var bq=av("search="+j(bo)+(br?"&search_cat="+j(br):"")+(s(bp)?"&search_count="+bp:""),bs,"sitesearch");az(bq,aO)}function aM(bo,br,bq){var bp=av("idgoal="+bo+(br?"&revenue="+br:""),bq,"goal");az(bp,aO)}function a9(bp,bo,br){var bq=av(bo+"="+j(bg(bp)),br,"link");az(bq,aO)}function bd(bp,bo){if(bp!==""){return bp+bo.charAt(0).toUpperCase()+bo.slice(1)}return bo}function aq(bt){var bs,bo,br=["","webkit","ms","moz"],bq;if(!aA){for(bo=0;bo<br.length;bo++){bq=br[bo];if(Object.prototype.hasOwnProperty.call(q,bd(bq,"hidden"))){if(q[bd(bq,"visibilityState")]==="prerender"){bs=true}break}}}if(bs){M(q,bq+"visibilitychange",function bp(){q.removeEventListener(bq+"visibilitychange",bp,false);bt()});return}bt()}function ao(bq,bp){var br,bo="(^| )(piwik[_-]"+bp;if(bq){for(br=0;br<bq.length;br++){bo+="|"+bq[br]}}bo+=")( |$)";return new RegExp(bo)}function a8(br,bo,bs){var bq=ao(aI,"download"),bp=ao(al,"link"),bt=new RegExp("\\.("+aw+")([?&#]|$)","i");return bp.test(br)?"link":(bq.test(br)||bt.test(bo)?"download":(bs?0:"link"))
 }function aZ(bt){var br,bp,bo;br=bt.parentNode;while(br!==null&&s(br)){bp=bt.tagName.toUpperCase();if(bp==="A"||bp==="AREA"){break}bt=br;br=bt.parentNode}if(s(bt.href)){var bu=bt.hostname||b(bt.href),bv=bu.toLowerCase(),bq=bt.href.replace(bu,bv),bs=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto):","i");if(!bs.test(bq)){bo=a8(bt.className,bq,aR(bv));if(bo){bq=f(bq);a9(bq,bo)}}}}function bm(bo){var bp,bq;bo=bo||A.event;bp=bo.which||bo.button;bq=bo.target||bo.srcElement;if(bo.type==="click"){if(bq){aZ(bq)}}else{if(bo.type==="mousedown"){if((bp===1||bp===2)&&bq){aK=bp;af=bq}else{aK=af=null}}else{if(bo.type==="mouseup"){if(bp===aK&&bq===af){aZ(bq)}aK=af=null}}}}function aY(bp,bo){if(bo){M(bp,"mouseup",bm,false);M(bp,"mousedown",bm,false)}else{M(bp,"click",bm,false)}}function aG(bp){if(!aX){aX=true;var bq,bo=ao(X,"ignore"),br=q.links;if(br){for(bq=0;bq<br.length;bq++){if(!bo.test(br[bq].className)){aY(br[bq],bp)}}}}}function bh(){var bp,bq,br={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"},bo=(new RegExp("Mac OS X.*Safari/")).test(d.userAgent)?A.devicePixelRatio||1:1;