diff options
| -rw-r--r-- | LEGALNOTICE | 6 | ||||
| -rw-r--r-- | js/LICENSE.txt | 29 | ||||
| -rw-r--r-- | js/piwik.js | 5 | ||||
| -rw-r--r-- | piwik.js | 9 |
4 files changed, 44 insertions, 5 deletions
diff --git a/LEGALNOTICE b/LEGALNOTICE index f462505ba8..05ec57c034 100644 --- a/LEGALNOTICE +++ b/LEGALNOTICE @@ -52,6 +52,10 @@ SEPARATELY LICENSED COMPONENTS AND LIBRARIES Link: http://dev.piwik.org/trac/browser/trunk/libs/jquery/truncate/ License: New BSD + Name: piwik.js - JavaScript tracker + Link: http://dev.piwik.org/trac/browser/trunk/js/piwik.js + License: New BSD + Name: PiwikMap.swf - map renderer Link: http://dev.piwik.org/trac/browser/worldmap/trunk/mapRenderer License: GPL @@ -62,7 +66,7 @@ SEPARATELY LICENSED COMPONENTS AND LIBRARIES Link: http://bitbucket.org/gka/piwik-map/overview License: MIT - Name: PiwikTracker + Name: PiwikTracker - server-side tracker Link: http://dev.piwik.org/trac/browser/trunk/libs/PiwikTracker/PiwikTracker.php License: New BSD diff --git a/js/LICENSE.txt b/js/LICENSE.txt new file mode 100644 index 0000000000..720761bc34 --- /dev/null +++ b/js/LICENSE.txt @@ -0,0 +1,29 @@ +Copyright 2010 Anthon Pang +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +* Neither the name of Anthon Pang nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/js/piwik.js b/js/piwik.js index 13caf53ad1..979e50786d 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -1,8 +1,11 @@ /*! * Piwik - Web Analytics * + * JavaScript tracking client + * * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * @source http://dev.piwik.org/trac/browser/trunk/js/piwik.js + * @license http://www.opensource.org/licenses/bsd-license.php Simplified BSD * @version $Id$ */ @@ -1,12 +1,15 @@ /* * Piwik - Web Analytics * + * JavaScript tracking client + * * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * @source http://dev.piwik.org/trac/browser/trunk/js/piwik.js + * @license http://www.opensource.org/licenses/bsd-license.php Simplified BSD * @version $Id$ */ -var Piwik,piwik_log,piwik_track;if(!this.Piwik){Piwik=(function(){var i,p={},c=document,g=navigator,o=screen,u=window,f=false,r=[],m=u.encodeURIComponent||escape,b=u.decodeURIComponent||unescape;function a(v){return typeof v!=="undefined"}function n(y,x,w,v){if(y.addEventListener){y.addEventListener(x,w,v);return true}else{if(y.attachEvent){return y.attachEvent("on"+x,w)}}y["on"+x]=w}function e(w,z){var v="",y,x;for(y in p){x=p[y][w];if(typeof x==="function"){v+=x(z)}}return v}function s(v){if(a(i)){var w;do{w=new Date()}while(w.getTime()<i)}e("unload")}function h(w){if(!f){f=true;e("load");for(var v=0;v<r.length;v++){r[v]()}}return true}function q(){if(c.addEventListener){n(c,"DOMContentLoaded",function v(){c.removeEventListener("DOMContentLoaded",v,false);h()})}else{if(c.attachEvent){c.attachEvent("onreadystatechange",function v(){if(c.readyState==="complete"){c.detachEvent("onreadystatechange",v); -h()}});if(c.documentElement.doScroll&&u==u.top){(function v(){if(f){return}try{c.documentElement.doScroll("left")}catch(w){setTimeout(v,0);return}h()}())}}}n(u,"load",h,false)}function d(){var v="";try{v=top.document.referrer}catch(x){if(parent){try{v=parent.document.referrer}catch(w){v=""}}}if(v===""){v=c.referrer}return v}function j(v){var x=new RegExp("^(?:(?:https?|ftp):)/*(?:[^@]+@)?([^:/#]+)"),w=x.exec(v);return w?w[1]:v}function l(w,A){var z=new RegExp("^(?:https?|ftp)(?::/*(?:[^?]+)[?])([^#]+)"),y=z.exec(w),x=new RegExp("(?:^|&)"+A+"=([^&]*)"),v=y?x.exec(y[1]):0;return v?b(v[1]):""}function k(w,v,x){if(w=="webcache.googleusercontent.com"||w=="cc.bingj.com"||w.substr(0,5)=="74.6."){v=c.links[0].href;w=j(v)}else{if(w=="translate.googleusercontent.com"){if(x===""){x=v}v=l(v,"u");w=j(v)}}return[w,v,x]}function t(X,W){var O=k(u.location.hostname,u.location.href,d()),A=O[0],G=O[1],Y=O[2],x="GET",K=X||"",ai=W||"",ad,ah=c.title,N="7z|aac|arc|arj|asf|asx|avi|bin|csv|deb|dmg|doc|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt|qtm?|ra(m|r)?|rpm|sea|sit|tar|t?bz2?|tgz|torrent|txt|wav|wma|wmv|wpd||xls|xml|z|zip",Z=[A],z=[],aa=[],ab=[],J=500,V,D="0",H={pdf:["pdf","application/pdf","0"],quicktime:["qt","video/quicktime","0"],realplayer:["realp","audio/x-pn-realaudio-plugin","0"],wma:["wma","application/x-mplayer2","0"],director:["dir","application/x-director","0"],flash:["fla","application/x-shockwave-flash","0"],java:["java","application/x-java-vm","0"],gears:["gears","application/x-googlegears","0"],silverlight:["ag","application/x-silverlight","0"]},R=false,aj=function(am){var ap=new RegExp('[\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]',"g"),an={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"}; +var Piwik,piwik_log,piwik_track;if(!this.Piwik){Piwik=(function(){var i,p={},c=document,g=navigator,o=screen,u=window,f=false,r=[],m=u.encodeURIComponent||escape,b=u.decodeURIComponent||unescape;function a(v){return typeof v!=="undefined"}function n(y,x,w,v){if(y.addEventListener){y.addEventListener(x,w,v);return true}else{if(y.attachEvent){return y.attachEvent("on"+x,w)}}y["on"+x]=w}function e(w,z){var v="",y,x;for(y in p){x=p[y][w];if(typeof x==="function"){v+=x(z)}}return v}function s(v){if(a(i)){var w;do{w=new Date()}while(w.getTime()<i)}e("unload")}function h(w){if(!f){f=true;e("load");for(var v=0;v<r.length;v++){r[v]()}}return true}function q(){if(c.addEventListener){n(c,"DOMContentLoaded",function v(){c.removeEventListener("DOMContentLoaded",v,false); +h()})}else{if(c.attachEvent){c.attachEvent("onreadystatechange",function v(){if(c.readyState==="complete"){c.detachEvent("onreadystatechange",v);h()}});if(c.documentElement.doScroll&&u==u.top){(function v(){if(f){return}try{c.documentElement.doScroll("left")}catch(w){setTimeout(v,0);return}h()}())}}}n(u,"load",h,false)}function d(){var v="";try{v=top.document.referrer}catch(x){if(parent){try{v=parent.document.referrer}catch(w){v=""}}}if(v===""){v=c.referrer}return v}function j(v){var x=new RegExp("^(?:(?:https?|ftp):)/*(?:[^@]+@)?([^:/#]+)"),w=x.exec(v);return w?w[1]:v}function l(w,A){var z=new RegExp("^(?:https?|ftp)(?::/*(?:[^?]+)[?])([^#]+)"),y=z.exec(w),x=new RegExp("(?:^|&)"+A+"=([^&]*)"),v=y?x.exec(y[1]):0;return v?b(v[1]):""}function k(w,v,x){if(w=="webcache.googleusercontent.com"||w=="cc.bingj.com"||w.substr(0,5)=="74.6."){v=c.links[0].href;w=j(v)}else{if(w=="translate.googleusercontent.com"){if(x===""){x=v}v=l(v,"u");w=j(v)}}return[w,v,x]}function t(X,W){var O=k(u.location.hostname,u.location.href,d()),A=O[0],G=O[1],Y=O[2],x="GET",K=X||"",ai=W||"",ad,ah=c.title,N="7z|aac|arc|arj|asf|asx|avi|bin|csv|deb|dmg|doc|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt|qtm?|ra(m|r)?|rpm|sea|sit|tar|t?bz2?|tgz|torrent|txt|wav|wma|wmv|wpd||xls|xml|z|zip",Z=[A],z=[],aa=[],ab=[],J=500,V,D="0",H={pdf:["pdf","application/pdf","0"],quicktime:["qt","video/quicktime","0"],realplayer:["realp","audio/x-pn-realaudio-plugin","0"],wma:["wma","application/x-mplayer2","0"],director:["dir","application/x-director","0"],flash:["fla","application/x-shockwave-flash","0"],java:["java","application/x-java-vm","0"],gears:["gears","application/x-googlegears","0"],silverlight:["ag","application/x-silverlight","0"]},R=false,aj=function(am){var ap=new RegExp('[\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]',"g"),an={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"}; function ak(aq){ap.lastIndex=0;return ap.test(aq)?'"'+aq.replace(ap,function(ar){var at=an[ar];return typeof at==="string"?at:"\\u"+("0000"+ar.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+aq+'"'}function al(aq){return aq<10?"0"+aq:aq}function ao(aw,av){var au,at,ar,aq,ax=av[aw];if(ax===null){return"null"}if(ax&&typeof ax==="object"&&typeof ax.toJSON==="function"){ax=ax.toJSON(aw)}switch(typeof ax){case"string":return ak(ax);case"number":return isFinite(ax)?String(ax):"null";case"boolean":case"null":return String(ax);case"object":aq=[];if(ax instanceof Array){for(au=0;au<ax.length;au++){aq[au]=ao(au,ax)||"null"}ar=aq.length===0?"[]":"["+aq.join(",")+"]";return ar}if(ax instanceof Date){return ak(ax.getUTCFullYear()+"-"+al(ax.getUTCMonth()+1)+"-"+al(ax.getUTCDate())+"T"+al(ax.getUTCHours())+":"+al(ax.getUTCMinutes())+":"+al(ax.getUTCSeconds())+"Z")}for(at in ax){ar=ao(at,ax);if(ar){aq.push(ak(at)+":"+ar)}}ar=aq.length===0?"{}":"{"+aq.join(",")+"}";return ar}}return ao("",{"":am})},B={}; function E(aq,an,al,ap,am,ao){var ak;if(al){ak=new Date();ak.setTime(ak.getTime()+al*86400000)}c.cookie=aq+"="+m(an)+(al?";expires="+ak.toGMTString():"")+";path="+(ap?ap:"/")+(am?";domain="+am:"")+(ao?";secure":"")}function y(am){var ak=new RegExp("(^|;)[ ]*"+am+"=([^;]*)"),al=ak.exec(c.cookie);return al?b(al[2]):0}function v(ak){var al=new Image(1,1);al.onLoad=function(){};al.src=K+"?"+ak}function I(ak){try{var am=u.XMLHttpRequest?new u.XMLHttpRequest():u.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;am.open("POST",K,true);am.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");am.setRequestHeader("Content-Length",ak.length);am.setRequestHeader("Connection","close");am.send(ak)}catch(al){v(ak)}}function ae(am,al){var ak=new Date();i=ak.getTime()+al;if(x=="POST"){I(am)}else{v(am)}}function F(){var ak,al;if(a(g.javaEnabled)&&g.javaEnabled()){H.java[2]="1"}if(typeof u.GearsFactory==="function"){H.gears[2]="1"}if(g.mimeTypes&&g.mimeTypes.length){for(ak in H){al=g.mimeTypes[H[ak][1]]; if(al&&al.enabledPlugin){H[ak][2]="1"}}}}function U(){var ak="_pk_testcookie";if(!a(g.cookieEnabled)){E(ak,"1");return y(ak)=="1"?"1":"0"}return g.cookieEnabled?"1":"0"}function P(an){var al,ak=new Date(),am="idsite="+ai+"&rec=1&rand="+Math.random()+"&h="+ak.getHours()+"&m="+ak.getMinutes()+"&s="+ak.getSeconds()+"&url="+m(a(ad)?ad:G)+"&urlref="+m(Y)+"&res="+o.width+"x"+o.height+"&cookie="+D;for(al in H){am+="&"+H[al][0]+"="+H[al][2]}if(a(an)){if(an!==null){am+="&data="+m(aj(an))}}else{if(a(V)){am+="&data="+m(aj(V))}}return am}function w(al,am){var ak=P(am)+"&action_name="+m(a(al)?al:ah);ak+=e("log");ae(ak,J)}function af(ak,an,am){var al=P(am)+"&idgoal="+ak;if(a(an)&&an!==null){al+="&revenue="+an}al+=e("goal");ae(al,J)}function M(al,ak,an){var am=P(an)+"&"+ak+"="+m(al)+"&redirect=0";am+=e("click");ae(am,J)}function S(an){var al,ak,am;for(al=0;al<Z.length;al++){ak=Z[al].toLowerCase();if(an==ak){return true}if(ak.substr(0,2)=="*."){if((an)==ak.substr(2)){return true}am=an.length-ak.length+1; |