refs #409 - add site ID to cookie name; shorten domain hash to 16 bits (4 hexit characters)

This is a hybrid between the previous implementation and what I proposed.
 * Adding idsite to the cookie name means subdomains that track using different site IDs can still use/share subdomain cookies
 * Keeping the domain hash in the cookie name will make it easier in future to delete invalid cookies (integrity check)

Decided not to auto-set www.example.com's cookie domain=.example.com -- as the convenience introduces side-effects, and I have a feeling will be more trouble than beneficial.  Will continue to leave it to the user to explicitly set the cookie domain.  Users should be advised to redirect example.com to www.example.com (or vice-versa) to:

a) to avoid separate cookies between the two domains, and
b) to improve SEO.  (Google for "seo www vs no www".)


git-svn-id: http://dev.piwik.org/svn/trunk@3960 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 1 insertions, 1 deletions

diff --git a/piwik.js b/piwik.js
index b080984cd9..78c1fdcf71 100644
--- a/piwik.js
+++ b/piwik.js
@@ -14,7 +14,7 @@ return typeof f==="function"?k({"":l},""):l}throw new SyntaxError("JSON.parse")}
 k()})}else{if(d.attachEvent){d.attachEvent("onreadystatechange",function I(){if(d.readyState==="complete"){d.detachEvent("onreadystatechange",I);k()}});if(d.documentElement.doScroll&&G===G.top){(function I(){if(!h){try{d.documentElement.doScroll("left")}catch(J){setTimeout(I,0);return}k()}}())}}}if((new RegExp("WebKit")).test(j.userAgent)){var i=setInterval(function(){if(h||/loaded|complete/.test(d.readyState)){clearInterval(i);k()}},10)}t(G,"load",k,false)}function f(){var i="";try{i=G.top.document.referrer}catch(J){if(G.parent){try{i=G.parent.document.referrer}catch(I){i=""}}}if(i===""){i=d.referrer}return i}function y(i){var J=new RegExp("^(?:(?:https?|ftp):)/*(?:[^@]+@)?([^:/#]+)"),I=J.exec(i);return I?I[1]:i}function p(J,I){var M=new RegExp("^(?:https?|ftp)(?::/*(?:[^?]+)[?])([^#]+)"),L=M.exec(J),K=new RegExp("(?:^|&)"+I+"=([^&]*)"),i=L?K.exec(L[1]):0;return i?H(i[1]):""}function s(N,K,J,M,I,L){var i;if(J){i=new Date();i.setTime(i.getTime()+J)}d.cookie=N+"="+e(K)+(J?";expires="+i.toGMTString():"")+";path="+(M?M:"/")+(I?";domain="+I:"")+(L?";secure":"")
 }function E(J){var i=new RegExp("(^|;)[ ]*"+J+"=([^;]*)"),I=i.exec(d.cookie);return I?H(I[2]):0}function r(i){return unescape(e(i))}function u(Y){var K=function(W,i){return(W<<i)|(W>>>(32-i))},Z=function(af){var ae="",ad,W;for(ad=7;ad>=0;ad--){W=(af>>>(ad*4))&15;ae+=W.toString(16)}return ae},N,ab,aa,J=[],R=1732584193,P=4023233417,O=2562383102,M=271733878,L=3285377520,X,V,U,T,S,ac,I,Q=[];Y=r(Y);I=Y.length;for(ab=0;ab<I-3;ab+=4){aa=Y.charCodeAt(ab)<<24|Y.charCodeAt(ab+1)<<16|Y.charCodeAt(ab+2)<<8|Y.charCodeAt(ab+3);Q.push(aa)}switch(I&3){case 0:ab=2147483648;break;case 1:ab=Y.charCodeAt(I-1)<<24|8388608;break;case 2:ab=Y.charCodeAt(I-2)<<24|Y.charCodeAt(I-1)<<16|32768;break;case 3:ab=Y.charCodeAt(I-3)<<24|Y.charCodeAt(I-2)<<16|Y.charCodeAt(I-1)<<8|128;break}Q.push(ab);while((Q.length&15)!==14){Q.push(0)}Q.push(I>>>29);Q.push((I<<3)&4294967295);for(N=0;N<Q.length;N+=16){for(ab=0;ab<16;ab++){J[ab]=Q[N+ab]}for(ab=16;ab<=79;ab++){J[ab]=K(J[ab-3]^J[ab-8]^J[ab-14]^J[ab-16],1)}X=R;V=P;U=O;T=M;S=L;
 for(ab=0;ab<=19;ab++){ac=(K(X,5)+((V&U)|(~V&T))+S+J[ab]+1518500249)&4294967295;S=T;T=U;U=K(V,30);V=X;X=ac}for(ab=20;ab<=39;ab++){ac=(K(X,5)+(V^U^T)+S+J[ab]+1859775393)&4294967295;S=T;T=U;U=K(V,30);V=X;X=ac}for(ab=40;ab<=59;ab++){ac=(K(X,5)+((V&U)|(V&T)|(U&T))+S+J[ab]+2400959708)&4294967295;S=T;T=U;U=K(V,30);V=X;X=ac}for(ab=60;ab<=79;ab++){ac=(K(X,5)+(V^U^T)+S+J[ab]+3395469782)&4294967295;S=T;T=U;U=K(V,30);V=X;X=ac}R=(R+X)&4294967295;P=(P+V)&4294967295;O=(O+U)&4294967295;M=(M+T)&4294967295;L=(L+S)&4294967295}ac=Z(R)+Z(P)+Z(O)+Z(M)+Z(L);return ac.toLowerCase()}function o(J,i,I){if(J==="translate.googleusercontent.com"){if(I===""){I=i}i=p(i,"u");J=y(i)}else{if(J==="cc.bingj.com"||J==="webcache.googleusercontent.com"||J.slice(0,5)==="74.6."){i=d.links[0].href;J=y(i)}}return[J,i,I]}function l(I){var i=I.length;if(I.charAt(--i)==="."){I=I.slice(0,i)}if(I.slice(0,2)==="*."){I=I.slice(1)}return I}function D(ay,aw){var aj=o(d.domain,G.location.href,f()),W=l(aj[0]),T=aj[1],az=aj[2],K="GET",aa=ay||"",aQ=aw||"",aJ,aP=d.title,af="7z|aac|ar[cj]|as[fx]|avi|bin|csv|deb|dmg|doc|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|ppt|qtm?|ra[mr]?|rpm|sea|sit|tar|t?bz2?|tgz|torrent|txt|wav|wm[av]|wpd||xls|xml|z|zip",aB=[W],M=[],aC=[],aF=[],Z=500,J,ah,ai,au,aD="_pk_",P,ax,L,aq,aR=63072000000,ad=1800000,Y=15768000000,aG=false,R=100,al={},ap=false,Q=false,X,aN,an,aI=u,av;
-function aK(aT){var aS;if(ai){aS=new RegExp("#.*");return aT.replace(aS,"")}return aT}function ao(aV){var aT,aS,aU;for(aT=0;aT<aB.length;aT++){aS=l(aB[aT].toLowerCase());if(aV===aS){return true}if(aS.slice(0,1)==="."){if(aV===aS.slice(1)){return true}aU=aV.length-aS.length;if((aU>0)&&(aV.slice(aU)===aS)){return true}}}return false}function i(aS){var aT=new Image(1,1);aT.onLoad=function(){};aT.src=aa+"?"+aS}function V(aS){try{var aU=G.XMLHttpRequest?new G.XMLHttpRequest():G.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;aU.open("POST",aa,true);aU.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");aU.send(aS)}catch(aT){i(aS)}}function aM(aU,aT){var aS=new Date();if(!L){if(K==="POST"){V(aU)}else{i(aU)}m=aS.getTime()+aT}}function N(aS){return aD+aS+"."+av}function at(){var aS=N("testcookie");if(!b(j.cookieEnabled)){s(aS,"1");return E(aS)==="1"?"1":"0"}return j.cookieEnabled?"1":"0"}function ag(){av=aI((P||W)+(ax||"/")).slice(0,8)}function U(){var aT=N("cvar"),aS=E(aT);
+function aK(aT){var aS;if(ai){aS=new RegExp("#.*");return aT.replace(aS,"")}return aT}function ao(aV){var aT,aS,aU;for(aT=0;aT<aB.length;aT++){aS=l(aB[aT].toLowerCase());if(aV===aS){return true}if(aS.slice(0,1)==="."){if(aV===aS.slice(1)){return true}aU=aV.length-aS.length;if((aU>0)&&(aV.slice(aU)===aS)){return true}}}return false}function i(aS){var aT=new Image(1,1);aT.onLoad=function(){};aT.src=aa+"?"+aS}function V(aS){try{var aU=G.XMLHttpRequest?new G.XMLHttpRequest():G.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;aU.open("POST",aa,true);aU.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");aU.send(aS)}catch(aT){i(aS)}}function aM(aU,aT){var aS=new Date();if(!L){if(K==="POST"){V(aU)}else{i(aU)}m=aS.getTime()+aT}}function N(aS){return aD+aS+"."+aQ+"."+av}function at(){var aS=N("testcookie");if(!b(j.cookieEnabled)){s(aS,"1");return E(aS)==="1"?"1":"0"}return j.cookieEnabled?"1":"0"}function ag(){av=aI((P||W)+(ax||"/")).slice(0,4)}function U(){var aT=N("cvar"),aS=E(aT);
 if(aS.length){aS=JSON2.parse(aS);if(n(aS)){return aS}}return{}}function aE(){if(aG===false){aG=U()}}function O(aS){var aT=new Date();X=aT.getTime()}function aA(){var aT=new Date(),aS=Math.round(aT.getTime()/1000),aV=E(N("id")),aU;if(aV){aU=aV.split(".");aU.unshift("0")}else{aU=["1",aI((j.userAgent||"")+(j.platform||"")+JSON2.stringify(al)+aS).slice(0,16),aS,0,aS,""]}return aU}function ak(aT,bd,bf){var bb,aS=new Date(),aZ=Math.round(aS.getTime()/1000),be,bg,bc,aV,a6,a9,aY,aX,ba,aU=1024,bh,a2,a8=aG,a4=N("id"),a0=N("ses"),a1=N("ref"),bi=N("cvar"),a7=aA(),a3=E(a0),aW=E(a1),a5=d.location.protocol==="https";if(L){s(a4,"",-1,ax,P);s(a0,"",-1,ax,P);s(bi,"",-1,ax,P);s(a1,"",-1,ax,P);return""}bg=a7[0];bc=a7[1];a6=a7[2];aV=a7[3];a9=a7[4];aY=a7[5];if(aW){be=aW.indexOf(".");aX=aW.slice(0,be);ba=aW.slice(be+1)}else{aX=0;ba=""}if(!a3){aV++;aY=a9;bh=y(az);a2=aW?y(aW):"";if(bh.length&&!ao(bh)&&(!aq||!a2.length||ao(a2))){aX=aZ;ba=az;s(a1,aX+"."+ba.slice(0,aU),Y,ax,P,a5)}}aT+="&idsite="+aQ+"&rec=1&rand="+Math.random()+"&h="+aS.getHours()+"&m="+aS.getMinutes()+"&s="+aS.getSeconds()+"&url="+e(aK(aJ||T))+"&urlref="+e(aK(az))+"&_id="+bc+"&_idts="+a6+"&_idvc="+aV+"&_idn="+bg+"&_ref="+e(aK(ba.slice(0,aU)))+"&_refts="+aX+"&_viewts="+aY;
 for(bb in al){aT+="&"+bb+"="+al[bb]}if(bd){aT+="&data="+e(JSON2.stringify(bd))}else{if(au){aT+="&data="+e(JSON2.stringify(au))}}if(aG){aT+="&_cvar="+e(JSON2.stringify(aG));for(bb in a8){if(aG[bb][0]===""||aG[bb][1]===""){delete aG[bb]}}s(bi,JSON2.stringify(aG),ad,ax,P,a5)}s(a4,bc+"."+a6+"."+aV+"."+aZ+"."+aY,aR,ax,P,a5);s(a0,"*",ad,ax,P,a5);aT+=g(bf);return aT}function I(aV,aW){var aS=new Date(),aU=ak("action_name="+e(aV||aP),aW,"log");aM(aU,Z);if(J&&ah&&!Q){Q=true;t(d,"click",O);t(d,"mouseup",O);t(d,"mousedown",O);t(d,"mousemove",O);t(d,"mousewheel",O);t(G,"DOMMouseScroll",O);t(G,"scroll",O);t(d,"keypress",O);t(d,"keydown",O);t(d,"keyup",O);t(G,"resize",O);t(G,"focus",O);t(G,"blur",O);X=aS.getTime();setTimeout(function aT(){var aX=new Date(),aY;if((X+ah)>aX.getTime()){if(J<aX.getTime()){aY=ak("ping=1",aW,"ping");aM(aY,Z)}setTimeout(aT,ah)}},ah)}}function aL(aS,aV,aU){var aT=ak("idgoal="+aS,aU,"goal");if(aV){aT+="&revenue="+aV}aM(aT,Z)}function ae(aT,aS,aV){var aU=ak(aS+"="+e(aK(aT)),aV,"link");
 aM(aU,Z)}function ar(aU,aT){var aV,aS="(^| )(piwik[_-]"+aT;if(aU){for(aV=0;aV<aU.length;aV++){aS+="|"+aU[aV]}}aS+=")( |$)";return new RegExp(aS)}function aO(aV,aS,aW){if(!aW){return"link"}var aU=ar(aC,"download"),aT=ar(aF,"link"),aX=new RegExp("\\.("+af+")([?&#]|$)","i");return aT.test(aV)?"link":(aU.test(aV)||aX.test(aS)?"download":0)}function S(aX){var aV,aT,aS;while(!!(aV=aX.parentNode)&&((aT=aX.tagName)!=="A"&&aT!=="AREA")){aX=aV}if(b(aX.href)){var aY=aX.hostname||y(aX.href),aZ=aY.toLowerCase(),aU=aX.href.replace(aY,aZ),aW=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript):","i");if(!aW.test(aU)){aS=aO(aX.className,aU,ao(aZ));if(aS){ae(aU,aS)}}}}function ab(aS){var aT,aU;aS=aS||G.event;aT=aS.which||aS.button;aU=aS.target||aS.srcElement;if(aS.type==="click"){if(aU){S(aU)}}else{if(aS.type==="mousedown"){if((aT===1||aT===2)&&aU){aN=aT;an=aU}else{aN=an=null}}else{if(aS.type==="mouseup"){if(aT===aN&&aU===an){S(aU)}aN=an=null}}}}function aH(aT,aS){if(aS){t(aT,"mouseup",ab,false);