diff options
106 files changed, 173 insertions, 172 deletions
diff --git a/bower.json b/bower.json index 15444c6a7f..a92f2d1030 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "Piwik", "main": "piwik.js", - "homepage": "http://piwik.org", + "homepage": "https://piwik.org", "authors": [ "Piwik.org <hello@piwik.org>" ], diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php index e9140fecf6..7fd5f39a74 100644 --- a/core/API/DataTableManipulator.php +++ b/core/API/DataTableManipulator.php @@ -170,7 +170,7 @@ abstract class DataTableManipulator if (empty($meta)) { throw new Exception(sprintf( - "The DataTable cannot be manipulated: Metadata for report %s.%s could not be found. You can define the metadata in a hook, see example at: http://developer.piwik.org/api-reference/events#apigetreportmetadata", + "The DataTable cannot be manipulated: Metadata for report %s.%s could not be found. You can define the metadata in a hook, see example at: https://developer.piwik.org/api-reference/events#apigetreportmetadata", $this->apiModule, $this->apiMethod )); } diff --git a/core/CronArchive.php b/core/CronArchive.php index b1489b27dd..d9c536a8c3 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -1275,7 +1275,7 @@ class CronArchive // Recommend to disable browser archiving when using this script if (Rules::isBrowserTriggerEnabled()) { $this->logger->info("- If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings."); - $this->logger->info(" See the doc at: http://piwik.org/docs/setup-auto-archiving/"); + $this->logger->info(" See the doc at: https://piwik.org/docs/setup-auto-archiving/"); } $this->logger->info("- Reports for today will be processed at most every " . $this->todayArchiveTimeToLive . " seconds. You can change this value in Piwik UI > Settings > General Settings."); diff --git a/core/ErrorHandler.php b/core/ErrorHandler.php index 6694d2cba3..8b1897c1fa 100644 --- a/core/ErrorHandler.php +++ b/core/ErrorHandler.php @@ -108,7 +108,7 @@ class ErrorHandler private static function createLogMessage($errno, $errstr, $errfile, $errline) { return sprintf( - "%s(%d): %s - %s - Piwik " . (class_exists('Piwik\Version') ? Version::VERSION : '') . " - Please report this message in the Piwik forums: http://forum.piwik.org (please do a search first as it might have been reported already)", + "%s(%d): %s - %s - Piwik " . (class_exists('Piwik\Version') ? Version::VERSION : '') . " - Please report this message in the Piwik forums: https://forum.piwik.org (please do a search first as it might have been reported already)", $errfile, $errline, ErrorHandler::getErrNoString($errno), @@ -123,7 +123,7 @@ class ErrorHandler $message = ErrorHandler::getErrNoString($errno) . ' - ' . $errstr; $html = "<p>There is an error. Please report the message (Piwik " . (class_exists('Piwik\Version') ? Version::VERSION : '') . ") - and full backtrace in the <a href='?module=Proxy&action=redirect&url=http://forum.piwik.org' target='_blank'>Piwik forums</a> (please do a search first as it might have been reported already!).</p>"; + and full backtrace in the <a href='?module=Proxy&action=redirect&url=https://forum.piwik.org' target='_blank'>Piwik forums</a> (please do a search first as it might have been reported already!).</p>"; $html .= "<p><strong>{$message}</strong> in <em>{$errfile}</em>"; $html .= " on line {$errline}</p>"; $html .= "Backtrace:<pre>"; diff --git a/core/Filechecks.php b/core/Filechecks.php index 5f98fd228d..73d641e090 100644 --- a/core/Filechecks.php +++ b/core/Filechecks.php @@ -94,7 +94,7 @@ class Filechecks . "<blockquote>$directoryList</blockquote>" . "<p>If this doesn't work, you can try to create the directories with your FTP software, and set the CHMOD to 0755 (or 0777 if 0755 is not enough). To do so with your FTP software, right click on the directories then click permissions.</p>" . "<p>After applying the modifications, you can <a href='index.php'>refresh the page</a>.</p>" - . "<p>If you need more help, try <a href='?module=Proxy&action=redirect&url=http://piwik.org'>Piwik.org</a>.</p>"; + . "<p>If you need more help, try <a href='?module=Proxy&action=redirect&url=https://piwik.org'>Piwik.org</a>.</p>"; $ex = new MissingFilePermissionException($directoryMessage); $ex->setIsHtmlMessage(); diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php index b3d552cf80..7522e3ab1d 100644 --- a/core/Plugin/MetadataLoader.php +++ b/core/Plugin/MetadataLoader.php @@ -82,8 +82,8 @@ class MetadataLoader $descriptionKey = $this->pluginName . '_PluginDescription'; return array( 'description' => $descriptionKey, - 'homepage' => 'http://piwik.org/', - 'authors' => array(array('name' => 'Piwik', 'homepage' => 'http://piwik.org/')), + 'homepage' => 'https://piwik.org/', + 'authors' => array(array('name' => 'Piwik', 'homepage' => 'https://piwik.org/')), 'license' => 'GPL v3+', 'version' => Version::VERSION, 'theme' => false, diff --git a/core/Session.php b/core/Session.php index 965553b521..60bf464278 100644 --- a/core/Session.php +++ b/core/Session.php @@ -121,7 +121,7 @@ class Session extends Zend_Session $enableDbSessions = ''; if (DbHelper::isInstalled()) { $enableDbSessions = "<br/>If you still experience issues after trying these changes, - we recommend that you <a href='http://piwik.org/faq/how-to-install/#faq_133' rel='noreferrer' target='_blank'>enable database session storage</a>."; + we recommend that you <a href='https://piwik.org/faq/how-to-install/#faq_133' rel='noreferrer' target='_blank'>enable database session storage</a>."; } $pathToSessions = Filechecks::getErrorMessageMissingPermissions(self::getSessionsDirectory()); diff --git a/js/piwik.js b/js/piwik.js index e9596d3cdc..7a092d8dd8 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -3,9 +3,9 @@ * * JavaScript tracking client * - * @link http://piwik.org + * @link https://piwik.org * @source https://github.com/piwik/piwik/blob/master/js/piwik.js - * @license http://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt) + * @license https://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt) * @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause */ // NOTE: if you change this above Piwik comment block, you must also change `$byteStart` in js/tracker.php @@ -1235,7 +1235,7 @@ if (typeof window.Piwik !== 'object') { if (context[f]) { context[f].apply(context, parameterArray); } else { - var message = 'The method \'' + f + '\' was not found in "_paq" variable. Please have a look at the Piwik tracker documentation: http://developer.piwik.org/api-reference/tracking-javascript'; + var message = 'The method \'' + f + '\' was not found in "_paq" variable. Please have a look at the Piwik tracker documentation: https://developer.piwik.org/api-reference/tracking-javascript'; logConsoleError(message); if (!isPluginTrackerCall) { @@ -7077,7 +7077,7 @@ if (typeof window.Piwik !== 'object') { delete paq[iterator]; if (appliedMethods[methodName] > 1) { - logConsoleError('The method ' + methodName + ' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: http://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers'); + logConsoleError('The method ' + methodName + ' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: https://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers'); } appliedMethods[methodName]++; diff --git a/js/piwik.min.js b/js/piwik.min.js index 4a6a602662..a904bac867 100644 --- a/js/piwik.min.js +++ b/js/piwik.min.js @@ -3,15 +3,15 @@ * * JavaScript tracking client * - * @link http://piwik.org + * @link https://piwik.org * @source https://github.com/piwik/piwik/blob/master/js/piwik.js - * @license http://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt) + * @license https://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt) * @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause */ if(typeof JSON_PIWIK!=="object"&&typeof window.JSON==="object"&&window.JSON.stringify&&window.JSON.parse){JSON_PIWIK=window.JSON}else{(function(){var a={}; /*!! JSON v3.3.2 | http://bestiejs.github.io/json3 | Copyright 2012-2014, Kit Cambridge | http://kit.mit-license.org */ -(function(){var c=typeof define==="function"&&define.amd;var e={"function":true,object:true};var h=e[typeof a]&&a&&!a.nodeType&&a;var i=e[typeof window]&&window||this,b=h&&e[typeof module]&&module&&!module.nodeType&&typeof global=="object"&&global;if(b&&(b.global===b||b.window===b||b.self===b)){i=b}function j(ab,V){ab||(ab=i.Object());V||(V=i.Object());var K=ab.Number||i.Number,R=ab.String||i.String,x=ab.Object||i.Object,S=ab.Date||i.Date,T=ab.SyntaxError||i.SyntaxError,aa=ab.TypeError||i.TypeError,J=ab.Math||i.Math,Y=ab.JSON||i.JSON; -if(typeof Y=="object"&&Y){V.stringify=Y.stringify;V.parse=Y.parse}var n=x.prototype,u=n.toString,r,m,L;var B=new S(-3509827334573292);try{B=B.getUTCFullYear()==-109252&&B.getUTCMonth()===0&&B.getUTCDate()===1&&B.getUTCHours()==10&&B.getUTCMinutes()==37&&B.getUTCSeconds()==6&&B.getUTCMilliseconds()==708}catch(v){}function o(ac){if(o[ac]!==L){return o[ac]}var ad;if(ac=="bug-string-char-index"){ad="a"[0]!="a"}else{if(ac=="json"){ad=o("json-stringify")&&o("json-parse")}else{var ak,ah='{"a":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}';if(ac=="json-stringify"){var ai=V.stringify,aj=typeof ai=="function"&&B;if(aj){(ak=function(){return 1}).toJSON=ak;try{aj=ai(0)==="0"&&ai(new K())==="0"&&ai(new R())=='""'&&ai(u)===L&&ai(L)===L&&ai()===L&&ai(ak)==="1"&&ai([ak])=="[1]"&&ai([L])=="[null]"&&ai(null)=="null"&&ai([L,u,null])=="[null,null,null]"&&ai({a:[ak,true,false,null,"\x00\b\n\f\r\t"]})==ah&&ai(null,ak)==="1"&&ai([1,2],null,1)=="[\n 1,\n 2\n]"&&ai(new S(-8640000000000000))=='"-271821-04-20T00:00:00.000Z"'&&ai(new S(8640000000000000))=='"+275760-09-13T00:00:00.000Z"'&&ai(new S(-62198755200000))=='"-000001-01-01T00:00:00.000Z"'&&ai(new S(-1))=='"1969-12-31T23:59:59.999Z"' +(function(){var c=typeof define==="function"&&define.amd;var e={"function":true,object:true};var h=e[typeof a]&&a&&!a.nodeType&&a;var i=e[typeof window]&&window||this,b=h&&e[typeof module]&&module&&!module.nodeType&&typeof global=="object"&&global;if(b&&(b.global===b||b.window===b||b.self===b)){i=b}function j(ab,V){ab||(ab=i.Object());V||(V=i.Object()); +var K=ab.Number||i.Number,R=ab.String||i.String,x=ab.Object||i.Object,S=ab.Date||i.Date,T=ab.SyntaxError||i.SyntaxError,aa=ab.TypeError||i.TypeError,J=ab.Math||i.Math,Y=ab.JSON||i.JSON;if(typeof Y=="object"&&Y){V.stringify=Y.stringify;V.parse=Y.parse}var n=x.prototype,u=n.toString,r,m,L;var B=new S(-3509827334573292);try{B=B.getUTCFullYear()==-109252&&B.getUTCMonth()===0&&B.getUTCDate()===1&&B.getUTCHours()==10&&B.getUTCMinutes()==37&&B.getUTCSeconds()==6&&B.getUTCMilliseconds()==708}catch(v){}function o(ac){if(o[ac]!==L){return o[ac]}var ad;if(ac=="bug-string-char-index"){ad="a"[0]!="a"}else{if(ac=="json"){ad=o("json-stringify")&&o("json-parse")}else{var ak,ah='{"a":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}';if(ac=="json-stringify"){var ai=V.stringify,aj=typeof ai=="function"&&B;if(aj){(ak=function(){return 1}).toJSON=ak;try{aj=ai(0)==="0"&&ai(new K())==="0"&&ai(new R())=='""'&&ai(u)===L&&ai(L)===L&&ai()===L&&ai(ak)==="1"&&ai([ak])=="[1]"&&ai([L])=="[null]"&&ai(null)=="null"&&ai([L,u,null])=="[null,null,null]"&&ai({a:[ak,true,false,null,"\x00\b\n\f\r\t"]})==ah&&ai(null,ak)==="1"&&ai([1,2],null,1)=="[\n 1,\n 2\n]"&&ai(new S(-8640000000000000))=='"-271821-04-20T00:00:00.000Z"'&&ai(new S(8640000000000000))=='"+275760-09-13T00:00:00.000Z"'&&ai(new S(-62198755200000))=='"-000001-01-01T00:00:00.000Z"'&&ai(new S(-1))=='"1969-12-31T23:59:59.999Z"' }catch(ae){aj=false}}ad=aj}if(ac=="json-parse"){var ag=V.parse;if(typeof ag=="function"){try{if(ag("0")===0&&!ag(false)){ak=ag(ah);var af=ak.a.length==5&&ak.a[0]===1;if(af){try{af=!ag('"\t"')}catch(ae){}if(af){try{af=ag("01")!==1}catch(ae){}}if(af){try{af=ag("1.")!==1}catch(ae){}}}}}catch(ae){af=false}}ad=af}}}return o[ac]=!!ad}if(!o("json")){var U="[object Function]",Q="[object Date]",N="[object Number]",O="[object String]",E="[object Array]",A="[object Boolean]";var F=o("bug-string-char-index");if(!B){var s=J.floor;var Z=[0,31,59,90,120,151,181,212,243,273,304,334];var D=function(ac,ad){return Z[ad]+365*(ac-1970)+s((ac-1969+(ad=+(ad>1)))/4)-s((ac-1901+ad)/100)+s((ac-1601+ad)/400)}}if(!(r=n.hasOwnProperty)){r=function(ae){var ac={},ad;if((ac.__proto__=null,ac.__proto__={toString:1},ac).toString!=u){r=function(ah){var ag=this.__proto__,af=ah in (this.__proto__=null,this);this.__proto__=ag;return af}}else{ad=ac.constructor;r=function(ag){var af=(this.constructor||ad).prototype;return ag in this&&!(ag in af&&this[ag]===af[ag]) }}ac=null;return r.call(this,ae)}}m=function(ae,ah){var af=0,ac,ad,ag;(ac=function(){this.valueOf=0}).prototype.valueOf=0;ad=new ac();for(ag in ad){if(r.call(ad,ag)){af++}}ac=ad=null;if(!af){ad=["valueOf","toString","toLocaleString","propertyIsEnumerable","isPrototypeOf","hasOwnProperty","constructor"];m=function(aj,an){var am=u.call(aj)==U,al,ak;var ai=!am&&typeof aj.constructor!="function"&&e[typeof aj.hasOwnProperty]&&aj.hasOwnProperty||r;for(al in aj){if(!(am&&al=="prototype")&&ai.call(aj,al)){an(al)}}for(ak=ad.length;al=ad[--ak];ai.call(aj,al)&&an(al)){}}}else{if(af==2){m=function(aj,am){var ai={},al=u.call(aj)==U,ak;for(ak in aj){if(!(al&&ak=="prototype")&&!r.call(ai,ak)&&(ai[ak]=1)&&r.call(aj,ak)){am(ak)}}}}else{m=function(aj,am){var al=u.call(aj)==U,ak,ai;for(ak in aj){if(!(al&&ak=="prototype")&&r.call(aj,ak)&&!(ai=ak==="constructor")){am(ak)}}if(ai||r.call(aj,(ak="constructor"))){am(ak)}}}}return m(ae,ah)};if(!o("json-stringify")){var q={92:"\\\\",34:'\\"',8:"\\b",12:"\\f",10:"\\n",13:"\\r",9:"\\t"}; var I="000000";var t=function(ac,ad){return(I+(ad||0)).slice(-ac)};var z="\\u00";var C=function(ai){var ad='"',ag=0,ah=ai.length,ac=!F||ah>10;var af=ac&&(F?ai.split(""):ai);for(;ag<ah;ag++){var ae=ai.charCodeAt(ag);switch(ae){case 8:case 9:case 10:case 12:case 13:case 34:case 92:ad+=q[ae];break;default:if(ae<32){ad+=z+t(2,ae.toString(16));break}ad+=ac?af[ag]:ai.charAt(ag)}}return ad+'"'};var p=function(ai,aA,ag,al,ax,ac,aj){var at,ae,ap,az,ay,ak,aw,au,aq,an,ar,ad,ah,af,av,ao;try{at=aA[ai]}catch(am){}if(typeof at=="object"&&at){ae=u.call(at);if(ae==Q&&!r.call(at,"toJSON")){if(at>-1/0&&at<1/0){if(D){ay=s(at/86400000);for(ap=s(ay/365.2425)+1970-1;D(ap+1,0)<=ay;ap++){}for(az=s((ay-D(ap,0))/30.42);D(ap,az+1)<=ay;az++){}ay=1+ay-D(ap,az);ak=(at%86400000+86400000)%86400000;aw=s(ak/3600000)%24;au=s(ak/60000)%60;aq=s(ak/1000)%60;an=ak%1000}else{ap=at.getUTCFullYear();az=at.getUTCMonth();ay=at.getUTCDate();aw=at.getUTCHours();au=at.getUTCMinutes();aq=at.getUTCSeconds();an=at.getUTCMilliseconds()}at=(ap<=0||ap>=10000?(ap<0?"-":"+")+t(6,ap<0?-ap:ap):t(4,ap))+"-"+t(2,az+1)+"-"+t(2,ay)+"T"+t(2,aw)+":"+t(2,au)+":"+t(2,aq)+"."+t(3,an)+"Z" @@ -20,7 +20,7 @@ ad.length<af;ad+=" "){}}}else{if(ai==O){ad=af.length<=10?af:af.slice(0,10)}}}ret return ag}H();default:ae=G;if(ad==45){ai=true;ad=ah.charCodeAt(++G)}if(ad>=48&&ad<=57){if(ad==48&&((ad=ah.charCodeAt(G+1)),ad>=48&&ad<=57)){H()}ai=false;for(;G<af&&((ad=ah.charCodeAt(G)),ad>=48&&ad<=57);G++){}if(ah.charCodeAt(G)==46){ac=++G;for(;ac<af&&((ad=ah.charCodeAt(ac)),ad>=48&&ad<=57);ac++){}if(ac==G){H()}G=ac}ad=ah.charCodeAt(G);if(ad==101||ad==69){ad=ah.charCodeAt(++G);if(ad==43||ad==45){G++}for(ac=G;ac<af&&((ad=ah.charCodeAt(ac)),ad>=48&&ad<=57);ac++){}if(ac==G){H()}G=ac}return +ah.slice(ae,G)}if(ai){H()}if(ah.slice(G,G+4)=="true"){G+=4;return true}else{if(ah.slice(G,G+5)=="false"){G+=5;return false}else{if(ah.slice(G,G+4)=="null"){G+=4;return null}}}H()}}return"$"};var W=function(ad){var ac,ae;if(ad=="$"){H()}if(typeof ad=="string"){if((F?ad.charAt(0):ad[0])=="@"){return ad.slice(1)}if(ad=="["){ac=[];for(;;ae||(ae=true)){ad=y();if(ad=="]"){break}if(ae){if(ad==","){ad=y();if(ad=="]"){H()}}else{H()}}if(ad==","){H()}ac.push(W(ad))}return ac}else{if(ad=="{"){ac={};for(;;ae||(ae=true)){ad=y(); if(ad=="}"){break}if(ae){if(ad==","){ad=y();if(ad=="}"){H()}}else{H()}}if(ad==","||typeof ad!="string"||(F?ad.charAt(0):ad[0])!="@"||y()!=":"){H()}ac[ad.slice(1)]=W(y())}return ac}}H()}return ad};var P=function(ae,ad,af){var ac=w(ae,ad,af);if(ac===L){delete ae[ad]}else{ae[ad]=ac}};var w=function(af,ae,ag){var ad=af[ae],ac;if(typeof ad=="object"&&ad){if(u.call(ad)==E){for(ac=ad.length;ac--;){P(ad,ac,ag)}}else{m(ad,function(ah){P(ad,ah,ag)})}}return ag.call(af,ae,ad)};V.parse=function(ae,af){var ac,ad;G=0;X=""+ae;ac=W(y());if(y()!="$"){H()}G=X=null;return af&&u.call(af)==U?w((ad={},ad[""]=ac,ad),"",af):ac}}}V.runInContext=j;return V}if(h&&!c){j(i,h)}else{var f=i.JSON,k=i.JSON3,d=false;var g=j(i,(i.JSON3={noConflict:function(){if(!d){d=true;i.JSON=f;i.JSON3=k;f=k=null}return g}}));i.JSON={parse:g.parse,stringify:g.stringify}}if(c){define(function(){return g})}}).call(this);JSON_PIWIK=a})()}if(typeof _paq!=="object"){_paq=[]}if(typeof window.Piwik!=="object"){window.Piwik=(function(){var q,b={},w={},E=document,h=navigator,U=screen,R=window,i=R.performance||R.mozPerformance||R.msPerformance||R.webkitPerformance,s=R.encodeURIComponent,Q=R.decodeURIComponent,l=unescape,G=[],C,e,ab=[]; function o(ai){try{return Q(ai)}catch(aj){return unescape(ai)}}function H(aj){var ai=typeof aj;return ai!=="undefined"}function y(ai){return typeof ai==="function"}function T(ai){return typeof ai==="object"}function v(ai){return typeof ai==="string"||ai instanceof String}function z(aj){if(!aj){return true}var ai;var ak=true;for(ai in aj){if(Object.prototype.hasOwnProperty.call(aj,ai)){ak=false}}return ak}function ae(ai){var aj=typeof console;if(aj!=="undefined"&&console&&console.error){console.error(ai)}}function aa(){var an,am,ap,aj,ai;for(an=0;an<arguments.length;an+=1){ai=null;if(arguments[an]&&arguments[an].slice){ai=arguments[an].slice()}aj=arguments[an];ap=aj.shift();var ao,ak;var al=v(ap)&&ap.indexOf("::")>0;if(al){ao=ap.split("::");ak=ao[0];ap=ao[1];if("object"===typeof e[ak]&&"function"===typeof e[ak][ap]){e[ak][ap].apply(e[ak],aj)}else{if(ai){ab.push(ai)}}}else{for(am=0;am<G.length;am++){if(v(ap)){ak=G[am];var aq=ap.indexOf(".")>0;if(aq){ao=ap.split(".");if(ak&&"object"===typeof ak[ao[0]]){ak=ak[ao[0]]; -ap=ao[1]}else{if(ai){ab.push(ai);break}}}if(ak[ap]){ak[ap].apply(ak,aj)}else{var ar="The method '"+ap+'\' was not found in "_paq" variable. Please have a look at the Piwik tracker documentation: http://developer.piwik.org/api-reference/tracking-javascript';ae(ar);if(!aq){throw new TypeError(ar)}}if(ap==="addTracker"){break}if(ap==="setTrackerUrl"||ap==="setSiteId"){break}}else{ap.apply(G[am],aj)}}}}}function ah(al,ak,aj,ai){if(al.addEventListener){al.addEventListener(ak,aj,ai);return true}if(al.attachEvent){return al.attachEvent("on"+ak,aj)}al["on"+ak]=aj}function m(ai){if(E.readyState==="complete"){ai()}else{if(R.addEventListener){R.addEventListener("load",ai)}else{if(R.attachEvent){R.attachEvent("onload",ai)}}}}function p(al){var ai=false;if(E.attachEvent){ai=E.readyState==="complete"}else{ai=E.readyState!=="loading"}if(ai){al();return}var ak;if(E.addEventListener){ah(E,"DOMContentLoaded",function aj(){E.removeEventListener("DOMContentLoaded",aj,false);if(!ai){ai=true;al()}})}else{if(E.attachEvent){E.attachEvent("onreadystatechange",function aj(){if(E.readyState==="complete"){E.detachEvent("onreadystatechange",aj); +ap=ao[1]}else{if(ai){ab.push(ai);break}}}if(ak[ap]){ak[ap].apply(ak,aj)}else{var ar="The method '"+ap+'\' was not found in "_paq" variable. Please have a look at the Piwik tracker documentation: https://developer.piwik.org/api-reference/tracking-javascript';ae(ar);if(!aq){throw new TypeError(ar)}}if(ap==="addTracker"){break}if(ap==="setTrackerUrl"||ap==="setSiteId"){break}}else{ap.apply(G[am],aj)}}}}}function ah(al,ak,aj,ai){if(al.addEventListener){al.addEventListener(ak,aj,ai);return true}if(al.attachEvent){return al.attachEvent("on"+ak,aj)}al["on"+ak]=aj}function m(ai){if(E.readyState==="complete"){ai()}else{if(R.addEventListener){R.addEventListener("load",ai)}else{if(R.attachEvent){R.attachEvent("onload",ai)}}}}function p(al){var ai=false;if(E.attachEvent){ai=E.readyState==="complete"}else{ai=E.readyState!=="loading"}if(ai){al();return}var ak;if(E.addEventListener){ah(E,"DOMContentLoaded",function aj(){E.removeEventListener("DOMContentLoaded",aj,false);if(!ai){ai=true;al()}})}else{if(E.attachEvent){E.attachEvent("onreadystatechange",function aj(){if(E.readyState==="complete"){E.detachEvent("onreadystatechange",aj); if(!ai){ai=true;al()}}});if(E.documentElement.doScroll&&R===R.top){(function aj(){if(!ai){try{E.documentElement.doScroll("left")}catch(am){setTimeout(aj,0);return}ai=true;al()}}())}}}ah(R,"load",function(){if(!ai){ai=true;al()}},false)}function X(aj,ao,ap){if(!aj){return""}var ai="",al,ak,am,an;for(al in b){if(Object.prototype.hasOwnProperty.call(b,al)){an=b[al]&&"function"===typeof b[al][aj];if(an){ak=b[al][aj];am=ak(ao||{},ap);if(am){ai+=am}}}}return ai}function ac(){var ai;X("unload");if(q){do{ai=new Date()}while(ai.getTimeAlias()<q)}}function n(ak,aj){var ai=E.createElement("script");ai.type="text/javascript";ai.src=ak;if(ai.readyState){ai.onreadystatechange=function(){var al=this.readyState;if(al==="loaded"||al==="complete"){ai.onreadystatechange=null;aj()}}}else{ai.onload=aj}E.getElementsByTagName("head")[0].appendChild(ai)}function I(){var ai="";try{ai=R.top.document.referrer}catch(ak){if(R.parent){try{ai=R.parent.document.referrer}catch(aj){ai=""}}}if(ai===""){ai=E.referrer}return ai }function r(ai){var ak=new RegExp("^([a-z]+):"),aj=ak.exec(ai);return aj?aj[1]:null}function d(ai){var ak=new RegExp("^(?:(?:https?|ftp):)/*(?:[^@]+@)?([^:/#]+)"),aj=ak.exec(ai);return aj?aj[1]:ai}function ad(aj,ai){aj=String(aj);return aj.lastIndexOf(ai,0)===0}function P(aj,ai){aj=String(aj);return aj.indexOf(ai,aj.length-ai.length)!==-1}function x(aj,ai){aj=String(aj);return aj.indexOf(ai)!==-1}function g(aj,ai){aj=String(aj);return aj.substr(0,aj.length-ai)}function D(al,ak,an){al=String(al);if(!an){an=""}var ai=al.indexOf("#");var ao=al.length;if(ai===-1){ai=ao}var am=al.substr(0,ai);var aj=al.substr(ai,ao-ai);if(am.indexOf("?")===-1){am+="?"}else{if(!P(am,"?")){am+="&"}}return am+s(ak)+"="+s(an)+aj}function k(aj,ak){aj=String(aj);if(aj.indexOf("?"+ak+"=")===-1&&aj.indexOf("&"+ak+"=")===-1){return aj}var al=aj.indexOf("?");if(al===-1){return aj}var ai=aj.substr(al+1);var ap=aj.substr(0,al);if(ai){var aq="";var at=ai.indexOf("#");if(at!==-1){aq=ai.substr(at+1);ai=ai.substr(0,at)}var am; var ao=ai.split("&");var an=ao.length-1;for(an;an>=0;an--){am=ao[an].split("=")[0];if(am===ak){ao.splice(an,1)}}var ar=ao.join("&");if(ar){ap=ap+"?"+ar}if(aq){ap+="#"+aq}}return ap}function f(ak,aj){var ai="[\\?&#]"+aj+"=([^&#]*)";var am=new RegExp(ai);var al=am.exec(ak);return al?Q(al[1]):""}function a(ai){if(ai&&String(ai)===ai){return ai.replace(/^\s+|\s+$/g,"")}return ai}function B(ai){return unescape(s(ai))}function ag(ay){var ak=function(aE,aD){return(aE<<aD)|(aE>>>(32-aD))},az=function(aG){var aE="",aF,aD;for(aF=7;aF>=0;aF--){aD=(aG>>>(aF*4))&15;aE+=aD.toString(16)}return aE},an,aB,aA,aj=[],ar=1732584193,ap=4023233417,ao=2562383102,am=271733878,al=3285377520,ax,aw,av,au,at,aC,ai,aq=[];ay=B(ay);ai=ay.length;for(aB=0;aB<ai-3;aB+=4){aA=ay.charCodeAt(aB)<<24|ay.charCodeAt(aB+1)<<16|ay.charCodeAt(aB+2)<<8|ay.charCodeAt(aB+3);aq.push(aA)}switch(ai&3){case 0:aB=2147483648;break;case 1:aB=ay.charCodeAt(ai-1)<<24|8388608;break;case 2:aB=ay.charCodeAt(ai-2)<<24|ay.charCodeAt(ai-1)<<16|32768; @@ -66,12 +66,12 @@ a7()}};this.getCookieDomain=function(){return cE};this.hasCookies=function(){ret var cY=this;b2(function(){p(function(){bp(cZ,cY)})})};this.enableJSErrorTracking=function(){if(cA){return}cA=true;var cY=R.onerror;R.onerror=function(c3,c1,c0,c2,cZ){b2(function(){var c4="JavaScript Errors";var c5=c1+":"+c0;if(c2){c5+=":"+c2}am(c4,c5,c3)});if(cY){return cY(c3,c1,c0,c2,cZ)}return false}};this.disablePerformanceTracking=function(){aU=false};this.setGenerationTimeMs=function(cY){b8=parseInt(cY,10)};this.enableHeartBeatTimer=function(cY){cY=Math.max(cY,1);aX=(cY||15)*1000;if(cF!==null){cV()}};this.disableHeartBeatTimer=function(){bw();if(aX||aF){if(R.removeEventListener){R.removeEventListener("focus",a1,true);R.removeEventListener("blur",aq,true)}else{if(R.detachEvent){R.detachEvent("onfocus",a1);R.detachEvent("onblur",aq)}}}aX=null;aF=false};this.killFrame=function(){if(R.location!==R.top.location){R.top.location=R.location}};this.redirectFile=function(cY){if(R.location.protocol==="file:"){R.location=cY}};this.setCountPreRendered=function(cY){a4=cY};this.trackGoal=function(cY,c0,cZ){b2(function(){cB(cY,c0,cZ) })};this.trackLink=function(cZ,cY,c1,c0){b2(function(){cJ(cZ,cY,c1,c0)})};this.getNumTrackedPageViews=function(){return ce};this.trackPageView=function(cY,c0,cZ){bV=[];if(L(bR)){b2(function(){V(aw,bt,bR)})}else{b2(function(){ce++;bL(cY,c0,cZ)})}};this.trackAllContentImpressions=function(){if(L(bR)){return}b2(function(){p(function(){var cY=u.findContentNodes();var cZ=cl(cY);cU(cZ,bv)})})};this.trackVisibleContentImpressions=function(cY,cZ){if(L(bR)){return}if(!H(cY)){cY=true}if(!H(cZ)){cZ=750}aJ(cY,cZ,this);b2(function(){m(function(){var c0=u.findContentNodes();var c1=a0(c0);cU(c1,bv)})})};this.trackContentImpression=function(c0,cY,cZ){if(L(bR)){return}c0=a(c0);cY=a(cY);cZ=a(cZ);if(!c0){return}cY=cY||"Unknown";b2(function(){var c1=ay(c0,cY,cZ);br(c1,bv)})};this.trackContentImpressionsWithinNode=function(cY){if(L(bR)||!cY){return}b2(function(){if(b0){m(function(){var cZ=u.findContentNodesWithinNode(cY);var c0=a0(cZ);cU(c0,bv)})}else{p(function(){var cZ=u.findContentNodesWithinNode(cY);var c0=cl(cZ); cU(c0,bv)})}})};this.trackContentInteraction=function(c0,c1,cY,cZ){if(L(bR)){return}c0=a(c0);c1=a(c1);cY=a(cY);cZ=a(cZ);if(!c0||!c1){return}cY=cY||"Unknown";b2(function(){var c2=aG(c0,c1,cY,cZ);br(c2,bv)})};this.trackContentInteractionNode=function(cZ,cY){if(L(bR)||!cZ){return}b2(function(){var c0=cR(cZ,cY);br(c0,bv)})};this.logAllContentBlocksOnPage=function(){var c0=u.findContentNodes();var cY=u.collectContent(c0);var cZ=typeof console;if(cZ!=="undefined"&&console&&console.log){console.log(cY)}};this.trackEvent=function(cZ,c1,cY,c0,c3,c2){b2(function(){am(cZ,c1,cY,c0,c3,c2)})};this.trackSiteSearch=function(cY,c0,cZ,c1){b2(function(){bT(cY,c0,cZ,c1)})};this.setEcommerceView=function(c1,cY,c0,cZ){if(!H(c0)||!c0.length){c0=""}else{if(c0 instanceof Array){c0=JSON_PIWIK.stringify(c0)}}bH[5]=["_pkc",c0];if(H(cZ)&&String(cZ).length){bH[2]=["_pkp",cZ]}if((!H(c1)||!c1.length)&&(!H(cY)||!cY.length)){return}if(H(c1)&&c1.length){bH[3]=["_pks",c1]}if(!H(cY)||!cY.length){cY=""}bH[4]=["_pkn",cY]};this.addEcommerceItem=function(c2,cY,c0,cZ,c1){if(c2.length){cI[c2]=[c2,cY,c0,cZ,c1] -}};this.trackEcommerceOrder=function(cY,c2,c1,c0,cZ,c3){bK(cY,c2,c1,c0,cZ,c3)};this.trackEcommerceCartUpdate=function(cY){bg(cY)};this.trackRequest=function(cZ,c1,c0,cY){b2(function(){var c2=cf(cZ,c1,cY);br(c2,bv,c0)})};e.trigger("TrackerSetup",[this])}function F(){return{push:aa}}function c(an,am){var ao={};var ak,al;for(ak=0;ak<am.length;ak++){var ai=am[ak];ao[ai]=1;for(al=0;al<an.length;al++){if(an[al]&&an[al][0]){var aj=an[al][0];if(ai===aj){aa(an[al]);delete an[al];if(ao[aj]>1){ae("The method "+aj+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: http://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')}ao[aj]++}}}}return an}var A=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","enableCrossDomainLinking","setCrossDomainLinkingTimeout","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","enableLinkTracking","setSecureCookie"];function Y(ai,ak){var aj=new O(ai,ak); -G.push(aj);_paq=c(_paq,A);for(C=0;C<_paq.length;C++){if(_paq[C]){aa(_paq[C])}}_paq=new F();return aj}ah(R,"beforeunload",ac,false);Date.prototype.getTimeAlias=Date.prototype.getTime;e={initialized:false,JSON:JSON_PIWIK,DOM:{addEventListener:function(al,ak,aj,ai){var am=typeof ai;if(am==="undefined"){ai=false}ah(al,ak,aj,ai)},onLoad:m,onReady:p,isNodeVisible:j,isOrWasNodeVisible:u.isNodeVisible},on:function(aj,ai){if(!w[aj]){w[aj]=[]}w[aj].push(ai)},off:function(ak,aj){if(!w[ak]){return}var ai=0;for(ai;ai<w[ak].length;ai++){if(w[ak][ai]===aj){w[ak].splice(ai,1)}}},trigger:function(ak,al,aj){if(!w[ak]){return}var ai=0;for(ai;ai<w[ak].length;ai++){w[ak][ai].apply(aj||R,al)}},addPlugin:function(ai,aj){b[ai]=aj},getTracker:function(ai,aj){if(!H(aj)){aj=this.getAsyncTracker().getSiteId()}if(!H(ai)){ai=this.getAsyncTracker().getTrackerUrl()}return new O(ai,aj)},getAsyncTrackers:function(){return G},addTracker:function(ai,aj){if(!G.length){Y(ai,aj)}else{G[0].addTracker(ai,aj)}},getAsyncTracker:function(aj,am){var al; -if(G&&G.length&&G[0]){al=G[0]}else{return Y(aj,am)}if(!am&&!aj){return al}if((!H(am)||null===am)&&al){am=al.getSiteId()}if((!H(aj)||null===aj)&&al){aj=al.getTrackerUrl()}var ak,ai=0;for(ai;ai<G.length;ai++){ak=G[ai];if(ak&&String(ak.getSiteId())===String(am)&&ak.getTrackerUrl()===aj){return ak}}},retryMissedPluginCalls:function(){var aj=ab;ab=[];var ai=0;for(ai;ai<aj.length;ai++){aa(aj[ai])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return e})}return e}()); +}};this.trackEcommerceOrder=function(cY,c2,c1,c0,cZ,c3){bK(cY,c2,c1,c0,cZ,c3)};this.trackEcommerceCartUpdate=function(cY){bg(cY)};this.trackRequest=function(cZ,c1,c0,cY){b2(function(){var c2=cf(cZ,c1,cY);br(c2,bv,c0)})};e.trigger("TrackerSetup",[this])}function F(){return{push:aa}}function c(an,am){var ao={};var ak,al;for(ak=0;ak<am.length;ak++){var ai=am[ak];ao[ai]=1;for(al=0;al<an.length;al++){if(an[al]&&an[al][0]){var aj=an[al][0];if(ai===aj){aa(an[al]);delete an[al];if(ao[aj]>1){ae("The method "+aj+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: https://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')}ao[aj]++}}}}return an}var A=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","enableCrossDomainLinking","setCrossDomainLinkingTimeout","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","enableLinkTracking","setSecureCookie"]; +function Y(ai,ak){var aj=new O(ai,ak);G.push(aj);_paq=c(_paq,A);for(C=0;C<_paq.length;C++){if(_paq[C]){aa(_paq[C])}}_paq=new F();return aj}ah(R,"beforeunload",ac,false);Date.prototype.getTimeAlias=Date.prototype.getTime;e={initialized:false,JSON:JSON_PIWIK,DOM:{addEventListener:function(al,ak,aj,ai){var am=typeof ai;if(am==="undefined"){ai=false}ah(al,ak,aj,ai)},onLoad:m,onReady:p,isNodeVisible:j,isOrWasNodeVisible:u.isNodeVisible},on:function(aj,ai){if(!w[aj]){w[aj]=[]}w[aj].push(ai)},off:function(ak,aj){if(!w[ak]){return}var ai=0;for(ai;ai<w[ak].length;ai++){if(w[ak][ai]===aj){w[ak].splice(ai,1)}}},trigger:function(ak,al,aj){if(!w[ak]){return}var ai=0;for(ai;ai<w[ak].length;ai++){w[ak][ai].apply(aj||R,al)}},addPlugin:function(ai,aj){b[ai]=aj},getTracker:function(ai,aj){if(!H(aj)){aj=this.getAsyncTracker().getSiteId()}if(!H(ai)){ai=this.getAsyncTracker().getTrackerUrl()}return new O(ai,aj)},getAsyncTrackers:function(){return G},addTracker:function(ai,aj){if(!G.length){Y(ai,aj)}else{G[0].addTracker(ai,aj) +}},getAsyncTracker:function(aj,am){var al;if(G&&G.length&&G[0]){al=G[0]}else{return Y(aj,am)}if(!am&&!aj){return al}if((!H(am)||null===am)&&al){am=al.getSiteId()}if((!H(aj)||null===aj)&&al){aj=al.getTrackerUrl()}var ak,ai=0;for(ai;ai<G.length;ai++){ak=G[ai];if(ak&&String(ak.getSiteId())===String(am)&&ak.getTrackerUrl()===aj){return ak}}},retryMissedPluginCalls:function(){var aj=ab;ab=[];var ai=0;for(ai;ai<aj.length;ai++){aa(aj[ai])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return e})}return e}()); /*!!! pluginTrackerHook */ -}(function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker() -}else{_paq={push:function(c){var d=typeof console;if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Piwik tracker was not initialized before the piwik.js file was loaded. Make sure to configure the tracker via _paq.push before loading piwik.js. Alternatively, you can create a tracker via Piwik.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)}}}}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.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()}}; +}(function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit() +}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker()}else{_paq={push:function(c){var d=typeof console;if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Piwik tracker was not initialized before the piwik.js file was loaded. Make sure to configure the tracker via _paq.push before loading piwik.js. Alternatively, you can create a tracker via Piwik.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)}}}}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.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()}}; /*!! @license-end */ };
\ No newline at end of file diff --git a/js/tracker.php b/js/tracker.php index b06cca49f6..551fef0805 100644 --- a/js/tracker.php +++ b/js/tracker.php @@ -45,7 +45,7 @@ $byteStart = $byteEnd = false; if (!defined("PIWIK_KEEP_JS_TRACKER_COMMENT") || !PIWIK_KEEP_JS_TRACKER_COMMENT ) { - $byteStart = 369; // length of comment header in bytes + $byteStart = 371; // length of comment header in bytes } $environment = new \Piwik\Application\Environment(null); diff --git a/misc/cron/archive.sh b/misc/cron/archive.sh index 4843b540ac..e47a19b875 100755 --- a/misc/cron/archive.sh +++ b/misc/cron/archive.sh @@ -4,7 +4,7 @@ # # => Replace your cron with `/usr/bin/php5 /path/to/piwik/console core:archive --url=http://example.org/piwik/` # -# See documentation at http://piwik.org/setup-auto-archiving/ +# See documentation at https://piwik.org/setup-auto-archiving/ # ======================================================================= for TEST_PHP_BIN in php5 php php-cli php-cgi; do @@ -32,7 +32,7 @@ PIWIK_PATH="$PIWIK_CRON_FOLDER"/../../console CONSOLE_CMD="$PHP_BIN -q $PIWIK_PATH core:archive --url=http://example.org" -MESSAGE="\n\n WARNING: this script archive.sh is DEPRECATED! \n\nPlease update your cron as explained in the documentation: http://piwik.org/docs/setup-auto-archiving/ \n\n" +MESSAGE="\n\n WARNING: this script archive.sh is DEPRECATED! \n\nPlease update your cron as explained in the documentation: https://piwik.org/docs/setup-auto-archiving/ \n\n" echo $MESSAGE; diff --git a/misc/others/widget_example_lastvisits.html b/misc/others/widget_example_lastvisits.html index a515255d03..d9aa0478eb 100644 --- a/misc/others/widget_example_lastvisits.html +++ b/misc/others/widget_example_lastvisits.html @@ -4,7 +4,7 @@ <div id="widgetIframe"> <iframe width="800" height="450" - src="http://piwik.org/demo/index.php?module=Widgetize&action=iframe&moduleToWidgetize=VisitsSummary&actionToWidgetize=getEvolutionGraph&idSite=1&period=week&date=last52&columns[]=nb_visits&disableLink=1" + src="https://piwik.org/demo/index.php?module=Widgetize&action=iframe&moduleToWidgetize=VisitsSummary&actionToWidgetize=getEvolutionGraph&idSite=1&period=week&date=last52&columns[]=nb_visits&disableLink=1" scrolling="no" frameborder="0" marginheight="0" marginwidth="0"></iframe> </div> </body> diff --git a/misc/user/index.html b/misc/user/index.html index 12e6653196..876ebadd73 100644 --- a/misc/user/index.html +++ b/misc/user/index.html @@ -1 +1 @@ -This directory stores the custom logo for this Piwik server. Learn more: <a href="http://piwik.org/faq/new-to-piwik/faq_129/">How do I customise the logo in Piwik?</a>
\ No newline at end of file +This directory stores the custom logo for this Piwik server. Learn more: <a href="https://piwik.org/faq/new-to-piwik/faq_129/">How do I customise the logo in Piwik?</a> @@ -3,15 +3,15 @@ * * JavaScript tracking client * - * @link http://piwik.org + * @link https://piwik.org * @source https://github.com/piwik/piwik/blob/master/js/piwik.js - * @license http://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt) + * @license https://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt) * @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause */ if(typeof JSON_PIWIK!=="object"&&typeof window.JSON==="object"&&window.JSON.stringify&&window.JSON.parse){JSON_PIWIK=window.JSON}else{(function(){var a={}; /*!! JSON v3.3.2 | http://bestiejs.github.io/json3 | Copyright 2012-2014, Kit Cambridge | http://kit.mit-license.org */ -(function(){var c=typeof define==="function"&&define.amd;var e={"function":true,object:true};var h=e[typeof a]&&a&&!a.nodeType&&a;var i=e[typeof window]&&window||this,b=h&&e[typeof module]&&module&&!module.nodeType&&typeof global=="object"&&global;if(b&&(b.global===b||b.window===b||b.self===b)){i=b}function j(ab,V){ab||(ab=i.Object());V||(V=i.Object());var K=ab.Number||i.Number,R=ab.String||i.String,x=ab.Object||i.Object,S=ab.Date||i.Date,T=ab.SyntaxError||i.SyntaxError,aa=ab.TypeError||i.TypeError,J=ab.Math||i.Math,Y=ab.JSON||i.JSON; -if(typeof Y=="object"&&Y){V.stringify=Y.stringify;V.parse=Y.parse}var n=x.prototype,u=n.toString,r,m,L;var B=new S(-3509827334573292);try{B=B.getUTCFullYear()==-109252&&B.getUTCMonth()===0&&B.getUTCDate()===1&&B.getUTCHours()==10&&B.getUTCMinutes()==37&&B.getUTCSeconds()==6&&B.getUTCMilliseconds()==708}catch(v){}function o(ac){if(o[ac]!==L){return o[ac]}var ad;if(ac=="bug-string-char-index"){ad="a"[0]!="a"}else{if(ac=="json"){ad=o("json-stringify")&&o("json-parse")}else{var ak,ah='{"a":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}';if(ac=="json-stringify"){var ai=V.stringify,aj=typeof ai=="function"&&B;if(aj){(ak=function(){return 1}).toJSON=ak;try{aj=ai(0)==="0"&&ai(new K())==="0"&&ai(new R())=='""'&&ai(u)===L&&ai(L)===L&&ai()===L&&ai(ak)==="1"&&ai([ak])=="[1]"&&ai([L])=="[null]"&&ai(null)=="null"&&ai([L,u,null])=="[null,null,null]"&&ai({a:[ak,true,false,null,"\x00\b\n\f\r\t"]})==ah&&ai(null,ak)==="1"&&ai([1,2],null,1)=="[\n 1,\n 2\n]"&&ai(new S(-8640000000000000))=='"-271821-04-20T00:00:00.000Z"'&&ai(new S(8640000000000000))=='"+275760-09-13T00:00:00.000Z"'&&ai(new S(-62198755200000))=='"-000001-01-01T00:00:00.000Z"'&&ai(new S(-1))=='"1969-12-31T23:59:59.999Z"' +(function(){var c=typeof define==="function"&&define.amd;var e={"function":true,object:true};var h=e[typeof a]&&a&&!a.nodeType&&a;var i=e[typeof window]&&window||this,b=h&&e[typeof module]&&module&&!module.nodeType&&typeof global=="object"&&global;if(b&&(b.global===b||b.window===b||b.self===b)){i=b}function j(ab,V){ab||(ab=i.Object());V||(V=i.Object()); +var K=ab.Number||i.Number,R=ab.String||i.String,x=ab.Object||i.Object,S=ab.Date||i.Date,T=ab.SyntaxError||i.SyntaxError,aa=ab.TypeError||i.TypeError,J=ab.Math||i.Math,Y=ab.JSON||i.JSON;if(typeof Y=="object"&&Y){V.stringify=Y.stringify;V.parse=Y.parse}var n=x.prototype,u=n.toString,r,m,L;var B=new S(-3509827334573292);try{B=B.getUTCFullYear()==-109252&&B.getUTCMonth()===0&&B.getUTCDate()===1&&B.getUTCHours()==10&&B.getUTCMinutes()==37&&B.getUTCSeconds()==6&&B.getUTCMilliseconds()==708}catch(v){}function o(ac){if(o[ac]!==L){return o[ac]}var ad;if(ac=="bug-string-char-index"){ad="a"[0]!="a"}else{if(ac=="json"){ad=o("json-stringify")&&o("json-parse")}else{var ak,ah='{"a":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}';if(ac=="json-stringify"){var ai=V.stringify,aj=typeof ai=="function"&&B;if(aj){(ak=function(){return 1}).toJSON=ak;try{aj=ai(0)==="0"&&ai(new K())==="0"&&ai(new R())=='""'&&ai(u)===L&&ai(L)===L&&ai()===L&&ai(ak)==="1"&&ai([ak])=="[1]"&&ai([L])=="[null]"&&ai(null)=="null"&&ai([L,u,null])=="[null,null,null]"&&ai({a:[ak,true,false,null,"\x00\b\n\f\r\t"]})==ah&&ai(null,ak)==="1"&&ai([1,2],null,1)=="[\n 1,\n 2\n]"&&ai(new S(-8640000000000000))=='"-271821-04-20T00:00:00.000Z"'&&ai(new S(8640000000000000))=='"+275760-09-13T00:00:00.000Z"'&&ai(new S(-62198755200000))=='"-000001-01-01T00:00:00.000Z"'&&ai(new S(-1))=='"1969-12-31T23:59:59.999Z"' }catch(ae){aj=false}}ad=aj}if(ac=="json-parse"){var ag=V.parse;if(typeof ag=="function"){try{if(ag("0")===0&&!ag(false)){ak=ag(ah);var af=ak.a.length==5&&ak.a[0]===1;if(af){try{af=!ag('"\t"')}catch(ae){}if(af){try{af=ag("01")!==1}catch(ae){}}if(af){try{af=ag("1.")!==1}catch(ae){}}}}}catch(ae){af=false}}ad=af}}}return o[ac]=!!ad}if(!o("json")){var U="[object Function]",Q="[object Date]",N="[object Number]",O="[object String]",E="[object Array]",A="[object Boolean]";var F=o("bug-string-char-index");if(!B){var s=J.floor;var Z=[0,31,59,90,120,151,181,212,243,273,304,334];var D=function(ac,ad){return Z[ad]+365*(ac-1970)+s((ac-1969+(ad=+(ad>1)))/4)-s((ac-1901+ad)/100)+s((ac-1601+ad)/400)}}if(!(r=n.hasOwnProperty)){r=function(ae){var ac={},ad;if((ac.__proto__=null,ac.__proto__={toString:1},ac).toString!=u){r=function(ah){var ag=this.__proto__,af=ah in (this.__proto__=null,this);this.__proto__=ag;return af}}else{ad=ac.constructor;r=function(ag){var af=(this.constructor||ad).prototype;return ag in this&&!(ag in af&&this[ag]===af[ag]) }}ac=null;return r.call(this,ae)}}m=function(ae,ah){var af=0,ac,ad,ag;(ac=function(){this.valueOf=0}).prototype.valueOf=0;ad=new ac();for(ag in ad){if(r.call(ad,ag)){af++}}ac=ad=null;if(!af){ad=["valueOf","toString","toLocaleString","propertyIsEnumerable","isPrototypeOf","hasOwnProperty","constructor"];m=function(aj,an){var am=u.call(aj)==U,al,ak;var ai=!am&&typeof aj.constructor!="function"&&e[typeof aj.hasOwnProperty]&&aj.hasOwnProperty||r;for(al in aj){if(!(am&&al=="prototype")&&ai.call(aj,al)){an(al)}}for(ak=ad.length;al=ad[--ak];ai.call(aj,al)&&an(al)){}}}else{if(af==2){m=function(aj,am){var ai={},al=u.call(aj)==U,ak;for(ak in aj){if(!(al&&ak=="prototype")&&!r.call(ai,ak)&&(ai[ak]=1)&&r.call(aj,ak)){am(ak)}}}}else{m=function(aj,am){var al=u.call(aj)==U,ak,ai;for(ak in aj){if(!(al&&ak=="prototype")&&r.call(aj,ak)&&!(ai=ak==="constructor")){am(ak)}}if(ai||r.call(aj,(ak="constructor"))){am(ak)}}}}return m(ae,ah)};if(!o("json-stringify")){var q={92:"\\\\",34:'\\"',8:"\\b",12:"\\f",10:"\\n",13:"\\r",9:"\\t"}; var I="000000";var t=function(ac,ad){return(I+(ad||0)).slice(-ac)};var z="\\u00";var C=function(ai){var ad='"',ag=0,ah=ai.length,ac=!F||ah>10;var af=ac&&(F?ai.split(""):ai);for(;ag<ah;ag++){var ae=ai.charCodeAt(ag);switch(ae){case 8:case 9:case 10:case 12:case 13:case 34:case 92:ad+=q[ae];break;default:if(ae<32){ad+=z+t(2,ae.toString(16));break}ad+=ac?af[ag]:ai.charAt(ag)}}return ad+'"'};var p=function(ai,aA,ag,al,ax,ac,aj){var at,ae,ap,az,ay,ak,aw,au,aq,an,ar,ad,ah,af,av,ao;try{at=aA[ai]}catch(am){}if(typeof at=="object"&&at){ae=u.call(at);if(ae==Q&&!r.call(at,"toJSON")){if(at>-1/0&&at<1/0){if(D){ay=s(at/86400000);for(ap=s(ay/365.2425)+1970-1;D(ap+1,0)<=ay;ap++){}for(az=s((ay-D(ap,0))/30.42);D(ap,az+1)<=ay;az++){}ay=1+ay-D(ap,az);ak=(at%86400000+86400000)%86400000;aw=s(ak/3600000)%24;au=s(ak/60000)%60;aq=s(ak/1000)%60;an=ak%1000}else{ap=at.getUTCFullYear();az=at.getUTCMonth();ay=at.getUTCDate();aw=at.getUTCHours();au=at.getUTCMinutes();aq=at.getUTCSeconds();an=at.getUTCMilliseconds()}at=(ap<=0||ap>=10000?(ap<0?"-":"+")+t(6,ap<0?-ap:ap):t(4,ap))+"-"+t(2,az+1)+"-"+t(2,ay)+"T"+t(2,aw)+":"+t(2,au)+":"+t(2,aq)+"."+t(3,an)+"Z" @@ -20,7 +20,7 @@ ad.length<af;ad+=" "){}}}else{if(ai==O){ad=af.length<=10?af:af.slice(0,10)}}}ret return ag}H();default:ae=G;if(ad==45){ai=true;ad=ah.charCodeAt(++G)}if(ad>=48&&ad<=57){if(ad==48&&((ad=ah.charCodeAt(G+1)),ad>=48&&ad<=57)){H()}ai=false;for(;G<af&&((ad=ah.charCodeAt(G)),ad>=48&&ad<=57);G++){}if(ah.charCodeAt(G)==46){ac=++G;for(;ac<af&&((ad=ah.charCodeAt(ac)),ad>=48&&ad<=57);ac++){}if(ac==G){H()}G=ac}ad=ah.charCodeAt(G);if(ad==101||ad==69){ad=ah.charCodeAt(++G);if(ad==43||ad==45){G++}for(ac=G;ac<af&&((ad=ah.charCodeAt(ac)),ad>=48&&ad<=57);ac++){}if(ac==G){H()}G=ac}return +ah.slice(ae,G)}if(ai){H()}if(ah.slice(G,G+4)=="true"){G+=4;return true}else{if(ah.slice(G,G+5)=="false"){G+=5;return false}else{if(ah.slice(G,G+4)=="null"){G+=4;return null}}}H()}}return"$"};var W=function(ad){var ac,ae;if(ad=="$"){H()}if(typeof ad=="string"){if((F?ad.charAt(0):ad[0])=="@"){return ad.slice(1)}if(ad=="["){ac=[];for(;;ae||(ae=true)){ad=y();if(ad=="]"){break}if(ae){if(ad==","){ad=y();if(ad=="]"){H()}}else{H()}}if(ad==","){H()}ac.push(W(ad))}return ac}else{if(ad=="{"){ac={};for(;;ae||(ae=true)){ad=y(); if(ad=="}"){break}if(ae){if(ad==","){ad=y();if(ad=="}"){H()}}else{H()}}if(ad==","||typeof ad!="string"||(F?ad.charAt(0):ad[0])!="@"||y()!=":"){H()}ac[ad.slice(1)]=W(y())}return ac}}H()}return ad};var P=function(ae,ad,af){var ac=w(ae,ad,af);if(ac===L){delete ae[ad]}else{ae[ad]=ac}};var w=function(af,ae,ag){var ad=af[ae],ac;if(typeof ad=="object"&&ad){if(u.call(ad)==E){for(ac=ad.length;ac--;){P(ad,ac,ag)}}else{m(ad,function(ah){P(ad,ah,ag)})}}return ag.call(af,ae,ad)};V.parse=function(ae,af){var ac,ad;G=0;X=""+ae;ac=W(y());if(y()!="$"){H()}G=X=null;return af&&u.call(af)==U?w((ad={},ad[""]=ac,ad),"",af):ac}}}V.runInContext=j;return V}if(h&&!c){j(i,h)}else{var f=i.JSON,k=i.JSON3,d=false;var g=j(i,(i.JSON3={noConflict:function(){if(!d){d=true;i.JSON=f;i.JSON3=k;f=k=null}return g}}));i.JSON={parse:g.parse,stringify:g.stringify}}if(c){define(function(){return g})}}).call(this);JSON_PIWIK=a})()}if(typeof _paq!=="object"){_paq=[]}if(typeof window.Piwik!=="object"){window.Piwik=(function(){var q,b={},w={},E=document,h=navigator,U=screen,R=window,i=R.performance||R.mozPerformance||R.msPerformance||R.webkitPerformance,s=R.encodeURIComponent,Q=R.decodeURIComponent,l=unescape,G=[],C,e,ab=[]; function o(ai){try{return Q(ai)}catch(aj){return unescape(ai)}}function H(aj){var ai=typeof aj;return ai!=="undefined"}function y(ai){return typeof ai==="function"}function T(ai){return typeof ai==="object"}function v(ai){return typeof ai==="string"||ai instanceof String}function z(aj){if(!aj){return true}var ai;var ak=true;for(ai in aj){if(Object.prototype.hasOwnProperty.call(aj,ai)){ak=false}}return ak}function ae(ai){var aj=typeof console;if(aj!=="undefined"&&console&&console.error){console.error(ai)}}function aa(){var an,am,ap,aj,ai;for(an=0;an<arguments.length;an+=1){ai=null;if(arguments[an]&&arguments[an].slice){ai=arguments[an].slice()}aj=arguments[an];ap=aj.shift();var ao,ak;var al=v(ap)&&ap.indexOf("::")>0;if(al){ao=ap.split("::");ak=ao[0];ap=ao[1];if("object"===typeof e[ak]&&"function"===typeof e[ak][ap]){e[ak][ap].apply(e[ak],aj)}else{if(ai){ab.push(ai)}}}else{for(am=0;am<G.length;am++){if(v(ap)){ak=G[am];var aq=ap.indexOf(".")>0;if(aq){ao=ap.split(".");if(ak&&"object"===typeof ak[ao[0]]){ak=ak[ao[0]]; -ap=ao[1]}else{if(ai){ab.push(ai);break}}}if(ak[ap]){ak[ap].apply(ak,aj)}else{var ar="The method '"+ap+'\' was not found in "_paq" variable. Please have a look at the Piwik tracker documentation: http://developer.piwik.org/api-reference/tracking-javascript';ae(ar);if(!aq){throw new TypeError(ar)}}if(ap==="addTracker"){break}if(ap==="setTrackerUrl"||ap==="setSiteId"){break}}else{ap.apply(G[am],aj)}}}}}function ah(al,ak,aj,ai){if(al.addEventListener){al.addEventListener(ak,aj,ai);return true}if(al.attachEvent){return al.attachEvent("on"+ak,aj)}al["on"+ak]=aj}function m(ai){if(E.readyState==="complete"){ai()}else{if(R.addEventListener){R.addEventListener("load",ai)}else{if(R.attachEvent){R.attachEvent("onload",ai)}}}}function p(al){var ai=false;if(E.attachEvent){ai=E.readyState==="complete"}else{ai=E.readyState!=="loading"}if(ai){al();return}var ak;if(E.addEventListener){ah(E,"DOMContentLoaded",function aj(){E.removeEventListener("DOMContentLoaded",aj,false);if(!ai){ai=true;al()}})}else{if(E.attachEvent){E.attachEvent("onreadystatechange",function aj(){if(E.readyState==="complete"){E.detachEvent("onreadystatechange",aj); +ap=ao[1]}else{if(ai){ab.push(ai);break}}}if(ak[ap]){ak[ap].apply(ak,aj)}else{var ar="The method '"+ap+'\' was not found in "_paq" variable. Please have a look at the Piwik tracker documentation: https://developer.piwik.org/api-reference/tracking-javascript';ae(ar);if(!aq){throw new TypeError(ar)}}if(ap==="addTracker"){break}if(ap==="setTrackerUrl"||ap==="setSiteId"){break}}else{ap.apply(G[am],aj)}}}}}function ah(al,ak,aj,ai){if(al.addEventListener){al.addEventListener(ak,aj,ai);return true}if(al.attachEvent){return al.attachEvent("on"+ak,aj)}al["on"+ak]=aj}function m(ai){if(E.readyState==="complete"){ai()}else{if(R.addEventListener){R.addEventListener("load",ai)}else{if(R.attachEvent){R.attachEvent("onload",ai)}}}}function p(al){var ai=false;if(E.attachEvent){ai=E.readyState==="complete"}else{ai=E.readyState!=="loading"}if(ai){al();return}var ak;if(E.addEventListener){ah(E,"DOMContentLoaded",function aj(){E.removeEventListener("DOMContentLoaded",aj,false);if(!ai){ai=true;al()}})}else{if(E.attachEvent){E.attachEvent("onreadystatechange",function aj(){if(E.readyState==="complete"){E.detachEvent("onreadystatechange",aj); if(!ai){ai=true;al()}}});if(E.documentElement.doScroll&&R===R.top){(function aj(){if(!ai){try{E.documentElement.doScroll("left")}catch(am){setTimeout(aj,0);return}ai=true;al()}}())}}}ah(R,"load",function(){if(!ai){ai=true;al()}},false)}function X(aj,ao,ap){if(!aj){return""}var ai="",al,ak,am,an;for(al in b){if(Object.prototype.hasOwnProperty.call(b,al)){an=b[al]&&"function"===typeof b[al][aj];if(an){ak=b[al][aj];am=ak(ao||{},ap);if(am){ai+=am}}}}return ai}function ac(){var ai;X("unload");if(q){do{ai=new Date()}while(ai.getTimeAlias()<q)}}function n(ak,aj){var ai=E.createElement("script");ai.type="text/javascript";ai.src=ak;if(ai.readyState){ai.onreadystatechange=function(){var al=this.readyState;if(al==="loaded"||al==="complete"){ai.onreadystatechange=null;aj()}}}else{ai.onload=aj}E.getElementsByTagName("head")[0].appendChild(ai)}function I(){var ai="";try{ai=R.top.document.referrer}catch(ak){if(R.parent){try{ai=R.parent.document.referrer}catch(aj){ai=""}}}if(ai===""){ai=E.referrer}return ai }function r(ai){var ak=new RegExp("^([a-z]+):"),aj=ak.exec(ai);return aj?aj[1]:null}function d(ai){var ak=new RegExp("^(?:(?:https?|ftp):)/*(?:[^@]+@)?([^:/#]+)"),aj=ak.exec(ai);return aj?aj[1]:ai}function ad(aj,ai){aj=String(aj);return aj.lastIndexOf(ai,0)===0}function P(aj,ai){aj=String(aj);return aj.indexOf(ai,aj.length-ai.length)!==-1}function x(aj,ai){aj=String(aj);return aj.indexOf(ai)!==-1}function g(aj,ai){aj=String(aj);return aj.substr(0,aj.length-ai)}function D(al,ak,an){al=String(al);if(!an){an=""}var ai=al.indexOf("#");var ao=al.length;if(ai===-1){ai=ao}var am=al.substr(0,ai);var aj=al.substr(ai,ao-ai);if(am.indexOf("?")===-1){am+="?"}else{if(!P(am,"?")){am+="&"}}return am+s(ak)+"="+s(an)+aj}function k(aj,ak){aj=String(aj);if(aj.indexOf("?"+ak+"=")===-1&&aj.indexOf("&"+ak+"=")===-1){return aj}var al=aj.indexOf("?");if(al===-1){return aj}var ai=aj.substr(al+1);var ap=aj.substr(0,al);if(ai){var aq="";var at=ai.indexOf("#");if(at!==-1){aq=ai.substr(at+1);ai=ai.substr(0,at)}var am; var ao=ai.split("&");var an=ao.length-1;for(an;an>=0;an--){am=ao[an].split("=")[0];if(am===ak){ao.splice(an,1)}}var ar=ao.join("&");if(ar){ap=ap+"?"+ar}if(aq){ap+="#"+aq}}return ap}function f(ak,aj){var ai="[\\?&#]"+aj+"=([^&#]*)";var am=new RegExp(ai);var al=am.exec(ak);return al?Q(al[1]):""}function a(ai){if(ai&&String(ai)===ai){return ai.replace(/^\s+|\s+$/g,"")}return ai}function B(ai){return unescape(s(ai))}function ag(ay){var ak=function(aE,aD){return(aE<<aD)|(aE>>>(32-aD))},az=function(aG){var aE="",aF,aD;for(aF=7;aF>=0;aF--){aD=(aG>>>(aF*4))&15;aE+=aD.toString(16)}return aE},an,aB,aA,aj=[],ar=1732584193,ap=4023233417,ao=2562383102,am=271733878,al=3285377520,ax,aw,av,au,at,aC,ai,aq=[];ay=B(ay);ai=ay.length;for(aB=0;aB<ai-3;aB+=4){aA=ay.charCodeAt(aB)<<24|ay.charCodeAt(aB+1)<<16|ay.charCodeAt(aB+2)<<8|ay.charCodeAt(aB+3);aq.push(aA)}switch(ai&3){case 0:aB=2147483648;break;case 1:aB=ay.charCodeAt(ai-1)<<24|8388608;break;case 2:aB=ay.charCodeAt(ai-2)<<24|ay.charCodeAt(ai-1)<<16|32768; @@ -66,12 +66,12 @@ a7()}};this.getCookieDomain=function(){return cE};this.hasCookies=function(){ret var cY=this;b2(function(){p(function(){bp(cZ,cY)})})};this.enableJSErrorTracking=function(){if(cA){return}cA=true;var cY=R.onerror;R.onerror=function(c3,c1,c0,c2,cZ){b2(function(){var c4="JavaScript Errors";var c5=c1+":"+c0;if(c2){c5+=":"+c2}am(c4,c5,c3)});if(cY){return cY(c3,c1,c0,c2,cZ)}return false}};this.disablePerformanceTracking=function(){aU=false};this.setGenerationTimeMs=function(cY){b8=parseInt(cY,10)};this.enableHeartBeatTimer=function(cY){cY=Math.max(cY,1);aX=(cY||15)*1000;if(cF!==null){cV()}};this.disableHeartBeatTimer=function(){bw();if(aX||aF){if(R.removeEventListener){R.removeEventListener("focus",a1,true);R.removeEventListener("blur",aq,true)}else{if(R.detachEvent){R.detachEvent("onfocus",a1);R.detachEvent("onblur",aq)}}}aX=null;aF=false};this.killFrame=function(){if(R.location!==R.top.location){R.top.location=R.location}};this.redirectFile=function(cY){if(R.location.protocol==="file:"){R.location=cY}};this.setCountPreRendered=function(cY){a4=cY};this.trackGoal=function(cY,c0,cZ){b2(function(){cB(cY,c0,cZ) })};this.trackLink=function(cZ,cY,c1,c0){b2(function(){cJ(cZ,cY,c1,c0)})};this.getNumTrackedPageViews=function(){return ce};this.trackPageView=function(cY,c0,cZ){bV=[];if(L(bR)){b2(function(){V(aw,bt,bR)})}else{b2(function(){ce++;bL(cY,c0,cZ)})}};this.trackAllContentImpressions=function(){if(L(bR)){return}b2(function(){p(function(){var cY=u.findContentNodes();var cZ=cl(cY);cU(cZ,bv)})})};this.trackVisibleContentImpressions=function(cY,cZ){if(L(bR)){return}if(!H(cY)){cY=true}if(!H(cZ)){cZ=750}aJ(cY,cZ,this);b2(function(){m(function(){var c0=u.findContentNodes();var c1=a0(c0);cU(c1,bv)})})};this.trackContentImpression=function(c0,cY,cZ){if(L(bR)){return}c0=a(c0);cY=a(cY);cZ=a(cZ);if(!c0){return}cY=cY||"Unknown";b2(function(){var c1=ay(c0,cY,cZ);br(c1,bv)})};this.trackContentImpressionsWithinNode=function(cY){if(L(bR)||!cY){return}b2(function(){if(b0){m(function(){var cZ=u.findContentNodesWithinNode(cY);var c0=a0(cZ);cU(c0,bv)})}else{p(function(){var cZ=u.findContentNodesWithinNode(cY);var c0=cl(cZ); cU(c0,bv)})}})};this.trackContentInteraction=function(c0,c1,cY,cZ){if(L(bR)){return}c0=a(c0);c1=a(c1);cY=a(cY);cZ=a(cZ);if(!c0||!c1){return}cY=cY||"Unknown";b2(function(){var c2=aG(c0,c1,cY,cZ);br(c2,bv)})};this.trackContentInteractionNode=function(cZ,cY){if(L(bR)||!cZ){return}b2(function(){var c0=cR(cZ,cY);br(c0,bv)})};this.logAllContentBlocksOnPage=function(){var c0=u.findContentNodes();var cY=u.collectContent(c0);var cZ=typeof console;if(cZ!=="undefined"&&console&&console.log){console.log(cY)}};this.trackEvent=function(cZ,c1,cY,c0,c3,c2){b2(function(){am(cZ,c1,cY,c0,c3,c2)})};this.trackSiteSearch=function(cY,c0,cZ,c1){b2(function(){bT(cY,c0,cZ,c1)})};this.setEcommerceView=function(c1,cY,c0,cZ){if(!H(c0)||!c0.length){c0=""}else{if(c0 instanceof Array){c0=JSON_PIWIK.stringify(c0)}}bH[5]=["_pkc",c0];if(H(cZ)&&String(cZ).length){bH[2]=["_pkp",cZ]}if((!H(c1)||!c1.length)&&(!H(cY)||!cY.length)){return}if(H(c1)&&c1.length){bH[3]=["_pks",c1]}if(!H(cY)||!cY.length){cY=""}bH[4]=["_pkn",cY]};this.addEcommerceItem=function(c2,cY,c0,cZ,c1){if(c2.length){cI[c2]=[c2,cY,c0,cZ,c1] -}};this.trackEcommerceOrder=function(cY,c2,c1,c0,cZ,c3){bK(cY,c2,c1,c0,cZ,c3)};this.trackEcommerceCartUpdate=function(cY){bg(cY)};this.trackRequest=function(cZ,c1,c0,cY){b2(function(){var c2=cf(cZ,c1,cY);br(c2,bv,c0)})};e.trigger("TrackerSetup",[this])}function F(){return{push:aa}}function c(an,am){var ao={};var ak,al;for(ak=0;ak<am.length;ak++){var ai=am[ak];ao[ai]=1;for(al=0;al<an.length;al++){if(an[al]&&an[al][0]){var aj=an[al][0];if(ai===aj){aa(an[al]);delete an[al];if(ao[aj]>1){ae("The method "+aj+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: http://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')}ao[aj]++}}}}return an}var A=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","enableCrossDomainLinking","setCrossDomainLinkingTimeout","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","enableLinkTracking","setSecureCookie"];function Y(ai,ak){var aj=new O(ai,ak); -G.push(aj);_paq=c(_paq,A);for(C=0;C<_paq.length;C++){if(_paq[C]){aa(_paq[C])}}_paq=new F();return aj}ah(R,"beforeunload",ac,false);Date.prototype.getTimeAlias=Date.prototype.getTime;e={initialized:false,JSON:JSON_PIWIK,DOM:{addEventListener:function(al,ak,aj,ai){var am=typeof ai;if(am==="undefined"){ai=false}ah(al,ak,aj,ai)},onLoad:m,onReady:p,isNodeVisible:j,isOrWasNodeVisible:u.isNodeVisible},on:function(aj,ai){if(!w[aj]){w[aj]=[]}w[aj].push(ai)},off:function(ak,aj){if(!w[ak]){return}var ai=0;for(ai;ai<w[ak].length;ai++){if(w[ak][ai]===aj){w[ak].splice(ai,1)}}},trigger:function(ak,al,aj){if(!w[ak]){return}var ai=0;for(ai;ai<w[ak].length;ai++){w[ak][ai].apply(aj||R,al)}},addPlugin:function(ai,aj){b[ai]=aj},getTracker:function(ai,aj){if(!H(aj)){aj=this.getAsyncTracker().getSiteId()}if(!H(ai)){ai=this.getAsyncTracker().getTrackerUrl()}return new O(ai,aj)},getAsyncTrackers:function(){return G},addTracker:function(ai,aj){if(!G.length){Y(ai,aj)}else{G[0].addTracker(ai,aj)}},getAsyncTracker:function(aj,am){var al; -if(G&&G.length&&G[0]){al=G[0]}else{return Y(aj,am)}if(!am&&!aj){return al}if((!H(am)||null===am)&&al){am=al.getSiteId()}if((!H(aj)||null===aj)&&al){aj=al.getTrackerUrl()}var ak,ai=0;for(ai;ai<G.length;ai++){ak=G[ai];if(ak&&String(ak.getSiteId())===String(am)&&ak.getTrackerUrl()===aj){return ak}}},retryMissedPluginCalls:function(){var aj=ab;ab=[];var ai=0;for(ai;ai<aj.length;ai++){aa(aj[ai])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return e})}return e}()); +}};this.trackEcommerceOrder=function(cY,c2,c1,c0,cZ,c3){bK(cY,c2,c1,c0,cZ,c3)};this.trackEcommerceCartUpdate=function(cY){bg(cY)};this.trackRequest=function(cZ,c1,c0,cY){b2(function(){var c2=cf(cZ,c1,cY);br(c2,bv,c0)})};e.trigger("TrackerSetup",[this])}function F(){return{push:aa}}function c(an,am){var ao={};var ak,al;for(ak=0;ak<am.length;ak++){var ai=am[ak];ao[ai]=1;for(al=0;al<an.length;al++){if(an[al]&&an[al][0]){var aj=an[al][0];if(ai===aj){aa(an[al]);delete an[al];if(ao[aj]>1){ae("The method "+aj+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: https://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')}ao[aj]++}}}}return an}var A=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","enableCrossDomainLinking","setCrossDomainLinkingTimeout","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","enableLinkTracking","setSecureCookie"]; +function Y(ai,ak){var aj=new O(ai,ak);G.push(aj);_paq=c(_paq,A);for(C=0;C<_paq.length;C++){if(_paq[C]){aa(_paq[C])}}_paq=new F();return aj}ah(R,"beforeunload",ac,false);Date.prototype.getTimeAlias=Date.prototype.getTime;e={initialized:false,JSON:JSON_PIWIK,DOM:{addEventListener:function(al,ak,aj,ai){var am=typeof ai;if(am==="undefined"){ai=false}ah(al,ak,aj,ai)},onLoad:m,onReady:p,isNodeVisible:j,isOrWasNodeVisible:u.isNodeVisible},on:function(aj,ai){if(!w[aj]){w[aj]=[]}w[aj].push(ai)},off:function(ak,aj){if(!w[ak]){return}var ai=0;for(ai;ai<w[ak].length;ai++){if(w[ak][ai]===aj){w[ak].splice(ai,1)}}},trigger:function(ak,al,aj){if(!w[ak]){return}var ai=0;for(ai;ai<w[ak].length;ai++){w[ak][ai].apply(aj||R,al)}},addPlugin:function(ai,aj){b[ai]=aj},getTracker:function(ai,aj){if(!H(aj)){aj=this.getAsyncTracker().getSiteId()}if(!H(ai)){ai=this.getAsyncTracker().getTrackerUrl()}return new O(ai,aj)},getAsyncTrackers:function(){return G},addTracker:function(ai,aj){if(!G.length){Y(ai,aj)}else{G[0].addTracker(ai,aj) +}},getAsyncTracker:function(aj,am){var al;if(G&&G.length&&G[0]){al=G[0]}else{return Y(aj,am)}if(!am&&!aj){return al}if((!H(am)||null===am)&&al){am=al.getSiteId()}if((!H(aj)||null===aj)&&al){aj=al.getTrackerUrl()}var ak,ai=0;for(ai;ai<G.length;ai++){ak=G[ai];if(ak&&String(ak.getSiteId())===String(am)&&ak.getTrackerUrl()===aj){return ak}}},retryMissedPluginCalls:function(){var aj=ab;ab=[];var ai=0;for(ai;ai<aj.length;ai++){aa(aj[ai])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return e})}return e}()); /*!!! pluginTrackerHook */ -}(function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker() -}else{_paq={push:function(c){var d=typeof console;if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Piwik tracker was not initialized before the piwik.js file was loaded. Make sure to configure the tracker via _paq.push before loading piwik.js. Alternatively, you can create a tracker via Piwik.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)}}}}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.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()}}; +}(function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit() +}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker()}else{_paq={push:function(c){var d=typeof console;if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Piwik tracker was not initialized before the piwik.js file was loaded. Make sure to configure the tracker via _paq.push before loading piwik.js. Alternatively, you can create a tracker via Piwik.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)}}}}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.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()}}; /*!! @license-end */ };
\ No newline at end of file diff --git a/plugins/API/Menu.php b/plugins/API/Menu.php index 312f03a2ef..0d031304a5 100644 --- a/plugins/API/Menu.php +++ b/plugins/API/Menu.php @@ -56,7 +56,7 @@ class Menu extends \Piwik\Plugin\Menu if (!empty($parsedOS['short_name']) && in_array($parsedOS['short_name'], array(self::DD_SHORT_NAME_ANDROID, self::DD_SHORT_NAME_IOS))) { - $url = $this->urlForModuleAction('Proxy', 'redirect', array('url' => 'http://piwik.org/mobile/')); + $url = $this->urlForModuleAction('Proxy', 'redirect', array('url' => 'https://piwik.org/mobile/')); if ($url) { $menu->addItem('Piwik Mobile App', null, $url, 4); diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig index 9aa2685881..fd9a879144 100644 --- a/plugins/API/templates/listAllAPI.twig +++ b/plugins/API/templates/listAllAPI.twig @@ -14,7 +14,7 @@ <p>{{ 'API_PluginDescription'|translate }}</p> <p> - {{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api/reference'>","</a>")|raw }} + {{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=httpd://piwik.org/docs/analytics-api/reference'>","</a>")|raw }} </p> </div> <div piwik-content-block content-title="{{ 'API_UserAuthentication'|translate|e('html_attr') }}"> diff --git a/plugins/Actions/Reports/GetSiteSearchKeywords.php b/plugins/Actions/Reports/GetSiteSearchKeywords.php index dc4b5e2d16..53a2acfea6 100644 --- a/plugins/Actions/Reports/GetSiteSearchKeywords.php +++ b/plugins/Actions/Reports/GetSiteSearchKeywords.php @@ -24,7 +24,7 @@ class GetSiteSearchKeywords extends SiteSearchBase $this->dimension = new Keyword(); $this->name = Piwik::translate('Actions_WidgetSearchKeywords'); $this->documentation = Piwik::translate('Actions_SiteSearchKeywordsDocumentation') . '<br/><br/>' . Piwik::translate('Actions_SiteSearchIntro') . '<br/><br/>' - . '<a href="http://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">' . Piwik::translate('Actions_LearnMoreAboutSiteSearchLink') . '</a>'; + . '<a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">' . Piwik::translate('Actions_LearnMoreAboutSiteSearchLink') . '</a>'; $this->metrics = array('nb_visits', 'nb_pages_per_search'); $this->processedMetrics = array( new AverageTimeOnPage(), diff --git a/plugins/BulkTracking/Tracker/Requests.php b/plugins/BulkTracking/Tracker/Requests.php index af4eb23a15..5baf6bbd4d 100644 --- a/plugins/BulkTracking/Tracker/Requests.php +++ b/plugins/BulkTracking/Tracker/Requests.php @@ -43,7 +43,7 @@ class Requests { if (empty($token)) { throw new Exception("token_auth must be specified when using Bulk Tracking Import. " - . " See <a href='http://developer.piwik.org/api-reference/tracking-api'>Tracking Doc</a>"); + . " See <a href='https://developer.piwik.org/api-reference/tracking-api'>Tracking Doc</a>"); } } diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index 8a78087345..bd53e896f8 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -33,14 +33,14 @@ <label for="enableBrowserTriggerArchiving2"> {{ 'General_No'|translate }} - <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }}</span> + <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }}</span> </label> </p> </div><div class="col s12 m6"> <div class="form-help"> {{ 'General_ArchivingInlineHelp'|translate }} <br/> - {{ 'General_SeeTheOfficialDocumentationForMoreInformation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }} + {{ 'General_SeeTheOfficialDocumentationForMoreInformation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }} </div> </div> </div> diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig index 71834c676e..98b55053f1 100644 --- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig +++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig @@ -14,7 +14,7 @@ <div piwik-content-block content-title="{{ title|e('html_attr') }}" - help-url="http://piwik.org/docs/tracking-api/" + help-url="https://piwik.org/docs/tracking-api/" rate="{{ 'CoreAdminHome_TrackingCode'|translate|e('html_attr') }}"> <div id="js-code-options" ng-controller="JsTrackingCodeController as jsTrackingCode"> @@ -22,11 +22,11 @@ <p> {{ 'CoreAdminHome_JSTrackingIntro1'|translate }} <br/><br/> - {{ 'CoreAdminHome_JSTrackingIntro2'|translate }} {{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="http://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }} + {{ 'CoreAdminHome_JSTrackingIntro2'|translate }} {{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }} <br/><br/> {{ 'CoreAdminHome_JSTrackingIntro4'|translate('<a href="#image-tracking-link">','</a>')|raw }} <br/><br/> - {{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/javascript-tracking/">','</a>')|raw }} + {{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/javascript-tracking/">','</a>')|raw }} </p> <div piwik-field uicontrol="site" name="js-tracker-website" @@ -42,7 +42,7 @@ {# track across all subdomains #} <div id="jsTrackAllSubdomainsInlineHelp" class="inline-help-node"> {{ 'CoreAdminHome_JSTracking_MergeSubdomainsDesc'|translate("x.<span class='current-site-host'></span>","y.<span class='current-site-host'></span>")|raw }} - {{ 'General_LearnMore'|translate(' (<a href="http://developer.piwik.org/guides/tracking-javascript-guide#measuring-domains-andor-sub-domains" rel="noreferrer" target="_blank">', '</a>)')|raw }} + {{ 'General_LearnMore'|translate(' (<a href="https://developer.piwik.org/guides/tracking-javascript-guide#measuring-domains-andor-sub-domains" rel="noreferrer" target="_blank">', '</a>)')|raw }} </div> <div piwik-field uicontrol="checkbox" name="javascript-tracking-all-subdomains" @@ -183,7 +183,7 @@ {# custom campaign name/keyword query params #} <div id="jsTrackCampaignParamsInlineHelp" class="inline-help-node"> - {{ 'CoreAdminHome_JSTracking_CustomCampaignQueryParamDesc'|translate('<a href="http://piwik.org/faq/general/#faq_119" rel="noreferrer" target="_blank">','</a>')|raw }} + {{ 'CoreAdminHome_JSTracking_CustomCampaignQueryParamDesc'|translate('<a href="https://piwik.org/faq/general/#faq_119" rel="noreferrer" target="_blank">','</a>')|raw }} </div> <div piwik-field uicontrol="checkbox" name="custom-campaign-query-params-check" @@ -245,7 +245,7 @@ {{ 'CoreAdminHome_ImageTrackingIntro1'|translate }} {{ 'CoreAdminHome_ImageTrackingIntro2'|translate("<code><noscript></noscript></code>")|raw }} </p> <p> - {{ 'CoreAdminHome_ImageTrackingIntro3'|translate('<a href="http://piwik.org/docs/tracking-api/reference/" rel="noreferrer" target="_blank">','</a>')|raw }} + {{ 'CoreAdminHome_ImageTrackingIntro3'|translate('<a href="https://piwik.org/docs/tracking-api/reference/" rel="noreferrer" target="_blank">','</a>')|raw }} </p> {# website #} @@ -314,7 +314,7 @@ <div piwik-content-block content-title="{{ 'CoreAdminHome_ImportingServerLogs'|translate|e('html_attr') }}"> <p> - {{ 'CoreAdminHome_ImportingServerLogsDesc'|translate('<a href="http://piwik.org/log-analytics/" rel="noreferrer" target="_blank">','</a>')|raw }} + {{ 'CoreAdminHome_ImportingServerLogsDesc'|translate('<a href="https://piwik.org/log-analytics/" rel="noreferrer" target="_blank">','</a>')|raw }} </p> </div> {% endblock %} diff --git a/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php b/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php index 367cee78f1..6879298f23 100644 --- a/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php +++ b/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php @@ -50,7 +50,7 @@ class DevelopmentSyncProcessedSystemTests extends ConsoleCommand } $filename = sprintf('system.%s.tar.bz2', $buildNumber); - $urlBase = sprintf('http://builds-artifacts.piwik.org/piwik/piwik/%s', $filename); + $urlBase = sprintf('https://builds-artifacts.piwik.org/piwik/piwik/%s', $filename); $tests = Http::sendHttpRequest($urlBase, $timeout = 120); $tarFile = $tmpDir . $filename; diff --git a/plugins/CoreConsole/Commands/GenerateAngularDirective.php b/plugins/CoreConsole/Commands/GenerateAngularDirective.php index d312cd995f..afe0ce5581 100644 --- a/plugins/CoreConsole/Commands/GenerateAngularDirective.php +++ b/plugins/CoreConsole/Commands/GenerateAngularDirective.php @@ -72,7 +72,7 @@ class GenerateAngularDirective extends GeneratePluginBase sprintf('In <comment>%1$s/%2$s.php</comment> you should now require the JS files', $pluginPath, $pluginName), sprintf('<comment>%1$s%2$s</comment>, <comment>%1$s%3$s</comment>', $pluginPath, $js1, $js2), sprintf('and the less file <comment>%1$s%2$s</comment>.', $pluginPath, $less1), - 'If you are not familiar with this have a look at <comment>http://developer.piwik.org/guides/working-with-piwiks-ui</comment>' + 'If you are not familiar with this have a look at <comment>https://developer.piwik.org/guides/working-with-piwiks-ui</comment>' )); } diff --git a/plugins/CoreConsole/Commands/GeneratePlugin.php b/plugins/CoreConsole/Commands/GeneratePlugin.php index 611a177fbb..17d1795db5 100644 --- a/plugins/CoreConsole/Commands/GeneratePlugin.php +++ b/plugins/CoreConsole/Commands/GeneratePlugin.php @@ -84,13 +84,13 @@ class GeneratePlugin extends GeneratePluginBase if ($isTheme) { $this->writeSuccessMessage($output, array( sprintf('Theme %s %s generated.', $pluginName, $version), - 'If you have not done yet check out our Theming guide <comment>http://developer.piwik.org/guides/theming</comment>', + 'If you have not done yet check out our Theming guide <comment>https://developer.piwik.org/guides/theming</comment>', 'Enjoy!' )); } else { $this->writeSuccessMessage($output, array( sprintf('Plugin %s %s generated.', $pluginName, $version), - 'Our developer guides will help you developing this plugin, check out <comment>http://developer.piwik.org/guides</comment>', + 'Our developer guides will help you developing this plugin, check out <comment>https://developer.piwik.org/guides</comment>', 'To see a list of available generators execute <comment>./console list generate</comment>', 'Enjoy!' )); diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 2120dd5a46..2bc8361875 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -1847,7 +1847,7 @@ $.extend(DataTable.prototype, UIControl.prototype, { }, handleSummaryRow: function (domElem) { - var details = _pk_translate('General_LearnMore', [' (<a href="http://piwik.org/faq/how-to/faq_54/" rel="noreferrer" target="_blank">', '</a>)']); + var details = _pk_translate('General_LearnMore', [' (<a href="https://piwik.org/faq/how-to/faq_54/" rel="noreferrer" target="_blank">', '</a>)']); domElem.find('tr.summaryRow').each(function () { var labelSpan = $(this).find('.label .value'); diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig index 91858adf66..1a47c5399b 100644 --- a/plugins/CoreHome/templates/_headerMessage.twig +++ b/plugins/CoreHome/templates/_headerMessage.twig @@ -32,12 +32,12 @@ {% if isMultiServerEnvironment %} {{ 'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment'|translate("<a rel='noreferrer' href='https://builds.piwik.org/piwik-" ~ latest_version_available ~ ".zip'>","</a>")|raw }} {% else %} - {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>","</a>")|raw }} + {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=https://piwik.org/changelog/' target='_blank'>","</a>")|raw }} {% endif %} <br /> {% elseif latest_version_available and not isPiwikDemo and hasSomeViewAccess and not isUserIsAnonymous %} {% set updateSubject = 'General_NewUpdatePiwikX'|translate(latest_version_available)|e('url') %} - {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }} + {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=https://piwik.org/changelog/' target='_blank'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }} <br /> {% endif %} diff --git a/plugins/CoreHome/templates/_warningInvalidHost.twig b/plugins/CoreHome/templates/_warningInvalidHost.twig index c93539346f..1caf03b791 100644 --- a/plugins/CoreHome/templates/_warningInvalidHost.twig +++ b/plugins/CoreHome/templates/_warningInvalidHost.twig @@ -1,7 +1,7 @@ {# untrusted host warning #} {% if (isValidHost is defined and invalidHostMessage is defined and isValidHost == false) %} {% set invalidHostText %} - <a class="btn btn-link" style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" rel="noreferrer" target="_blank"> + <a class="btn btn-link" style="float:right;" href="https://piwik.org/faq/troubleshooting/#faq_171" rel="noreferrer" target="_blank"> <span class="icon-help"></span> {{ 'General_Help'|translate }} </a> diff --git a/plugins/CoreHome/templates/getPromoVideo.twig b/plugins/CoreHome/templates/getPromoVideo.twig index 227ce9670a..3b911b63ed 100755 --- a/plugins/CoreHome/templates/getPromoVideo.twig +++ b/plugins/CoreHome/templates/getPromoVideo.twig @@ -8,7 +8,7 @@ </div> </div> - <a id="piwik-promo-videos-link" href="http://piwik.org/blog/2012/12/piwik-how-to-videos/" rel="noreferrer" target="_blank"> + <a id="piwik-promo-videos-link" href="https://piwik.org/blog/2012/12/piwik-how-to-videos/" rel="noreferrer" target="_blank"> {{ 'CoreHome_ViewAllPiwikVideoTutorials'|translate }} </a> @@ -16,12 +16,12 @@ <span>{{ 'CoreHome_ShareThis'|translate }}:</span> {# facebook #} - <a href="http://www.facebook.com/sharer.php?u={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank"> + <a href="https://www.facebook.com/sharer.php?u={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank"> <img src="plugins/Morpheus/icons/dist/socials/facebook.com.png" width="16px" height="16px" /> </a> {# twitter #} - <a href="http://twitter.com/share?text={{ shareText|url_encode }}&url={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank"> + <a href="https://twitter.com/share?text={{ shareText|url_encode }}&url={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank"> <img src="plugins/Morpheus/icons/dist/socials/twitter.com.png" width="16px" height="16px" /> </a> diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig index ffdff511f7..b3ceafe741 100644 --- a/plugins/CorePluginsAdmin/templates/macros.twig +++ b/plugins/CorePluginsAdmin/templates/macros.twig @@ -144,7 +144,8 @@ {{ plugin.info.description|raw|nl2br }} {% if plugin.info.homepage|default is not empty and plugin.info.homepage not in [ - 'http://piwik.org', 'http://www.piwik.org', 'http://piwik.org/', 'http://www.piwik.org/' + 'http://piwik.org', 'http://www.piwik.org', 'http://piwik.org/', 'http://www.piwik.org/', + 'https://piwik.org', 'https://www.piwik.org', 'https://piwik.org/', 'https://www.piwik.org/' ] %} <span class="plugin-homepage"> <a target="_blank" href="{{ plugin.info.homepage }}">({{ 'CorePluginsAdmin_PluginHomepage'|translate|replace({' ': ' '})|raw }})</a> diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php index 650569a922..6caf7cafc9 100644 --- a/plugins/CoreUpdater/CoreUpdater.php +++ b/plugins/CoreUpdater/CoreUpdater.php @@ -74,7 +74,7 @@ class CoreUpdater extends \Piwik\Plugin if ($updater->getComponentUpdates() !== null) { if (FrontController::shouldRethrowException()) { throw new Exception("Piwik and/or some plugins have been upgraded to a new version. \n" . - "--> Please run the update process first. See documentation: http://piwik.org/docs/update/ \n"); + "--> Please run the update process first. See documentation: https://piwik.org/docs/update/ \n"); } elseif ($module === 'API') { $outputFormat = strtolower(Common::getRequestVar('format', 'xml', 'string', $_GET + $_POST)); diff --git a/plugins/CoreUpdater/SystemSettings.php b/plugins/CoreUpdater/SystemSettings.php index 70bab5bdd1..f8db4e1d49 100644 --- a/plugins/CoreUpdater/SystemSettings.php +++ b/plugins/CoreUpdater/SystemSettings.php @@ -84,11 +84,11 @@ class SystemSettings extends \Piwik\Settings\Plugin\SystemSettings }; $field->inlineHelp = Piwik::translate('CoreAdminHome_DevelopmentProcess', - array("<a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>", + array("<a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>", "</a>")) . Piwik::translate('<br/>') . Piwik::translate('CoreAdminHome_StableReleases', - array("<a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>", + array("<a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>", "</a>")) . Piwik::translate('<br />') . Piwik::translate('CoreAdminHome_LtsReleases'); diff --git a/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php b/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php index 8533e5675c..34870e4f2f 100644 --- a/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php +++ b/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php @@ -77,12 +77,12 @@ CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage {$rootUrl}index.php?module=CoreUpdater&action=newVersionAvailable CoreUpdater_ViewVersionChangelog -http://piwik.org/changelog/piwik-33-0-0/ +https://piwik.org/changelog/piwik-33-0-0/ CoreUpdater_ReceiveEmailBecauseIsSuperUser CoreUpdater_FeedbackRequest -http://piwik.org/contact/"; +https://piwik.org/contact/"; $this->assertEmailForVersion('33.0.0', $message); } @@ -100,7 +100,7 @@ CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage CoreUpdater_ReceiveEmailBecauseIsSuperUser CoreUpdater_FeedbackRequest -http://piwik.org/contact/"; +https://piwik.org/contact/"; $this->assertEmailForVersion('33.0.0-b1', $message); } diff --git a/plugins/CoreUpdater/UpdateCommunication.php b/plugins/CoreUpdater/UpdateCommunication.php index 43271c83dc..def5f97a2a 100644 --- a/plugins/CoreUpdater/UpdateCommunication.php +++ b/plugins/CoreUpdater/UpdateCommunication.php @@ -87,7 +87,7 @@ class UpdateCommunication $message .= "\n\n"; $message .= Piwik::translate('CoreUpdater_FeedbackRequest'); $message .= "\n"; - $message .= 'http://piwik.org/contact/'; + $message .= 'https://piwik.org/contact/'; $this->sendEmailNotification($subject, $message); } @@ -96,7 +96,7 @@ class UpdateCommunication { $version = str_replace('.', '-', $version); - $link = sprintf('http://piwik.org/changelog/piwik-%s/', $version); + $link = sprintf('https://piwik.org/changelog/piwik-%s/', $version); return $link; } diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig index 1f634f5d1f..4afc51ac17 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig @@ -1,6 +1,6 @@ {% extends '@CoreUpdater/layout.twig' %} {% set helpMessage %} - {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/faq/">','</a>','</li><li>')|raw }} + {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/faq/">','</a>','</li><li>')|raw }} {% endset %} {% block content %} diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig index 3d1a8a5357..679b56e254 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig @@ -11,7 +11,7 @@ <div class="content" style="text-align:left;"> {% set helpMessage %} - {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/faq/">','</a>','</li><li>')|raw }} + {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/faq/">','</a>','</li><li>')|raw }} {% endset %} {% if coreError %} diff --git a/plugins/CoreUpdater/templates/updateHttpError.twig b/plugins/CoreUpdater/templates/updateHttpError.twig index c7d6a90dfb..74f1d4ff7c 100644 --- a/plugins/CoreUpdater/templates/updateHttpError.twig +++ b/plugins/CoreUpdater/templates/updateHttpError.twig @@ -18,7 +18,7 @@ </div> <p> - {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/update/'>","</a>")|raw }} + {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/update/'>","</a>")|raw }} </p> </div> diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 0f6930f1b89bc61970637000f32b132e5a2f664 +Subproject a304f97bc23315c06091bea0e1c1b52172344d3 diff --git a/plugins/CustomVariables/Reports/GetCustomVariables.php b/plugins/CustomVariables/Reports/GetCustomVariables.php index b460c8b836..c97746330a 100644 --- a/plugins/CustomVariables/Reports/GetCustomVariables.php +++ b/plugins/CustomVariables/Reports/GetCustomVariables.php @@ -21,7 +21,7 @@ class GetCustomVariables extends Base $this->dimension = new CustomVariableName(); $this->name = Piwik::translate('CustomVariables_CustomVariables'); $this->documentation = Piwik::translate('CustomVariables_CustomVariablesReportDocumentation', - array('<br />', '<a href="http://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">', '</a>')); + array('<br />', '<a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">', '</a>')); $this->actionToLoadSubTables = 'getCustomVariablesValuesFromNameId'; $this->order = 10; diff --git a/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php b/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php index e4f57af4fc..44c63fd2d5 100644 --- a/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php +++ b/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php @@ -20,7 +20,7 @@ class GetCustomVariablesValuesFromNameId extends Base $this->dimension = new CustomVariableValue(); $this->name = Piwik::translate('CustomVariables_CustomVariables'); $this->documentation = Piwik::translate('CustomVariables_CustomVariablesReportDocumentation', - array('<br />', '<a href="http://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">', '</a>')); + array('<br />', '<a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">', '</a>')); $this->isSubtableReport = true; $this->order = 15; } diff --git a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html b/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html index 96b61a92cb..286ec3d064 100644 --- a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html +++ b/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html @@ -1,7 +1,7 @@ <div class="manageCustomVars"> <div piwik-content-intro> <h2 piwik-enriched-headline - help-url="http://piwik.org/docs/custom-variables/"> + help-url="https://piwik.org/docs/custom-variables/"> {{ 'CustomVariables_CustomVariables'|translate }} </h2> diff --git a/plugins/CustomVariables/lang/en.json b/plugins/CustomVariables/lang/en.json index 56a6d3380b..1ecccedc5a 100644 --- a/plugins/CustomVariables/lang/en.json +++ b/plugins/CustomVariables/lang/en.json @@ -4,7 +4,7 @@ "ColumnCustomVariableValue": "Custom Variable value", "CustomVariables": "Custom Variables", "CustomVariablesReportDocumentation": "This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. %1$s For more information about Custom Variables in general, read the %2$sCustom Variables documentation on piwik.org%3$s", - "PluginDescription": "Custom Variables are (name, value) pairs that you can assign using the Javascript API to visitors or any of their action. Piwik will then report how many visits, pages, conversions for each of these custom names and values. View the detailed Custom Variables for each user and action in the Visitor Log.<br />Required to use <a href=\"http://piwik.org/docs/ecommerce-analytics/\">Ecommerce Analytics</a> feature!", + "PluginDescription": "Custom Variables are (name, value) pairs that you can assign using the Javascript API to visitors or any of their action. Piwik will then report how many visits, pages, conversions for each of these custom names and values. View the detailed Custom Variables for each user and action in the Visitor Log.<br />Required to use <a href=\"https://piwik.org/docs/ecommerce-analytics/\">Ecommerce Analytics</a> feature!", "ScopePage": "scope page", "ScopeVisit": "scope visit", "ScopeConversion": "scope conversion", diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig index 486e4c8528..08b900ecf1 100755 --- a/plugins/DBStats/templates/index.twig +++ b/plugins/DBStats/templates/index.twig @@ -9,7 +9,7 @@ </h2> <p> {{ 'DBStats_MainDescription'|translate(totalSpaceUsed) }}<br/> - {{ 'DBStats_LearnMore'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>Piwik Auto Archiving</a>")|raw }} + {{ 'DBStats_LearnMore'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/setup-auto-archiving/' target='_blank'>Piwik Auto Archiving</a>")|raw }} </p> </div> diff --git a/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php b/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php index 0d06ceef04..15bf5d83df 100644 --- a/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php +++ b/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php @@ -78,7 +78,7 @@ class LoadDataInfileCheck implements Diagnostic '<br/><strong>%s:</strong> %s<br/>%s', $this->translator->translate('General_Error'), $errorMessage, - 'Troubleshooting: <a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/faq/troubleshooting/%23faq_194">FAQ on piwik.org</a>' + 'Troubleshooting: <a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/faq/troubleshooting/%23faq_194">FAQ on piwik.org</a>' ); } diff --git a/plugins/ExampleAPI/plugin.json b/plugins/ExampleAPI/plugin.json index bf17ca1e07..544965416e 100644 --- a/plugins/ExampleAPI/plugin.json +++ b/plugins/ExampleAPI/plugin.json @@ -3,13 +3,13 @@ "description": "Piwik Platform showcase: how to create an API for your plugin to let your users export your data in multiple formats.", "version": "1.0", "keywords": ["example", "api"], - "homepage": "http://piwik.org", + "homepage": "https://piwik.org", "license": "GPL v3+", "authors": [ { "name": "Piwik", "email": "hello@piwik.org", - "homepage": "http://piwik.org" + "homepage": "https://piwik.org" } ] }
\ No newline at end of file diff --git a/plugins/ExampleVisualization/plugin.json b/plugins/ExampleVisualization/plugin.json index bcf9f49ce2..1fa9d6c281 100644 --- a/plugins/ExampleVisualization/plugin.json +++ b/plugins/ExampleVisualization/plugin.json @@ -5,12 +5,12 @@ "theme": false, "license": "GPL v3+", "keywords": ["SimpleTable"], - "homepage": "http://piwik.org", + "homepage": "https://piwik.org", "authors": [ { "name": "The Piwik Team", "email": "hello@piwik.org", - "homepage": "http://piwik.org" + "homepage": "https://piwik.org" } ] }
\ No newline at end of file diff --git a/plugins/Goals/Visualizations/Goals.php b/plugins/Goals/Visualizations/Goals.php index 4be5e24ef0..b6a3e573ac 100644 --- a/plugins/Goals/Visualizations/Goals.php +++ b/plugins/Goals/Visualizations/Goals.php @@ -48,7 +48,7 @@ class Goals extends HtmlTable if (1 == Common::getRequestVar('documentationForGoalsPage', 0, 'int')) { // TODO: should not use query parameter $this->config->documentation = Piwik::translate('Goals_ConversionByTypeReportDocumentation', - array('<br />', '<br />', '<a href="http://piwik.org/docs/tracking-goals-web-analytics/" rel="noreferrer" target="_blank">', '</a>')); + array('<br />', '<br />', '<a href="https://piwik.org/docs/tracking-goals-web-analytics/" rel="noreferrer" target="_blank">', '</a>')); } parent::beforeRender(); diff --git a/plugins/Goals/templates/_formAddGoal.twig b/plugins/Goals/templates/_formAddGoal.twig index 9505ac1898..b0c68aaf87 100644 --- a/plugins/Goals/templates/_formAddGoal.twig +++ b/plugins/Goals/templates/_formAddGoal.twig @@ -37,7 +37,7 @@ </div> <div class="col s12 m6"> <div piwik-alert="info" ng-show="manageGoals.goal.triggerType == 'manually'"> - {{ 'Goals_WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/javascript-tracking/%23toc-manually-trigger-a-conversion-for-a-goal'>","</a>")|raw }} + {{ 'Goals_WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/javascript-tracking/%23toc-manually-trigger-a-conversion-for-a-goal'>","</a>")|raw }} </div> <div piwik-field uicontrol="radio" name="match_attribute" diff --git a/plugins/Goals/templates/_listGoalEdit.twig b/plugins/Goals/templates/_listGoalEdit.twig index c0ca80e08a..6fab4baec8 100644 --- a/plugins/Goals/templates/_listGoalEdit.twig +++ b/plugins/Goals/templates/_listGoalEdit.twig @@ -6,7 +6,7 @@ <div piwik-activity-indicator loading="manageGoals.isLoading"></div> <div class="contentHelp"> - {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} + {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} {% if not ecommerceEnabled %} <br /><br/> @@ -14,7 +14,7 @@ <a href='{{ linkTo({'module':'SitesManager','action':'index' }) }}'>{{ 'SitesManager_WebsitesManagement'|translate }}</a> {% endset %} {% set ecommerceReportText %} - <a href="http://piwik.org/docs/ecommerce-analytics/" rel="noreferrer" target="_blank">{{ 'Goals_EcommerceReports'|translate }}</a> + <a href="https://piwik.org/docs/ecommerce-analytics/" rel="noreferrer" target="_blank">{{ 'Goals_EcommerceReports'|translate }}</a> {% endset %} {{ 'Goals_Optional'|translate }} {{ 'Goals_Ecommerce'|translate }}: {{ 'Goals_YouCanEnableEcommerceReports'|translate(ecommerceReportText,websiteManageText)|raw }} {% endif %} diff --git a/plugins/Goals/templates/addNewGoal.twig b/plugins/Goals/templates/addNewGoal.twig index ae57805f3c..5ce89449d6 100644 --- a/plugins/Goals/templates/addNewGoal.twig +++ b/plugins/Goals/templates/addNewGoal.twig @@ -1,7 +1,7 @@ {% if userCanEditGoals %} {% set addNewGoalIntro %} <p>{{ 'Goals_NewGoalIntro'|translate }}</p> - <p>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}</p> + <p>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}</p> {% endset %} {% include "@Goals/_addEditGoal.twig" %} @@ -14,7 +14,7 @@ {{ 'Goals_NoGoalsNeedAccess'|translate|raw }} </p> <p> - {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} + {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} </p> </div> {{ postEvent("Template.afterGoalCannotAddNewGoal") }} diff --git a/plugins/Installation/templates/finished.twig b/plugins/Installation/templates/finished.twig index 133bdc6ab4..59191eff1e 100644 --- a/plugins/Installation/templates/finished.twig +++ b/plugins/Installation/templates/finished.twig @@ -11,8 +11,8 @@ {{ 'Installation_CollaborativeProject'|translate }} </p> <p> - {{ 'Installation_GetInvolved'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/get-involved/">','</a>')|raw }} - {{ 'General_HelpTranslatePiwik'|translate("<a rel='noreferrer' target='_blank' href=\'http://piwik.org/translations/\'>","<\/a>")|raw }} + {{ 'Installation_GetInvolved'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/get-involved/">','</a>')|raw }} + {{ 'General_HelpTranslatePiwik'|translate("<a rel='noreferrer' target='_blank' href=\'https://piwik.org/translations/\'>","<\/a>")|raw }} </p> <p>{{ 'Installation_WeHopeYouWillEnjoyPiwik'|translate }}</p> <p><i>{{ 'Installation_HappyAnalysing'|translate }}</i></p> diff --git a/plugins/Installation/templates/systemCheck.twig b/plugins/Installation/templates/systemCheck.twig index f73ab100c0..acdb965a81 100644 --- a/plugins/Installation/templates/systemCheck.twig +++ b/plugins/Installation/templates/systemCheck.twig @@ -23,7 +23,7 @@ {% if not showNextStep %} <p> <span class="icon-export"></span> - <a href="?module=Proxy&action=redirect&url=http://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a> + <a href="?module=Proxy&action=redirect&url=https://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a> </p> {% include "@Installation/_systemCheckLegend.twig" %} {% endif %} diff --git a/plugins/Installation/templates/trackingCode.twig b/plugins/Installation/templates/trackingCode.twig index f2555c1c15..f51f74383a 100644 --- a/plugins/Installation/templates/trackingCode.twig +++ b/plugins/Installation/templates/trackingCode.twig @@ -12,10 +12,10 @@ <h3>{{ 'Installation_LargePiwikInstances'|translate }}</h3> <p> - {{ 'Installation_JsTagArchivingHelp1'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/setup-auto-archiving/">','</a>')|raw }} + {{ 'Installation_JsTagArchivingHelp1'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/setup-auto-archiving/">','</a>')|raw }} </p> <p> - {{ 'General_ReadThisToLearnMore'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/optimize/">','</a>')|raw }} + {{ 'General_ReadThisToLearnMore'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/optimize/">','</a>')|raw }} </p> {% endblock %} diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php index 9d75f62c2f..e02573bf12 100644 --- a/plugins/LanguagesManager/API.php +++ b/plugins/LanguagesManager/API.php @@ -21,7 +21,7 @@ use Piwik\Translation\Loader\DevelopmentLoader; * The LanguagesManager API lets you access existing Piwik translations, and change Users languages preferences. * * "getTranslationsForLanguage" will return all translation strings for a given language, - * so you can leverage Piwik translations in your application (and automatically benefit from the <a href='http://piwik.org/translations/' rel='noreferrer' target='_blank'>40+ translations</a>!). + * so you can leverage Piwik translations in your application (and automatically benefit from the <a href='https://piwik.org/translations/' rel='noreferrer' target='_blank'>40+ translations</a>!). * This is mostly useful to developers who integrate Piwik API results in their own application. * * You can also request the default language to load for a user via "getLanguageForUser", diff --git a/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html b/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html index b67dda0e19..f7f87f4479 100644 --- a/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html +++ b/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html @@ -2,7 +2,7 @@ <p> This page helps you to find existing translations that you can reuse in your Plugin. - If you want to know more about translations have a look at our <a href="http://developer.piwik.org/guides/internationalization" rel="noreferrer" target="_blank">Internationalization guide</a>. + If you want to know more about translations have a look at our <a href="https://developer.piwik.org/guides/internationalization" rel="noreferrer" target="_blank">Internationalization guide</a>. Enter a search term to find translations and their corresponding keys: </p> diff --git a/plugins/LanguagesManager/templates/getLanguagesSelector.twig b/plugins/LanguagesManager/templates/getLanguagesSelector.twig index ecd881202b..5265bf24c5 100644 --- a/plugins/LanguagesManager/templates/getLanguagesSelector.twig +++ b/plugins/LanguagesManager/templates/getLanguagesSelector.twig @@ -3,7 +3,7 @@ menu-title="{{ currentLanguageName|e('html_attr') }}" piwik-menudropdown> <a class="item" - href="?module=Proxy&action=redirect&url=http://piwik.org/translations/">{{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a> + href="?module=Proxy&action=redirect&url=https://piwik.org/translations/">{{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a> {% for language in languages %} <a class="item {% if language.code == currentLanguageCode %}active{% endif %}" value="{{ language.code }}" diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig index f21a2477a3..77fe92a742 100644 --- a/plugins/Live/templates/getVisitorProfilePopup.twig +++ b/plugins/Live/templates/getVisitorProfilePopup.twig @@ -8,7 +8,7 @@ tabindex="0"> <div class="visitor-profile-options"> <a href class="visitor-profile-close" title="{{ 'General_Close'|translate }} "></a> - <a href="http://piwik.org/docs/user-profile/" class="visitor-profile-help" rel="noreferrer" + <a href="https://piwik.org/docs/user-profile/" class="visitor-profile-help" rel="noreferrer" target="_blank" title="{{ 'General_ViewDocumentationFor'|translate("Live_VisitorProfile"|translate|ucwords) }}"> </a> diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index 01c115333f..a32eeb5e9a 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -215,7 +215,7 @@ class Controller extends \Piwik\Plugin\Controller protected function getMessageExceptionNoAccess() { - $message = Piwik::translate('Login_InvalidNonceOrHeadersOrReferrer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('http://piwik.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>')); + $message = Piwik::translate('Login_InvalidNonceOrHeadersOrReferrer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('https://piwik.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>')); $message .= $this->getMessageExceptionNoAccessWhenInsecureConnectionMayBeUsed(); @@ -234,7 +234,7 @@ class Controller extends \Piwik\Plugin\Controller if(Url::isSecureConnectionAssumedByPiwikButNotForcedYet()) { $message = '<br/><br/>' . Piwik::translate('Login_InvalidNonceSSLMisconfigured', array( - '<a href="?module=Proxy&action=redirect&url=' . urlencode('<a href="http://piwik.org/faq/how-to/faq_91/">') . '">', + '<a href="?module=Proxy&action=redirect&url=' . urlencode('<a href="https://piwik.org/faq/how-to/faq_91/">') . '">', '</a>', 'config/config.ini.php', '<pre>force_ssl=1</pre>', diff --git a/plugins/Marketplace/templates/overview.twig b/plugins/Marketplace/templates/overview.twig index f158b2522a..4d20b79bd2 100644 --- a/plugins/Marketplace/templates/overview.twig +++ b/plugins/Marketplace/templates/overview.twig @@ -70,7 +70,7 @@ {% include '@Marketplace/plugin-list.twig' %} <div class="footer-message center"> - {{ 'Marketplace_DevelopersLearnHowToDevelopPlugins'|translate('<a href="?module=Proxy&action=redirect&url=http://developer.piwik.org/develop" target="_blank">', '</a>')|raw }} + {{ 'Marketplace_DevelopersLearnHowToDevelopPlugins'|translate('<a href="?module=Proxy&action=redirect&url=https://developer.piwik.org/develop" target="_blank">', '</a>')|raw }} <br /> <br /> <br /> diff --git a/plugins/MobileAppMeasurable/Type.php b/plugins/MobileAppMeasurable/Type.php index 34ff4335b5..2c6de23b66 100644 --- a/plugins/MobileAppMeasurable/Type.php +++ b/plugins/MobileAppMeasurable/Type.php @@ -14,7 +14,7 @@ class Type extends \Piwik\Measurable\Type protected $name = 'MobileAppMeasurable_MobileApp'; protected $namePlural = 'MobileAppMeasurable_MobileApps'; protected $description = 'MobileAppMeasurable_MobileAppDescription'; - protected $howToSetupUrl = 'http://developer.piwik.org/guides/tracking-api-clients#mobile-sdks'; + protected $howToSetupUrl = 'https://developer.piwik.org/guides/tracking-api-clients#mobile-sdks'; } diff --git a/plugins/Morpheus/templates/ajaxMacros.twig b/plugins/Morpheus/templates/ajaxMacros.twig index 2a4584c425..b526ae8b19 100644 --- a/plugins/Morpheus/templates/ajaxMacros.twig +++ b/plugins/Morpheus/templates/ajaxMacros.twig @@ -27,7 +27,7 @@ {{ 'General_NeedMoreHelp'|translate }} <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> – - <a rel="noreferrer" target="_blank" href="http://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> + <a rel="noreferrer" target="_blank" href="https://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> {%- if areAdsForProfessionalServicesEnabled %} – diff --git a/plugins/Morpheus/templates/maintenance.tpl b/plugins/Morpheus/templates/maintenance.tpl index 076b6a069a..2895a3cdb8 100644 --- a/plugins/Morpheus/templates/maintenance.tpl +++ b/plugins/Morpheus/templates/maintenance.tpl @@ -12,7 +12,7 @@ <div class="logo"> <img title="Piwik" alt="Piwik" src="%logoUrl%" /> <br/> - <a href='http://piwik.org/'>%piwikTitle%</a> + <a href='https://piwik.org/'>%piwikTitle%</a> </div> <div class="box"> diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html index a0354621b8..25e57c802e 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html @@ -1,7 +1,7 @@ <div> <h2 piwik-enriched-headline class="card-title" - help-url="http://piwik.org/docs/manage-websites/#all-websites-dashboard" + help-url="https://piwik.org/docs/manage-websites/#all-websites-dashboard" feature-name="{{ 'General_AllWebsitesDashboard'|translate }}"> {{ 'General_AllWebsitesDashboard'|translate }} <span class='smallTitle' @@ -65,7 +65,7 @@ <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> – - <a rel="noreferrer" target="_blank" href="http://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> + <a rel="noreferrer" target="_blank" href="https://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> <span ng-show="areAdsForProfessionalServicesEnabled"> – </span> <a ng-show="areAdsForProfessionalServicesEnabled" rel="noreferrer" target="_blank" href="https://piwik.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Piwik_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>. </div> diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig index 13315dc56c..1d4ed41db2 100644 --- a/plugins/Overlay/templates/index.twig +++ b/plugins/Overlay/templates/index.twig @@ -8,7 +8,7 @@ {% block content %} <div class="overlay-sidebar-container"> - <a id="overlayTitle" href="http://piwik.org/docs/page-overlay/" rel="noreferrer" target="_blank"> + <a id="overlayTitle" href="https://piwik.org/docs/page-overlay/" rel="noreferrer" target="_blank"> {{ 'Overlay_Overlay'|translate }} <span class="icon-info2"></span> </a> @@ -37,7 +37,7 @@ </p> <p> - <a href="http://piwik.org/docs/page-overlay/#toc-page-overlay-troubleshooting" rel="noreferrer" target="_blank"> + <a href="https://piwik.org/docs/page-overlay/#toc-page-overlay-troubleshooting" rel="noreferrer" target="_blank"> {{ 'Overlay_ErrorNotLoadingLink'|translate }} </a> </p> diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig index ab26aa3bef..056ac36065 100644 --- a/plugins/PrivacyManager/templates/privacySettings.twig +++ b/plugins/PrivacyManager/templates/privacySettings.twig @@ -7,10 +7,10 @@ {% if isSuperUser %} <div piwik-content-intro> - <h2 piwik-enriched-headline help-url="http://piwik.org/docs/privacy/">{{ title }}</h2> + <h2 piwik-enriched-headline help-url="https://piwik.org/docs/privacy/">{{ title }}</h2> <p>{{ 'PrivacyManager_Teaser'|translate('<a href="#anonymizeIPAnchor">',"</a>",'<a href="#deleteLogsAnchor">',"</a>",'<a href="#optOutAnchor">',"</a>")|raw }} - {{'PrivacyManager_SeeAlsoOurOfficialGuidePrivacy'|translate('<a href="http://piwik.org/privacy/" rel="noreferrer" target="_blank">','</a>')|raw }}</p> + {{'PrivacyManager_SeeAlsoOurOfficialGuidePrivacy'|translate('<a href="https://piwik.org/privacy/" rel="noreferrer" target="_blank">','</a>')|raw }}</p> </div> <div piwik-content-block @@ -94,7 +94,7 @@ <div class="alert alert-warning" style="width: 50%;"> {{ 'PrivacyManager_DeleteLogDescription2'|translate|raw }} - <a href="http://piwik.org/faq/general/#faq_125" rel="noreferrer" target="_blank"> + <a href="https://piwik.org/faq/general/#faq_125" rel="noreferrer" target="_blank"> {{ 'General_ClickHere'|translate }} </a> </div> diff --git a/plugins/ProfessionalServices/templates/promoBelowEvents.twig b/plugins/ProfessionalServices/templates/promoBelowEvents.twig index 8121d9c1cb..ef7d95bb67 100644 --- a/plugins/ProfessionalServices/templates/promoBelowEvents.twig +++ b/plugins/ProfessionalServices/templates/promoBelowEvents.twig @@ -1,6 +1,6 @@ <p style="margin-top:3em" class=" alert-info alert">Did you know? - <br/>Using Events you can measure any user interaction and gain amazing insights into your audience. <a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/docs/event-tracking/">Learn more</a>. - <br/> To measure blocks of content such as image galleries, listings or ads: use <a target="_blank" href="?module=Proxy&action=redirect&url=http://developer.piwik.org/guides/content-tracking">Content Tracking</a> and see exactly which content is viewed and clicked. + <br/>Using Events you can measure any user interaction and gain amazing insights into your audience. <a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/docs/event-tracking/">Learn more</a>. + <br/> To measure blocks of content such as image galleries, listings or ads: use <a target="_blank" href="?module=Proxy&action=redirect&url=https://developer.piwik.org/guides/content-tracking">Content Tracking</a> and see exactly which content is viewed and clicked. {% if displayMediaAnalyticsAd %} <br/>When you publish videos or audios, <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/media-analytics-website">Media Analytics gives deep insights into your audience</a> and how they watch your videos or listens to your music. {% endif %} diff --git a/plugins/Provider/Reports/GetProvider.php b/plugins/Provider/Reports/GetProvider.php index adf03cd26f..a5ff778f0a 100644 --- a/plugins/Provider/Reports/GetProvider.php +++ b/plugins/Provider/Reports/GetProvider.php @@ -44,7 +44,7 @@ class GetProvider extends Report if (! Common::getRequestVar('disableLink', 0, 'int')) { $message .= ' ' . Piwik::translate( 'General_SeeThisFaq', - array('<a href="http://piwik.org/faq/general/faq_52/" rel="noreferrer" target="_blank">', '</a>') + array('<a href="https://piwik.org/faq/general/faq_52/" rel="noreferrer" target="_blank">', '</a>') ); } $view->config->show_footer_message = $message; diff --git a/plugins/Referrers/Reports/GetCampaigns.php b/plugins/Referrers/Reports/GetCampaigns.php index a1b5f6fd94..36df4fead4 100644 --- a/plugins/Referrers/Reports/GetCampaigns.php +++ b/plugins/Referrers/Reports/GetCampaigns.php @@ -21,7 +21,7 @@ class GetCampaigns extends Base $this->dimension = new Campaign(); $this->name = Piwik::translate('Referrers_Campaigns'); $this->documentation = Piwik::translate('Referrers_CampaignsReportDocumentation', - array('<br />', '<a href="http://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>')); + array('<br />', '<a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>')); $this->actionToLoadSubTables = 'getKeywordsFromCampaignId'; $this->hasGoalMetrics = true; $this->order = 9; diff --git a/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php b/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php index 0a12e87fde..d3f2fd1784 100644 --- a/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php +++ b/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php @@ -20,7 +20,7 @@ class GetKeywordsFromCampaignId extends Base $this->dimension = new Keyword(); $this->name = Piwik::translate('Referrers_Campaigns'); $this->documentation = Piwik::translate('Referrers_CampaignsReportDocumentation', - array('<br />', '<a href="http://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>')); + array('<br />', '<a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>')); $this->isSubtableReport = true; $this->order = 10; } diff --git a/plugins/Referrers/SearchEngine.php b/plugins/Referrers/SearchEngine.php index f8b1f806e0..02e4338d95 100644 --- a/plugins/Referrers/SearchEngine.php +++ b/plugins/Referrers/SearchEngine.php @@ -485,7 +485,7 @@ class SearchEngine extends Singleton public function getBackLinkFromUrlAndKeyword($url, $keyword) { if ($keyword === API::LABEL_KEYWORD_NOT_DEFINED) { - return 'http://piwik.org/faq/general/#faq_144'; + return 'https://piwik.org/faq/general/#faq_144'; } $keyword = urlencode($keyword); $keyword = str_replace(urlencode('+'), urlencode(' '), $keyword); diff --git a/plugins/RssWidget/plugin.json b/plugins/RssWidget/plugin.json index ba44ad733c..a9a6472345 100644 --- a/plugins/RssWidget/plugin.json +++ b/plugins/RssWidget/plugin.json @@ -3,13 +3,13 @@ "description": "Piwik Platform showcase: how to create a new widget that displays a user submitted RSS feed.", "version": "1.0", "keywords": ["example", "feed", "widget"], - "homepage": "http://piwik.org", + "homepage": "https://piwik.org", "license": "GPL v3+", "authors": [ { "name": "Piwik", "email": "hello@piwik.org", - "homepage": "http://piwik.org" + "homepage": "https://piwik.org" } ] }
\ No newline at end of file diff --git a/plugins/ScheduledReports/templates/_listReports.twig b/plugins/ScheduledReports/templates/_listReports.twig index f755f6c0ee..ffbeeeb564 100644 --- a/plugins/ScheduledReports/templates/_listReports.twig +++ b/plugins/ScheduledReports/templates/_listReports.twig @@ -1,7 +1,7 @@ <div id='entityEditContainer' class="entityTableContainer" piwik-content-block content-title="{{ title|e('html_attr') }}" - help-url="http://piwik.org/docs/email-reports/" + help-url="https://piwik.org/docs/email-reports/" feature="true" ng-show="manageScheduledReport.showReportsList"> diff --git a/plugins/SitesManager/templates/_displayJavascriptCode.twig b/plugins/SitesManager/templates/_displayJavascriptCode.twig index a400c316ad..6425e1fc41 100644 --- a/plugins/SitesManager/templates/_displayJavascriptCode.twig +++ b/plugins/SitesManager/templates/_displayJavascriptCode.twig @@ -3,7 +3,7 @@ <div class='trackingHelp'> <p>{{ 'Installation_JSTracking_Intro'|translate }}</p> - <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="http://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}</p> + <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}</p> <h3>{{ 'General_JsTrackingTag'|translate }}</h3> @@ -11,7 +11,7 @@ <pre piwik-select-on-focus>{{ jsTag|raw }}</pre> - <p>{{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/javascript-tracking/">','</a>')|raw }}</p> + <p>{{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/javascript-tracking/">','</a>')|raw }}</p> {% if isInstall is defined %} <p>{{ 'Installation_JSTracking_EndNote'|translate('', '')|raw }}</p> diff --git a/plugins/SitesManager/templates/sites-manager-header.html b/plugins/SitesManager/templates/sites-manager-header.html index 4a7a1c08cb..a677cc1968 100644 --- a/plugins/SitesManager/templates/sites-manager-header.html +++ b/plugins/SitesManager/templates/sites-manager-header.html @@ -2,7 +2,7 @@ <h2 ng-show="availableTypes" piwik-enriched-headline - help-url="http://piwik.org/docs/manage-websites/" + help-url="https://piwik.org/docs/manage-websites/" feature-name="{{ 'SitesManager_WebsitesManagement'|translate }}"> {{ 'SitesManager_XManagement'|translate:(availableTypes.length > 1 ? ('General_Measurables'|translate) : ('SitesManager_Sites'|translate)) }} </h2> diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml index 21672ff427..a0aa7be1ac 100644 --- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml +++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml @@ -210,7 +210,7 @@ <row>Ecommerce enabled</row> </availableValues> <description /> - <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='http://piwik.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://piwik.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> <templateFile /> <introduction /> <condition /> diff --git a/plugins/TestRunner/Commands/SyncScreenshots.php b/plugins/TestRunner/Commands/SyncScreenshots.php index b0f7616598..1ce6fa4828 100644 --- a/plugins/TestRunner/Commands/SyncScreenshots.php +++ b/plugins/TestRunner/Commands/SyncScreenshots.php @@ -79,7 +79,7 @@ class SyncScreenshots extends ConsoleCommand private function getScreenshotList($repository, $buildNumber, $httpUser = null, $httpPassword = null) { - $url = sprintf('http://builds-artifacts.piwik.org/api/%s/%s', $repository, $buildNumber); + $url = sprintf('https://builds-artifacts.piwik.org/api/%s/%s', $repository, $buildNumber); $this->logger->debug('Fetching {url}', array('url' => $url)); @@ -110,7 +110,7 @@ class SyncScreenshots extends ConsoleCommand private function downloadScreenshot($url, $repository, $screenshot, $httpUser, $httpPassword) { $downloadTo = $this->getDownloadToPath($repository) . $screenshot; - $url = 'http://builds-artifacts.piwik.org' . $url; + $url = 'https://builds-artifacts.piwik.org' . $url; $this->logger->debug("Downloading {url} to {destination}", array('url' => $url, 'destination' => $downloadTo)); diff --git a/plugins/Transitions/javascripts/transitions.js b/plugins/Transitions/javascripts/transitions.js index a8fb05a363..f26470e0b3 100644 --- a/plugins/Transitions/javascripts/transitions.js +++ b/plugins/Transitions/javascripts/transitions.js @@ -188,7 +188,7 @@ Piwik_Transitions.prototype.showPopover = function () { var self = this; this.popover = Piwik_Popover.showLoading('Transitions', self.actionName, 550); - Piwik_Popover.addHelpButton('http://piwik.org/docs/transitions'); + Piwik_Popover.addHelpButton('https://piwik.org/docs/transitions'); var bothLoaded = function () { Piwik_Popover.setContent(Piwik_Transitions.popoverHtml); diff --git a/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php b/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php index c01660bbc0..432d57d444 100644 --- a/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php +++ b/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php @@ -50,12 +50,12 @@ class GeolocationDiagnostic implements Diagnostic if ($isProviderInstalled) { $comment = $this->translator->translate('UserCountry_GeoIpLocationProviderNotRecomnended') . ' '; $comment .= $this->translator->translate('UserCountry_GeoIpLocationProviderDesc_ServerBased2', array( - '<a href="http://piwik.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>' + '<a href="https://piwik.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>' )); } else { $comment = $this->translator->translate('UserCountry_DefaultLocationProviderDesc1') . ' '; $comment .= $this->translator->translate('UserCountry_DefaultLocationProviderDesc2', array( - '<a href="http://piwik.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>' + '<a href="https://piwik.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>' )); } diff --git a/plugins/UserCountry/LocationProvider/DefaultProvider.php b/plugins/UserCountry/LocationProvider/DefaultProvider.php index 665f7c0e17..6a0cf82f17 100755 --- a/plugins/UserCountry/LocationProvider/DefaultProvider.php +++ b/plugins/UserCountry/LocationProvider/DefaultProvider.php @@ -104,7 +104,7 @@ class DefaultProvider extends LocationProvider $desc = Piwik::translate('UserCountry_DefaultLocationProviderDesc1') . ' ' . Piwik::translate('UserCountry_DefaultLocationProviderDesc2', array('<strong>', '', '', '</strong>')) - . '<p><a href="http://piwik.org/faq/how-to/#faq_163" rel="noreferrer" target="_blank">' + . '<p><a href="https://piwik.org/faq/how-to/#faq_163" rel="noreferrer" target="_blank">' . Piwik::translate('UserCountry_HowToInstallGeoIPDatabases') . '</a></p>'; return array('id' => self::ID, 'title' => self::TITLE, 'description' => $desc, 'order' => 1); diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php index a462bd2419..965740824f 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php @@ -217,7 +217,7 @@ class Pecl extends GeoIp { $desc = Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Pecl1') . '<br/><br/>' . Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Pecl2'); - $installDocs = '<a rel="noreferrer" target="_blank" href="http://piwik.org/faq/how-to/#faq_164">' + $installDocs = '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_164">' . Piwik::translate('UserCountry_HowToInstallGeoIpPecl') . '</a>'; diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Php.php b/plugins/UserCountry/LocationProvider/GeoIp/Php.php index 02399ecf8f..35c505f7b9 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Php.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Php.php @@ -324,7 +324,7 @@ class Php extends GeoIp $desc = Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Php1') . '<br/><br/>' . Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Php2', array('<strong>', '</strong>', '<strong>', '</strong>')); - $installDocs = '<a rel="noreferrer" target="_blank" href="http://piwik.org/faq/how-to/#faq_163">' + $installDocs = '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_163">' . Piwik::translate('UserCountry_HowToInstallGeoIPDatabases') . '</a>'; diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php index 71199f2f0b..fe27a5dd2e 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php @@ -223,10 +223,10 @@ class ServerBased extends GeoIp . Piwik::translate('UserCountry_GeoIpLocationProviderDesc_ServerBased2', array('<strong>', '</strong>', '<strong>', '</strong>')); $installDocs = - '<a rel="noreferrer" target="_blank" href="http://piwik.org/faq/how-to/#faq_165">' + '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_165">' . Piwik::translate('UserCountry_HowToInstallApacheModule') . '</a><br/>' - . '<a rel="noreferrer" target="_blank" href="http://piwik.org/faq/how-to/#faq_166">' + . '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_166">' . Piwik::translate('UserCountry_HowToInstallNginxModule') . '</a>'; diff --git a/plugins/UserCountry/Reports/Base.php b/plugins/UserCountry/Reports/Base.php index c24ec82d24..a1ec96e427 100644 --- a/plugins/UserCountry/Reports/Base.php +++ b/plugins/UserCountry/Reports/Base.php @@ -54,7 +54,7 @@ abstract class Base extends \Piwik\Plugin\Report '</a>')); } else { $footerMessage .= ' ' . Piwik::translate('UserCountry_ToGeolocateOldVisits', - array('<a rel="noreferrer" target="_blank" href="http://piwik.org/faq/how-to/#faq_167">', '</a>')); + array('<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_167">', '</a>')); } $view->config->show_footer_message = $footerMessage; diff --git a/plugins/UserCountry/Reports/GetCountry.php b/plugins/UserCountry/Reports/GetCountry.php index 5b038f7e49..9e5c7faae1 100644 --- a/plugins/UserCountry/Reports/GetCountry.php +++ b/plugins/UserCountry/Reports/GetCountry.php @@ -39,7 +39,7 @@ class GetCountry extends Base // if we're using the default location provider, add a note explaining how it works $footerMessage = Piwik::translate("General_Note") . ': ' . Piwik::translate('UserCountry_DefaultLocationProviderExplanation', - array('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/geo-locate/">', '</a>')); + array('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/geo-locate/">', '</a>')); $view->config->show_footer_message = $footerMessage; } diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig index 7fec097d1d..0e45d899f6 100755 --- a/plugins/UserCountry/templates/adminIndex.twig +++ b/plugins/UserCountry/templates/adminIndex.twig @@ -7,7 +7,7 @@ <div piwik-content-intro> <h2 piwik-enriched-headline - help-url="http://piwik.org/docs/geo-locate/" + help-url="https://piwik.org/docs/geo-locate/" id="location-providers">{{ title }}</h2> <p>{{ 'UserCountry_GeolocationPageDesc'|translate }}</p> </div> diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig index 23a8001047..2217ce28ae 100644 --- a/plugins/UsersManager/templates/userSettings.twig +++ b/plugins/UsersManager/templates/userSettings.twig @@ -35,7 +35,7 @@ </div> <div id="languageHelp" class="inline-help-node"> - <a href="?module=Proxy&action=redirect&url=http://piwik.org/translations/" target="_blank"> + <a href="?module=Proxy&action=redirect&url=https://piwik.org/translations/" target="_blank"> {{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a> </div> diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php index db0a52ce86..76606885db 100644 --- a/plugins/VisitsSummary/API.php +++ b/plugins/VisitsSummary/API.php @@ -146,7 +146,7 @@ class API extends \Piwik\Plugin\API if (!SettingsPiwik::isUniqueVisitorsEnabled($period)) { throw new \Exception( "The metric " . $metric . " is not enabled for the requested period. " . - "Please see this FAQ: http://piwik.org/faq/how-to/faq_113/" + "Please see this FAQ: https://piwik.org/faq/how-to/faq_113/" ); } } diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index ca141b7ed8..fc15828149 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -77,7 +77,7 @@ class Controller extends \Piwik\Plugin\Controller . $this->translator->translate('General_ColumnNbActionsDocumentation') . '<br />' . '<b>' . $this->translator->translate('General_ColumnNbUsers') . ':</b> ' - . $this->translator->translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/user-id/">User ID</a>)<br />' + . $this->translator->translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/user-id/">User ID</a>)<br />' . '<b>' . $this->translator->translate('General_ColumnActionsPerVisit') . ':</b> ' . $this->translator->translate('General_ColumnActionsPerVisitDocumentation'); diff --git a/plugins/WebsiteMeasurable/MeasurableSettings.php b/plugins/WebsiteMeasurable/MeasurableSettings.php index 3d141b5301..a0e696a842 100644 --- a/plugins/WebsiteMeasurable/MeasurableSettings.php +++ b/plugins/WebsiteMeasurable/MeasurableSettings.php @@ -334,7 +334,7 @@ class MeasurableSettings extends \Piwik\Settings\Measurable\MeasurableSettings $field->inlineHelp = Piwik::translate('SitesManager_EcommerceHelp') . '<br />' . Piwik::translate('SitesManager_PiwikOffersEcommerceAnalytics', - array("<a href='http://piwik.org/docs/ecommerce-analytics/' target='_blank'>", '</a>')); + array("<a href='https://piwik.org/docs/ecommerce-analytics/' target='_blank'>", '</a>')); $field->uiControl = FieldConfig::UI_CONTROL_SINGLE_SELECT; $field->availableValues = array( 0 => Piwik::translate('SitesManager_NotAnEcommerceSite'), diff --git a/tests/PHPUnit/Integration/CronArchiveTest.php b/tests/PHPUnit/Integration/CronArchiveTest.php index e8cfbc45fe..e8ab6d3bbe 100644 --- a/tests/PHPUnit/Integration/CronArchiveTest.php +++ b/tests/PHPUnit/Integration/CronArchiveTest.php @@ -91,7 +91,7 @@ Running Piwik %s as Super User --------------------------- NOTES - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. - See the doc at: http://piwik.org/docs/setup-auto-archiving/ + See the doc at: https://piwik.org/docs/setup-auto-archiving/ - Reports for today will be processed at most every %s seconds. You can change this value in Piwik UI > Settings > General Settings. - Reports for the current week/month/year will be requested at most every %s seconds. - Will process all 1 websites diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml index 8c48d07315..fa92d64f22 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml @@ -20,7 +20,7 @@ <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> </availableValues> <description /> - <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> <templateFile /> <introduction>Release channel</introduction> <condition /> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml index 8c48d07315..fa92d64f22 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml @@ -20,7 +20,7 @@ <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> </availableValues> <description /> - <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> <templateFile /> <introduction>Release channel</introduction> <condition /> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml index 6b0247d330..32180cf068 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml @@ -9,7 +9,7 @@ <module>Actions</module> <action>getSiteSearchKeywords</action> <dimension>Keyword</dimension> - <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="http://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation> + <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation> <metrics> <nb_visits>Searches</nb_visits> <nb_pages_per_search>Search Results pages</nb_pages_per_search> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml index b6b731c93f..cc68783ae4 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml @@ -9,7 +9,7 @@ <module>Actions</module> <action>getSiteSearchKeywords</action> <dimension>Keyword</dimension> - <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="http://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation> + <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation> <metrics> <nb_visits>Searches</nb_visits> <nb_pages_per_search>Search Results pages</nb_pages_per_search> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml index b4bf45b285..7cdae8f702 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml @@ -9,7 +9,7 @@ <module>CustomVariables</module> <action>getCustomVariables</action> <dimension>Custom Variable name</dimension> - <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="http://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation> + <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml index 90304482e5..2592d92de7 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml @@ -9,7 +9,7 @@ <module>CustomVariables</module> <action>getCustomVariables</action> <dimension>Custom Variable name</dimension> - <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="http://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation> + <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_actions>Actions</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml index e8e63ff5b6..dc37118e2b 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <error message="The metric nb_users is not enabled for the requested period. Please see this FAQ: http://piwik.org/faq/how-to/faq_113/ + <error message="The metric nb_users is not enabled for the requested period. Please see this FAQ: https://piwik.org/faq/how-to/faq_113/ --> To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" /> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index e64de1c114..60e6c15993 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -213,7 +213,7 @@ <row>Ecommerce enabled</row> </availableValues> <description /> - <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='http://piwik.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://piwik.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> <templateFile /> <introduction /> <condition /> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml index 1622d19eba..896ea015bc 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml @@ -18,7 +18,7 @@ </row> <row> <name>Campaigns (Referrers)</name> - <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="http://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a></documentation> + <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a></documentation> </row> <row> <name>City (Visitors)</name> @@ -38,7 +38,7 @@ </row> <row> <name>Custom Variables (Visitors)</name> - <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="http://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation> + <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation> </row> <row> <name>Downloads (Actions)</name> @@ -114,7 +114,7 @@ </row> <row> <name>Site Search Keywords (Actions)</name> - <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="http://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation> + <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation> </row> <row> <name>Social Networks (Referrers)</name> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index fe04019899..998faacdb8 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -135,7 +135,7 @@ <module>CustomVariables</module> <action>getCustomVariables</action> <dimension>Custom Variable name</dimension> - <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="http://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation> + <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -1309,7 +1309,7 @@ <module>Actions</module> <action>getSiteSearchKeywords</action> <dimension>Keyword</dimension> - <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="http://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation> + <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation> <metrics> <nb_visits>Searches</nb_visits> <nb_pages_per_search>Search Results pages</nb_pages_per_search> @@ -1843,7 +1843,7 @@ <module>Referrers</module> <action>getCampaigns</action> <dimension>Campaign</dimension> - <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="http://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a></documentation> + <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a></documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml index 8c48d07315..fa92d64f22 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml @@ -20,7 +20,7 @@ <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> </availableValues> <description /> - <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> <templateFile /> <introduction>Release channel</introduction> <condition /> diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml index 8c48d07315..fa92d64f22 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml @@ -20,7 +20,7 @@ <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> </availableValues> <description /> - <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> <templateFile /> <introduction>Release channel</introduction> <condition /> diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml index 394b8fbe22..2e710b0d90 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml @@ -8,7 +8,7 @@ <module>CustomVariables</module> <action>getCustomVariablesValuesFromNameId</action> <dimension>Custom Variable value</dimension> - <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="http://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation> + <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation> <isSubtableReport>1</isSubtableReport> <metrics> <nb_visits>Visits</nb_visits> diff --git a/tests/README.md b/tests/README.md index ea10ef1a05..0f71ec8ce2 100644 --- a/tests/README.md +++ b/tests/README.md @@ -7,7 +7,7 @@ We use Travis CI for our continuous integration server. It automatically runs ou after each commit to our GIT repo. More information at the links: * Piwik on Travis CI: https://travis-ci.org/piwik/piwik - * QA in Piwik: http://piwik.org/qa/ + * QA in Piwik: https://piwik.org/qa/ Each core Piwik developer is responsible to keep the build green. If a developer breaks the build, he will receive an email from Travis CI. @@ -147,7 +147,7 @@ See [tests/README.screenshots.md](https://github.com/piwik/piwik/blob/master/tes ### Download build artifacts for any recent commit -You can retrieve the files generated during the build (the build artifacts) at [builds-artifacts.piwik.org](http://builds-artifacts.piwik.org/) +You can retrieve the files generated during the build (the build artifacts) at [builds-artifacts.piwik.org](https://builds-artifacts.piwik.org/) ### Test logs on CI @@ -157,7 +157,7 @@ Note: `DEBUG` and `VERBOSE` messages are not logged by default (to keep Travis p ### Screenshot tests build artifacts -The screenshot tests generated by the continuous integration server are uploaded in [builds-artifacts.piwik.org/ui-tests.master/](http://builds-artifacts.piwik.org/ui-tests.master/?C=M;O=D) +The screenshot tests generated by the continuous integration server are uploaded in [builds-artifacts.piwik.org/ui-tests.master/](https://builds-artifacts.piwik.org/ui-tests.master/?C=M;O=D) ## Troubleshooting @@ -183,6 +183,6 @@ See [tests/README.xhprof.md](https://github.com/piwik/piwik/blob/master/tests/RE ## Participate You can help by improving existing tests, or identify some missing tests and implement them. -See http://piwik.org/participate/development-process +See https://piwik.org/participate/development-process Please contact us at hello@piwik.org diff --git a/tests/README.screenshots.md b/tests/README.screenshots.md index 13c0fff01c..2a914c5f64 100644 --- a/tests/README.screenshots.md +++ b/tests/README.screenshots.md @@ -25,7 +25,7 @@ To fix a broken build, follow these steps: * In the build output, at the beginning of the test output, there will be a link to a image diff viewer. It will look something like this: - View UI failures (if any) here http://builds-artifacts.piwik.org/ui-tests.master/1837.1/screenshot-diffs/diffviewer.html + View UI failures (if any) here https://builds-artifacts.piwik.org/ui-tests.master/1837.1/screenshot-diffs/diffviewer.html Click on the link in the message. * The diff viewer will list links to the generated screenshots for failed tests as well as the expected screenshots and image diffs. diff --git a/tests/README.troubleshooting.md b/tests/README.troubleshooting.md index 8e38380634..af945516a4 100644 --- a/tests/README.troubleshooting.md +++ b/tests/README.troubleshooting.md @@ -2,7 +2,7 @@ If you have problems with running Piwik tests see below. -If you cannot solve your issues please [ask in the forums](http://forum.piwik.org/list.php?9) +If you cannot solve your issues please [ask in the forums](https://forum.piwik.org/list.php?9) ## Important note for Linux users: fix for slow tests diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index e7230a00f6..5d122c2ce6 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a4e2a13bbbd3240afea8b55992821acd6ed7a82b7d0e3f837f1766e0773ab13 -size 3656564 +oid sha256:52a16a21658c45a4274e1e37a491531597fefc39c9bc8d10c9e8ad350a45a74f +size 3656163 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index 8636a11726..84a1b3e615 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05739f4983fadd53b2ef2ccb19fd63ac926a797dbba00a0c1ea4947adcdfcbdd -size 998448 +oid sha256:6b1dc2b9914e917566893a0238d88c4e502a8c7fbd97418e0d4adc863baf7223 +size 994627 |
