未验证 提交 82a9b1b0 编写于 作者: T Thomas Steur 提交者: GitHub

Further Piwik.org => Matomo.org replacements (#12415)

* renaming more Piwik mentions

* some more updates

* fix some tests

* support matomo partially as require string

* fix tests

* fix failing system test

* fix tests

* fix system test

* fix test
上级 92cb21b6
此差异已折叠。
......@@ -2,15 +2,15 @@
Great to have you here! Read the following guide on our developer zone to learn how you can help make this project better!
https://developer.piwik.org/guides/contributing-to-piwik-core
https://developer.matomo.org/guides/contributing-to-piwik-core
## How to submit a bug report or suggest a feature?
Please read the recommendations on writing a good [bug report](https://developer.piwik.org/guides/core-team-workflow#submitting-a-bug-report) or [feature request](https://developer.piwik.org/guides/core-team-workflow#submitting-a-feature-request).
Please read the recommendations on writing a good [bug report](https://developer.matomo.org/guides/core-team-workflow#submitting-a-bug-report) or [feature request](https://developer.matomo.org/guides/core-team-workflow#submitting-a-feature-request).
## How to suggest improvements to translations?
You can help improve translations in Piwik, please read [contribute to translations](https://github.com/piwik/piwik/blob/master/lang/README.md).
You can help improve translations in Matomo, please read [contribute to translations](https://github.com/matomo-org/piwik/blob/master/lang/README.md).
## How to submit code improvements via pull requests?
You can help contribute to Piwik codebase via Pull Requests, see [Contributing to Piwik core](https://developer.piwik.org/guides/contributing-to-piwik-core)
You can help contribute to Matomo codebase via Pull Requests, see [Contributing to Matomo core](https://developer.matomo.org/guides/contributing-to-piwik-core)
COPYRIGHT
Piwik - free/libre analytics platform
Matomo - free/libre analytics platform
The software package is:
......@@ -12,17 +12,17 @@ COPYRIGHT
SOFTWARE LICENSE
The free software license of Piwik is GNU General Public License v3
The free software license of Matomo is GNU General Public License v3
or later. A copy of GNU GPL v3 should have been included in this
software package in misc/gpl-3.0.txt.
TRADEMARK
Piwik (TM) is an internationally registered trademark.
Matomo (TM) is an internationally registered trademark.
The software license does not grant any rights under trademark
law for use of the trademark. Refer to https://piwik.org/trademark/
law for use of the trademark. Refer to https://matomo.org/trademark/
for up-to-date trademark licensing information.
*
......@@ -36,12 +36,12 @@ TRADEMARK
CREDITS
The software consists of contributions made by many individuals.
Major contributors are listed in https://piwik.org/the-piwik-team/.
Major contributors are listed in https://matomo.org/the-piwik-team/.
For detailed contribution history, refer to the source, tickets,
patches, and Git revision history, available at
https://github.com/piwik/piwik/issues
https://github.com/piwik/piwik
https://github.com/matomo-org/piwik/issues
https://github.com/matomo-org/piwik
SEPARATELY LICENSED COMPONENTS AND LIBRARIES
......@@ -50,31 +50,31 @@ SEPARATELY LICENSED COMPONENTS AND LIBRARIES
and subject to their respective licenses.
Name: javascriptCode.tpl - tracking tag to embed in your web pages
Link: https://github.com/piwik/piwik/blob/master/core/Tracker/javascriptTag.tpl
Link: https://github.com/matomo-org/piwik/blob/master/core/Tracker/javascriptTag.tpl
License: Public Domain
Name: jquery.truncate
Link: https://github.com/piwik/piwik/blob/master/libs/jquery/truncate/
Link: https://github.com/matomo-org/piwik/blob/master/libs/jquery/truncate/
License: New BSD
Name: piwik.js - JavaScript tracker
Link: https://github.com/piwik/piwik/blob/master/js/piwik.js
Link: https://github.com/matomo-org/piwik/blob/master/js/piwik.js
License: New BSD
Name: PiwikTracker - server-side tracker (PHP)
Link: https://github.com/piwik/piwik/blob/master/libs/PiwikTracker/
Link: https://github.com/matomo-org/piwik/blob/master/libs/PiwikTracker/
License: New BSD
Name: DeviceDetector
Link: https://github.com/piwik/device-detector
Link: https://github.com/matomo-org/device-detector
License: LGPL
Name: Piwik/Decompress
Link: https://github.com/piwik/component-decompress
Link: https://github.com/matomo-org/component-decompress
License: LGPL v3.0
Name: Piwik/Network
Link: https://github.com/piwik/component-network
Link: https://github.com/matomo-org/component-network
License: LGPL v3.0
......@@ -243,7 +243,7 @@ THIRD-PARTY CONTENT
Link: http://www.iconspedia.com/icon/neptune-4672.html
License: Free for non-commercial use
Notes:
- used in Piwik's ExampleUI plugin
- used in Matomo's ExampleUI plugin
Name: flag-icon-css - Lipis
Link: https://github.com/lipis/flag-icon-css
......
......@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
Piwik Copyright (C) 2007-2017 Piwik.org
Matomo Copyright (C) 2007-2018 Matomo.org
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
......
......@@ -9,31 +9,31 @@ In this section we document how to protect the privacy of visitors who are track
By default, Piwik stores the visitor IP address (IPv4 or IPv6 format) in the database for each new visitor.
If a visitor has a static IP address this means her browsing history can be easily identified across several days and
even across several websites tracked within the same Piwik server. You can anonymize IP addresses to ensure visitors cannot
be tracked this way: [How to anonymise IP addresses.](https://piwik.org/docs/privacy/#step-1-automatically-anonymize-visitor-ips)
be tracked this way: [How to anonymise IP addresses.](https://matomo.org/docs/privacy/#step-1-automatically-anonymize-visitor-ips)
### Delete old visitors logs
By default, Piwik stores tracked data forever. To better respect the privacy of your users, it is recommended to regularly
purge old data. You can configure Piwik to automatically delete log data older than a specified number of months:
[How to delete old visitors log data.](https://piwik.org/docs/privacy/#step-2-delete-old-visitors-logs)
[How to delete old visitors log data.](https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs)
### Include a tracking Opt-Out feature on your site
In your website, we recommended providing an easy way for your visitors to “opt-out” of being tracked by Piwik.
You can use the Opt-Out feature to display a link your website that sets a special browser cookie (`piwik_ignore`) when
clicked. Visitors that click that link will be ignored by Piwik in the future:
[How to include a tracking opt-out iframe.](https://piwik.org/docs/privacy/#step-3-include-a-web-analytics-opt-out-feature-on-your-site-using-an-iframe)
[How to include a tracking opt-out iframe.](https://matomo.org/docs/privacy/#step-3-include-a-web-analytics-opt-out-feature-on-your-site-using-an-iframe)
### Respect DoNotTrack preference
Do Not Track is a browser-level technology and policy proposal that lets visitors opt out of tracking by websites they
do not visit. Visitors can enable this preference in their browser, and then it's up to Piwik to respect it. By default,
Piwik is configured to ignore visitors that have enabled it:
[How to check if your Piwik respects DoNotTrack.] (https://piwik.org/docs/privacy/#step-4-respect-donottrack-preference)
[How to check if your Piwik respects DoNotTrack.] (https://matomo.org/docs/privacy/#step-4-respect-donottrack-preference)
### Disable tracking cookies
A cookie is a collection of information that a website stores on a visitor’s computer and accesses each time the visitor
returns. By default, Piwik uses cookies to aid in tracking visitor behavior. If someone gains access to a visitor's
computer, they could learn a few things about how the visitor visited your website. For many websites, this isn't a
problem, but for others where a strong level of privacy is required (like online banking), disabling tracking cookies may
be a good idea: [How to disable tracking cookies.](https://piwik.org/faq/general/faq_157/)
be a good idea: [How to disable tracking cookies.](https://matomo.org/faq/general/faq_157/)
### Keep your visitors details private
Any user that has at least `view` access (the default access level) to Piwik can view detailed information for all users
......@@ -49,7 +49,7 @@ In this section we document how a Piwik administrator can better protect their o
By default, the Piwik Javascript code on all tracked websites contains the Piwik server URL. In some cases you might
want to hide this Piwik URL completely while still tracking all websites in your Piwik instance. To hide your Piwik
server's URL, you can modify the Javascript Tracking code and point it to a proxy piwik.php script instead of your actual
Piwik server: [How to keep Piwik server URL private.](https://piwik.org/faq/how-to/faq_132/)
Piwik server: [How to keep Piwik server URL private.](https://matomo.org/faq/how-to/faq_132/)
### Automatic update check
From time to time, Piwik uses `api.piwik.org` to check if the current version of Piwik is the latest version of Piwik.
......@@ -57,4 +57,4 @@ If an update is available, a notification is displayed allowing you to upgrade P
and stop your instance from sending HTTP requests to `api.piwik.org`, deactivate the "Automatic update" feature by
setting `enable_auto_update = 0` in your configuration file `config/config.ini.php`.
Learn more about [Privacy in Piwik](https://piwik.org/privacy/).
Learn more about [Privacy in Piwik](https://matomo.org/privacy/).
# Piwik - piwik.org
# Matomo (formerly Piwik) - matomo.org
[![Latest Stable Version](https://poser.pugx.org/piwik/piwik/v/stable)](https://piwik.org/download/)
[![Latest Stable Version](https://poser.pugx.org/piwik/piwik/v/stable)](https://matomo.org/download/)
[![Latest Unstable Version](https://poser.pugx.org/piwik/piwik/v/unstable)](https://packagist.org/packages/piwik/piwik)
[![License](https://poser.pugx.org/piwik/piwik/license)](https://piwik.org/free-software/)
[![License](https://poser.pugx.org/piwik/piwik/license)](https://matomo.org/free-software/)
## Code Status
......@@ -14,13 +14,13 @@
## Description
Piwik is the leading Free/Libre open analytics platform.
Matomo is the leading Free/Libre open analytics platform.
Piwik is a full featured PHP MySQL software program that you download and install on your own webserver.
Matomo is a full featured PHP MySQL software program that you download and install on your own webserver.
At the end of the five minute installation process you will be given a JavaScript code.
Simply copy and paste this tag on websites you wish to track and access your analytics reports in real time.
Piwik aims to be a Free software alternative to Google Analytics, and is already used on more than 1,000,000 websites. Privacy is built-in!
Matomo aims to be a Free software alternative to Google Analytics, and is already used on more than 1,000,000 websites. Privacy is built-in!
## Mission Statement
......@@ -31,7 +31,7 @@ Or in short:
## License
Piwik is released under the GPL v3 (or later) license, see [misc/gpl-3.0.txt](misc/gpl-3.0.txt)
Matomo is released under the GPL v3 (or later) license, see [misc/gpl-3.0.txt](misc/gpl-3.0.txt)
## Requirements
......@@ -39,84 +39,84 @@ Piwik is released under the GPL v3 (or later) license, see [misc/gpl-3.0.txt](mi
* PHP 5.5.9 or greater
* MySQL version 5.5 or greater, or MariaDB
* PHP extension pdo and pdo_mysql, or the MySQLi extension.
* Piwik is OS / server independent
* Matomo is OS / server independent
See https://piwik.org/docs/requirements/
See https://matomo.org/docs/requirements/
## Install
* Upload piwik to your webserver
* Upload matomo to your webserver
* Point your browser to the directory
* Follow the steps
* Add the given javascript code to your pages
* (You may also generate fake data to experiment, by enabling the plugin VisitorGenerator)
See https://piwik.org/docs/installation/
See https://matomo.org/docs/installation/
## Free trial
If you do not have a server or don't want to host yourself you can use our Piwik Cloud partner service (30 day free trial): https://www.innocraft.cloud/
If you do not have a server or don't want to host yourself you can use our Matomo Cloud partner service (30 day free trial): https://www.innocraft.cloud/
## Online Demo
Check out the online demo for Piwik at [demo.piwik.org](https://demo.piwik.org/)
Check out the online demo for Matomo at [demo.matomo.org](https://demo.matomo.org/)
## Changelog
For the list of all tickets closed in the current and past releases, see https://piwik.org/changelog/. For the list of technical changes in the Piwik platform, see [https://developer.piwik.org/changelog](https://developer.piwik.org/changelog).
For the list of all tickets closed in the current and past releases, see https://matomo.org/changelog/. For the list of technical changes in the Matomo platform, see [https://developer.matomo.org/changelog](https://developer.matomo.org/changelog).
## Get involved!
We believe in liberating Web Analytics, providing a free platform for simple and advanced analytics. Piwik was built by dozens of people like you,
and we need your help to make Piwik better… Why not participate in a useful project today? [Learn how you can contribute to Piwik.](https://piwik.org/get-involved)
We believe in liberating Web Analytics, providing a free platform for simple and advanced analytics. Matomo was built by dozens of people like you,
and we need your help to make Matomo better… Why not participate in a useful project today? [Learn how you can contribute to Matomo.](https://matomo.org/get-involved)
## Quality Assurance
The Piwik project uses an ever-expanding comprehensive set of thousands of unit tests and hundreds of automated integration tests, system tests, JavaScript tests, and screenshot UI tests, running on a continuous integration server as part of its software quality assurance. [Learn more](https://piwik.org/qa/)
The Matomo project uses an ever-expanding comprehensive set of thousands of unit tests and hundreds of automated integration tests, system tests, JavaScript tests, and screenshot UI tests, running on a continuous integration server as part of its software quality assurance. [Learn more](https://matomo.org/qa/)
We use [BrowserStack.com](https://www.browserstack.com/) testing tool to help check the Piwik user interface is compatible with many browsers.
We use [BrowserStack.com](https://www.browserstack.com/) testing tool to help check the Matomo user interface is compatible with many browsers.
## Security
Security is a top priority at Piwik. As potential issues are discovered, we validate, patch and release fixes as quickly as we can. We have a security bug bounty program in place that rewards researchers for finding security issues and disclosing them to us.
Security is a top priority at Matomo. As potential issues are discovered, we validate, patch and release fixes as quickly as we can. We have a security bug bounty program in place that rewards researchers for finding security issues and disclosing them to us.
[Learn more](https://piwik.org/security/)
[Learn more](https://matomo.org/security/)
## Support for Piwik
## Support for Matomo
For **Free support**, post a message in our community forums: [forum.piwik.org](https://forum.piwik.org/)
For **Free support**, post a message in our community forums: [forum.matomo.org](https://forum.matomo.org/)
For **Professional paid support**, send a message to our network of Piwik professionals: [piwik.org/support](https://piwik.org/contact/)
For **Professional paid support**, send a message to our network of Matomo professionals: [matomo.org/support](https://matomo.org/contact/)
## Contact
Website: [piwik.org](https://piwik.org)
Website: [matomo.org](https://matomo.org)
About us: [piwik.org/team/](https://piwik.org/team/)
About us: [matomo.org/team/](https://matomo.org/team/)
Contact us: [piwik.org/contact/](https://piwik.org/contact/)
Contact us: [matomo.org/contact/](https://matomo.org/contact/)
## More information
What makes Piwik unique from the competition:
What makes Matomo unique from the competition:
* Real time web analytics reports: in Piwik, reports are by default generated in real time.
* Real time web analytics reports: in Matomo, reports are by default generated in real time.
For high traffic websites, you can choose the frequency for reports to be processed.
* You own your web analytics data: since Piwik is installed on your server, the data is stored in your own database and you can get all the statistics using the powerful Piwik Analytics API.
* You own your web analytics data: since Matomo is installed on your server, the data is stored in your own database and you can get all the statistics using the powerful Matomo Analytics API.
* Piwik is a Free Software which can easily be configured to respect your visitors' privacy.
* Matomo is a Free Software which can easily be configured to respect your visitors' privacy.
* Modern, easy to use User Interface: you can fully customize your dashboard, drag and drop widgets and more.
* Piwik features are built inside plugins: you can add new features and remove the ones you don’t need.
You can build your own web analytics plugins or hire a consultant to have your custom feature built in Piwik
* Matomo features are built inside plugins: you can add new features and remove the ones you don’t need.
You can build your own web analytics plugins or hire a consultant to have your custom feature built in Matomo
* Vibrant international Open community of more than 200,000 active users (tracking even more websites!)
* Advanced Web Analytics capabilities such as Ecommerce Tracking, Goal tracking, Campaign tracking,
Custom Variables, Email Reports, Custom Segment Editor, Geo Location, Real time maps, and more!
Documentation and more info on https://piwik.org
Documentation and more info on https://matomo.org
......@@ -7,15 +7,15 @@ The Piwik Security Bug Bounty Program is designed to encourage security research
## Responsible disclosure by email
If you have found a security issue in Piwik please read [our security notes](https://piwik.org/security/) regarding responsible disclosures.
If you have found a security issue in Piwik please read [our security notes](https://matomo.org/security/) regarding responsible disclosures.
[Email your Report Vulnerability to the Piwik Security team](mailto:security@piwik.org?subject=Reporting%20Vulnerability%20in%20Piwik)
[Email your Report Vulnerability to the Piwik Security team](mailto:security@matomo.org?subject=Reporting%20Vulnerability%20in%20Piwik)
## Improve your Piwik Server Security
[Secure Piwik server](https://piwik.org/docs/how-to-secure-piwik/): follow these steps to keep your Piwik data safe.
[Secure Piwik server](https://matomo.org/docs/how-to-secure-piwik/): follow these steps to keep your Piwik data safe.
## Security announcements
Please subscribe to [the Changelog](https://piwik.org/changelog/) ([rss feed](https://piwik.org/changelog/feed/)) to be notified of new releases (including security releases).
Please subscribe to [the Changelog](https://matomo.org/changelog/) ([rss feed](https://matomo.org/changelog/feed/)) to be notified of new releases (including security releases).
......@@ -2,21 +2,21 @@
"name": "piwik/piwik",
"type": "application",
"description": "the leading free/libre analytics platform",
"keywords": ["piwik","web","analytics"],
"homepage": "https://piwik.org",
"keywords": ["piwik","matomo","web","analytics"],
"homepage": "https://matomo.org",
"license": "GPL-3.0+",
"authors": [
{
"name": "The Piwik Team",
"email": "hello@piwik.org",
"homepage": "https://piwik.org/team/"
"name": "The Matomo Team",
"email": "hello@matomo.org",
"homepage": "https://matomo.org/team/"
}
],
"support": {
"forum": "https://forum.piwik.org/",
"issues": "https://github.com/piwik/piwik/issues",
"wiki": "https://github.com/piwik/piwik/wiki",
"source": "https://github.com/piwik/piwik"
"forum": "https://forum.matomo.org/",
"issues": "https://github.com/matomo-org/piwik/issues",
"wiki": "https://github.com/matomo-org/piwik/wiki",
"source": "https://github.com/matomo-org/piwik"
},
"config":{
"platform": {
......
此差异已折叠。
......@@ -170,7 +170,7 @@ abstract class DataTableManipulator
if (empty($meta)) {
throw new Exception(sprintf(
"The DataTable cannot be manipulated: Metadata for report %s.%s could not be found. You can define the metadata in a hook, see example at: https://developer.piwik.org/api-reference/events#apigetreportmetadata",
"The DataTable cannot be manipulated: Metadata for report %s.%s could not be found. You can define the metadata in a hook, see example at: https://developer.matomo.org/api-reference/events#apigetreportmetadata",
$this->apiModule, $this->apiMethod
));
}
......
......@@ -51,7 +51,7 @@ class EnvironmentValidator
if(SettingsServer::isTrackerApiRequest()) {
// if Piwik is not installed yet, the piwik.php should do nothing and not return an error
throw new NotYetInstalledException("As Piwik is not installed yet, the Tracking API cannot proceed and will exit without error.");
throw new NotYetInstalledException("As Matomo is not installed yet, the Tracking API cannot proceed and will exit without error.");
}
if(Common::isPhpCliMode()) {
......
......@@ -43,7 +43,7 @@ class JScriptUIAssetMerger extends UIAssetMerger
protected function generateCacheBuster()
{
$cacheBuster = $this->cacheBuster->piwikVersionBasedCacheBuster($this->getPlugins());
return "/* Piwik Javascript - cb=" . $cacheBuster . "*/\n";
return "/* Matomo Javascript - cb=" . $cacheBuster . "*/\n";
}
protected function getPreamble()
......
......@@ -114,7 +114,7 @@ class StylesheetUIAssetMerger extends UIAssetMerger
protected function getPreamble()
{
return $this->getCacheBusterValue() . "\n"
. "/* Piwik CSS file is compiled with Less. You may be interested in writing a custom Theme for Piwik! */\n";
. "/* Matomo CSS file is compiled with Less. You may be interested in writing a custom Theme for Matomo! */\n";
}
protected function postEvent(&$mergedContent)
......
......@@ -60,7 +60,7 @@ class UIAssetMinifier extends Singleton
private static function validateDependency()
{
if (!class_exists("JShrink\\Minifier")) {
throw new Exception("JShrink could not be found, maybe you are using Piwik from git and need to update Composer. $ php composer.phar update");
throw new Exception("JShrink could not be found, maybe you are using Matomo from git and need to update Composer. $ php composer.phar update");
}
}
}
......@@ -36,7 +36,7 @@ class RequestCommand extends ConsoleCommand
{
$this->setName('climulti:request');
$this->setDescription('Parses and executes the given query. See Piwik\CliMulti. Intended only for system usage.');
$this->addArgument('url-query', InputArgument::REQUIRED, 'Piwik URL query string, for instance: "module=API&method=API.getPiwikVersion&token_auth=123456789"');
$this->addArgument('url-query', InputArgument::REQUIRED, 'Matomo URL query string, for instance: "module=API&method=API.getPiwikVersion&token_auth=123456789"');
$this->addOption('superuser', null, InputOption::VALUE_NONE, 'If supplied, runs the code as superuser.');
}
......
......@@ -225,7 +225,7 @@ class Config
$filename = $hostConfig['file'];
if (!Filesystem::isValidFilename($filename)) {
throw new Exception('Piwik domain is not a valid looking hostname (' . $filename . ').');
throw new Exception('Matomo domain is not a valid looking hostname (' . $filename . ').');
}
$pathLocal = $hostConfig['path'];
......@@ -359,7 +359,7 @@ class Config
$chain = $this->settings->getIniFileChain();
$header = "; <?php exit; ?> DO NOT REMOVE THIS LINE\n";
$header .= "; file automatically generated or modified by Piwik; you can manually override the default values in global.ini.php by redefining them in this file.\n";
$header .= "; file automatically generated or modified by Matomo; you can manually override the default values in global.ini.php by redefining them in this file.\n";
return $chain->dumpChanges($header);
}
......
......@@ -38,7 +38,7 @@ class Console extends Application
$option = new InputOption('piwik-domain',
null,
InputOption::VALUE_OPTIONAL,
'Piwik URL (protocol and domain) eg. "http://piwik.example.org"'
'Matomo URL (protocol and domain) eg. "http://matomo.example.org"'
);
$this->getDefinition()->addOption($option);
......
......@@ -363,7 +363,7 @@ class CronArchive
$timer = new Timer;
$this->logSection("START");
$this->logger->info("Starting Piwik reports archiving...");
$this->logger->info("Starting Matomo reports archiving...");
do {
......@@ -996,7 +996,7 @@ class CronArchive
if($this->makeCliMulti()->supportsAsync()) {
$message .= " For more information and the error message please check in your PHP CLI error log file. As this core:archive command triggers PHP processes over the CLI, you can find where PHP CLI logs are stored by running this command: php -i | grep error_log";
} else {
$message .= " For more information and the error message please check your web server's error Log file. As this core:archive command triggers PHP processes over HTTP, you can find the error message in your Piwik's web server error logs. ";
$message .= " For more information and the error message please check your web server's error Log file. As this core:archive command triggers PHP processes over HTTP, you can find the error message in your Matomo's web server error logs. ";
}
} else {
$message .= "Response was '$response'";
......@@ -1281,7 +1281,7 @@ class CronArchive
private function logInitInfo()
{
$this->logSection("INIT");
$this->logger->info("Running Piwik " . Version::VERSION . " as Super User");
$this->logger->info("Running Matomo " . Version::VERSION . " as Super User");
}
private function logArchiveTimeoutInfo()
......@@ -1290,11 +1290,11 @@ class CronArchive
// Recommend to disable browser archiving when using this script
if (Rules::isBrowserTriggerEnabled()) {
$this->logger->info("- If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings.");
$this->logger->info(" See the doc at: https://piwik.org/docs/setup-auto-archiving/");
$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 Matomo UI > Settings > General Settings.");
$this->logger->info(" See the doc at: https://matomo.org/docs/setup-auto-archiving/");
}
$this->logger->info("- Reports for today will be processed at most every " . $this->todayArchiveTimeToLive
. " seconds. You can change this value in Piwik UI > Settings > General Settings.");
. " seconds. You can change this value in Matomo UI > Settings > General Settings.");
$this->logger->info("- Reports for the current week/month/year will be requested at most every "
. $this->processPeriodsMaximumEverySeconds . " seconds.");
......@@ -1335,7 +1335,7 @@ class CronArchive
$this->logger->info("WARNING: Automatically increasing --force-timeout-for-periods from {$this->forceTimeoutPeriod} to "
. $this->todayArchiveTimeToLive
. " to match the cache timeout for Today's report specified in Piwik UI > Settings > General Settings");
. " to match the cache timeout for Today's report specified in Matomo UI > Settings > General Settings");
return $this->todayArchiveTimeToLive;
}
......
......@@ -62,7 +62,7 @@ class Manager extends \ArrayObject
public function getTable($idTable)
{
if (!isset($this[$idTable])) {
throw new TableNotFoundException(sprintf("Error: table id %s not found in memory. (If this error is causing you problems in production, please report it in Piwik issue tracker.)", $idTable));
throw new TableNotFoundException(sprintf("Error: table id %s not found in memory. (If this error is causing you problems in production, please report it in Matomo issue tracker.)", $idTable));
}
return $this[$idTable];
......
......@@ -78,7 +78,7 @@ class Rss extends Renderer
<guid>$thisPiwikUrl</guid>
<link>$thisPiwikUrl</link>
<title>$title</title>
<author>http://piwik.org</author>
<author>https://matomo.org</author>
<description>";
$out .= Common::sanitizeInputValue($this->renderDataTable($subtable));
......@@ -112,11 +112,11 @@ class Rss extends Renderer
$header = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<rss version=\"2.0\">
<channel>
<title>piwik statistics - RSS</title>
<link>http://piwik.org</link>
<description>Piwik RSS feed</description>
<title>matomo statistics - RSS</title>
<link>https://matomo.org</link>
<description>Matomo RSS feed</description>
<pubDate>$generationDate</pubDate>
<generator>piwik</generator>
<generator>matomo</generator>
<language>en</language>
<lastBuildDate>$generationDate</lastBuildDate>";
return $header;
......