Skip to content

Commit c1422b5

Browse files
Findus23sgiehl
Findus23
authored and
sgiehl
committed
Even more HTTPS links (matomo-org#12161)
* http://piwik.org -> https://piwik.org * more HTTPS URLs * some more HTTPS URLs * test README * don't show "Plugin Hompage" for Piwik plugins * fix tests * compile minified js (hope I didn't break anything) * some more small changes * fix UI test * comment length in piwik.js changed due to https links * fix test * update ui file * update submodule
1 parent 3a2bc01 commit c1422b5

106 files changed

Lines changed: 174 additions & 173 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Piwik",
33
"main": "piwik.js",
4-
"homepage": "http://piwik.org",
4+
"homepage": "https://piwik.org",
55
"authors": [
66
"Piwik.org <[email protected]>"
77
],

‎core/API/DataTableManipulator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private function getApiMethodForSubtable($request)
170170

171171
if (empty($meta)) {
172172
throw new Exception(sprintf(
173-
"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",
173+
"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",
174174
$this->apiModule, $this->apiMethod
175175
));
176176
}

‎core/CronArchive.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,7 @@ private function logArchiveTimeoutInfo()
12751275
// Recommend to disable browser archiving when using this script
12761276
if (Rules::isBrowserTriggerEnabled()) {
12771277
$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.");
1278-
$this->logger->info(" See the doc at: http://piwik.org/docs/setup-auto-archiving/");
1278+
$this->logger->info(" See the doc at: https://piwik.org/docs/setup-auto-archiving/");
12791279
}
12801280
$this->logger->info("- Reports for today will be processed at most every " . $this->todayArchiveTimeToLive
12811281
. " seconds. You can change this value in Piwik UI > Settings > General Settings.");

‎core/ErrorHandler.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public static function errorHandler($errno, $errstr, $errfile, $errline)
108108
private static function createLogMessage($errno, $errstr, $errfile, $errline)
109109
{
110110
return sprintf(
111-
"%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)",
111+
"%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)",
112112
$errfile,
113113
$errline,
114114
ErrorHandler::getErrNoString($errno),
@@ -123,7 +123,7 @@ private static function getHtmlMessage($errno, $errstr, $errfile, $errline, $tra
123123
$message = ErrorHandler::getErrNoString($errno) . ' - ' . $errstr;
124124

125125
$html = "<p>There is an error. Please report the message (Piwik " . (class_exists('Piwik\Version') ? Version::VERSION : '') . ")
126-
and full backtrace in the <a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Fmodule%3DProxy%26amp%3Baction%3Dredirect%26amp%3Burl%3D%3Cspan+class%3D"x x-first x-last">http://forum.piwik.org' target='_blank'>Piwik forums</a> (please do a search first as it might have been reported already!).</p>";
126+
and full backtrace in the <a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Fmodule%3DProxy%26amp%3Baction%3Dredirect%26amp%3Burl%3D%3Cspan+class%3D"x x-first x-last">https://forum.piwik.org' target='_blank'>Piwik forums</a> (please do a search first as it might have been reported already!).</p>";
127127
$html .= "<p><strong>{$message}</strong> in <em>{$errfile}</em>";
128128
$html .= " on line {$errline}</p>";
129129
$html .= "Backtrace:<pre>";

‎core/Filechecks.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public static function dieIfDirectoriesNotWritable($directoriesToCheck = null)
9494
. "<blockquote>$directoryList</blockquote>"
9595
. "<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>"
9696
. "<p>After applying the modifications, you can <a href='index.php'>refresh the page</a>.</p>"
97-
. "<p>If you need more help, try <a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Fmodule%3DProxy%26amp%3Baction%3Dredirect%26amp%3Burl%3D%3Cspan+class%3D"x x-first x-last">http://piwik.org'>Piwik.org</a>.</p>";
97+
. "<p>If you need more help, try <a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Fmodule%3DProxy%26amp%3Baction%3Dredirect%26amp%3Burl%3D%3Cspan+class%3D"x x-first x-last">https://piwik.org'>Piwik.org</a>.</p>";
9898

9999
$ex = new MissingFilePermissionException($directoryMessage);
100100
$ex->setIsHtmlMessage();

‎core/Plugin/MetadataLoader.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ private function getDefaultPluginInformation()
8282
$descriptionKey = $this->pluginName . '_PluginDescription';
8383
return array(
8484
'description' => $descriptionKey,
85-
'homepage' => 'http://piwik.org/',
86-
'authors' => array(array('name' => 'Piwik', 'homepage' => 'http://piwik.org/')),
85+
'homepage' => 'https://piwik.org/',
86+
'authors' => array(array('name' => 'Piwik', 'homepage' => 'https://piwik.org/')),
8787
'license' => 'GPL v3+',
8888
'version' => Version::VERSION,
8989
'theme' => false,

‎core/Session.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public static function start($options = false)
121121
$enableDbSessions = '';
122122
if (DbHelper::isInstalled()) {
123123
$enableDbSessions = "<br/>If you still experience issues after trying these changes,
124-
we recommend that you <a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"x x-first x-last">http://piwik.org/faq/how-to-install/#faq_133' rel='noreferrer' target='_blank'>enable database session storage</a>.";
124+
we recommend that you <a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%3Cspan+class%3D"x x-first x-last">https://piwik.org/faq/how-to-install/#faq_133' rel='noreferrer' target='_blank'>enable database session storage</a>.";
125125
}
126126

127127
$pathToSessions = Filechecks::getErrorMessageMissingPermissions(self::getSessionsDirectory());

‎js/piwik.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
*
44
* JavaScript tracking client
55
*
6-
* @link http://piwik.org
6+
* @link https://piwik.org
77
* @source https://github.com/piwik/piwik/blob/master/js/piwik.js
8-
* @license http://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt)
8+
* @license https://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt)
99
* @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause
1010
*/
1111
// 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') {
12351235
if (context[f]) {
12361236
context[f].apply(context, parameterArray);
12371237
} else {
1238-
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';
1238+
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';
12391239
logConsoleError(message);
12401240

12411241
if (!isPluginTrackerCall) {
@@ -7077,7 +7077,7 @@ if (typeof window.Piwik !== 'object') {
70777077
delete paq[iterator];
70787078

70797079
if (appliedMethods[methodName] > 1) {
7080-
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');
7080+
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');
70817081
}
70827082

70837083
appliedMethods[methodName]++;

0 commit comments

Comments
 (0)