refs #4996 tests should now work in case Piwik is installed in a subdirectory although could not really test it. Also encode redirect uri

1 files changed, 1 insertions, 1 deletions

diff --git a/piwik.js b/piwik.js
index 3d92b8f541..5127a9977e 100644
--- a/piwik.js
+++ b/piwik.js
@@ -35,7 +35,7 @@ if(ao){W()}if(bP){return""}cw=cj[0];cr=cj[1];ci=cj[2];b7=cj[3];cn=cj[4];cb=cj[5]
 for(cq in bN){if(Object.prototype.hasOwnProperty.call(bN,cq)){b4+="&"+cq+"="+bN[cq]}}if(cs){b4+="&data="+l(JSON2.stringify(cs))}else{if(an){b4+="&data="+l(JSON2.stringify(an))}}function ca(cA,cB){var cC=JSON2.stringify(cA);if(cC.length>2){return"&"+cB+"="+l(cC)}return""}var cx=bK(bb);var ck=bK(ab);b4+=ca(cx,"cvar");b4+=ca(ck,"e_cvar");if(ag){b4+=ca(ag,"_cvar");for(cq in cm){if(Object.prototype.hasOwnProperty.call(cm,cq)){if(ag[cq][0]===""||ag[cq][1]===""){delete ag[cq]}}}if(a3){bB(cz,JSON2.stringify(ag),az,bV,aq)}}if(aZ){if(aH){b4+="&gt_ms="+aH}else{if(f&&f.timing&&f.timing.requestStart&&f.timing.responseEnd){b4+="&gt_ms="+(f.timing.responseEnd-f.timing.requestStart)}}}am(cr,ci,b7,cc,cb,w(b5)&&String(b5).length?b5:cl);bB(cd,"*",az,bV,aq);b4+=O(ct);if(bj.length){b4+="&"+bj}if(q(au)){b4=au(b4)}return b4}function bE(b5,b4,b9,b6,b2,cc){var b7="idgoal=0",b8,b3=new Date(),ca=[],cb;if(String(b5).length){b7+="&ec_id="+l(b5);b8=Math.round(b3.getTime()/1000)}b7+="&revenue="+b4;if(String(b9).length){b7+="&ec_st="+b9
 }if(String(b6).length){b7+="&ec_tx="+b6}if(String(b2).length){b7+="&ec_sh="+b2}if(String(cc).length){b7+="&ec_dt="+cc}if(bz){for(cb in bz){if(Object.prototype.hasOwnProperty.call(bz,cb)){if(!w(bz[cb][1])){bz[cb][1]=""}if(!w(bz[cb][2])){bz[cb][2]=""}if(!w(bz[cb][3])||String(bz[cb][3]).length===0){bz[cb][3]=0}if(!w(bz[cb][4])||String(bz[cb][4]).length===0){bz[cb][4]=1}ca.push(bz[cb])}}b7+="&ec_items="+l(JSON2.stringify(ca))}b7=aR(b7,an,"ecommerce",b8);aX(b7,bi)}function bD(b2,b6,b5,b4,b3,b7){if(String(b2).length&&w(b6)){bE(b2,b6,b5,b4,b3,b7)}}function bT(b2){if(w(b2)){bE("",b2,"","","","")}}function a9(b5,b6){var b2=new Date(),b4=aR("action_name="+l(V(b5||aQ)),b6,"log");aX(b4,bi);if(aj&&aF&&!br){br=true;U(u,"click",bL);U(u,"mouseup",bL);U(u,"mousedown",bL);U(u,"mousemove",bL);U(u,"mousewheel",bL);U(G,"DOMMouseScroll",bL);U(G,"scroll",bL);U(u,"keypress",bL);U(u,"keydown",bL);U(u,"keyup",bL);U(G,"resize",bL);U(G,"focus",bL);U(G,"blur",bL);bo=b2.getTime();setTimeout(function b3(){var b7;b2=new Date();
 if((bo+aF)>b2.getTime()){if(aj<b2.getTime()){b7=aR("ping=1",b6,"ping");aX(b7,bi)}setTimeout(b3,aF)}},aF)}}function aG(b4,b3){var b5,b2="(^| )(piwik[_-]"+b3;if(b4){for(b5=0;b5<b4.length;b5++){b2+="|"+b4[b5]}}b2+=")( |$)";return new RegExp(b2)}function bx(b2){return(aa&&b2&&0===String(b2).indexOf(aa))}function bJ(b5,b2,b6){if(bx(b2)){return 0}var b4=aG(ba,"download"),b3=aG(aC,"link"),b7=new RegExp("\\.("+aS+")([?&#]|$)","i");if(b3.test(b5)){return"link"}if(b4.test(b5)||b7.test(b2)){return"download"}if(b6){return 0}return"link"}function a5(b3){var b2;b2=b3.parentNode;while(b2!==null&&w(b2)){if(Q.isLinkElement(b3)){break}b3=b2;b2=b3.parentNode}return b3}function bd(b6){b6=a5(b6);if(!Q.hasNodeAttribute(b6,"href")){return}if(!w(b6.href)){return}var b5=Q.getAttributeValueFromNode(b6,"href");if(bx(b5)){return}var b7=b6.hostname||b(b6.href);var b8=b7.toLowerCase();var b3=b6.href.replace(b7,b8);var b4=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto):","i");if(!b4.test(b3)){var b2=bJ(b6.className,b3,bm(b8));
-if(b2){return{type:b2,href:b3}}}}function bY(b2,b3,b4,b5){var b6=m.buildInteractionRequestParams(b2,b3,b4,b5);if(!b6){return}return aR(b6,null,"contentInteraction")}function bX(b4,b5,b9,b2,b3){if(!w(b4)){return}if(bx(b4)){return b4}var b7=m.toAbsoluteUrl(b4);var b6="redirecturl="+b7+"&";b6+=bY(b5,b9,b2,(b3||b4));var b8="&";if(aa.indexOf("?")<0){b8="?"}return aa+b8+b6}function a1(b2,b3){if(!b2||!b3){return false}var b4=m.findTargetNode(b2);if(m.shouldIgnoreInteraction(b4)){return false}b4=m.findTargetNodeNoDefault(b2);if(b4&&!H(b4,b3)){return false}return true}function aP(b4,b3,b6){if(!b4){return}var b2=m.findParentContentNode(b4);if(!b2){return}if(!a1(b2,b4)){return}var b5=m.buildContentBlock(b2);if(!b5){return}if(!b5.target&&b6){b5.target=b6}return m.buildInteractionRequestParams(b3,b5.name,b5.piece,b5.target)}function aM(b3){if(!ah||!ah.length){return false}var b2,b4;for(b2=0;b2<ah.length;b2++){b4=ah[b2];if(b4&&b4.name===b3.name&&b4.piece===b3.piece&&b4.target===b3.target){return true
+if(b2){return{type:b2,href:b3}}}}function bY(b2,b3,b4,b5){var b6=m.buildInteractionRequestParams(b2,b3,b4,b5);if(!b6){return}return aR(b6,null,"contentInteraction")}function bX(b4,b5,b9,b2,b3){if(!w(b4)){return}if(bx(b4)){return b4}var b7=m.toAbsoluteUrl(b4);var b6="redirecturl="+l(b7)+"&";b6+=bY(b5,b9,b2,(b3||b4));var b8="&";if(aa.indexOf("?")<0){b8="?"}return aa+b8+b6}function a1(b2,b3){if(!b2||!b3){return false}var b4=m.findTargetNode(b2);if(m.shouldIgnoreInteraction(b4)){return false}b4=m.findTargetNodeNoDefault(b2);if(b4&&!H(b4,b3)){return false}return true}function aP(b4,b3,b6){if(!b4){return}var b2=m.findParentContentNode(b4);if(!b2){return}if(!a1(b2,b4)){return}var b5=m.buildContentBlock(b2);if(!b5){return}if(!b5.target&&b6){b5.target=b6}return m.buildInteractionRequestParams(b3,b5.name,b5.piece,b5.target)}function aM(b3){if(!ah||!ah.length){return false}var b2,b4;for(b2=0;b2<ah.length;b2++){b4=ah[b2];if(b4&&b4.name===b3.name&&b4.piece===b3.piece&&b4.target===b3.target){return true
 }}return false}function ac(b5){if(!b5){return false}var b8=m.findTargetNode(b5);if(!b8||m.shouldIgnoreInteraction(b8)){return false}var b6=bd(b8);if(bu&&b6&&b6.type){return false}if(Q.isLinkElement(b8)&&Q.hasNodeAttributeWithValue(b8,"href")){var b4=String(Q.getAttributeValueFromNode(b8,"href"));if(0===b4.indexOf("#")){return false}if(bx(b4)){return true}if(!m.isUrlToCurrentDomain(b4)){return false}var b7=m.findContentName(b5);var b2=m.findContentPiece(b5);var b3=m.findContentTarget(b5);if(!Q.hasNodeAttributeWithValue(b8,m.CONTENT_TARGET_ATTR)||b8.wasContentTargetAttrReplaced){b8.wasContentTargetAttrReplaced=true;b3=m.toAbsoluteUrl(b4);Q.setAnyAttribute(b8,m.CONTENT_TARGET_ATTR,b3)}var b9=bX(b4,"click",b7,b2,b3);m.setHrefAttribute(b8,b9);return true}return false}function af(b3){if(!b3||!b3.length){return}var b2;for(b2=0;b2<b3.length;b2++){ac(b3[b2])}}function bc(b2){return function(b3){if(!b2){return}var b6=m.findParentContentNode(b2);var b7;if(b3){b7=b3.target||b3.srcElement}if(!b7){b7=b2
 }if(!a1(b6,b7)){return}if(Q.isLinkElement(b2)&&Q.hasNodeAttributeWithValue(b2,"href")&&Q.hasNodeAttributeWithValue(b2,m.CONTENT_TARGET_ATTR)){var b4=Q.getAttributeValueFromNode(b2,"href");if(!bx(b4)&&b2.wasContentTargetAttrReplaced){Q.setAnyAttribute(b2,m.CONTENT_TARGET_ATTR,"")}}var ca=bd(b2);if(bu&&ca&&ca.type){return ca.type}if(ac(b6)){return"href"}var b5=m.findContentName(b6);var cb=m.findContentPiece(b6);var b9=m.findContentTarget(b6);var b8=bY("click",b5,cb,b9);aX(b8,bi);return b8}}function aE(b4){if(!b4||!b4.length){return}var b2,b3;for(b2=0;b2<b4.length;b2++){b3=m.findTargetNode(b4[b2]);if(b3&&!b3.contentInteractionTrackingSetupDone){b3.contentInteractionTrackingSetupDone=true;U(b3,"click",bc(b3))}}}function aB(b4,b5){if(!b4||!b4.length){return[]}var b2,b3;for(b2=0;b2<b4.length;b2++){if(aM(b4[b2])){b4.splice(b2,1);b2--}else{ah.push(b4[b2])}}if(!b4||!b4.length){return[]}af(b5);aE(b5);var b6=[];for(b2=0;b2<b4.length;b2++){b3=aR(m.buildImpressionRequestParams(b4[b2].name,b4[b2].piece,b4[b2].target),undefined,"contentImpressions");
 b6.push(b3)}return b6}function aU(b3){var b2=m.collectContent(b3);return aB(b2,b3)}function bw(b3){if(!b3||!b3.length){return[]}var b2;for(b2=0;b2<b3.length;b2++){if(!m.isNodeVisible(b3[b2])){b3.splice(b2,1);b2--}}if(!b3||!b3.length){return[]}return aU(b3)}function bH(b4,b2,b3){var b5=m.buildImpressionRequestParams(b4,b2,b3);return aR(b5,null,"contentImpression")}function aT(b5,b3){if(!b5){return}var b2=m.findParentContentNode(b5);var b4=m.buildContentBlock(b2);if(!b4){return}if(!b3){b3="Unknown"}return bY(b3,b4.name,b4.piece,b4.target)}function bs(b3,b5,b2,b4){return"e_c="+l(b3)+"&e_a="+l(b5)+(w(b2)?"&e_n="+l(b2):"")+(w(b4)?"&e_v="+l(b4):"")}function al(b4,b6,b2,b5,b7){if(String(b4).length===0||String(b6).length===0){return false}var b3=aR(bs(b4,b6,b2,b5),b7,"event");aX(b3,bi)}function aL(b2,b5,b3,b6){var b4=aR("search="+l(b2)+(b5?"&search_cat="+l(b5):"")+(w(b3)?"&search_count="+b3:""),b6,"sitesearch");aX(b4,bi)}function bg(b2,b5,b4){var b3=aR("idgoal="+b2+(b5?"&revenue="+b5:""),b4,"goal");