From 6aba44f0b64c510a7e9308c8a07aa17849266e16 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Mon, 24 Feb 2025 22:00:33 +0100 Subject: [PATCH 1/4] Use https URLs --- CHANGELOG.md | 2 +- core/API/Request.php | 2 +- core/Application/Environment.php | 2 +- core/CliMulti.php | 2 +- core/Common.php | 4 +-- core/Console.php | 2 +- core/Container/ContainerFactory.php | 2 +- core/Cookie.php | 2 +- core/DataTable.php | 4 +-- .../Filter/ColumnCallbackAddColumn.php | 2 +- .../Filter/ColumnCallbackAddMetadata.php | 2 +- .../Filter/ColumnCallbackDeleteRow.php | 2 +- .../Filter/ColumnCallbackReplace.php | 2 +- core/DataTable/Filter/GroupBy.php | 2 +- .../Filter/MetadataCallbackReplace.php | 2 +- core/DataTable/Filter/SafeDecodeLabel.php | 2 +- core/DataTable/Filter/Sort.php | 4 +-- core/DataTable/Filter/Truncate.php | 2 +- core/Date.php | 4 +-- core/Db.php | 4 +-- core/Db/Adapter/Mysqli.php | 2 +- core/Db/Adapter/Pdo/Mysql.php | 6 ++-- core/Db/BatchInsert.php | 2 +- core/Filesystem.php | 6 ++-- core/Http.php | 2 +- core/Intl/Data/Resources/currencies.php | 2 +- core/Nonce.php | 2 +- core/NumberFormatter.php | 2 +- core/Plugin.php | 2 +- core/ProxyHttp.php | 2 +- core/QuickForm2.php | 2 +- core/Scheduler/Schedule/Schedule.php | 4 +-- core/SettingsPiwik.php | 4 +-- core/SettingsServer.php | 2 +- core/Tracker/Db/Pdo/Mysql.php | 2 +- core/Tracker/GoalManager.php | 2 +- core/Tracker/PageUrl.php | 4 +-- core/Tracker/TrackerCodeGenerator.php | 2 +- core/Tracker/VisitorRecognizer.php | 4 +-- core/UpdateCheck.php | 2 +- core/UpdateCheck/ReleaseChannel.php | 2 +- core/Updates/0.9.1.php | 2 +- core/Updates/2.0-a13.php | 2 +- core/Url.php | 28 +++++++++---------- core/UrlHelper.php | 10 +++---- core/View.php | 2 +- misc/cron/archive.php | 4 +-- misc/cron/archive.sh | 4 +-- .../uninstall-delete-matomo-directory.php | 6 ++-- piwik.php | 2 +- plugins/API/API.php | 4 +-- plugins/Actions/API.php | 2 +- plugins/Actions/ArchivingHelper.php | 10 +++---- plugins/Actions/Columns/ActionType.php | 2 +- plugins/Contents/Reports/GetContentNames.php | 2 +- plugins/Contents/Reports/GetContentPieces.php | 2 +- plugins/CoreHome/javascripts/uiControl.js | 2 +- .../src/EnrichedHeadline/EnrichedHeadline.vue | 2 +- plugins/CoreHome/vue/src/Periods/utilities.ts | 2 +- .../JqplotDataGenerator/Chart.php | 4 +-- .../CustomDimensions/Dimension/Extraction.php | 2 +- .../CustomDimensions/GetCustomDimension.php | 2 +- plugins/CustomDimensions/Menu.php | 2 +- plugins/DBStats/API.php | 2 +- plugins/DBStats/MySQLMetadataProvider.php | 14 +++++----- plugins/Dashboard/API.php | 2 +- plugins/Diagnostics/Menu.php | 2 +- plugins/Events/API.php | 2 +- .../ExampleCommand/Commands/HelloWorld.php | 2 +- plugins/ExamplePlugin/Controller.php | 6 ++-- plugins/ExamplePlugin/Menu.php | 2 +- .../RecordBuilders/ExampleBlob.php | 2 +- .../RecordBuilders/ExampleMetric.php | 2 +- .../RecordBuilders/ExampleMetric2.php | 2 +- .../ExamplePlugin/Widgets/MyExampleWidget.php | 2 +- .../Reports/GetExampleReport.php | 2 +- .../Columns/ExampleActionDimension.php | 2 +- .../Columns/ExampleConversionDimension.php | 2 +- .../Columns/ExampleDimension.php | 2 +- .../Columns/ExampleVisitDimension.php | 2 +- plugins/ExampleUI/Reports/GetPlanetRatios.php | 2 +- .../Reports/GetPlanetRatiosWithLogos.php | 2 +- plugins/ExampleUI/Reports/GetTemperatures.php | 2 +- .../Reports/GetTemperaturesEvolution.php | 2 +- plugins/GeoIp2/data/regionMapping.php | 2 +- plugins/Goals/API.php | 4 +-- plugins/Live/API.php | 6 ++-- plugins/Marketplace/Api/Service.php | 2 +- .../Emails/RequestTrialNotificationEmail.php | 2 +- .../Marketplace/PluginTrial/Notification.php | 2 +- plugins/Marketplace/PluginTrial/Request.php | 2 +- plugins/Marketplace/PluginTrial/Service.php | 2 +- plugins/Marketplace/PluginTrial/Storage.php | 2 +- .../PluginTrial/NotificationTest.php | 2 +- .../Integration/PluginTrial/RequestTest.php | 2 +- .../Integration/PluginTrial/ServiceTest.php | 2 +- .../Integration/PluginTrial/StorageTest.php | 2 +- .../tests/UI/Marketplace_RequestTrial_spec.js | 2 +- .../vue/src/RequestTrial/RequestTrial.vue | 2 +- .../JqplotDataGenerator/Chart.php | 4 +-- plugins/Referrers/SearchEngine.php | 4 +-- plugins/ScheduledReports/API.php | 2 +- plugins/ScheduledReports/ScheduledReports.php | 2 +- plugins/SitesManager/API.php | 4 +-- plugins/UserId/tests/UI/UserId_spec.js | 2 +- plugins/UsersManager/API.php | 2 +- plugins/UsersManager/Model.php | 2 +- 107 files changed, 161 insertions(+), 161 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61bacb9c819..63b344a9f83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -886,7 +886,7 @@ The folder containing expected screenshots was renamed from `expected-ui-screens ## Piwik 2.16.2 ### New APIs - * Multiple JavaScript trackers can now be created easily via `_paq.push(['addTracker', piwikUrl, piwikSiteId])`. All tracking requests will be then sent to all added Piwik trackers. [Learn more.](http://developer.matomo.org/guides/tracking-javascript-guide#multiple-piwik-trackers) + * Multiple JavaScript trackers can now be created easily via `_paq.push(['addTracker', piwikUrl, piwikSiteId])`. All tracking requests will be then sent to all added Piwik trackers. [Learn more.](https://developer.matomo.org/guides/tracking-javascript-guide#multiple-piwik-trackers) * It is possible to get an asynchronously created tracker instance (`addTracker`) via the method `Piwik.getAsyncTracker(optionalPiwikUrl, optionalPiwikSiteId)`. This allows you to get the tracker instance and to send different tracking requests to this Piwik instance and to configure it differently than other tracker instances. * Added a new API method `Goals.getGoal($idSite, $idGoal)` to fetch a single goal. diff --git a/core/API/Request.php b/core/API/Request.php index 34d70f82fa3..5b82a34db54 100644 --- a/core/API/Request.php +++ b/core/API/Request.php @@ -71,7 +71,7 @@ * )); * echo "This DataTable has " . $dataTable->getRowsCount() . " rows."; * - * @see http://piwik.org/docs/analytics-api + * @see https://piwik.org/docs/analytics-api * @api */ class Request diff --git a/core/Application/Environment.php b/core/Application/Environment.php index 6ca75dd3817..728f22f806f 100644 --- a/core/Application/Environment.php +++ b/core/Application/Environment.php @@ -125,7 +125,7 @@ public function getContainer() } /** - * @link http://php-di.org/doc/container-configuration.html + * @link https://php-di.org/doc/container-configuration.html */ private function createContainer() { diff --git a/core/CliMulti.php b/core/CliMulti.php index 67c3c02449f..d8aed65edd6 100644 --- a/core/CliMulti.php +++ b/core/CliMulti.php @@ -109,7 +109,7 @@ public function __construct(?LoggerInterface $logger = null) * * @param string[] $piwikUrls An array of urls, for instance: * - * `array('http://www.example.com/piwik?module=API...')` + * `array('https://www.example.com/matomo?module=API...')` * * **Make sure query parameter values are properly encoded in the URLs.** * diff --git a/core/Common.php b/core/Common.php index f5afbad02f4..20ea64915a9 100644 --- a/core/Common.php +++ b/core/Common.php @@ -337,7 +337,7 @@ public static function safe_unserialize($string, $allowedClasses = [], $rethrow * * **Implementation Details** * - * - [htmlspecialchars](http://php.net/manual/en/function.htmlspecialchars.php) is used to escape text. + * - [htmlspecialchars](https://php.net/manual/en/function.htmlspecialchars.php) is used to escape text. * - Single quotes are not escaped so **Piwik's amazing community** will still be * **Piwik's amazing community**. * - Use of the `magic_quotes` setting will not break this method. @@ -678,7 +678,7 @@ public static function getRandomString($length = 16, $alphabet = "abcdefghijklmn * Convert hexadecimal representation into binary data. * !! Will emit warning if input string is not hex!! * - * @see http://php.net/bin2hex + * @see https://php.net/bin2hex * * @param string $str Hexadecimal representation * @return string diff --git a/core/Console.php b/core/Console.php index 1afb10d6d6c..0fa3e0b2b8f 100644 --- a/core/Console.php +++ b/core/Console.php @@ -277,7 +277,7 @@ protected function initEnvironment(OutputInterface $output) * Register the console output into the logger. * * Ideally, this should be done automatically with events: - * @see http://symfony.com/fr/doc/current/components/console/events.html + * @see https://symfony.com/fr/doc/current/components/console/events.html * @see Symfony\Bridge\Monolog\Handler\ConsoleHandler::onCommand() * But it would require to install Symfony's Event Dispatcher. */ diff --git a/core/Container/ContainerFactory.php b/core/Container/ContainerFactory.php index a1b355361e5..63eab87e0fc 100644 --- a/core/Container/ContainerFactory.php +++ b/core/Container/ContainerFactory.php @@ -56,7 +56,7 @@ public function __construct(PluginList $pluginList, GlobalSettingsProvider $sett } /** - * @link http://php-di.org/doc/container-configuration.html + * @link https://php-di.org/doc/container-configuration.html * @throws \Exception * @return Container */ diff --git a/core/Cookie.php b/core/Cookie.php index a8d2debcd21..7920fdb597a 100644 --- a/core/Cookie.php +++ b/core/Cookie.php @@ -125,7 +125,7 @@ protected function getDefaultExpire() * setcookie() replacement -- we don't use the built-in function because * it is buggy for some PHP versions. * - * @link http://php.net/setcookie + * @link https://php.net/setcookie * * @param string $Name Name of cookie * @param string $Value Value of cookie diff --git a/core/DataTable.php b/core/DataTable.php index 07d2549e0df..d3d39bb11bf 100644 --- a/core/DataTable.php +++ b/core/DataTable.php @@ -85,7 +85,7 @@ * * All predefined filters exist in the **Piwik\DataTable\BaseFilter** namespace. * - * _Note: For convenience, [anonymous functions](http://www.php.net/manual/en/functions.anonymous.php) + * _Note: For convenience, [anonymous functions](https://www.php.net/manual/en/functions.anonymous.php) * can be used as DataTable filters._ * * ### Applying Filters @@ -1826,7 +1826,7 @@ public function setMaximumAllowedRows($maximumAllowedRows) * a subtable is encountered w/o the required label, a new row is created * with the label, and a new subtable is added to the row. * - * Read [http://en.wikipedia.org/wiki/Tree_(data_structure)#Traversal_methods](http://en.wikipedia.org/wiki/Tree_(data_structure)#Traversal_methods) + * Read [https://en.wikipedia.org/wiki/Tree_(data_structure)#Traversal_methods](https://en.wikipedia.org/wiki/Tree_(data_structure)#Traversal_methods) * for more information about tree walking. * * @param array $path The path to walk. An array of label values. The first element diff --git a/core/DataTable/Filter/ColumnCallbackAddColumn.php b/core/DataTable/Filter/ColumnCallbackAddColumn.php index 05ce2cd0b2a..69321acc2da 100644 --- a/core/DataTable/Filter/ColumnCallbackAddColumn.php +++ b/core/DataTable/Filter/ColumnCallbackAddColumn.php @@ -57,7 +57,7 @@ class ColumnCallbackAddColumn extends BaseFilter * @param string $columnToAdd The name of the column to add. * @param callable $functionToApply The callback to apply to each row of a DataTable. The columns * specified in `$columns` are passed to this callback. - * @param array $functionParameters deprecated - use an [anonymous function](http://php.net/manual/en/functions.anonymous.php) + * @param array $functionParameters deprecated - use an [anonymous function](https://php.net/manual/en/functions.anonymous.php) * instead. */ public function __construct($table, $columns, $columnToAdd, $functionToApply, $functionParameters = array()) diff --git a/core/DataTable/Filter/ColumnCallbackAddMetadata.php b/core/DataTable/Filter/ColumnCallbackAddMetadata.php index 6be4d8c0a6b..ca6ad0c29ed 100644 --- a/core/DataTable/Filter/ColumnCallbackAddMetadata.php +++ b/core/DataTable/Filter/ColumnCallbackAddMetadata.php @@ -37,7 +37,7 @@ class ColumnCallbackAddMetadata extends BaseFilter * @param string|array $columnsToRead The columns to read from each row and pass on to the callback. * @param string $metadataToAdd The name of the metadata field that will be added to each row. * @param callable $functionToApply The callback to apply for each row. - * @param array $functionParameters deprecated - use an [anonymous function](http://php.net/manual/en/functions.anonymous.php) + * @param array $functionParameters deprecated - use an [anonymous function](https://php.net/manual/en/functions.anonymous.php) * instead. * @param bool $applyToSummaryRow Whether the callback should be applied to the summary row or not. */ diff --git a/core/DataTable/Filter/ColumnCallbackDeleteRow.php b/core/DataTable/Filter/ColumnCallbackDeleteRow.php index 2c9f968fc42..27a1bfe411f 100644 --- a/core/DataTable/Filter/ColumnCallbackDeleteRow.php +++ b/core/DataTable/Filter/ColumnCallbackDeleteRow.php @@ -38,7 +38,7 @@ class ColumnCallbackDeleteRow extends BaseFilter * passed to the callback. * @param callback $function The callback that determines whether a row should be deleted * or not. Should return `true` if the row should be deleted. - * @param array $functionParams deprecated - use an [anonymous function](http://php.net/manual/en/functions.anonymous.php) + * @param array $functionParams deprecated - use an [anonymous function](https://php.net/manual/en/functions.anonymous.php) * instead. */ public function __construct($table, $columnsToFilter, $function, $functionParams = []) diff --git a/core/DataTable/Filter/ColumnCallbackReplace.php b/core/DataTable/Filter/ColumnCallbackReplace.php index 542c9130386..58b5235b815 100644 --- a/core/DataTable/Filter/ColumnCallbackReplace.php +++ b/core/DataTable/Filter/ColumnCallbackReplace.php @@ -47,7 +47,7 @@ class ColumnCallbackReplace extends BaseFilter * and then replaced with the callback's result. * @param callable $functionToApply The function to execute. Must take the column value as a parameter * and return a value that will be used to replace the original. - * @param array|null $functionParameters deprecated - use an [anonymous function](http://php.net/manual/en/functions.anonymous.php) + * @param array|null $functionParameters deprecated - use an [anonymous function](https://php.net/manual/en/functions.anonymous.php) * instead. * @param array $extraColumnParameters Extra column values that should be passed to the callback, but * shouldn't be replaced. diff --git a/core/DataTable/Filter/GroupBy.php b/core/DataTable/Filter/GroupBy.php index 4e9fe3f9b0b..39e03a0b7d1 100644 --- a/core/DataTable/Filter/GroupBy.php +++ b/core/DataTable/Filter/GroupBy.php @@ -54,7 +54,7 @@ class GroupBy extends BaseFilter * @param string $groupByColumn The column name to reduce. * @param callable $reduceFunction The reduce function. This must alter the `$groupByColumn` * column in some way. If not set then the filter will group by the raw column value. - * @param array $parameters deprecated - use an [anonymous function](http://php.net/manual/en/functions.anonymous.php) + * @param array $parameters deprecated - use an [anonymous function](https://php.net/manual/en/functions.anonymous.php) * instead. */ public function __construct($table, $groupByColumn, $reduceFunction = null, $parameters = array()) diff --git a/core/DataTable/Filter/MetadataCallbackReplace.php b/core/DataTable/Filter/MetadataCallbackReplace.php index 9f72a6c5f69..1582b216be0 100644 --- a/core/DataTable/Filter/MetadataCallbackReplace.php +++ b/core/DataTable/Filter/MetadataCallbackReplace.php @@ -34,7 +34,7 @@ class MetadataCallbackReplace extends ColumnCallbackReplace * and then replaced with the callback's result. * @param callable $functionToApply The function to execute. Must take the metadata value as a parameter * and return a value that will be used to replace the original. - * @param array|null $functionParameters deprecated - use an [anonymous function](http://php.net/manual/en/functions.anonymous.php) + * @param array|null $functionParameters deprecated - use an [anonymous function](https://php.net/manual/en/functions.anonymous.php) * instead. * @param array $extraColumnParameters Extra column values that should be passed to the callback, but * shouldn't be replaced. diff --git a/core/DataTable/Filter/SafeDecodeLabel.php b/core/DataTable/Filter/SafeDecodeLabel.php index 40c79cec691..9fe580df9b8 100644 --- a/core/DataTable/Filter/SafeDecodeLabel.php +++ b/core/DataTable/Filter/SafeDecodeLabel.php @@ -48,7 +48,7 @@ public static function decodeLabelSafe($value) // ENT_IGNORE so that if utf8 string has some errors, we simply discard invalid code unit sequences $style = ENT_QUOTES | ENT_IGNORE; - // See changes in 5.4: http://nikic.github.com/2012/01/28/htmlspecialchars-improvements-in-PHP-5-4.html + // See changes in 5.4: https://nikic.github.com/2012/01/28/htmlspecialchars-improvements-in-PHP-5-4.html // Note: at some point we should change ENT_IGNORE to ENT_SUBSTITUTE $value = htmlspecialchars($value, $style, 'UTF-8'); diff --git a/core/DataTable/Filter/Sort.php b/core/DataTable/Filter/Sort.php index 0a78b063ad1..9eefff028f5 100644 --- a/core/DataTable/Filter/Sort.php +++ b/core/DataTable/Filter/Sort.php @@ -17,7 +17,7 @@ /** * Sorts a {@link DataTable} based on the value of a specific column. * - * It is possible to specify a natural sorting (see [php.net/natsort](http://php.net/natsort) for details). + * It is possible to specify a natural sorting (see [php.net/natsort](https://php.net/natsort) for details). * * @api */ @@ -38,7 +38,7 @@ class Sort extends BaseFilter * @param DataTable $table The table to eventually filter. * @param string $columnToSort The name of the column to sort by. * @param string $order order `'asc'` or `'desc'`. - * @param bool $naturalSort Whether to use a natural sort or not (see {@link http://php.net/natsort}). + * @param bool $naturalSort Whether to use a natural sort or not (see {@link https://php.net/natsort}). * @param bool $recursiveSort Whether to sort all subtables or not. * @param bool|callback $doSortBySecondaryColumn If true will sort by a secondary column. The column is automatically * detected and will be either nb_visits or label, if possible. diff --git a/core/DataTable/Filter/Truncate.php b/core/DataTable/Filter/Truncate.php index 4717a86dfb3..c28b4f31e16 100644 --- a/core/DataTable/Filter/Truncate.php +++ b/core/DataTable/Filter/Truncate.php @@ -129,7 +129,7 @@ private function addSummaryRow($table) // case when the last row is a summary row, it is not indexed by $count but by DataTable::ID_SUMMARY_ROW $summaryRow = $table->getRowFromId(DataTable::ID_SUMMARY_ROW); - //FIXME: I'm not sure why it could return false, but it was reported in: http://forum.piwik.org/read.php?2,89324,page=1#msg-89442 + //FIXME: I'm not sure why it could return false, but it was reported in: https://forum.piwik.org/read.php?2,89324,page=1#msg-89442 if ($summaryRow) { $newRow->sumRow($summaryRow, $enableCopyMetadata = false, $aggregationOps); } diff --git a/core/Date.php b/core/Date.php index f5fd96a4fdd..a0dc2e4911a 100644 --- a/core/Date.php +++ b/core/Date.php @@ -477,7 +477,7 @@ public function isLeapYear() } /** - * Converts this date to the requested string format. See {@link http://php.net/date} + * Converts this date to the requested string format. See {@link https://php.net/date} * for the list of format strings. * * @param string $format @@ -1141,7 +1141,7 @@ public static function secondsToDays($secs) private static function getInvalidDateFormatException($dateString) { - $message = Piwik::translate('General_ExceptionInvalidDateFormat', array("YYYY-MM-DD, or 'today' or 'yesterday'", "strtotime", "http://php.net/strtotime")); + $message = Piwik::translate('General_ExceptionInvalidDateFormat', array("YYYY-MM-DD, or 'today' or 'yesterday'", "strtotime", "https://php.net/strtotime")); return new Exception($message . ": " . var_export($dateString, true)); } diff --git a/core/Db.php b/core/Db.php index fe6aeb1515d..dc0fddbe6a3 100644 --- a/core/Db.php +++ b/core/Db.php @@ -239,7 +239,7 @@ public static function destroyDatabaseObject() * Executes an unprepared SQL query. Recommended for DDL statements like `CREATE`, * `DROP` and `ALTER`. The return value is DBMS-specific. For MySQLI, it returns the * number of rows affected. For PDO, it returns a - * [Zend_Db_Statement](http://framework.zend.com/manual/1.12/en/zend.db.statement.html) object. + * [Zend_Db_Statement](https://framework.zend.com/manual/1.12/en/zend.db.statement.html) object. * * @param string $sql The SQL query. * @throws \Exception If there is an error in the SQL. @@ -267,7 +267,7 @@ public static function exec($sql) } /** - * Executes an SQL query and returns the [Zend_Db_Statement](http://framework.zend.com/manual/1.12/en/zend.db.statement.html) + * Executes an SQL query and returns the [Zend_Db_Statement](https://framework.zend.com/manual/1.12/en/zend.db.statement.html) * for the query. * * This method is meant for non-query SQL statements like `INSERT` and `UPDATE. If you want to fetch diff --git a/core/Db/Adapter/Mysqli.php b/core/Db/Adapter/Mysqli.php index cfc838abee1..bc206a50b31 100644 --- a/core/Db/Adapter/Mysqli.php +++ b/core/Db/Adapter/Mysqli.php @@ -221,7 +221,7 @@ public static function isMysqliErrorNumber($e, $connection, $errno) * Execute unprepared SQL query and throw away the result * * Workaround some SQL statements not compatible with prepare(). - * See http://framework.zend.com/issues/browse/ZF-1398 + * See https://framework.zend.com/issues/browse/ZF-1398 * * @param string $sqlQuery * @return int Number of rows affected (SELECT/INSERT/UPDATE/DELETE) diff --git a/core/Db/Adapter/Pdo/Mysql.php b/core/Db/Adapter/Pdo/Mysql.php index c85ad5424e6..c38eaf0c789 100644 --- a/core/Db/Adapter/Pdo/Mysql.php +++ b/core/Db/Adapter/Pdo/Mysql.php @@ -78,11 +78,11 @@ public function getConnection() /** * Before MySQL 5.1.17, server-side prepared statements * do not use the query cache. - * @see http://dev.mysql.com/doc/refman/5.1/en/query-cache-operation.html + * @see https://dev.mysql.com/doc/refman/5.1/en/query-cache-operation.html * * MySQL also does not support preparing certain DDL and SHOW * statements. - * @see http://framework.zend.com/issues/browse/ZF-1398 + * @see https://framework.zend.com/issues/browse/ZF-1398 */ $this->_connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); @@ -296,7 +296,7 @@ public function getClientVersion() /** * Override _dsn() to ensure host and port to not be passed along * if unix_socket is set since setting both causes unexpected behaviour - * @see http://php.net/manual/en/ref.pdo-mysql.connection.php + * @see https://php.net/manual/en/ref.pdo-mysql.connection.php */ protected function _dsn() // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore { diff --git a/core/Db/BatchInsert.php b/core/Db/BatchInsert.php index c25d7b198ac..ad01f0a6138 100644 --- a/core/Db/BatchInsert.php +++ b/core/Db/BatchInsert.php @@ -227,7 +227,7 @@ public static function createTableFromCSVFile($tableName, $fields, $filePath, $f /* * Second attempt: using the LOCAL keyword means the client reads the file and sends it to the server; * the LOCAL keyword may trigger a known PHP PDO\MYSQL bug when MySQL not built with --enable-local-infile - * @see http://bugs.php.net/bug.php?id=54158 + * @see https://bugs.php.net/bug.php?id=54158 */ $openBaseDir = ini_get('open_basedir'); $safeMode = ini_get('safe_mode'); diff --git a/core/Filesystem.php b/core/Filesystem.php index 92b19a92815..845fefe6eae 100644 --- a/core/Filesystem.php +++ b/core/Filesystem.php @@ -82,7 +82,7 @@ public static function isValidFilename($filename) /** * Get canonicalized absolute path - * See http://php.net/realpath + * See https://php.net/realpath * * @param string $path * @return string canonicalized absolute path @@ -183,11 +183,11 @@ public static function checkIfFileSystemIsNFS() /** * Recursively find pathnames that match a pattern. * - * See {@link http://php.net/manual/en/function.glob.php glob} for more info. + * See {@link https://php.net/manual/en/function.glob.php glob} for more info. * * @param string $sDir directory The directory to glob in. * @param string $sPattern pattern The pattern to match paths against. - * @param int $nFlags `glob()` . See {@link http://php.net/manual/en/function.glob.php glob()}. + * @param int $nFlags `glob()` . See {@link https://php.net/manual/en/function.glob.php glob()}. * @return array The list of paths that match the pattern. * @api */ diff --git a/core/Http.php b/core/Http.php index e8f17478e2c..66ce9c7d149 100644 --- a/core/Http.php +++ b/core/Http.php @@ -882,7 +882,7 @@ private static function buildHeadersForPost($requestBody) * { * $outputPath = PIWIK_INCLUDE_PATH . '/tmp/averybigfile.zip'; * $isStart = Common::getRequestVar('isStart', 1, 'int'); - * Http::downloadChunk("http://bigfiles.com/averybigfile.zip", $outputPath, $isStart == 1); + * Http::downloadChunk("https://bigfiles.com/averybigfile.zip", $outputPath, $isStart == 1); * } * ``` * diff --git a/core/Intl/Data/Resources/currencies.php b/core/Intl/Data/Resources/currencies.php index ee2fb950fc9..b7866e2acf0 100644 --- a/core/Intl/Data/Resources/currencies.php +++ b/core/Intl/Data/Resources/currencies.php @@ -10,7 +10,7 @@ /** * International currencies in circulation. * - * @see http://en.wikipedia.org/wiki/List_of_circulating_currencies + * @see https://en.wikipedia.org/wiki/List_of_circulating_currencies */ return array( // 'ISO-4217 CODE' => array('currency symbol', 'description'), diff --git a/core/Nonce.php b/core/Nonce.php index a10829ffb54..ff220f3a546 100644 --- a/core/Nonce.php +++ b/core/Nonce.php @@ -20,7 +20,7 @@ * * Nonces in Piwik are stored as a session variable and have a configurable expiration. * - * Learn more about nonces [here](http://en.wikipedia.org/wiki/Cryptographic_nonce). + * Learn more about nonces [here](https://en.wikipedia.org/wiki/Cryptographic_nonce). * * @api */ diff --git a/core/NumberFormatter.php b/core/NumberFormatter.php index f6a1780de35..18421720750 100644 --- a/core/NumberFormatter.php +++ b/core/NumberFormatter.php @@ -378,7 +378,7 @@ protected function formatNumberWithPattern($pattern, $value, $maximumFractionDig * * @return string * - * @see http://cldr.unicode.org/translation/number-symbols + * @see https://cldr.unicode.org/translation/number-symbols */ protected function replaceSymbols($value) { diff --git a/core/Plugin.php b/core/Plugin.php index baafa9694dc..e4c6e303357 100644 --- a/core/Plugin.php +++ b/core/Plugin.php @@ -526,7 +526,7 @@ public function schedulePluginReArchiving() * Extracts the plugin name from a backtrace array. Returns `false` if we can't find one. * * @param array $backtrace The result of {@link debug_backtrace()} or - * [Exception::getTrace()](http://www.php.net/manual/en/exception.gettrace.php). + * [Exception::getTrace()](https://www.php.net/manual/en/exception.gettrace.php). * @return string|false */ public static function getPluginNameFromBacktrace($backtrace) diff --git a/core/ProxyHttp.php b/core/ProxyHttp.php index 19dd4faae8b..345f9ea3089 100644 --- a/core/ProxyHttp.php +++ b/core/ProxyHttp.php @@ -245,7 +245,7 @@ public static function isPhpOutputCompressed() * Cache-Control: no-store,max-age=0,must-revalidate * Pragma: no-cache * - * @see http://support.microsoft.com/kb/316431/ + * @see https://support.microsoft.com/kb/316431/ * @see RFC2616 * * @param string $override One of "public", "private", "no-cache", or "no-store". (optional) diff --git a/core/QuickForm2.php b/core/QuickForm2.php index 4958b5a32d7..ab2df5f6164 100644 --- a/core/QuickForm2.php +++ b/core/QuickForm2.php @@ -21,7 +21,7 @@ * For an example, @see Piwik\Plugins\Login\FormLogin * * @see HTML_QuickForm2, libs/HTML/QuickForm2.php - * @link http://pear.php.net/package/HTML_QuickForm2/ + * @link https://pear.php.net/package/HTML_QuickForm2/ */ abstract class QuickForm2 extends HTML_QuickForm2 { diff --git a/core/Scheduler/Schedule/Schedule.php b/core/Scheduler/Schedule/Schedule.php index 38ca191b76e..d6d5a3a4338 100644 --- a/core/Scheduler/Schedule/Schedule.php +++ b/core/Scheduler/Schedule/Schedule.php @@ -29,14 +29,14 @@ abstract class Schedule public const PERIOD_RANGE = 'range'; /** - * @link http://php.net/manual/en/function.date.php, format string : 'G' + * @link https://php.net/manual/en/function.date.php, format string : 'G' * Defaults to midnight * @var integer */ protected $hour = 0; /** - * For weekly scheduling : http://php.net/manual/en/function.date.php, format string : 'N', defaults to Monday + * For weekly scheduling : https://php.net/manual/en/function.date.php, format string : 'N', defaults to Monday * For monthly scheduling : day of the month (1 to 31) (note: will be capped at the latest day available the * month), defaults to first day of the month * @var integer diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php index 92428e554d8..a6ce4b331ce 100644 --- a/core/SettingsPiwik.php +++ b/core/SettingsPiwik.php @@ -175,7 +175,7 @@ public static function getWebsitesCountToDisplay(): int } /** - * Returns the URL to this Piwik instance, eg. **http://demo.piwik.org/** or **http://example.org/piwik/**. + * Returns the URL to this Piwik instance, eg. **https://demo.piwik.org/** or **https://example.org/piwik/**. * * @return string|false return false if no value is configured and we are in PHP CLI mode * @api @@ -416,7 +416,7 @@ public static function checkPiwikServerWorking(string $piwikServerUrl, bool $acc /** * Returns true if Piwik is deployed using git - * FAQ: http://piwik.org/faq/how-to-install/faq_18271/ + * FAQ: https://piwik.org/faq/how-to-install/faq_18271/ * * @return bool */ diff --git a/core/SettingsServer.php b/core/SettingsServer.php index 5332b69f060..80d2f68163e 100644 --- a/core/SettingsServer.php +++ b/core/SettingsServer.php @@ -226,7 +226,7 @@ public static function getPostMaxUploadSize() } /** - * @see http://www.php.net/manual/en/faq.using.php#faq.using.shorthandbytes + * @see https://www.php.net/manual/en/faq.using.php#faq.using.shorthandbytes * @param $value * @return false|float|int */ diff --git a/core/Tracker/Db/Pdo/Mysql.php b/core/Tracker/Db/Pdo/Mysql.php index f3cc6902ef1..e302b6250cf 100644 --- a/core/Tracker/Db/Pdo/Mysql.php +++ b/core/Tracker/Db/Pdo/Mysql.php @@ -428,7 +428,7 @@ private function establishConnection(): void /* * Lazy initialization via MYSQL_ATTR_INIT_COMMAND depends * on mysqlnd support, PHP version, and OS. - * see ZF-7428 and http://bugs.php.net/bug.php?id=47224 + * see ZF-7428 and https://bugs.php.net/bug.php?id=47224 */ if (!empty($this->charset)) { $sql = "SET NAMES '" . $this->charset . "'"; diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php index 36f779a2125..4600308e78f 100644 --- a/core/Tracker/GoalManager.php +++ b/core/Tracker/GoalManager.php @@ -778,7 +778,7 @@ protected function insertNewConversion($conversion, $visitInformation, Request $ * * This event can be used to modify conversion information or to add new information to be persisted. * - * This event is deprecated, use [Dimensions](http://developer.piwik.org/guides/dimensions) instead. + * This event is deprecated, use [Dimensions](https://developer.piwik.org/guides/dimensions) instead. * * @param array $conversion The conversion entity. Read [this](/guides/persistence-and-the-mysql-backend#conversions) * to see what it contains. diff --git a/core/Tracker/PageUrl.php b/core/Tracker/PageUrl.php index 2fa0d70d598..910b6a7fbd8 100644 --- a/core/Tracker/PageUrl.php +++ b/core/Tracker/PageUrl.php @@ -194,8 +194,8 @@ protected static function cleanupHostAndHashTag($parsedUrl, $idSite = false) /** * Converts Matrix URL format - * from http://example.org/thing;paramA=1;paramB=6542 - * to http://example.org/thing?paramA=1¶mB=6542 + * from https://example.org/thing;paramA=1;paramB=6542 + * to https://example.org/thing?paramA=1¶mB=6542 * * @param string $originalUrl * @return string diff --git a/core/Tracker/TrackerCodeGenerator.php b/core/Tracker/TrackerCodeGenerator.php index e6aaa87a706..34589c30c7a 100644 --- a/core/Tracker/TrackerCodeGenerator.php +++ b/core/Tracker/TrackerCodeGenerator.php @@ -36,7 +36,7 @@ public function forceMatomoEndpoint() /** * @param int $idSite - * @param string $piwikUrl http://path/to/piwik/site/ + * @param string $piwikUrl https://path/to/piwik/site/ * @param bool $mergeSubdomains * @param bool $groupPageTitlesByDomain * @param bool $mergeAliasUrls diff --git a/core/Tracker/VisitorRecognizer.php b/core/Tracker/VisitorRecognizer.php index d29966b0974..3cbd61e919a 100644 --- a/core/Tracker/VisitorRecognizer.php +++ b/core/Tracker/VisitorRecognizer.php @@ -33,7 +33,7 @@ class VisitorRecognizer private $visitFieldsToSelect; /** - * See http://piwik.org/faq/how-to/faq_175/. + * See https://piwik.org/faq/how-to/faq_175/. * * @var bool */ @@ -295,7 +295,7 @@ private function getVisitorFieldsPersist() * * Plugins can use this event to load additional visit entity properties for later use during tracking. * - * This event is deprecated, use [Dimensions](http://developer.piwik.org/guides/dimensions) instead. + * This event is deprecated, use [Dimensions](https://developer.piwik.org/guides/dimensions) instead. * * @deprecated */ diff --git a/core/UpdateCheck.php b/core/UpdateCheck.php index d06ab28ea4b..538852828bc 100644 --- a/core/UpdateCheck.php +++ b/core/UpdateCheck.php @@ -69,7 +69,7 @@ public static function check($force = false, $interval = null) /** * Get the latest available version number for the currently active release channel. Eg '2.15.0-b4' or '2.15.0'. - * Should return a semantic version number in format MAJOR.MINOR.PATCH (http://semver.org/). + * Should return a semantic version number in format MAJOR.MINOR.PATCH (https://semver.org/). * Returns an empty string in case one cannot connect to the remote server. * @return string */ diff --git a/core/UpdateCheck/ReleaseChannel.php b/core/UpdateCheck/ReleaseChannel.php index 18c0b92068f..f84f6aa9997 100644 --- a/core/UpdateCheck/ReleaseChannel.php +++ b/core/UpdateCheck/ReleaseChannel.php @@ -43,7 +43,7 @@ public function doesPreferStable() /** * Get the latest available version number for this release channel. Eg '2.15.0-b4' or '2.15.0'. Should be - * a semantic version number in format MAJOR.MINOR.PATCH (http://semver.org/). Returning an empty string in case + * a semantic version number in format MAJOR.MINOR.PATCH (https://semver.org/). Returning an empty string in case * one cannot connect to the remote server can be acceptable. * @return string */ diff --git a/core/Updates/0.9.1.php b/core/Updates/0.9.1.php index f9f910febff..4e9169ba6f6 100644 --- a/core/Updates/0.9.1.php +++ b/core/Updates/0.9.1.php @@ -34,7 +34,7 @@ public function getMigrations(Updater $updater) if (!SettingsServer::isTimezoneSupportEnabled()) { return array(); } - // @see http://bugs.php.net/46111 + // @see https://bugs.php.net/46111 $timezones = timezone_identifiers_list(); $brokenTZ = array(); diff --git a/core/Updates/2.0-a13.php b/core/Updates/2.0-a13.php index 94f40be9872..df3ff2f86eb 100644 --- a/core/Updates/2.0-a13.php +++ b/core/Updates/2.0-a13.php @@ -53,7 +53,7 @@ public function getMigrations(Updater $updater) $migrations[] = $this->migration->db->sql($query, $errorCodeTableNotFound); $query = 'UPDATE `' . Common::prefixTable('option') . '` SET `option_name` = \'version_ScheduledReports\' WHERE `option_name` = \'version_PDFReports\' '; - $migrations[] = $this->migration->db->sql($query, Updater\Migration\Db::ERROR_CODE_DUPLICATE_ENTRY); // http://forum.piwik.org/read.php?2,106895 + $migrations[] = $this->migration->db->sql($query, Updater\Migration\Db::ERROR_CODE_DUPLICATE_ENTRY); // https://forum.piwik.org/read.php?2,106895 $migrations[] = $this->migration->plugin->activate('Referrers'); $migrations[] = $this->migration->plugin->activate('ScheduledReports'); diff --git a/core/Url.php b/core/Url.php index 03e7fd69d72..52113ba8f23 100644 --- a/core/Url.php +++ b/core/Url.php @@ -54,7 +54,7 @@ class Url /** * Returns the current URL. * - * @return string eg, `"http://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"` + * @return string eg, `"https://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"` * @api */ public static function getCurrentUrl() @@ -70,8 +70,8 @@ public static function getCurrentUrl() * * @param bool $checkTrustedHost Whether to do trusted host check. Should ALWAYS be true, * except in {@link Piwik\Plugin\Controller}. - * @return string eg, `"http://example.org/dir1/dir2/index.php"` if the current URL is - * `"http://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"`. + * @return string eg, `"https://example.org/dir1/dir2/index.php"` if the current URL is + * `"https://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"`. * @api */ public static function getCurrentUrlWithoutQueryString($checkTrustedHost = true) @@ -85,8 +85,8 @@ public static function getCurrentUrlWithoutQueryString($checkTrustedHost = true) * Returns the current URL without the query string and without the name of the file * being executed. * - * @return string eg, `"http://example.org/dir1/dir2/"` if the current URL is - * `"http://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"`. + * @return string eg, `"https://example.org/dir1/dir2/"` if the current URL is + * `"https://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"`. * @api */ public static function getCurrentUrlWithoutFileName() @@ -100,7 +100,7 @@ public static function getCurrentUrlWithoutFileName() * Returns the path to the script being executed. The script file name is not included. * * @return string eg, `"/dir1/dir2/"` if the current URL is - * `"http://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"` + * `"https://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"` * @api */ public static function getCurrentScriptPath() @@ -122,7 +122,7 @@ public static function getCurrentScriptPath() * * @param bool $removePathInfo If true (default value) then the PATH_INFO will be stripped. * @return string eg, `"/dir1/dir2/index.php"` if the current URL is - * `"http://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"` + * `"https://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"` * @api */ public static function getCurrentScriptName($removePathInfo = true) @@ -141,7 +141,7 @@ public static function getCurrentScriptName($removePathInfo = true) if (!empty($_SERVER['REQUEST_URI'])) { $url .= $_SERVER['REQUEST_URI']; - // strip http://host (Apache+Rails anomaly) + // strip https://host (Apache+Rails anomaly) if (preg_match('~^https?://[^/]+($|/.*)~D', $url, $matches)) { $url = $matches[1]; } @@ -160,7 +160,7 @@ public static function getCurrentScriptName($removePathInfo = true) /** * SCRIPT_NAME is our fallback, though it may not be set correctly * - * @see http://php.net/manual/en/reserved.variables.php + * @see https://php.net/manual/en/reserved.variables.php */ if (empty($url)) { if (isset($_SERVER['SCRIPT_NAME'])) { @@ -377,7 +377,7 @@ public static function setHost($host) * @param bool $checkTrustedHost Whether to do trusted host check. Should ALWAYS be true, * except in Controller. * @return string eg, `"example.org"` if the current URL is - * `"http://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"` + * `"https://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"` * @api */ public static function getCurrentHost($default = 'unknown', $checkTrustedHost = true) @@ -403,7 +403,7 @@ public static function getCurrentHost($default = 'unknown', $checkTrustedHost = * Returns the query string of the current URL. * * @return string eg, `"?param1=value1¶m2=value2"` if the current URL is - * `"http://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"` + * `"https://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"` * @api */ public static function getCurrentQueryString() @@ -422,7 +422,7 @@ public static function getCurrentQueryString() * Returns an array mapping query parameter names with query parameter values for * the current URL. * - * @return array If current URL is `"http://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"` + * @return array If current URL is `"https://example.org/dir1/dir2/index.php?param1=value1¶m2=value2"` * this will return: * * array( @@ -633,7 +633,7 @@ public static function getTrustedHostsFromConfig() { $hosts = self::getHostsFromConfig('General', 'trusted_hosts'); - // Case user wrote in the config, http://example.com/test instead of example.com + // Case user wrote in the config, https://example.com/test instead of example.com foreach ($hosts as &$host) { if (UrlHelper::isLookLikeUrl($host)) { $host = parse_url($host, PHP_URL_HOST); @@ -704,7 +704,7 @@ public static function getHostFromUrl($url) /** * Checks whether any of the given URLs has the given host. If not, we will also check whether any URL uses a - * subdomain of the given host. For instance if host is "example.com" and a URL is "http://www.example.com" we + * subdomain of the given host. For instance if host is "example.com" and a URL is "https://www.example.com" we * consider this as valid and return true. The always trusted hosts such as "127.0.0.1" are considered valid as well. * * @param $host diff --git a/core/UrlHelper.php b/core/UrlHelper.php index b5f30db5846..1450452a4cb 100644 --- a/core/UrlHelper.php +++ b/core/UrlHelper.php @@ -164,12 +164,12 @@ public static function isLookLikeSafeUrl($url) } /** - * Returns a URL created from the result of the [parse_url](http://php.net/manual/en/function.parse-url.php) + * Returns a URL created from the result of the [parse_url](https://php.net/manual/en/function.parse-url.php) * function. * - * Copied from the PHP comments at [http://php.net/parse_url](http://php.net/parse_url). + * Copied from the PHP comments at [https://php.net/parse_url](https://php.net/parse_url). * - * @param array $parsed Result of [parse_url](http://php.net/manual/en/function.parse-url.php). + * @param array $parsed Result of [parse_url](https://php.net/manual/en/function.parse-url.php). * @return false|string The URL or `false` if `$parsed` isn't an array. * @api */ @@ -299,7 +299,7 @@ public static function getParameterFromQueryString($urlQuery, $parameter) * @param string $url The URL. * @param array $additionalParamsToAdd If not empty the given parameters will be added to the query. * @param bool $preserveAnchor If true then do not remove any #anchor from the url, default false - * @return string eg, `/test/index.php?module=CoreHome` if `$url` is `http://piwik.org/test/index.php?module=CoreHome`. + * @return string eg, `/test/index.php?module=CoreHome` if `$url` is `https://piwik.org/test/index.php?module=CoreHome`. * @api */ public static function getPathAndQueryFromUrl($url, array $additionalParamsToAdd = [], bool $preserveAnchor = false) @@ -336,7 +336,7 @@ public static function getPathAndQueryFromUrl($url, array $additionalParamsToAdd /** * Returns the query part from any valid url and adds additional parameters to the query part if needed. * - * @param string $url Any url eg `"http://example.com/piwik/?foo=bar"` + * @param string $url Any url eg `"https://example.com/piwik/?foo=bar"` * @param array $additionalParamsToAdd If not empty the given parameters will be added to the query. * * @return string eg. `"foo=bar&foo2=bar2"` diff --git a/core/View.php b/core/View.php index 2ecb047f33b..8bc0119707f 100644 --- a/core/View.php +++ b/core/View.php @@ -26,7 +26,7 @@ } /** - * Encapsulates and manages a [Twig](http://twig.sensiolabs.org/) template. + * Encapsulates and manages a [Twig](https://twig.sensiolabs.org/) template. * * View lets you set properties that will be passed on to a Twig template. * View will also set several properties that will be available in all Twig diff --git a/misc/cron/archive.php b/misc/cron/archive.php index bad2d248a27..8af6dd5646d 100644 --- a/misc/cron/archive.php +++ b/misc/cron/archive.php @@ -40,7 +40,7 @@ See also: https://matomo.org/docs/setup-auto-archiving/ If you cannot use the console because it requires CLI -try 'php archive.php --url=http://your.piwik/path' +try 'php archive.php --url=https://your.piwik/path' ------------------------------------------------------- \n\n"; @@ -59,7 +59,7 @@ You must specify the Super User token_auth as a parameter to this script, eg. ?token_auth=XYZ if you wish to run this script through the browser.
However it is recommended to run it via cron in the command line, since it can take a long time to run.
In a shell, execute for example the following to trigger archiving on the local Piwik server:
-$ /path/to/php /path/to/piwik/console core:archive --url=http://your-website.org/path/to/piwik/ +$ /path/to/php /path/to/piwik/console core:archive --url=https://your-website.org/path/to/piwik/ \n\n"; exit; } diff --git a/misc/cron/archive.sh b/misc/cron/archive.sh index e05b83eac9f..9288d1792f1 100644 --- a/misc/cron/archive.sh +++ b/misc/cron/archive.sh @@ -2,7 +2,7 @@ # ======================================================================= # WARNING: this script archive.sh is DEPRECATED! # -# => Replace your cron with `/usr/bin/php /path/to/piwik/console core:archive --url=http://example.org/piwik/` +# => Replace your cron with `/usr/bin/php /path/to/piwik/console core:archive --url=https://example.org/piwik/` # # See documentation at https://piwik.org/setup-auto-archiving/ # ======================================================================= @@ -30,7 +30,7 @@ ARCHIVE=`act_path ${0}` PIWIK_CRON_FOLDER=`dirname ${ARCHIVE}` PIWIK_PATH="$PIWIK_CRON_FOLDER"/../../console -CONSOLE_CMD="$PHP_BIN -q $PIWIK_PATH core:archive --url=http://example.org" +CONSOLE_CMD="$PHP_BIN -q $PIWIK_PATH core:archive --url=https://example.org" MESSAGE="\n\n WARNING: this script archive.sh is DEPRECATED! \n\nPlease update your cron as explained in the documentation: https://matomo.org/docs/setup-auto-archiving/ \n\n" diff --git a/misc/others/uninstall-delete-matomo-directory.php b/misc/others/uninstall-delete-matomo-directory.php index 172cdfcba97..d5312d6695a 100644 --- a/misc/others/uninstall-delete-matomo-directory.php +++ b/misc/others/uninstall-delete-matomo-directory.php @@ -5,9 +5,9 @@ // 1) Download and upload this file to your webserver // 2) Remove the 2nd line (the "exit;") // 3) Put this file in the folder that contains the matomo/ directory (above the matomo/ directory) -// For example if the matomo/ folder is at http://your-site/matomo/ you put the file in http://your-site/uninstall-delete-matomo-directory.php -// 4) Go with your browser to http://your-site/uninstall-delete-matomo-directory.php -// 5) The folder http://your-site/matomo/ should now be deleted! +// For example if the matomo/ folder is at https://your-site/matomo/ you put the file in https://your-site/uninstall-delete-matomo-directory.php +// 4) Go with your browser to https://your-site/uninstall-delete-matomo-directory.php +// 5) The folder https://your-site/matomo/ should now be deleted! // We hope you enjoyed Matomo. If you have any feedback why you stopped using Matomo, // please let us know at hello@matomo.org - we are interested by your experience function unlinkRecursive($dir) diff --git a/piwik.php b/piwik.php index 576c7dd8801..cb003f641e7 100644 --- a/piwik.php +++ b/piwik.php @@ -15,7 +15,7 @@ @ignore_user_abort(true); // Note: if you wish to debug the Tracking API please see this documentation: -// http://developer.piwik.org/api-reference/tracking-api#debugging-the-tracker +// https://developer.piwik.org/api-reference/tracking-api#debugging-the-tracker if (!defined('PIWIK_DOCUMENT_ROOT')) { define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__)); diff --git a/plugins/API/API.php b/plugins/API/API.php index 2a10f0f3262..091ab623bd1 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -37,7 +37,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Config.php'; /** - * This API is the Metadata API: it gives information about all other available APIs methods, as well as providing + * This API is the Metadata API: it gives information about all other available APIs methods, as well as providing * human readable and more complete outputs than normal API methods. * * Some of the information that is returned by the Metadata API: @@ -50,7 +50,7 @@ *
  • the method "getSuggestedValuesForSegment" returns top suggested values for a particular segment. It uses the Live.getLastVisitsDetails API to fetch the most recently used values, and will return the most often used values first.
    • * * The Metadata API is for example used by the Matomo Mobile App to automatically display all Matomo reports, with translated report & columns names and nicely formatted values. - * More information on the Metadata API documentation page + * More information on the Metadata API documentation page * * @method static \Piwik\Plugins\API\API getInstance() */ diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php index a705baa7e2d..fb7f8919e67 100644 --- a/plugins/Actions/API.php +++ b/plugins/Actions/API.php @@ -28,7 +28,7 @@ * The Actions API lets you request reports for all your Visitor Actions: Page URLs, Page titles, Events, Content Tracking, * File Downloads and Clicks on external websites. * - * For example, "getPageTitles" will return all your page titles along with standard Actions metrics for each row. + * For example, "getPageTitles" will return all your page titles along with standard Actions metrics for each row. * * It is also possible to request data for a specific Page Title with "getPageTitle" * and setting the parameter pageName to the page title you wish to request. diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php index 630c665cc9c..2858a76a5c2 100644 --- a/plugins/Actions/ArchivingHelper.php +++ b/plugins/Actions/ArchivingHelper.php @@ -113,8 +113,8 @@ public static function updateActionsTableWithRowQuery($query, $fieldQueried, $ac // Here we do ensure that, the Metadata URL set for a given row, is the one from the Pageview with the most hits. // This is to ensure that when, different URLs are loaded with the same page name. - // For example http://piwik.org and http://id.piwik.org are reported in Piwik > Actions > Pages with /index - // But, we must make sure http://piwik.org is used to link & for transitions + // For example https://piwik.org and https://id.piwik.org are reported in Piwik > Actions > Pages with /index + // But, we must make sure https://piwik.org is used to link & for transitions // Note: this code is partly duplicated from Row->sumRowMetadata() if ( !is_null($url) @@ -594,13 +594,13 @@ public static function getUnknownActionName($type) * NOTE: before calling this function make sure ArchivingHelper::reloadConfig(); is called * * for downloads: - * we explode link http://piwik.org/some/path/piwik.zip into an array( 'piwik.org', '/some/path/piwik.zip' ); + * we explode link https://piwik.org/some/path/piwik.zip into an array( 'piwik.org', '/some/path/piwik.zip' ); * * for outlinks: - * we explode link http://dev.piwik.org/some/path into an array( 'dev.piwik.org', '/some/path' ); + * we explode link https://dev.piwik.org/some/path into an array( 'dev.piwik.org', '/some/path' ); * * for action urls: - * we explode link http://piwik.org/some/path into an array( 'some', 'path' ); + * we explode link https://piwik.org/some/path into an array( 'some', 'path' ); * * for action names: * we explode name 'Piwik / Category 1 / Category 2' into an array('Matomo', 'Category 1', 'Category 2'); diff --git a/plugins/Actions/Columns/ActionType.php b/plugins/Actions/Columns/ActionType.php index 83f28a7a8fb..547a4c661e4 100644 --- a/plugins/Actions/Columns/ActionType.php +++ b/plugins/Actions/Columns/ActionType.php @@ -19,7 +19,7 @@ /** * This example dimension only defines a name and does not track any data. It's supposed to be only used in reports. * - * See {@link http://developer.piwik.org/api-reference/Piwik/Columns\Dimension} for more information. + * See {@link https://developer.piwik.org/api-reference/Piwik/Columns\Dimension} for more information. */ class ActionType extends ActionDimension { diff --git a/plugins/Contents/Reports/GetContentNames.php b/plugins/Contents/Reports/GetContentNames.php index 56bb1f177e3..ce87ee022e9 100644 --- a/plugins/Contents/Reports/GetContentNames.php +++ b/plugins/Contents/Reports/GetContentNames.php @@ -16,7 +16,7 @@ /** * This class defines a new report. * - * See {@link http://developer.piwik.org/api-reference/Piwik/Plugin/Report} for more information. + * See {@link https://developer.piwik.org/api-reference/Piwik/Plugin/Report} for more information. */ class GetContentNames extends Base { diff --git a/plugins/Contents/Reports/GetContentPieces.php b/plugins/Contents/Reports/GetContentPieces.php index 0260220bcea..c4ae104a838 100644 --- a/plugins/Contents/Reports/GetContentPieces.php +++ b/plugins/Contents/Reports/GetContentPieces.php @@ -16,7 +16,7 @@ /** * This class defines a new report. * - * See {@link http://developer.piwik.org/api-reference/Piwik/Plugin/Report} for more information. + * See {@link https://developer.piwik.org/api-reference/Piwik/Plugin/Report} for more information. */ class GetContentPieces extends Base { diff --git a/plugins/CoreHome/javascripts/uiControl.js b/plugins/CoreHome/javascripts/uiControl.js index 33530c4e26a..d3dc6b3364e 100644 --- a/plugins/CoreHome/javascripts/uiControl.js +++ b/plugins/CoreHome/javascripts/uiControl.js @@ -112,7 +112,7 @@ * Handle the widget resize event, if we're currently in a widget. * * TODO: should use proper resize detection (see - * http://www.backalleycoder.com/2013/03/18/cross-browser-event-based-element-resize-detection/ ) + * https://www.backalleycoder.com/2013/03/18/cross-browser-event-based-element-resize-detection/ ) * with timeouts (since resizing widgets can be expensive) */ onWidgetResize: function (handler) { diff --git a/plugins/CoreHome/vue/src/EnrichedHeadline/EnrichedHeadline.vue b/plugins/CoreHome/vue/src/EnrichedHeadline/EnrichedHeadline.vue index 6785113d907..952d0694ad7 100644 --- a/plugins/CoreHome/vue/src/EnrichedHeadline/EnrichedHeadline.vue +++ b/plugins/CoreHome/vue/src/EnrichedHeadline/EnrichedHeadline.vue @@ -93,7 +93,7 @@ interface EnrichedHeadlineData { * 309 Visits) * -> custom featurename * - *

    All Websites Dashboard

    + *

    All Websites Dashboard

    * -> shows help icon and links to external url * *

    All Websites diff --git a/plugins/CoreHome/vue/src/Periods/utilities.ts b/plugins/CoreHome/vue/src/Periods/utilities.ts index e8afc7abece..d63e3d17ff7 100644 --- a/plugins/CoreHome/vue/src/Periods/utilities.ts +++ b/plugins/CoreHome/vue/src/Periods/utilities.ts @@ -87,7 +87,7 @@ export function todayIsInRange(dateRange: Date[]): boolean { export function getWeekNumber(date: Date): number { // Algorithm from https://www.w3resource.com/javascript-exercises/javascript-date-exercise-24.php - // and updated based on http://www.java2s.com/example/nodejs/date/get-the-iso-week-date-week-number.html + // and updated based on https://www.java2s.com/example/nodejs/date/get-the-iso-week-date-week-number.html // for legibility // Create a copy of the date object diff --git a/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php b/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php index ee22ed3c0ac..802ca9506b6 100644 --- a/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php +++ b/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php @@ -22,7 +22,7 @@ class Chart public $properties; // the data kept here conforms to the jqplot data layout - // @see http://www.jqplot.com/docs/files/jqPlotOptions-txt.html + // @see https://www.jqplot.com/docs/files/jqPlotOptions-txt.html protected $series = []; protected $data = []; protected $axes = []; @@ -161,7 +161,7 @@ public function render() $this->checkDataStateAvailableForAllTicks(); - // See http://www.jqplot.com/docs/files/jqPlotOptions-txt.html + // See https://www.jqplot.com/docs/files/jqPlotOptions-txt.html $data = [ 'params' => [ 'axes' => &$this->axes, diff --git a/plugins/CustomDimensions/Dimension/Extraction.php b/plugins/CustomDimensions/Dimension/Extraction.php index 181e85d8af8..3b7d07bf1a8 100644 --- a/plugins/CustomDimensions/Dimension/Extraction.php +++ b/plugins/CustomDimensions/Dimension/Extraction.php @@ -114,7 +114,7 @@ private function extractValue($value) $regex = $this->formatPattern(); if (preg_match($regex, (string) $value, $matches)) { - // we could improve performance here I reckon by combining all patterns of all configs see eg http://nikic.github.io/2014/02/18/Fast-request-routing-using-regular-expressions.html + // we could improve performance here I reckon by combining all patterns of all configs see eg https://nikic.github.io/2014/02/18/Fast-request-routing-using-regular-expressions.html if (array_key_exists(1, $matches)) { return $matches[1]; diff --git a/plugins/CustomDimensions/GetCustomDimension.php b/plugins/CustomDimensions/GetCustomDimension.php index 7b869b10748..ca1544b5266 100644 --- a/plugins/CustomDimensions/GetCustomDimension.php +++ b/plugins/CustomDimensions/GetCustomDimension.php @@ -31,7 +31,7 @@ /** * This class defines a new report. * - * See {@link http://developer.piwik.org/api-reference/Piwik/Plugin/Report} for more information. + * See {@link https://developer.matomo.org/api-reference/Piwik/Plugin/Report} for more information. */ class GetCustomDimension extends Report { diff --git a/plugins/CustomDimensions/Menu.php b/plugins/CustomDimensions/Menu.php index 534593d0486..3fba3912341 100644 --- a/plugins/CustomDimensions/Menu.php +++ b/plugins/CustomDimensions/Menu.php @@ -17,7 +17,7 @@ /** * This class allows you to add, remove or rename menu items. * To configure a menu (such as Admin Menu, Reporting Menu, User Menu...) simply call the corresponding methods as - * described in the API-Reference http://developer.piwik.org/api-reference/Piwik/Menu/MenuAbstract + * described in the API-Reference https://developer.matomo.org/api-reference/Piwik/Menu/MenuAbstract */ class Menu extends \Piwik\Plugin\Menu { diff --git a/plugins/DBStats/API.php b/plugins/DBStats/API.php index 8f0042d4d16..428407cb69b 100644 --- a/plugins/DBStats/API.php +++ b/plugins/DBStats/API.php @@ -58,7 +58,7 @@ public function getGeneralInformation() /** * Gets general database info that is not specific to any table. * - * @return array See http://dev.mysql.com/doc/refman/5.1/en/show-status.html . + * @return array See https://dev.mysql.com/doc/refman/5.1/en/show-status.html . */ public function getDBStatus() { diff --git a/plugins/DBStats/MySQLMetadataProvider.php b/plugins/DBStats/MySQLMetadataProvider.php index bad9045a3b0..479b239c122 100644 --- a/plugins/DBStats/MySQLMetadataProvider.php +++ b/plugins/DBStats/MySQLMetadataProvider.php @@ -47,7 +47,7 @@ public function __construct(MySQLMetadataDataAccess $dataAccess) * Gets general database info that is not specific to any table. * * @throws Exception - * @return array See http://dev.mysql.com/doc/refman/5.1/en/show-status.html . + * @return array See https://dev.mysql.com/doc/refman/5.1/en/show-status.html . */ public function getDBStatus() { @@ -59,7 +59,7 @@ public function getDBStatus() * * @param string $table The name of the table. Should not be prefixed (ie, 'log_visit' is * correct, 'matomo_log_visit' is not). - * @return array See http://dev.mysql.com/doc/refman/5.1/en/show-table-status.html . + * @return array See https://dev.mysql.com/doc/refman/5.1/en/show-table-status.html . */ public function getTableStatus($table) { @@ -79,7 +79,7 @@ public function getTableStatus($table) * * @param string $matchingRegex Regex used to filter out tables whose name doesn't * match it. - * @return array The table information. See http://dev.mysql.com/doc/refman/5.5/en/show-table-status.html + * @return array The table information. See https://dev.mysql.com/doc/refman/5.5/en/show-table-status.html * for specifics. */ public function getAllTablesStatus($matchingRegex = null) @@ -111,7 +111,7 @@ public function getAllTablesStatus($matchingRegex = null) /** * Returns table statuses for every log table. * - * @return array An array of status arrays. See http://dev.mysql.com/doc/refman/5.5/en/show-table-status.html. + * @return array An array of status arrays. See https://dev.mysql.com/doc/refman/5.5/en/show-table-status.html. */ public function getAllLogTableStatus() { @@ -122,7 +122,7 @@ public function getAllLogTableStatus() /** * Returns table statuses for every numeric archive table. * - * @return array An array of status arrays. See http://dev.mysql.com/doc/refman/5.5/en/show-table-status.html. + * @return array An array of status arrays. See https://dev.mysql.com/doc/refman/5.5/en/show-table-status.html. */ public function getAllNumericArchiveStatus() { @@ -133,7 +133,7 @@ public function getAllNumericArchiveStatus() /** * Returns table statuses for every blob archive table. * - * @return array An array of status arrays. See http://dev.mysql.com/doc/refman/5.5/en/show-table-status.html. + * @return array An array of status arrays. See https://dev.mysql.com/doc/refman/5.5/en/show-table-status.html. */ public function getAllBlobArchiveStatus() { @@ -144,7 +144,7 @@ public function getAllBlobArchiveStatus() /** * Returns table statuses for every admin table. * - * @return array An array of status arrays. See http://dev.mysql.com/doc/refman/5.5/en/show-table-status.html. + * @return array An array of status arrays. See https://dev.mysql.com/doc/refman/5.5/en/show-table-status.html. */ public function getAllAdminTableStatus() { diff --git a/plugins/Dashboard/API.php b/plugins/Dashboard/API.php index 414b07dceba..ebf6345f051 100644 --- a/plugins/Dashboard/API.php +++ b/plugins/Dashboard/API.php @@ -13,7 +13,7 @@ use Piwik\Piwik; /** - * This API is the Dashboard API: it gives information about dashboards. + * This API is the Dashboard API: it gives information about dashboards. * * @method static \Piwik\Plugins\Dashboard\API getInstance() */ diff --git a/plugins/Diagnostics/Menu.php b/plugins/Diagnostics/Menu.php index dd32d7e4dbf..efd564895c0 100644 --- a/plugins/Diagnostics/Menu.php +++ b/plugins/Diagnostics/Menu.php @@ -15,7 +15,7 @@ /** * This class allows you to add, remove or rename menu items. * To configure a menu (such as Admin Menu, Reporting Menu, User Menu...) simply call the corresponding methods as - * described in the API-Reference http://developer.piwik.org/api-reference/Piwik/Menu/MenuAbstract + * described in the API-Reference https://developer.piwik.org/api-reference/Piwik/Menu/MenuAbstract */ class Menu extends \Piwik\Plugin\Menu { diff --git a/plugins/Events/API.php b/plugins/Events/API.php index 92df1cfb0f4..7ee3d3a012b 100644 --- a/plugins/Events/API.php +++ b/plugins/Events/API.php @@ -17,7 +17,7 @@ /** * The Events API lets you request reports about your users' Custom Events. * - * Events are tracked using the Javascript Tracker trackEvent() function, or using the [Tracking HTTP API](http://developer.matomo.org/api-reference/tracking-api). + * Events are tracked using the Javascript Tracker trackEvent() function, or using the [Tracking HTTP API](https://developer.matomo.org/api-reference/tracking-api). * *
    An event is defined by an event category (Videos, Music, Games...), * an event action (Play, Pause, Duration, Add Playlist, Downloaded, Clicked...), diff --git a/plugins/ExampleCommand/Commands/HelloWorld.php b/plugins/ExampleCommand/Commands/HelloWorld.php index 3ec0375c954..986305dd2f3 100644 --- a/plugins/ExampleCommand/Commands/HelloWorld.php +++ b/plugins/ExampleCommand/Commands/HelloWorld.php @@ -16,7 +16,7 @@ * https://developer.matomo.org/guides/piwik-on-the-command-line * * As Matomo Console is based on the Symfony Console you might also want to have a look at - * http://symfony.com/doc/current/components/console/index.html + * https://symfony.com/doc/current/components/console/index.html */ class HelloWorld extends ConsoleCommand { diff --git a/plugins/ExamplePlugin/Controller.php b/plugins/ExamplePlugin/Controller.php index 9492bffd2af..26be213ccd3 100644 --- a/plugins/ExamplePlugin/Controller.php +++ b/plugins/ExamplePlugin/Controller.php @@ -11,9 +11,9 @@ /** * A controller lets you for example create a page that can be added to a menu. For more information read our guide - * http://developer.piwik.org/guides/mvc-in-piwik or have a look at the our API references for controller and view: - * http://developer.piwik.org/api-reference/Piwik/Plugin/Controller and - * http://developer.piwik.org/api-reference/Piwik/View + * https://developer.piwik.org/guides/mvc-in-piwik or have a look at the our API references for controller and view: + * https://developer.piwik.org/api-reference/Piwik/Plugin/Controller and + * https://developer.piwik.org/api-reference/Piwik/View */ class Controller extends \Piwik\Plugin\Controller { diff --git a/plugins/ExamplePlugin/Menu.php b/plugins/ExamplePlugin/Menu.php index f832b3b4e61..013de5cb1c9 100644 --- a/plugins/ExamplePlugin/Menu.php +++ b/plugins/ExamplePlugin/Menu.php @@ -15,7 +15,7 @@ /** * This class allows you to add, remove or rename menu items. * To configure a menu (such as Admin Menu, Top Menu, User Menu...) simply call the corresponding methods as - * described in the API-Reference http://developer.piwik.org/api-reference/Piwik/Menu/MenuAbstract + * described in the API-Reference https://developer.piwik.org/api-reference/Piwik/Menu/MenuAbstract */ class Menu extends \Piwik\Plugin\Menu { diff --git a/plugins/ExamplePlugin/RecordBuilders/ExampleBlob.php b/plugins/ExamplePlugin/RecordBuilders/ExampleBlob.php index c0e0feb7fdb..7c1672d2764 100644 --- a/plugins/ExamplePlugin/RecordBuilders/ExampleBlob.php +++ b/plugins/ExamplePlugin/RecordBuilders/ExampleBlob.php @@ -24,7 +24,7 @@ * queries as possible (this results in improved performance overall). * * For more detailed information about RecordBuilders please visit Matomo developer guide - * http://developer.piwik.org/api-reference/Piwik/ArchiveProcessor/RecordBuilder + * https://developer.piwik.org/api-reference/Piwik/ArchiveProcessor/RecordBuilder */ class ExampleBlob extends RecordBuilder { diff --git a/plugins/ExamplePlugin/RecordBuilders/ExampleMetric.php b/plugins/ExamplePlugin/RecordBuilders/ExampleMetric.php index b04700f7466..1dbe5b6762e 100644 --- a/plugins/ExamplePlugin/RecordBuilders/ExampleMetric.php +++ b/plugins/ExamplePlugin/RecordBuilders/ExampleMetric.php @@ -24,7 +24,7 @@ * queries as possible (this results in improved performance overall). * * For more detailed information about RecordBuilders please visit Matomo developer guide - * http://developer.piwik.org/api-reference/Piwik/ArchiveProcessor/RecordBuilder + * https://developer.piwik.org/api-reference/Piwik/ArchiveProcessor/RecordBuilder */ class ExampleMetric extends RecordBuilder { diff --git a/plugins/ExamplePlugin/RecordBuilders/ExampleMetric2.php b/plugins/ExamplePlugin/RecordBuilders/ExampleMetric2.php index 6c3a3a73dcb..a9884ad7fdf 100644 --- a/plugins/ExamplePlugin/RecordBuilders/ExampleMetric2.php +++ b/plugins/ExamplePlugin/RecordBuilders/ExampleMetric2.php @@ -24,7 +24,7 @@ * queries as possible (this results in improved performance overall). * * For more detailed information about RecordBuilders please visit Matomo developer guide - * http://developer.piwik.org/api-reference/Piwik/ArchiveProcessor/RecordBuilder + * https://developer.piwik.org/api-reference/Piwik/ArchiveProcessor/RecordBuilder */ class ExampleMetric2 extends RecordBuilder { diff --git a/plugins/ExamplePlugin/Widgets/MyExampleWidget.php b/plugins/ExamplePlugin/Widgets/MyExampleWidget.php index 281863fe590..069e4bc005c 100644 --- a/plugins/ExamplePlugin/Widgets/MyExampleWidget.php +++ b/plugins/ExamplePlugin/Widgets/MyExampleWidget.php @@ -16,7 +16,7 @@ * This class allows you to add your own widget to the Piwik platform. In case you want to remove widgets from another * plugin please have a look at the "configureWidgetsList()" method. * To configure a widget simply call the corresponding methods as described in the API-Reference: - * http://developer.piwik.org/api-reference/Piwik/Plugin\Widget + * https://developer.piwik.org/api-reference/Piwik/Plugin\Widget */ class MyExampleWidget extends Widget { diff --git a/plugins/ExampleReport/Reports/GetExampleReport.php b/plugins/ExampleReport/Reports/GetExampleReport.php index 36d9786b12d..bc3a7cefda8 100644 --- a/plugins/ExampleReport/Reports/GetExampleReport.php +++ b/plugins/ExampleReport/Reports/GetExampleReport.php @@ -16,7 +16,7 @@ /** * This class defines a new report. * - * See {@link http://developer.piwik.org/api-reference/Piwik/Plugin/Report} for more information. + * See {@link https://developer.piwik.org/api-reference/Piwik/Plugin/Report} for more information. */ class GetExampleReport extends Base { diff --git a/plugins/ExampleTracker/Columns/ExampleActionDimension.php b/plugins/ExampleTracker/Columns/ExampleActionDimension.php index df45055b4b1..edeede7cbb3 100644 --- a/plugins/ExampleTracker/Columns/ExampleActionDimension.php +++ b/plugins/ExampleTracker/Columns/ExampleActionDimension.php @@ -21,7 +21,7 @@ * on a certain page. Please note that dimension instances are usually cached during one tracking request so they * should be stateless (meaning an instance of this dimension will be reused if requested multiple times). * - * See {@link http://developer.piwik.org/api-reference/Piwik/Plugin\Dimension\ActionDimension} for more information. + * See {@link https://developer.matomo.org/api-reference/Piwik/Plugin\Dimension\ActionDimension} for more information. */ class ExampleActionDimension extends ActionDimension { diff --git a/plugins/ExampleTracker/Columns/ExampleConversionDimension.php b/plugins/ExampleTracker/Columns/ExampleConversionDimension.php index 8023541d1c9..17aa004ff2e 100644 --- a/plugins/ExampleTracker/Columns/ExampleConversionDimension.php +++ b/plugins/ExampleTracker/Columns/ExampleConversionDimension.php @@ -23,7 +23,7 @@ * request url property. Please note that dimension instances are usually cached during one tracking request so they * should be stateless (meaning an instance of this dimension will be reused if requested multiple times). * - * See {@link http://developer.piwik.org/api-reference/Piwik/Plugin\Dimension\ConversionDimension} for more information. + * See {@link https://developer.matomo.org/api-reference/Piwik/Plugin\Dimension\ConversionDimension} for more information. */ class ExampleConversionDimension extends ConversionDimension { diff --git a/plugins/ExampleTracker/Columns/ExampleDimension.php b/plugins/ExampleTracker/Columns/ExampleDimension.php index 01cbfd72d88..d5193d85a86 100644 --- a/plugins/ExampleTracker/Columns/ExampleDimension.php +++ b/plugins/ExampleTracker/Columns/ExampleDimension.php @@ -14,7 +14,7 @@ /** * This example dimension only defines a name and does not track any data. It's supposed to be only used in reports. * - * See {@link http://developer.piwik.org/api-reference/Piwik/Columns\Dimension} for more information. + * See {@link https://developer.matomo.org/api-reference/Piwik/Columns\Dimension} for more information. */ class ExampleDimension extends Dimension { diff --git a/plugins/ExampleTracker/Columns/ExampleVisitDimension.php b/plugins/ExampleTracker/Columns/ExampleVisitDimension.php index 4cd2bb4fca6..6072a9e76e3 100644 --- a/plugins/ExampleTracker/Columns/ExampleVisitDimension.php +++ b/plugins/ExampleTracker/Columns/ExampleVisitDimension.php @@ -22,7 +22,7 @@ * request url property. Please note that dimension instances are usually cached during one tracking request so they * should be stateless (meaning an instance of this dimension will be reused if requested multiple times). * - * See {@link http://developer.piwik.org/api-reference/Piwik/Plugin\Dimension\VisitDimension} for more information. + * See {@link https://developer.matomo.org/api-reference/Piwik/Plugin\Dimension\VisitDimension} for more information. */ class ExampleVisitDimension extends VisitDimension { diff --git a/plugins/ExampleUI/Reports/GetPlanetRatios.php b/plugins/ExampleUI/Reports/GetPlanetRatios.php index 10bf42aeb64..99e493cbf7a 100644 --- a/plugins/ExampleUI/Reports/GetPlanetRatios.php +++ b/plugins/ExampleUI/Reports/GetPlanetRatios.php @@ -18,7 +18,7 @@ /** * This class defines a new report. * - * See {@link http://developer.piwik.org/api-reference/Piwik/Plugin/Report} for more information. + * See {@link https://developer.matomo.org/api-reference/Piwik/Plugin/Report} for more information. */ class GetPlanetRatios extends Base { diff --git a/plugins/ExampleUI/Reports/GetPlanetRatiosWithLogos.php b/plugins/ExampleUI/Reports/GetPlanetRatiosWithLogos.php index ed543b700bd..06abe0a94fc 100644 --- a/plugins/ExampleUI/Reports/GetPlanetRatiosWithLogos.php +++ b/plugins/ExampleUI/Reports/GetPlanetRatiosWithLogos.php @@ -16,7 +16,7 @@ /** * This class defines a new report. * - * See {@link http://developer.piwik.org/api-reference/Piwik/Plugin/Report} for more information. + * See {@link https://developer.matomo.org/api-reference/Piwik/Plugin/Report} for more information. */ class GetPlanetRatiosWithLogos extends Base { diff --git a/plugins/ExampleUI/Reports/GetTemperatures.php b/plugins/ExampleUI/Reports/GetTemperatures.php index 3ae47dccf4e..d10e75b5ba0 100644 --- a/plugins/ExampleUI/Reports/GetTemperatures.php +++ b/plugins/ExampleUI/Reports/GetTemperatures.php @@ -19,7 +19,7 @@ /** * This class defines a new report. * - * See {@link http://developer.piwik.org/api-reference/Piwik/Plugin/Report} for more information. + * See {@link https://developer.matomo.org/api-reference/Piwik/Plugin/Report} for more information. */ class GetTemperatures extends Base { diff --git a/plugins/ExampleUI/Reports/GetTemperaturesEvolution.php b/plugins/ExampleUI/Reports/GetTemperaturesEvolution.php index cbf4c6be8d3..b4c9b2c527f 100644 --- a/plugins/ExampleUI/Reports/GetTemperaturesEvolution.php +++ b/plugins/ExampleUI/Reports/GetTemperaturesEvolution.php @@ -20,7 +20,7 @@ /** * This class defines a new report. * - * See {@link http://developer.piwik.org/api-reference/Piwik/Plugin/Report} for more information. + * See {@link https://developer.matomo.org/api-reference/Piwik/Plugin/Report} for more information. */ class GetTemperaturesEvolution extends Base { diff --git a/plugins/GeoIp2/data/regionMapping.php b/plugins/GeoIp2/data/regionMapping.php index c1992987f22..e3492dc6276 100644 --- a/plugins/GeoIp2/data/regionMapping.php +++ b/plugins/GeoIp2/data/regionMapping.php @@ -498,7 +498,7 @@ '25' => 'FP', // Freeport '26' => 'CS', // Fresh Creek [is now roughly Central Andros] '27' => 'CE', // Governor's Harbour [is now roughly Central Eleuthera] - '28' => 'HT', // Green Turtle Cay - mapped to GT by wikidata, but removed in 2010 - now HT according to geonames (http://www.geonames.org/maps/google_26.758_-77.325.html) + '28' => 'HT', // Green Turtle Cay - mapped to GT by wikidata, but removed in 2010 - now HT according to geonames (https://www.geonames.org/maps/google_26.758_-77.325.html) '29' => 'EG', // High Rock [is now roughly East Grand Bahama] '30' => 'SA', // Kemps Bay [now in South Andros] '31' => '', // Marsh Harbour diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index 068935a0793..c9c474d1749 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -38,7 +38,7 @@ * Goals API lets you Manage existing goals, via "updateGoal" and "deleteGoal", create new Goals via "addGoal", * or list existing Goals for one or several websites via "getGoals" * - * If you are tracking Ecommerce orders and products on your site, the functions "getItemsSku", "getItemsName" and "getItemsCategory" + * If you are tracking Ecommerce orders and products on your site, the functions "getItemsSku", "getItemsName" and "getItemsCategory" * will return the list of products purchased on your site, either grouped by Product SKU, Product Name or Product Category. For each name, SKU or category, the following * metrics are returned: Total revenue, Total quantity, average price, average quantity, number of orders (or abandoned carts) containing this product, number of visits on the Product page, * Conversion rate. @@ -50,7 +50,7 @@ * If you wish to request specific metrics about Ecommerce goals, you can set the parameter &idGoal=ecommerceAbandonedCart to get metrics about abandoned carts (including Lost revenue, and number of items left in the cart) * or &idGoal=ecommerceOrder to get metrics about Ecommerce orders (number of orders, visits with an order, subtotal, tax, shipping, discount, revenue, items ordered) * - * See also the documentation about Tracking Goals in Matomo. + * See also the documentation about Tracking Goals in Matomo. * * @method static \Piwik\Plugins\Goals\API getInstance() */ diff --git a/plugins/Live/API.php b/plugins/Live/API.php index 7f0013c42d6..0f40b78759f 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -26,7 +26,7 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php'; /** - * The Live! API lets you access complete visit level information about your visitors. Combined with the power of Segmentation, + * The Live! API lets you access complete visit level information about your visitors. Combined with the power of Segmentation, * you will be able to request visits filtered by any criteria. * * The method "getLastVisitsDetails" will return extensive RAW data for each visit, which includes: server time, visitId, visitorId, @@ -38,12 +38,12 @@ * browser, type of screen, resolution, supported browser plugins (flash, java, silverlight, pdf, etc.), various dates & times format to make * it easier for API users... and more! * - * With the parameter '&segment=' you can filter the + * With the parameter '&segment=' you can filter the * returned visits by any criteria (visitor IP, visitor ID, country, keyword used, time of day, etc.). * * The method "getCounters" is used to return a simple counter: visits, number of actions, number of converted visits, in the last N minutes. * - * See also the documentation about Real time widget and visitor level reports in Matomo. + * See also the documentation about Real time widget and visitor level reports in Matomo. * You may also be interested in steps to export your RAW data to a data warehouse. * @method static \Piwik\Plugins\Live\API getInstance() */ diff --git a/plugins/Marketplace/Api/Service.php b/plugins/Marketplace/Api/Service.php index 5ba1b5b5ad7..99bf8ee38c0 100644 --- a/plugins/Marketplace/Api/Service.php +++ b/plugins/Marketplace/Api/Service.php @@ -189,7 +189,7 @@ public function fetch( } /** - * Get the domain that is used in order to access the Marketplace. Eg http://plugins.piwik.org + * Get the domain that is used in order to access the Marketplace. Eg https://plugins.matomo.org * @return string */ public function getDomain() diff --git a/plugins/Marketplace/Emails/RequestTrialNotificationEmail.php b/plugins/Marketplace/Emails/RequestTrialNotificationEmail.php index 0b92a818fe0..6abbdd031f4 100644 --- a/plugins/Marketplace/Emails/RequestTrialNotificationEmail.php +++ b/plugins/Marketplace/Emails/RequestTrialNotificationEmail.php @@ -4,7 +4,7 @@ * Matomo - free/libre analytics platform * * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * @license https://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ declare(strict_types=1); diff --git a/plugins/Marketplace/PluginTrial/Notification.php b/plugins/Marketplace/PluginTrial/Notification.php index cb5291f7b6a..5260ace0750 100644 --- a/plugins/Marketplace/PluginTrial/Notification.php +++ b/plugins/Marketplace/PluginTrial/Notification.php @@ -4,7 +4,7 @@ * Matomo - free/libre analytics platform * * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * @license https://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ namespace Piwik\Plugins\Marketplace\PluginTrial; diff --git a/plugins/Marketplace/PluginTrial/Request.php b/plugins/Marketplace/PluginTrial/Request.php index a188be80c23..649651c9e1d 100644 --- a/plugins/Marketplace/PluginTrial/Request.php +++ b/plugins/Marketplace/PluginTrial/Request.php @@ -4,7 +4,7 @@ * Matomo - free/libre analytics platform * * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * @license https://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ namespace Piwik\Plugins\Marketplace\PluginTrial; diff --git a/plugins/Marketplace/PluginTrial/Service.php b/plugins/Marketplace/PluginTrial/Service.php index 3beae8860e6..5f4d207744f 100644 --- a/plugins/Marketplace/PluginTrial/Service.php +++ b/plugins/Marketplace/PluginTrial/Service.php @@ -4,7 +4,7 @@ * Matomo - free/libre analytics platform * * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * @license https://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ namespace Piwik\Plugins\Marketplace\PluginTrial; diff --git a/plugins/Marketplace/PluginTrial/Storage.php b/plugins/Marketplace/PluginTrial/Storage.php index 9aa0f882feb..2dba1feb3b5 100644 --- a/plugins/Marketplace/PluginTrial/Storage.php +++ b/plugins/Marketplace/PluginTrial/Storage.php @@ -4,7 +4,7 @@ * Matomo - free/libre analytics platform * * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * @license https://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ namespace Piwik\Plugins\Marketplace\PluginTrial; diff --git a/plugins/Marketplace/tests/Integration/PluginTrial/NotificationTest.php b/plugins/Marketplace/tests/Integration/PluginTrial/NotificationTest.php index 075cb454916..cfadf3361da 100644 --- a/plugins/Marketplace/tests/Integration/PluginTrial/NotificationTest.php +++ b/plugins/Marketplace/tests/Integration/PluginTrial/NotificationTest.php @@ -4,7 +4,7 @@ * Matomo - free/libre analytics platform * * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * @license https://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ namespace Piwik\Plugins\Marketplace\tests\Integration\PluginTrial; diff --git a/plugins/Marketplace/tests/Integration/PluginTrial/RequestTest.php b/plugins/Marketplace/tests/Integration/PluginTrial/RequestTest.php index f12fe383fcd..b7a22cde6de 100644 --- a/plugins/Marketplace/tests/Integration/PluginTrial/RequestTest.php +++ b/plugins/Marketplace/tests/Integration/PluginTrial/RequestTest.php @@ -4,7 +4,7 @@ * Matomo - free/libre analytics platform * * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * @license https://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ namespace Piwik\Plugins\Marketplace\tests\Integration\PluginTrial; diff --git a/plugins/Marketplace/tests/Integration/PluginTrial/ServiceTest.php b/plugins/Marketplace/tests/Integration/PluginTrial/ServiceTest.php index 8453f7d0239..1c3287b8f11 100644 --- a/plugins/Marketplace/tests/Integration/PluginTrial/ServiceTest.php +++ b/plugins/Marketplace/tests/Integration/PluginTrial/ServiceTest.php @@ -4,7 +4,7 @@ * Matomo - free/libre analytics platform * * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * @license https://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ namespace Piwik\Plugins\Marketplace\tests\Integration\PluginTrial; diff --git a/plugins/Marketplace/tests/Integration/PluginTrial/StorageTest.php b/plugins/Marketplace/tests/Integration/PluginTrial/StorageTest.php index 06bf143e2c1..a2d2f652f4a 100644 --- a/plugins/Marketplace/tests/Integration/PluginTrial/StorageTest.php +++ b/plugins/Marketplace/tests/Integration/PluginTrial/StorageTest.php @@ -4,7 +4,7 @@ * Matomo - free/libre analytics platform * * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * @license https://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ namespace Piwik\Plugins\Marketplace\tests\Integration\PluginTrial; diff --git a/plugins/Marketplace/tests/UI/Marketplace_RequestTrial_spec.js b/plugins/Marketplace/tests/UI/Marketplace_RequestTrial_spec.js index 15fdce60647..6f7fb60a241 100644 --- a/plugins/Marketplace/tests/UI/Marketplace_RequestTrial_spec.js +++ b/plugins/Marketplace/tests/UI/Marketplace_RequestTrial_spec.js @@ -4,7 +4,7 @@ * Screenshot tests for Marketplace. * * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * @license https://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ describe('Marketplace_RequestTrial', function () { diff --git a/plugins/Marketplace/vue/src/RequestTrial/RequestTrial.vue b/plugins/Marketplace/vue/src/RequestTrial/RequestTrial.vue index 35b23cc46ac..996cac6beef 100644 --- a/plugins/Marketplace/vue/src/RequestTrial/RequestTrial.vue +++ b/plugins/Marketplace/vue/src/RequestTrial/RequestTrial.vue @@ -1,7 +1,7 @@