refs #7220 fixes #7218 refs #4633 prevent double url encoded url and referrer.

location.href and top.document.referer are both already URL encoded.
To prevent double encoding we need to decode them.

1 files changed, 1 insertions, 1 deletions

diff --git a/piwik.js b/piwik.js
index e2e91b58d5..b5df935e64 100644
--- a/piwik.js
+++ b/piwik.js
@@ -27,7 +27,7 @@ if(Q.hasNodeAttributeWithValue(W,"href")){X=Q.getAttributeValueFromNode(W,"href"
 }}}var ac=Q.findNodesByTagName(aa,"embed");if(ac&&ac.length){return this.findMediaUrlInNode(ac[0])}}},trim:function(W){if(W&&String(W)===W){return W.replace(/^\s+|\s+$/g,"")}return W},isOrWasNodeInViewport:function(ab){if(!ab||!ab.getBoundingClientRect||ab.nodeType!==1){return true}var aa=ab.getBoundingClientRect();var Z=u.documentElement||{};var Y=aa.top<0;if(Y&&ab.offsetTop){Y=(ab.offsetTop+aa.height)>0}var X=Z.clientWidth;if(G.innerWidth&&X>G.innerWidth){X=G.innerWidth}var W=Z.clientHeight;if(G.innerHeight&&W>G.innerHeight){W=G.innerHeight}return((aa.bottom>0||Y)&&aa.right>0&&aa.left<X&&((aa.top<W)||Y))},isNodeVisible:function(X){var W=g(X);var Y=this.isOrWasNodeInViewport(X);return W&&Y},buildInteractionRequestParams:function(W,X,Y,Z){var aa="";if(W){aa+="c_i="+l(W)}if(X){if(aa){aa+="&"}aa+="c_n="+l(X)}if(Y){if(aa){aa+="&"}aa+="c_p="+l(Y)}if(Z){if(aa){aa+="&"}aa+="c_t="+l(Z)}return aa},buildImpressionRequestParams:function(W,X,Y){var Z="c_n="+l(W)+"&c_p="+l(X);if(Y){Z+="&c_t="+l(Y)}return Z
 },buildContentBlock:function(Y){if(!Y){return}var W=this.findContentName(Y);var X=this.findContentPiece(Y);var Z=this.findContentTarget(Y);W=this.trim(W);X=this.trim(X);Z=this.trim(Z);return{name:W||"Unknown",piece:X||"Unknown",target:Z||""}},collectContent:function(Z){if(!Z||!Z.length){return[]}var Y=[];var W,X;for(W=0;W<Z.length;W++){X=this.buildContentBlock(Z[W]);if(w(X)){Y.push(X)}}return Y},setLocation:function(W){this.location=W},getLocation:function(){var W=this.location||G.location;if(!W.origin){W.origin=W.protocol+"//"+W.hostname+(W.port?":"+W.port:"")}return W},toAbsoluteUrl:function(X){if((!X||String(X)!==X)&&X!==""){return X}if(""===X){return this.getLocation().href}if(X.search(/^\/\//)!==-1){return this.getLocation().protocol+X}if(X.search(/:\/\//)!==-1){return X}if(0===X.indexOf("#")){return this.getLocation().origin+this.getLocation().pathname+X}if(0===X.indexOf("?")){return this.getLocation().origin+this.getLocation().pathname+X}if(0===X.search("^[a-zA-Z]{2,11}:")){return X
 }if(X.search(/^\//)!==-1){return this.getLocation().origin+X}var W="(.*/)";var Y=this.getLocation().origin+this.getLocation().pathname.match(new RegExp(W))[0];return Y+X},isUrlToCurrentDomain:function(X){var Y=this.toAbsoluteUrl(X);if(!Y){return false}var W=this.getLocation().origin;if(W===Y){return true}if(0===String(Y).indexOf(W)){if(":"===String(Y).substr(W.length,1)){return false}return true}return false},setHrefAttribute:function(X,W){if(!X||!W){return}Q.setAnyAttribute(X,"href",W)},shouldIgnoreInteraction:function(Y){var X=Q.hasNodeAttribute(Y,this.CONTENT_IGNOREINTERACTION_ATTR);var W=Q.hasNodeCssClass(Y,this.CONTENT_IGNOREINTERACTION_CLASS);return X||W}};function B(W,X){if(X){return X}if(W.slice(-9)==="piwik.php"){W=W.slice(0,W.length-9)}return W}function A(aa){var W="Piwik_Overlay";var ad=new RegExp("index\\.php\\?module=Overlay&action=startOverlaySession&idSite=([0-9]+)&period=([^&]+)&date=([^&]+)$");var Y=ad.exec(u.referrer);if(Y){var Z=Y[1];if(Z!==String(aa)){return false}var ac=Y[2],X=Y[3];
-G.name=W+"###"+ac+"###"+X}var ab=G.name.split("###");return ab.length===3&&ab[0]===W}function M(X,ac,Z){var ab=G.name.split("###"),aa=ab[1],W=ab[2],Y=B(X,ac);i(Y+"plugins/Overlay/client/client.js?v=1",function(){Piwik_Overlay_Client.initialize(Y,Z,aa,W)})}function D(aE,bl,bJ){var ad=N(u.domain,G.location.href,x()),bL=y(ad[0]),b3=ad[1],bt=ad[2],b6=false,bp="GET",br=bp,bb="application/x-www-form-urlencoded; charset=UTF-8",aK=bb,aa=aE||"",ax="",bn="",bR=bl||"",aJ="",a6,aS=u.title,aU="7z|aac|apk|ar[cj]|as[fx]|avi|azw3|bin|csv|deb|dmg|docx?|epub|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mobi|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",bo=[bL],ai=[],be=[],aC=[],bm=500,aj,aG,ak,an,aY=["pk_campaign","piwik_campaign","utm_campaign","utm_source","utm_medium"],aP=["pk_kwd","piwik_kwd","utm_term"],b1="_pk_",aq,b2,ao=false,bV,a0,a4,aw=33955200000,az=1800000,a9=15768000000,a1=true,aI=0,a5=false,ag=false,au,bf={},ab={},bW=200,bD={},bS={},ah=[],ay=false,a8=false,by=false,bT=false,bv=false,bs,bi,at,aX=T,bx,a2=bJ;
+G.name=W+"###"+ac+"###"+X}var ab=G.name.split("###");return ab.length===3&&ab[0]===W}function M(X,ac,Z){var ab=G.name.split("###"),aa=ab[1],W=ab[2],Y=B(X,ac);i(Y+"plugins/Overlay/client/client.js?v=1",function(){Piwik_Overlay_Client.initialize(Y,Z,aa,W)})}function D(aE,bl,bJ){var ad=N(u.domain,G.location.href,x()),bL=y(ad[0]),b3=F(ad[1]),bt=F(ad[2]),b6=false,bp="GET",br=bp,bb="application/x-www-form-urlencoded; charset=UTF-8",aK=bb,aa=aE||"",ax="",bn="",bR=bl||"",aJ="",a6,aS=u.title,aU="7z|aac|apk|ar[cj]|as[fx]|avi|azw3|bin|csv|deb|dmg|docx?|epub|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mobi|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",bo=[bL],ai=[],be=[],aC=[],bm=500,aj,aG,ak,an,aY=["pk_campaign","piwik_campaign","utm_campaign","utm_source","utm_medium"],aP=["pk_kwd","piwik_kwd","utm_term"],b1="_pk_",aq,b2,ao=false,bV,a0,a4,aw=33955200000,az=1800000,a9=15768000000,a1=true,aI=0,a5=false,ag=false,au,bf={},ab={},bW=200,bD={},bS={},ah=[],ay=false,a8=false,by=false,bT=false,bv=false,bs,bi,at,aX=T,bx,a2=bJ;
 function bF(cf,cc,cb,ce,ca,cd){if(ao){return}var b9;if(cb){b9=new Date();b9.setTime(b9.getTime()+cb)}u.cookie=cf+"="+l(cc)+(cb?";expires="+b9.toGMTString():"")+";path="+(ce||"/")+(ca?";domain="+ca:"")+(cd?";secure":"")}function av(cb){if(ao){return 0}var b9=new RegExp("(^|;)[ ]*"+cb+"=([^;]*)"),ca=b9.exec(u.cookie);return ca?F(ca[2]):0}function bX(b9){var ca;if(ak){ca=new RegExp("#.*");return b9.replace(ca,"")}return b9}function bK(cb,b9){var cc=k(b9),ca;if(cc){return b9}if(b9.slice(0,1)==="/"){return k(cb)+"://"+b(cb)+b9}cb=bX(cb);ca=cb.indexOf("?");if(ca>=0){cb=cb.slice(0,ca)}ca=cb.lastIndexOf("/");if(ca!==cb.length-1){cb=cb.slice(0,ca+1)}return cb+b9}function bq(cc){var ca,b9,cb;for(ca=0;ca<bo.length;ca++){b9=y(bo[ca].toLowerCase());if(cc===b9){return true}if(b9.slice(0,1)==="."){if(cc===b9.slice(1)){return true}cb=cc.length-b9.length;if((cb>0)&&(cc.slice(cb)===b9)){return true}}}return false}function b8(b9,cb){var ca=new Image(1,1);ca.onload=function(){t=0;if(typeof cb==="function"){cb()
 }};ca.src=aa+(aa.indexOf("?")<0?"?":"&")+b9}function bG(ca,cd,b9){if(!w(b9)||null===b9){b9=true}try{var cc=G.XMLHttpRequest?new G.XMLHttpRequest():G.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;cc.open("POST",aa,true);cc.onreadystatechange=function(){if(this.readyState===4&&!(this.status>=200&&this.status<300)&&b9){b8(ca,cd)}else{if(typeof cd==="function"){cd()}}};cc.setRequestHeader("Content-Type",aK);cc.send(ca)}catch(cb){if(b9){b8(ca,cd)}}}function bY(ca){var b9=new Date();var cb=b9.getTime()+ca;if(!j||cb>j){j=cb}}function aD(cd){var ca=new Date();var b9=ca.getTime();if(a8&&b9<a8){var cb=a8-b9;setTimeout(cd,cb);bY(cb+50);a8+=50;return}if(a8===false){var cc=800;a8=b9+cc}cd()}function aZ(ca,b9,cb){if(!bV&&ca){aD(function(){if(br==="POST"){bG(ca,cb)}else{b8(ca,cb)}bY(b9)})}}function ba(b9){if(bV){return false}return(b9&&b9.length)}function ap(cb,b9){if(!ba(cb)){return}var ca='{"requests":["?'+cb.join('","?')+'"]}';aD(function(){bG(ca,null,false);bY(b9)})}function bE(b9){return b1+b9+"."+bR+"."+bx
 }function ae(){if(ao){return"0"}if(!w(e.cookieEnabled)){var b9=bE("testcookie");bF(b9,"1");return av(b9)==="1"?"1":"0"}return e.cookieEnabled?"1":"0"}function bj(){bx=aX((aq||bL)+(b2||"/")).slice(0,4)}function ar(){var ca=bE("cvar"),b9=av(ca);if(b9.length){b9=JSON2.parse(b9);if(J(b9)){return b9}}return{}}function Z(){if(ag===false){ag=ar()}}function bQ(){var b9=new Date();bs=b9.getTime()}function Y(){var ca=new Date(),b9=Math.round(ca.getTime()/1000),cc=av(bE("id")),cb;if(cc){cb=cc.split(".");cb.unshift("0")}else{if(!a2){a2=aX((e.userAgent||"")+(e.platform||"")+JSON2.stringify(bS)+ca.getTime()+Math.random()).slice(0,16)}cb=["1",a2,b9,0,b9,"",""]}return cb}function aL(){var cd=new Date(),ca=cd.getTime(),cc=Y();var b9=parseInt(cc[2],10);var cb=(b9*1000)+aw-ca;return cb}function am(cd,ca,b9,cc,cb,cf){var ce=aL();bF(bE("id"),cd+"."+ca+"."+b9+"."+cc+"."+cb+"."+cf,ce,b2,aq)}function X(){var b9=av(bE("ref"));if(b9.length){try{b9=JSON2.parse(b9);if(J(b9)){return b9}}catch(ca){}}return["","",0,""]