Fixes #5118 getRequest() method returns the query string of Tracking API HTTP request + tests

Close PR#243

1 files changed, 5 insertions, 5 deletions

diff --git a/piwik.js b/piwik.js
index 09d46b0a4c..ff1e135d2a 100644
--- a/piwik.js
+++ b/piwik.js
@@ -24,8 +24,8 @@ for(bO in bd){if(Object.prototype.hasOwnProperty.call(bd,bO)){bs+="&"+bO+"="+bd[
 az(bv,aO)}setTimeout(br,an)}},an)}}function aa(bs,bu,bq,bt,bv){if(String(bs).length===0||String(bu).length===0){return false}var br=av("e_c="+j(bs)+"&e_a="+j(bu)+(s(bq)?"&e_n="+j(bq):"")+(s(bt)?"&e_v="+j(bt):""),bv,"event");az(br,aO)}function ar(bq,bt,br,bu){var bs=av("search="+j(bq)+(bt?"&search_cat="+j(bt):"")+(s(br)?"&search_count="+br:""),bu,"sitesearch");az(bs,aO)}function aM(bq,bt,bs){var br=av("idgoal="+bq+(bt?"&revenue="+bt:""),bs,"goal");az(br,aO)}function a9(br,bq,bt){var bs=av(bq+"="+j(bh(br)),bt,"link");az(bs,aO)}function be(br,bq){if(br!==""){return br+bq.charAt(0).toUpperCase()+bq.slice(1)}return bq}function aq(bv){var bu,bq,bt=["","webkit","ms","moz"],bs;if(!aA){for(bq=0;bq<bt.length;bq++){bs=bt[bq];if(Object.prototype.hasOwnProperty.call(q,be(bs,"hidden"))){if(q[be(bs,"visibilityState")]==="prerender"){bu=true}break}}}if(bu){M(q,bs+"visibilitychange",function br(){q.removeEventListener(bs+"visibilitychange",br,false);bv()});return}bv()}function ao(bs,br){var bt,bq="(^| )(piwik[_-]"+br;
 if(bs){for(bt=0;bt<bs.length;bt++){bq+="|"+bs[bt]}}bq+=")( |$)";return new RegExp(bq)}function a8(bt,bq,bu){var bs=ao(aI,"download"),br=ao(al,"link"),bv=new RegExp("\\.("+aw+")([?&#]|$)","i");return br.test(bt)?"link":(bs.test(bt)||bv.test(bq)?"download":(bu?0:"link"))}function aZ(bv){var bt,br,bq;bt=bv.parentNode;while(bt!==null&&s(bt)){br=bv.tagName.toUpperCase();if(br==="A"||br==="AREA"){break}bv=bt;bt=bv.parentNode}if(s(bv.href)){var bw=bv.hostname||b(bv.href),bx=bw.toLowerCase(),bs=bv.href.replace(bw,bx),bu=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto):","i");if(!bu.test(bs)){bq=a8(bv.className,bs,aR(bx));if(bq){bs=f(bs);a9(bs,bq)}}}}function bo(bq){var br,bs;bq=bq||A.event;br=bq.which||bq.button;bs=bq.target||bq.srcElement;if(bq.type==="click"){if(bs){aZ(bs)}}else{if(bq.type==="mousedown"){if((br===1||br===2)&&bs){aK=br;af=bs}else{aK=af=null}}else{if(bq.type==="mouseup"){if(br===aK&&bs===af){aZ(bs)}aK=af=null}}}}function aY(br,bq){if(bq){M(br,"mouseup",bo,false);
 M(br,"mousedown",bo,false)}else{M(br,"click",bo,false)}}function aG(br){if(!aX){aX=true;var bs,bq=ao(X,"ignore"),bt=q.links;if(bt){for(bs=0;bs<bt.length;bs++){if(!bq.test(bt[bs].className)){aY(bt[bs],br)}}}}}function bi(){var br,bs,bt={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"},bq=(new RegExp("Mac OS X.*Safari/")).test(d.userAgent)?A.devicePixelRatio||1:1;if(!((new RegExp("MSIE")).test(d.userAgent))){if(d.mimeTypes&&d.mimeTypes.length){for(br in bt){if(Object.prototype.hasOwnProperty.call(bt,br)){bs=d.mimeTypes[bt[br]];bd[br]=(bs&&bs.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&s(d.javaEnabled)&&d.javaEnabled()){bd.java="1"}if(n(A.GearsFactory)){bd.gears="1"}bd.cookie=V()}bd.res=D.width*bq+"x"+D.height*bq}bi();aL();return{getVisitorId:function(){return(Q())[1]
-},getVisitorInfo:function(){return Q()},getAttributionInfo:function(){return O()},getAttributionCampaignName:function(){return O()[0]},getAttributionCampaignKeyword:function(){return O()[1]},getAttributionReferrerTimestamp:function(){return O()[2]},getAttributionReferrerUrl:function(){return O()[3]},setTrackerUrl:function(bq){S=bq},setSiteId:function(bq){bc=bq},setCustomData:function(bq,br){if(C(bq)){ab=bq}else{if(!ab){ab=[]}ab[bq]=br}},appendToTrackingUrl:function(bq){aP=bq},getCustomData:function(){return ab},setCustomVariable:function(br,bq,bu,bs){var bt;if(!s(bs)){bs="visit"}if(!s(bq)){return}if(!s(bu)){bu=""}if(br>0){bq=!k(bq)?String(bq):bq;bu=!k(bu)?String(bu):bu;bt=[bq.slice(0,bg),bu.slice(0,bg)];if(bs==="visit"||bs===2){R();W[br]=bt}else{if(bs==="page"||bs===3){aJ[br]=bt}else{if(bs==="event"){T[br]=bt}}}}},getCustomVariable:function(br,bs){var bq;if(!s(bs)){bs="visit"}if(bs==="page"||bs===3){bq=aJ[br]}else{if(bs==="event"){bq=T[br]}else{if(bs==="visit"||bs===2){R();bq=W[br]}}}if(!s(bq)||(bq&&bq[0]==="")){return false
-}return bq},deleteCustomVariable:function(bq,br){if(this.getCustomVariable(bq,br)){this.setCustomVariable(bq,"","",br)}},setLinkTrackingTimer:function(bq){aO=bq},setDownloadExtensions:function(bq){aw=bq},addDownloadExtensions:function(bq){aw+="|"+bq},setDomains:function(bq){aQ=k(bq)?[bq]:bq;aQ.push(a7)},setIgnoreClasses:function(bq){X=k(bq)?[bq]:bq},setRequestMethod:function(bq){aS=bq||"GET"},setReferrerUrl:function(bq){aU=bq},setCustomUrl:function(bq){aE=a6(bm,bq)},setDocumentTitle:function(bq){au=bq},setAPIUrl:function(bq){aj=bq},setDownloadClasses:function(bq){aI=k(bq)?[bq]:bq},setLinkClasses:function(bq){al=k(bq)?[bq]:bq},setCampaignNameKey:function(bq){ay=k(bq)?[bq]:bq},setCampaignKeywordKey:function(bq){at=k(bq)?[bq]:bq},discardHashTag:function(bq){Z=bq},setCookieNamePrefix:function(bq){bk=bq;W=ag()},setCookieDomain:function(bq){ae=u(bq);aL()},setCookiePath:function(bq){bl=bq;aL()},setVisitorCookieTimeout:function(bq){ai=bq*1000},setSessionCookieTimeout:function(bq){ak=bq*1000},setReferralCookieTimeout:function(bq){aF=bq*1000
-},setConversionAttributionFirstReferrer:function(bq){aD=bq},disableCookies:function(){ac=true;bd.cookie="0"},deleteCookies:function(){P()},setDoNotTrack:function(br){var bq=d.doNotTrack||d.msDoNotTrack;bf=br&&(bq==="yes"||bq==="1");if(bf){this.disableCookies()}},addListener:function(br,bq){aY(br,bq)},enableLinkTracking:function(bq){if(m){aG(bq)}else{y.push(function(){aG(bq)})}},enableJSErrorTracking:function(){if(bn){return}bn=true;var bq=A.onerror;A.onerror=function(bv,bt,bs,bu,br){aq(function(){var bw="JavaScript Errors";var bx=bt+":"+bs;if(bu){bx+=":"+bu}aa(bw,bx,bv)});if(bq){return bq(bv,bt,bs,bu,br)}return false}},disablePerformanceTracking:function(){aB=false},setGenerationTimeMs:function(bq){ap=parseInt(bq,10)},setHeartBeatTimer:function(bs,br){var bq=new Date();Y=bq.getTime()+bs*1000;an=br*1000},killFrame:function(){if(A.location!==A.top.location){A.top.location=A.location}},redirectFile:function(bq){if(A.location.protocol==="file:"){A.location=bq}},setCountPreRendered:function(bq){aA=bq
-},trackGoal:function(bq,bs,br){aq(function(){aM(bq,bs,br)})},trackLink:function(br,bq,bs){aq(function(){a9(br,bq,bs)})},trackPageView:function(bq,br){if(v(bc)){aq(function(){F(S,aj,bc)})}else{aq(function(){aH(bq,br)})}},trackEvent:function(br,bt,bq,bs){aq(function(){aa(br,bt,bq,bs)})},trackSiteSearch:function(bq,bs,br){aq(function(){ar(bq,bs,br)})},setEcommerceView:function(bt,bq,bs,br){if(!s(bs)||!bs.length){bs=""}else{if(bs instanceof Array){bs=JSON2.stringify(bs)}}aJ[5]=["_pkc",bs];if(s(br)&&String(br).length){aJ[2]=["_pkp",br]}if((!s(bt)||!bt.length)&&(!s(bq)||!bq.length)){return}if(s(bt)&&bt.length){aJ[3]=["_pks",bt]}if(!s(bq)||!bq.length){bq=""}aJ[4]=["_pkn",bq]},addEcommerceItem:function(bu,bq,bs,br,bt){if(bu.length){a0[bu]=[bu,bq,bs,br,bt]}},trackEcommerceOrder:function(bq,bu,bt,bs,br,bv){a4(bq,bu,bt,bs,br,bv)},trackEcommerceCartUpdate:function(bq){bj(bq)}}}function r(){return{push:J}}M(A,"beforeunload",K,false);l();Date.prototype.getTimeAlias=Date.prototype.getTime;E=new x();for(p=0;
-p<_paq.length;p++){if(_paq[p][0]==="setTrackerUrl"||_paq[p][0]==="setAPIUrl"||_paq[p][0]==="setSiteId"){J(_paq[p]);delete _paq[p]}}for(p=0;p<_paq.length;p++){if(_paq[p]){J(_paq[p])}}_paq=new r();c={addPlugin:function(O,P){a[O]=P},getTracker:function(O,P){return new x(O,P)},getAsyncTracker:function(){return E}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return c})}return c}())}if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{return eval("piwik_"+h)}catch(i){}return}var c,e=Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}};
\ No newline at end of file
+},getVisitorInfo:function(){return Q()},getAttributionInfo:function(){return O()},getAttributionCampaignName:function(){return O()[0]},getAttributionCampaignKeyword:function(){return O()[1]},getAttributionReferrerTimestamp:function(){return O()[2]},getAttributionReferrerUrl:function(){return O()[3]},setTrackerUrl:function(bq){S=bq},setSiteId:function(bq){bc=bq},setCustomData:function(bq,br){if(C(bq)){ab=bq}else{if(!ab){ab=[]}ab[bq]=br}},getCustomData:function(){return ab},appendToTrackingUrl:function(bq){aP=bq},getRequest:function(bq){return av(bq)},setCustomVariable:function(br,bq,bu,bs){var bt;if(!s(bs)){bs="visit"}if(!s(bq)){return}if(!s(bu)){bu=""}if(br>0){bq=!k(bq)?String(bq):bq;bu=!k(bu)?String(bu):bu;bt=[bq.slice(0,bg),bu.slice(0,bg)];if(bs==="visit"||bs===2){R();W[br]=bt}else{if(bs==="page"||bs===3){aJ[br]=bt}else{if(bs==="event"){T[br]=bt}}}}},getCustomVariable:function(br,bs){var bq;if(!s(bs)){bs="visit"}if(bs==="page"||bs===3){bq=aJ[br]}else{if(bs==="event"){bq=T[br]}else{if(bs==="visit"||bs===2){R();
+bq=W[br]}}}if(!s(bq)||(bq&&bq[0]==="")){return false}return bq},deleteCustomVariable:function(bq,br){if(this.getCustomVariable(bq,br)){this.setCustomVariable(bq,"","",br)}},setLinkTrackingTimer:function(bq){aO=bq},setDownloadExtensions:function(bq){aw=bq},addDownloadExtensions:function(bq){aw+="|"+bq},setDomains:function(bq){aQ=k(bq)?[bq]:bq;aQ.push(a7)},setIgnoreClasses:function(bq){X=k(bq)?[bq]:bq},setRequestMethod:function(bq){aS=bq||"GET"},setReferrerUrl:function(bq){aU=bq},setCustomUrl:function(bq){aE=a6(bm,bq)},setDocumentTitle:function(bq){au=bq},setAPIUrl:function(bq){aj=bq},setDownloadClasses:function(bq){aI=k(bq)?[bq]:bq},setLinkClasses:function(bq){al=k(bq)?[bq]:bq},setCampaignNameKey:function(bq){ay=k(bq)?[bq]:bq},setCampaignKeywordKey:function(bq){at=k(bq)?[bq]:bq},discardHashTag:function(bq){Z=bq},setCookieNamePrefix:function(bq){bk=bq;W=ag()},setCookieDomain:function(bq){ae=u(bq);aL()},setCookiePath:function(bq){bl=bq;aL()},setVisitorCookieTimeout:function(bq){ai=bq*1000},setSessionCookieTimeout:function(bq){ak=bq*1000
+},setReferralCookieTimeout:function(bq){aF=bq*1000},setConversionAttributionFirstReferrer:function(bq){aD=bq},disableCookies:function(){ac=true;bd.cookie="0"},deleteCookies:function(){P()},setDoNotTrack:function(br){var bq=d.doNotTrack||d.msDoNotTrack;bf=br&&(bq==="yes"||bq==="1");if(bf){this.disableCookies()}},addListener:function(br,bq){aY(br,bq)},enableLinkTracking:function(bq){if(m){aG(bq)}else{y.push(function(){aG(bq)})}},enableJSErrorTracking:function(){if(bn){return}bn=true;var bq=A.onerror;A.onerror=function(bv,bt,bs,bu,br){aq(function(){var bw="JavaScript Errors";var bx=bt+":"+bs;if(bu){bx+=":"+bu}aa(bw,bx,bv)});if(bq){return bq(bv,bt,bs,bu,br)}return false}},disablePerformanceTracking:function(){aB=false},setGenerationTimeMs:function(bq){ap=parseInt(bq,10)},setHeartBeatTimer:function(bs,br){var bq=new Date();Y=bq.getTime()+bs*1000;an=br*1000},killFrame:function(){if(A.location!==A.top.location){A.top.location=A.location}},redirectFile:function(bq){if(A.location.protocol==="file:"){A.location=bq
+}},setCountPreRendered:function(bq){aA=bq},trackGoal:function(bq,bs,br){aq(function(){aM(bq,bs,br)})},trackLink:function(br,bq,bs){aq(function(){a9(br,bq,bs)})},trackPageView:function(bq,br){if(v(bc)){aq(function(){F(S,aj,bc)})}else{aq(function(){aH(bq,br)})}},trackEvent:function(br,bt,bq,bs){aq(function(){aa(br,bt,bq,bs)})},trackSiteSearch:function(bq,bs,br){aq(function(){ar(bq,bs,br)})},setEcommerceView:function(bt,bq,bs,br){if(!s(bs)||!bs.length){bs=""}else{if(bs instanceof Array){bs=JSON2.stringify(bs)}}aJ[5]=["_pkc",bs];if(s(br)&&String(br).length){aJ[2]=["_pkp",br]}if((!s(bt)||!bt.length)&&(!s(bq)||!bq.length)){return}if(s(bt)&&bt.length){aJ[3]=["_pks",bt]}if(!s(bq)||!bq.length){bq=""}aJ[4]=["_pkn",bq]},addEcommerceItem:function(bu,bq,bs,br,bt){if(bu.length){a0[bu]=[bu,bq,bs,br,bt]}},trackEcommerceOrder:function(bq,bu,bt,bs,br,bv){a4(bq,bu,bt,bs,br,bv)},trackEcommerceCartUpdate:function(bq){bj(bq)}}}function r(){return{push:J}}M(A,"beforeunload",K,false);l();Date.prototype.getTimeAlias=Date.prototype.getTime;
+E=new x();for(p=0;p<_paq.length;p++){if(_paq[p][0]==="setTrackerUrl"||_paq[p][0]==="setAPIUrl"||_paq[p][0]==="setSiteId"){J(_paq[p]);delete _paq[p]}}for(p=0;p<_paq.length;p++){if(_paq[p]){J(_paq[p])}}_paq=new r();c={addPlugin:function(O,P){a[O]=P},getTracker:function(O,P){return new x(O,P)},getAsyncTracker:function(){return E}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return c})}return c}())}if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{return eval("piwik_"+h)}catch(i){}return}var c,e=Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}};
\ No newline at end of file