refs #2195 - move revenue parameter closer to start of request (in event request string is truncated)

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

1 files changed, 1 insertions, 1 deletions

diff --git a/piwik.js b/piwik.js
index 543c9e7ec7..bd524cd548 100644
--- a/piwik.js
+++ b/piwik.js
@@ -17,7 +17,7 @@ O+=16){for(ac=0;ac<16;ac++){K[ac]=R[O+ac]}for(ac=16;ac<=79;ac++){K[ac]=L(K[ac-3]
 }return J}function E(aA,ay){var al=o(d.domain,H.location.href,f()),X=l(al[0]),U=al[1],aB=al[2],L="GET",ab=aA||"",aS=ay||"",aL,aR=d.title,ah="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",aD=[X],N=[],aE=[],aH=[],aa=500,K,aj,ak,aw,aF="_pk_",Q,az,M,at,aT=63072000000,ae=1800000,Z=15768000000,aI=false,S=100,an={},ar=false,R=false,Y,aP,ap,aK=u,ax;function aM(aU){var aV;if(ak){aV=new RegExp("#.*");return aU.replace(aV,"")}return aU}function ag(aW,aU){var aX=A(aU),aV;if(aX){return aU}if(aU.slice(0,1)==="/"){return A(aW)+"://"+y(aW)+aU}aW=aM(aW);if((aV=aW.indexOf("?"))>=0){aW=aW.slice(0,aV)}if((aV=aW.lastIndexOf("/"))!==aW.length-1){aW=aW.slice(0,aV+1)}return aW+aU}function aq(aX){var aV,aU,aW;for(aV=0;aV<aD.length;aV++){aU=l(aD[aV].toLowerCase());if(aX===aU){return true}if(aU.slice(0,1)==="."){if(aX===aU.slice(1)){return true
 }aW=aX.length-aU.length;if((aW>0)&&(aX.slice(aW)===aU)){return true}}}return false}function i(aU){var aV=new Image(1,1);aV.onLoad=function(){};aV.src=ab+(ab.indexOf("?")<0?"?":"&")+aU}function W(aU){try{var aW=H.XMLHttpRequest?new H.XMLHttpRequest():H.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;aW.open("POST",ab,true);aW.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");aW.send(aU)}catch(aV){i(aU)}}function aO(aW,aV){var aU=new Date();if(!M){if(L==="POST"){W(aW)}else{i(aW)}m=aU.getTime()+aV}}function O(aU){return aF+aU+"."+aS+"."+ax}function av(){var aU=O("testcookie");if(!b(j.cookieEnabled)){s(aU,"1");return F(aU)==="1"?"1":"0"}return j.cookieEnabled?"1":"0"}function ai(){ax=aK((Q||X)+(az||"/")).slice(0,4)}function V(){var aV=O("cvar"),aU=F(aV);if(aU.length){aU=JSON2.parse(aU);if(n(aU)){return aU}}return{}}function aG(){if(aI===false){aI=V()}}function P(aU){var aV=new Date();Y=aV.getTime()}function aC(){var aV=new Date(),aU=Math.round(aV.getTime()/1000),aX=F(O("id")),aW;
 if(aX){aW=aX.split(".");aW.unshift("0")}else{aW=["1",aK((j.userAgent||"")+(j.platform||"")+JSON2.stringify(an)+aU).slice(0,16),aU,0,aU,""]}return aW}function am(aV,bf,bh){var bd,aU=new Date(),a1=Math.round(aU.getTime()/1000),bg,bi,be,aX,a8,bb,a0,aZ,bc,aW=1024,bj,a4,ba=aI,a6=O("id"),a2=O("ses"),a3=O("ref"),bk=O("cvar"),a9=aC(),a5=F(a2),aY=F(a3),a7=d.location.protocol==="https";if(M){s(a6,"",-1,az,Q);s(a2,"",-1,az,Q);s(bk,"",-1,az,Q);s(a3,"",-1,az,Q);return""}bi=a9[0];be=a9[1];a8=a9[2];aX=a9[3];bb=a9[4];a0=a9[5];if(aY){bg=aY.indexOf(".");aZ=aY.slice(0,bg);bc=aY.slice(bg+1)}else{aZ=0;bc=""}if(!a5){aX++;a0=bb;bj=y(aB);a4=aY?y(aY):"";if(bj.length&&!aq(bj)&&(!at||!a4.length||aq(a4))){aZ=a1;bc=aB;s(a3,aZ+"."+bc.slice(0,aW),Z,az,Q,a7)}}aV+="&idsite="+aS+"&rec=1&rand="+Math.random()+"&h="+aU.getHours()+"&m="+aU.getMinutes()+"&s="+aU.getSeconds()+"&url="+e(aM(aL||U))+"&urlref="+e(aM(aB))+"&_id="+be+"&_idts="+a8+"&_idvc="+aX+"&_idn="+bi+"&_ref="+e(aM(bc.slice(0,aW)))+"&_refts="+aZ+"&_viewts="+a0;for(bd in an){if(Object.prototype.hasOwnProperty.call(an,bd)){aV+="&"+bd+"="+an[bd]
-}}if(bf){aV+="&data="+e(JSON2.stringify(bf))}else{if(aw){aV+="&data="+e(JSON2.stringify(aw))}}if(aI){aV+="&_cvar="+e(JSON2.stringify(aI));for(bd in ba){if(Object.prototype.hasOwnProperty.call(ba,bd)){if(aI[bd][0]===""||aI[bd][1]===""){delete aI[bd]}}}s(bk,JSON2.stringify(aI),ae,az,Q,a7)}s(a6,be+"."+a8+"."+aX+"."+a1+"."+a0,aT,az,Q,a7);s(a2,"*",ae,az,Q,a7);aV+=g(bh);return aV}function J(aX,aY){var aU=new Date(),aW=am("action_name="+e(aX||aR),aY,"log");aO(aW,aa);if(K&&aj&&!R){R=true;t(d,"click",P);t(d,"mouseup",P);t(d,"mousedown",P);t(d,"mousemove",P);t(d,"mousewheel",P);t(H,"DOMMouseScroll",P);t(H,"scroll",P);t(d,"keypress",P);t(d,"keydown",P);t(d,"keyup",P);t(H,"resize",P);t(H,"focus",P);t(H,"blur",P);Y=aU.getTime();setTimeout(function aV(){var aZ=new Date(),a0;if((Y+aj)>aZ.getTime()){if(K<aZ.getTime()){a0=am("ping=1",aY,"ping");aO(a0,aa)}setTimeout(aV,aj)}},aj)}}function aN(aU,aX,aW){var aV=am("idgoal="+aU,aW,"goal");if(aX){aV+="&revenue="+aX}aO(aV,aa)}function af(aV,aU,aX){var aW=am(aU+"="+e(aM(aV)),aX,"link");
+}}if(bf){aV+="&data="+e(JSON2.stringify(bf))}else{if(aw){aV+="&data="+e(JSON2.stringify(aw))}}if(aI){aV+="&_cvar="+e(JSON2.stringify(aI));for(bd in ba){if(Object.prototype.hasOwnProperty.call(ba,bd)){if(aI[bd][0]===""||aI[bd][1]===""){delete aI[bd]}}}s(bk,JSON2.stringify(aI),ae,az,Q,a7)}s(a6,be+"."+a8+"."+aX+"."+a1+"."+a0,aT,az,Q,a7);s(a2,"*",ae,az,Q,a7);aV+=g(bh);return aV}function J(aX,aY){var aU=new Date(),aW=am("action_name="+e(aX||aR),aY,"log");aO(aW,aa);if(K&&aj&&!R){R=true;t(d,"click",P);t(d,"mouseup",P);t(d,"mousedown",P);t(d,"mousemove",P);t(d,"mousewheel",P);t(H,"DOMMouseScroll",P);t(H,"scroll",P);t(d,"keypress",P);t(d,"keydown",P);t(d,"keyup",P);t(H,"resize",P);t(H,"focus",P);t(H,"blur",P);Y=aU.getTime();setTimeout(function aV(){var aZ=new Date(),a0;if((Y+aj)>aZ.getTime()){if(K<aZ.getTime()){a0=am("ping=1",aY,"ping");aO(a0,aa)}setTimeout(aV,aj)}},aj)}}function aN(aU,aX,aW){var aV=am("idgoal="+aU+(aX?"&revenue="+aX:""),aW,"goal");aO(aV,aa)}function af(aV,aU,aX){var aW=am(aU+"="+e(aM(aV)),aX,"link");
 aO(aW,aa)}function au(aW,aV){var aX,aU="(^| )(piwik[_-]"+aV;if(aW){for(aX=0;aX<aW.length;aX++){aU+="|"+aW[aX]}}aU+=")( |$)";return new RegExp(aU)}function aQ(aX,aU,aY){if(!aY){return"link"}var aW=au(aE,"download"),aV=au(aH,"link"),aZ=new RegExp("\\.("+ah+")([?&#]|$)","i");return aV.test(aX)?"link":(aW.test(aX)||aZ.test(aU)?"download":0)}function T(aZ){var aX,aV,aU;while(!!(aX=aZ.parentNode)&&((aV=aZ.tagName)!=="A"&&aV!=="AREA")){aZ=aX}if(b(aZ.href)){var a0=aZ.hostname||y(aZ.href),a1=a0.toLowerCase(),aW=aZ.href.replace(a0,a1),aY=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript):","i");if(!aY.test(aW)){aU=aQ(aZ.className,aW,aq(a1));if(aU){af(aW,aU)}}}}function ac(aU){var aV,aW;aU=aU||H.event;aV=aU.which||aU.button;aW=aU.target||aU.srcElement;if(aU.type==="click"){if(aW){T(aW)}}else{if(aU.type==="mousedown"){if((aV===1||aV===2)&&aW){aP=aV;ap=aW}else{aP=ap=null}}else{if(aU.type==="mouseup"){if(aV===aP&&aW===ap){T(aW)}aP=ap=null}}}}function aJ(aV,aU){if(aU){t(aV,"mouseup",ac,false);
 t(aV,"mousedown",ac,false)}else{t(aV,"click",ac,false)}}function ao(aV){if(!ar){ar=true;var aW,aU=au(N,"ignore"),aX=d.links;if(aX){for(aW=0;aW<aX.length;aW++){if(!aU.test(aX[aW].className)){aJ(aX[aW],aV)}}}}}function ad(){var aU,aV,aW={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"};if(j.mimeTypes&&j.mimeTypes.length){for(aU in aW){if(Object.prototype.hasOwnProperty.call(aW,aU)){aV=j.mimeTypes[aW[aU]];an[aU]=(aV&&aV.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&b(j.javaEnabled)&&j.javaEnabled()){an.java="1"}if(a(H.GearsFactory)){an.gears="1"}an.res=v.width+"x"+v.height;an.cookie=av()}ad();ai();return{getVisitorId:function(){return(aC())[1]},getVisitorInfo:function(){return aC()},setTrackerUrl:function(aU){ab=aU},setSiteId:function(aU){aS=aU},setCustomData:function(aU,aV){if(n(aU)){aw=aU
 }else{if(!aw){aw=[]}aw[aU]=aV}},getCustomData:function(){return aw},setCustomVariable:function(aV,aU,aW){aG();if(aV>0&&aV<=5){aI[aV]=[aU.slice(0,S),aW.slice(0,S)]}},getCustomVariable:function(aV){var aU;aG();aU=aI[aV];if(aU&&aU[0]===""){return}return aI[aV]},deleteCustomVariable:function(aU){if(this.getCustomVariable(aU)){this.setCustomVariable(aU,"","")}},setLinkTrackingTimer:function(aU){aa=aU},setDownloadExtensions:function(aU){ah=aU},addDownloadExtensions:function(aU){ah+="|"+aU},setDomains:function(aU){aD=q(aU)?[aU]:aU;aD.push(X)},setIgnoreClasses:function(aU){N=q(aU)?[aU]:aU},setRequestMethod:function(aU){L=aU||"GET"},setReferrerUrl:function(aU){aB=aU},setCustomUrl:function(aU){aL=ag(U,aU)},setDocumentTitle:function(aU){aR=aU},setDownloadClasses:function(aU){aE=q(aU)?[aU]:aU},setLinkClasses:function(aU){aH=q(aU)?[aU]:aU},discardHashTag:function(aU){ak=aU},setCookieNamePrefix:function(aU){aF=aU;aI=V()},setCookieDomain:function(aU){Q=l(aU);ai()},setCookiePath:function(aU){az=aU;ai()