diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bc03edc649f0d6e7df8b951970797fc5823f5c3..7d3dc9aa33c1a72d2e383b42f8acf4445f0322ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-# Piwik Platform Changelog
+# Matomo Platform Changelog
-This is the Developer Changelog for Piwik platform developers. All changes in our HTTP API's, Plugins, Themes, SDKs, etc. are listed below.
+This is the Developer Changelog for Matomo platform developers. All changes in our HTTP API's, Plugins, Themes, SDKs, etc. are listed below.
-The Product Changelog at **[piwik.org/changelog](https://piwik.org/changelog)** lets you see more details about any Piwik release, such as the list of new guides and FAQs, security fixes, and links to all closed issues.
+The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)** lets you see more details about any Matomo release, such as the list of new guides and FAQs, security fixes, and links to all closed issues.
## Piwik 3.2.1
@@ -97,7 +97,7 @@ The Product Changelog at **[piwik.org/changelog](https://piwik.org/changelog)**
## Piwik 3.0.1
### New APIs
-* Live API responses now return a new field ‘generationTimeMilliseconds’ (the generation time for this page, in milliseconds) which is internally used to process the Average generation time in the [Visitor Profile](https://piwik.org/docs/user-profile/)
+* Live API responses now return a new field ‘generationTimeMilliseconds’ (the generation time for this page, in milliseconds) which is internally used to process the Average generation time in the [Visitor Profile](https://matomo.org/docs/user-profile/)
* Added new event `MultiSites.filterRowsForTotalsCalculation` to filter which sites will be included in the All Websites Dashboard totals calculation.
* The method `Piwik\Plugin\Archiver::shouldRunEvenWhenNoVisits()` has been added. By overwriting this method and returning true, a plugin archiver can force the archiving to run even when there was no visit for the website/date/period/segment combination (by default, archivers are skipped when there is no visit).
@@ -105,7 +105,7 @@ The Product Changelog at **[piwik.org/changelog](https://piwik.org/changelog)**
### New guide
-Read more about migrating a plugin from Piwik 2.X to Piwik 3 in [our Migration guide](https://developer.piwik.org/guides/migrate-piwik-2-to-3).
+Read more about migrating a plugin from Piwik 2.X to Piwik 3 in [our Migration guide](https://developer.matomo.org/guides/migrate-piwik-2-to-3).
### Breaking Changes
* When using the Piwik JavaScript Tracking via `_paq.push`, it is now required to configure the tracker (eg calling `setSiteId` and `setTrackerUrl`) before the `piwik.js` JavaScript tracker is loaded to ensure the tracker works correctly.
@@ -137,17 +137,17 @@ If the tracker is not initialised correctly, the browser console will display th
* It is no longer possible to define an introduction text for settings.
* If requesting multiple periods for one report, the keys that define the range are no longer translated. For example before 3.0 an API response may contain: `<result date="From 2010-02-01 to 2010-02-07">` which is now `<result date="2010-02-01,2010-02-07">`.
* The following deprecated events have been removed as mentioned.
- * `Tracker.existingVisitInformation` Use [dimensions](https://developer.piwik.org/guides/dimensions) instead of using `Tracker` events.
+ * `Tracker.existingVisitInformation` Use [dimensions](https://developer.matomo.org/guides/dimensions) instead of using `Tracker` events.
* `Tracker.newVisitorInformation`
* `Tracker.recordAction`
* `Tracker.recordEcommerceGoal`
* `Tracker.recordStandardGoals`
- * `API.getSegmentDimensionMetadata` Define segments in [Dimension](https://developer.piwik.org/guides/dimensions) instead
- * `Menu.Admin.addItems` Create a [Menu](https://developer.piwik.org/guides/menus) instead of using `Menu` events
+ * `API.getSegmentDimensionMetadata` Define segments in [Dimension](https://developer.matomo.org/guides/dimensions) instead
+ * `Menu.Admin.addItems` Create a [Menu](https://developer.matomo.org/guides/menus) instead of using `Menu` events
* `Menu.Reporting.addItems`
* `Menu.Top.addItems`
- * `ViewDataTable.addViewDataTable` Create a [Visualization](https://developer.piwik.org/guides/visualizing-report-data) instead
- * `ViewDataTable.getDefaultType` Specify the default type in a [Report](https://developer.piwik.org/guides/custom-reports) instead
+ * `ViewDataTable.addViewDataTable` Create a [Visualization](https://developer.matomo.org/guides/visualizing-report-data) instead
+ * `ViewDataTable.getDefaultType` Specify the default type in a [Report](https://developer.matomo.org/guides/custom-reports) instead
* `Login.authenticate` Create a custom SessionInitializer instead of using `Login` events
* `Login.initSession.end`
* `Login.authenticate.successful`
@@ -170,7 +170,7 @@ If the tracker is not initialised correctly, the browser console will display th
UserSettings | getLanguageCode | UserLanguage | getLanguageCode
-Read more about migrating a plugin from Piwik 2.X to Piwik 3 on our [Migration guide](https://developer.piwik.org/guides/migrate-piwik-2-to-3).
+Read more about migrating a plugin from Piwik 2.X to Piwik 3 on our [Migration guide](https://developer.matomo.org/guides/migrate-piwik-2-to-3).
### Deprecations
* The method `Piwik\Updates::getMigrationQueries()` has been deprecated and renamed to `getMigrations()`. It is still supported to use the method, but the method will be removed in Piwik 4.0.0
@@ -199,7 +199,7 @@ Read more about migrating a plugin from Piwik 2.X to Piwik 3 on our [Migration g
* `PluginManager.pluginUninstalled` triggered after a plugin was uninstalled
* `Updater.componentInstalled` triggered after a component was installed
* `Updater.componentUninstalled` triggered after a component was uninstalled
-* New HTTP Tracking API parameter `pv_id` which accepts a six character unique ID that identifies which actions were performed on a specific page view. Read more about it in the [HTTP Tracking API](https://developer.piwik.org/api-reference/tracking-api);
+* New HTTP Tracking API parameter `pv_id` which accepts a six character unique ID that identifies which actions were performed on a specific page view. Read more about it in the [HTTP Tracking API](https://developer.matomo.org/api-reference/tracking-api);
* New event `Segment.addSegments` that lets you add segments.
* New Piwik JavaScript Tracker method `disableHeartBeatTimer()` to disable the heartbeat timer if it was previously enabled.
* The `SitesManager.getJavascriptTag` has a new option `getJavascriptTag` to enable the tracking of users that have JavaScript disabled
@@ -234,7 +234,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.piwik.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.](http://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.
@@ -243,7 +243,7 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
* `piwik.js`, if you call the method `setDomains` note that that the behavior has slightly changed. The current page domain (hostname) will now be added automatically if none of the given host alias passed as a parameter to `setDomains` contain a path and if no host alias is already given for the current host alias.
Say you are on "example.org" and set `hostAlias = ['example.com', 'example.org/test']` then the current "example.org" domain will not be added as there is already a more restrictive hostAlias 'example.org/test' given.
We also do not add the current page domain (hostname) automatically if there was any other host specifying any path such as `['example.com', 'example2.com/test']`.
- In this case we also do not add the current page domain "example.org" automatically as the "path" feature is used. As soon as someone uses the path feature, for Piwik JS Tracker to work correctly in all cases, one needs to specify all hosts manually. [Learn more.](http://developer.piwik.org/guides/tracking-javascript-guide#measuring-domains-andor-sub-domains)
+ In this case we also do not add the current page domain "example.org" automatically as the "path" feature is used. As soon as someone uses the path feature, for Piwik JS Tracker to work correctly in all cases, one needs to specify all hosts manually. [Learn more.](http://developer.matomo.org/guides/tracking-javascript-guide#measuring-domains-andor-sub-domains)
* `piwik.js`: after an ecommerce order is tracked using `trackEcommerceOrder`, the items in the cart will now be removed from the JavaScript object. Calling `trackEcommerceCartUpdate` will not remove the items in the cart.
@@ -251,7 +251,7 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
### New features
* New method `setIsWritableByCurrentUser` for `SystemSetting` to change the writable permission for certain system settings via DI.
- * JS Tracker: `setDomains` function now supports page wildcards matching eg. `example.com/index*` which can be useful when [tracking a group of pages within a domain in a separate website in Piwik](http://developer.piwik.org/guides/tracking-javascript-guide#tracking-a-group-of-pages-in-a-separate-website)
+ * JS Tracker: `setDomains` function now supports page wildcards matching eg. `example.com/index*` which can be useful when [tracking a group of pages within a domain in a separate website in Piwik](http://developer.matomo.org/guides/tracking-javascript-guide#tracking-a-group-of-pages-in-a-separate-website)
* To customise the list of URL query parameters to be removed from your URLs, you can now define and overwrite `url_query_parameter_to_exclude_from_url` INI setting in your `config.ini.php` file. By default, the following query string parameters will be removed: `gclid, fb_xd_fragment, fb_comment_id, phpsessid, jsessionid, sessionid, aspsessionid, doing_wp_cron, sid`.
### Deprecations
@@ -259,14 +259,14 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
* `SettingsServer::isApache()`
### New guides
- * JavaScript Tracker: [Measuring domains and/or sub-domains](http://developer.piwik.org/guides/tracking-javascript-guide#measuring-domains-andor-sub-domains)
+ * JavaScript Tracker: [Measuring domains and/or sub-domains](http://developer.matomo.org/guides/tracking-javascript-guide#measuring-domains-andor-sub-domains)
### Breaking Changes
* Reporting API: when a cell value in a CSV or TSV (excel) data export starts with a character `=`, `-` or `+`, Piwik will now prefix the value with `'` to ensure that it is displayed correctly in Excel or OpenOffice/LibreOffice.
### Internal change
* Tracking API: by default, when tracking a Page URL, Piwik will now remove the URL query string parameter `sid` if it is found.
- * In the JavaScript tracker, the function `setDomains` will not anymore attempt to set a cookie path. Learn more about [configuring the tracker correctly](http://developer.piwik.org/guides/tracking-javascript-guide#tracking-one-domain) when tracking one or several domains and/or paths.
+ * In the JavaScript tracker, the function `setDomains` will not anymore attempt to set a cookie path. Learn more about [configuring the tracker correctly](http://developer.matomo.org/guides/tracking-javascript-guide#tracking-one-domain) when tracking one or several domains and/or paths.
## Piwik 2.16.1
@@ -278,9 +278,9 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
### New features
* New segment `actionType` lets you segment all actions of a given type, eg. `actionType==events` or `actionType==downloads`. Action types values are: `pageviews`, `contents`, `sitesearches`, `events`, `outlinks`, `downloads`
* New segment `actionUrl` lets you segment any action that matches a given URL, whether they are Pageviews, Site searches, Contents, Downloads or Events.
- * New segment `deviceBrand` lets you restrict your users to those using a particular device brand such as Apple, Samsung, LG, Google, Nokia, Sony, Lenovo, Alcatel, etc. View the [complete list of device brands.](http://developer.piwik.org/api-reference/segmentation)
+ * New segment `deviceBrand` lets you restrict your users to those using a particular device brand such as Apple, Samsung, LG, Google, Nokia, Sony, Lenovo, Alcatel, etc. View the [complete list of device brands.](http://developer.matomo.org/api-reference/segmentation)
* New segment operators `=^` "Starts with" and `=$` "Ends with" complement the existing segment operators: Contains, Does not contain, Equals, Not equals, Greater than or equal to, Less than or equal to.
- * The JavaScript Tracker method `PiwikTracker.setDomains()` can now handle paths. This means when setting eg `_paq.push(['setDomains, '*.piwik.org/website1'])` all link that goes to the same domain `piwik.org` but to any other path than `website1/*` will be treated as outlink.
+ * The JavaScript Tracker method `PiwikTracker.setDomains()` can now handle paths. This means when setting eg `_paq.push(['setDomains, '*.matomo.org/website1'])` all link that goes to the same domain `matomo.org` but to any other path than `website1/*` will be treated as outlink.
* In Administration > Websites, for each website, there is a checkbox "Only track visits and actions when the action URL starts with one of the above URLs". In Piwik 2.14.0, any action URL starting with one of the Alias URLs or starting with a subdomain of the Alias URL would be tracked. As of Piwik 2.15.0, when this checkbox is enabled, it may track less data: action URLs on an Alias URL subdomain will not be tracked anymore (you must specify each sub-domain as Alias URL).
* It is now possible to pass an option `php-cli-options` to the `core:archive` command. The given cli options will be forwarded to the actual PHP command. This allows to for example specify a different memory limit for the archiving process like this: `./console core:archive --php-cli-options="-d memory_limit=8G"`
* New less variable `@theme-color-menu-contrast-textSelected` that lets you specify the color of a selected menu item.
@@ -293,8 +293,8 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
* `UsersManager.*` API calls: when an API request specifies a `token_auth` of a user with `admin` permission, the returned dataset will not include all usernames as previously, API will now only return usernames for users with `view` or `admin` permission to website(s) viewable by this `token_auth`.
* When generating a new plugin skeleton via `generate:plugin` command, plugin name must now contain only letters and numbers.
* JavaScript Tracker tests no longer require `SQLite`. The existing MySQL configuration for tests is used now. In order to run the tests make sure Piwik is installed and `[database_tests]` is configured in `config/config.ini.php`.
- * The definitions for search engine and social network detection have been moved from bundled data files to a separate package (see [https://github.com/piwik/searchengine-and-social-list](https://github.com/piwik/searchengine-and-social-list)).
- * In [UI screenshot tests](https://developer.piwik.org/guides/tests-ui), a test environment `configOverride` setting should be no longer overwritten. Instead new values should be added to the existing `configOverride` array in PHP or JavaScript. For example instead of `testEnvironment.configOverride = {group: {name: 1}}` use `testEnvironment.overrideConfig('group', 'name', '1')`.
+ * The definitions for search engine and social network detection have been moved from bundled data files to a separate package (see [https://github.com/matomo-org/searchengine-and-social-list](https://github.com/matomo-org/searchengine-and-social-list)).
+ * In [UI screenshot tests](https://developer.matomo.org/guides/tests-ui), a test environment `configOverride` setting should be no longer overwritten. Instead new values should be added to the existing `configOverride` array in PHP or JavaScript. For example instead of `testEnvironment.configOverride = {group: {name: 1}}` use `testEnvironment.overrideConfig('group', 'name', '1')`.
### New APIs
* Add your own SMS/Text provider by creating a new class in the `SMSProvider` directory of your plugin. The class has to extend `Piwik\Plugins\MobileMessaging\SMSProvider` and implement the required methods.
@@ -309,7 +309,7 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
### New commands
* New command `diagnostics:analyze-archive-table` that analyzes archive tables
* New command `database:optimize-archive-tables` to optimize archive tables and possibly save disk space (even if on InnoDB)
- * New Command `core:invalidate-report-data` to invalidate archive data (w/ period cascading) ([FAQ](https://piwik.org/faq/how-to/faq_155/))
+ * New Command `core:invalidate-report-data` to invalidate archive data (w/ period cascading) ([FAQ](https://matomo.org/faq/how-to/faq_155/))
### New APIs and features
* Piwik 2.15.0 is now mostly compatible with PHP7.
@@ -318,7 +318,7 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
* The new method `Piwik\Menu\MenuAbstract::registerMenuIcon()` can be used to define an icon for a menu category to replace the default arrow icon.
* New event `CronArchive.getIdSitesNotUsingTracker` that allows you to set a list of idSites that do not use the Tracker API to make sure we archive these sites if needed.
* New events `CronArchive.init.start` which is triggered when the CLI archiver starts and `CronArchive.end` when the archiver ended.
-* Piwik tracker can now be configured with strict Content Security Policy ([CSP FAQ](https://piwik.org/faq/general/faq_20904/)).
+* Piwik tracker can now be configured with strict Content Security Policy ([CSP FAQ](https://matomo.org/faq/general/faq_20904/)).
* Super Users can choose whether to use the latest stable release or latest Long Term Support release.
### Breaking Changes
@@ -332,7 +332,7 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
* The following HTTP API methods have been deprecated and will be removed in Piwik 3.0:
* `SitesManager.getSitesIdWithVisits`
* `API.getLastDate`
-* The following events have been deprecated and will be removed in Piwik 3.0. Use [dimensions](http://developer.piwik.org/guides/dimensions) instead.
+* The following events have been deprecated and will be removed in Piwik 3.0. Use [dimensions](https://developer.matomo.org/guides/dimensions) instead.
* `Tracker.existingVisitInformation`
* `Tracker.getVisitFieldsToPersist`
* `Tracker.newConversionInformation`
@@ -356,7 +356,7 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
### Breaking Changes
* The `UserSettings` API has been removed. The API was deprecated in earlier versions. Use `DevicesDetection`, `Resolution` and `DevicePlugins` API instead.
-* Many translations have been moved to the new Intl plugin. Most of them will still work, but please update their usage. See https://github.com/piwik/piwik/pull/8101 for a full list
+* Many translations have been moved to the new Intl plugin. Most of them will still work, but please update their usage. See https://github.com/matomo-org/piwik/pull/8101 for a full list
### New features
* The JavaScript Tracker does now track outlinks and downloads if a user opens the context menu if the `enabled` parameter of the `enableLinkTracking()` method is set to `true`. To use this new feature use `tracker.enableLinkTracking(true)` or `_paq.push(['enableLinkTracking', true]);`. This is not industry standard and is vulnerable to false positives since not every user will select "Open in a new tab" when the context menu is shown. Most users will do though and it will lead to more accurate results in most cases.
@@ -397,7 +397,7 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
### Internal changes
-* The referrer spam filter has moved from the `referrer_urls_spam` INI option (in `global.ini.php`) to a separate package (see [https://github.com/piwik/referrer-spam-blacklist](https://github.com/piwik/referrer-spam-blacklist)).
+* The referrer spam filter has moved from the `referrer_urls_spam` INI option (in `global.ini.php`) to a separate package (see [https://github.com/matomo-org/referrer-spam-blacklist](https://github.com/matomo-org/referrer-spam-blacklist)).
## Piwik 2.12.0
@@ -464,14 +464,14 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
* During UI tests we do now add a CSS class to the HTML element called `uiTest`. This allows you do hide content when screenshots are captured.
### New commands
-* A new command (core:fix-duplicate-log-actions) has been added which can be used to remove duplicate actions and correct references to them in other tables. Duplicates were caused by this bug: [#6436](https://github.com/piwik/piwik/issues/6436)
+* A new command (core:fix-duplicate-log-actions) has been added which can be used to remove duplicate actions and correct references to them in other tables. Duplicates were caused by this bug: [#6436](https://github.com/matomo-org/piwik/issues/6436)
### Library updates
* Updated AngularJS from 1.2.26 to 1.2.28
* Updated piwik/device-detector from 2.8 to 3.0
### Internal change
-* UI specs were moved from `tests/PHPUnit/UI` to `tests/UI`. We also moved the UI specs directly into the Piwik repository meaning the [piwik-ui-tests](https://github.com/piwik/piwik-ui-tests) repository contains only the expected screenshots from now on.
+* UI specs were moved from `tests/PHPUnit/UI` to `tests/UI`. We also moved the UI specs directly into the Piwik repository meaning the [piwik-ui-tests](https://github.com/matomo-org/piwik-ui-tests) repository contains only the expected screenshots from now on.
* There is a new command `development:sync-system-test-processed` for core developers that allows you to copy processed test results from travis to your local dev environment.
## Piwik 2.10.0
@@ -484,14 +484,14 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
* `Log.formatFileMessage`
* `Log.formatDatabaseMessage`
* `Log.formatScreenMessage`
- * These events have been removed as Piwik now uses the Monolog logging library. [Learn more.](http://developer.piwik.org/guides/logging)
+ * These events have been removed as Piwik now uses the Monolog logging library. [Learn more.](http://developer.matomo.org/guides/logging)
* The event `Log.getAvailableWriters` has been removed: to add custom log backends, you now need to configure Monolog handlers
* The INI options `log_only_when_cli` and `log_only_when_debug_parameter` have been removed
### Library updates
* We added the `symfony/var-dumper` library allowing you to better print any arbitrary PHP variable via `dump($var1, $var2, ...)`.
* Piwik now uses [Monolog](https://github.com/Seldaek/monolog) as a logger.
-* The tracker proxy (previously in `misc/proxy-hide-piwik-url/`) has been moved to a separate repository: [https://github.com/piwik/tracker-proxy](https://github.com/piwik/tracker-proxy).
+* The tracker proxy (previously in `misc/proxy-hide-piwik-url/`) has been moved to a separate repository: [https://github.com/matomo-org/tracker-proxy](https://github.com/matomo-org/tracker-proxy).
### Deprecations
* Some duplicate reports from UserSettings plugin have been removed. Widget URLs for those reports will still work till May 1st 2015. Please update those to the new reports of DevicesDetection plugin.
@@ -515,7 +515,7 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
* The HTTP Tracker API does now respond with a HTTP 400 instead of a HTTP 500 in case an invalid `idsite` is used
### New APIs
-* New URL parameter `send_image=0` in the [HTTP Tracking API](http://developer.piwik.org/api-reference/tracking-api) to receive a HTTP 204 response code instead of a GIF image. This improves performance and can fix errors if images are not allowed to be obtained directly (eg Chrome Apps).
+* New URL parameter `send_image=0` in the [HTTP Tracking API](http://developer.matomo.org/api-reference/tracking-api) to receive a HTTP 204 response code instead of a GIF image. This improves performance and can fix errors if images are not allowed to be obtained directly (eg Chrome Apps).
### New commands
* `core:plugin list` lists all plugins currently activated in Piwik.
@@ -523,15 +523,15 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
## Piwik 2.9.0
### Breaking Changes
-* Development related [console commands](http://developer.piwik.org/guides/piwik-on-the-command-line) are only available if the development mode is enabled. To enable the development mode execute `./console development:enable`.
+* Development related [console commands](http://developer.matomo.org/guides/piwik-on-the-command-line) are only available if the development mode is enabled. To enable the development mode execute `./console development:enable`.
* The command `php console core:update` does no longer have a parameter `--dry-run`. A dry run is now executed by default followed by a question whether one actually wants to execute the updates. To skip this confirmation step one can use the `--yes` option.
### Deprecations
-* Most methods of `Piwik\IP` have been deprecated in favor of the new [piwik/network](https://github.com/piwik/component-network) component.
+* Most methods of `Piwik\IP` have been deprecated in favor of the new [piwik/network](https://github.com/matomo-org/component-network) component.
* The file `tests/PHPUnit/phpunit.xml` is no longer needed in order to run tests and we suggest to delete it. The test configuration is now done automatically if possible. In case the tests do no longer work check out the `[tests]` section in `config/global.ini.php`
### Library updates
-* Code for manipulating IP addresses has been moved to a separate standalone component: [piwik/network](https://github.com/piwik/component-network). Backward compatibility is kept in Piwik core.
+* Code for manipulating IP addresses has been moved to a separate standalone component: [piwik/network](https://github.com/matomo-org/component-network). Backward compatibility is kept in Piwik core.
## Piwik 2.8.2
@@ -547,8 +547,8 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
If your Auth implementation implements its own session logic you will have to extend and override SessionInitializer.
* The following methods have been added: setPassword, setPasswordHash, getTokenAuthSecret and getLogin.
* Clarifying semantics of each method and what they must support and can support.
- * **Read the documentation for the [Auth interface](http://developer.piwik.org/2.x/api-reference/Piwik/Auth) to learn more.**
-* The `Piwik\Unzip\*` classes have been extracted out of the Piwik repository into a separate component named [Decompress](https://github.com/piwik/component-decompress).
+ * **Read the documentation for the [Auth interface](http://developer.matomo.org/2.x/api-reference/Piwik/Auth) to learn more.**
+* The `Piwik\Unzip\*` classes have been extracted out of the Piwik repository into a separate component named [Decompress](https://github.com/matomo-org/component-decompress).
* `Piwik\Unzip` has not moved, it is kept for backward compatibility. If you have been using that class, you don't need to change anything.
* The `Piwik\Unzip\*` classes (Tar, PclZip, Gzip, ZipArchive) have moved to the `Piwik\Decompress\*` namespace (inside the new repository).
* `Piwik\Unzip\UncompressInterface` has been moved and renamed to `Piwik\Decompress\DecompressInterface` (inside the new repository).
@@ -564,7 +564,7 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
* The class `\Piwik\Tests\OverrideLogin` is deprecated and will be removed from February 6ths 2015. Use `\Piwik\Framework\Framework\OverrideLogin` instead.
### New API Features
-* The pivotBy and related query parameters can be used to pivot reports by another dimension. Read more about the new query parameters [here](http://developer.piwik.org/api-reference/reporting-api#optional-api-parameters).
+* The pivotBy and related query parameters can be used to pivot reports by another dimension. Read more about the new query parameters [here](http://developer.matomo.org/api-reference/reporting-api#optional-api-parameters).
### Library updates
* Updated AngularJS from 1.2.13 to 1.2.25
@@ -579,14 +579,14 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
## Piwik 2.7.0
### Reporting APIs
-* Several APIs will now expose a new metric `nb_users` which measures the number of unique users when a [User ID](http://piwik.org/docs/user-id/) is set.
-* New APIs have been added for [Content Tracking](http://piwik.org/docs/content-tracking/) feature: Contents.getContentNames, Contents.getContentPieces
+* Several APIs will now expose a new metric `nb_users` which measures the number of unique users when a [User ID](http://matomo.org/docs/user-id/) is set.
+* New APIs have been added for [Content Tracking](https://matomo.org/docs/content-tracking/) feature: Contents.getContentNames, Contents.getContentPieces
### Deprecations
-* The `Piwik\Menu\MenuAbstract::add()` method is deprecated in favor of `addItem()`. Read more about this here: [#6140](https://github.com/piwik/piwik/issues/6140). We do not plan to remove the deprecated method before Piwik 3.0.
+* The `Piwik\Menu\MenuAbstract::add()` method is deprecated in favor of `addItem()`. Read more about this here: [#6140](https://github.com/matomo-org/piwik/issues/6140). We do not plan to remove the deprecated method before Piwik 3.0.
### New APIs
-* It is now easier to generate the URL for a menu item see [#6140](https://github.com/piwik/piwik/issues/6140), [urlForDefaultAction()](http://developer.piwik.org/2.x/api-reference/Piwik/Plugin/Menu#urlfordefaultaction), [urlForAction()](http://developer.piwik.org/2.x/api-reference/Piwik/Plugin/Menu#urlforaction), [urlForModuleAction()](http://developer.piwik.org/2.x/api-reference/Piwik/Plugin/Menu#urlformoduleaction)
+* It is now easier to generate the URL for a menu item see [#6140](https://github.com/matomo-org/piwik/issues/6140), [urlForDefaultAction()](http://developer.matomo.org/2.x/api-reference/Piwik/Plugin/Menu#urlfordefaultaction), [urlForAction()](http://developer.matomo.org/2.x/api-reference/Piwik/Plugin/Menu#urlforaction), [urlForModuleAction()](http://developer.matomo.org/2.x/api-reference/Piwik/Plugin/Menu#urlformoduleaction)
### New commands
* `core:clear-caches` Lets you easily delete all caches. This command can be useful for instance after updating Piwik files manually.
@@ -612,50 +612,50 @@ The folder containing expected screenshots was renamed from `expected-ui-screens
## Piwik 2.5.0
### Breaking Changes
-* Javascript Tracking API: if you are using `getCustomVariable` function to access custom variables values that were set on previous page views, you now must also call `storeCustomVariablesInCookie` before the first call to `trackPageView`. Read more about [Javascript Tracking here](http://developer.piwik.org/api-reference/tracking-javascript).
-* The [settings](http://developer.piwik.org/guides/piwik-configuration) API will receive the actual entered value and will no longer convert characters like `&` to `&`. If you still want this behavior - for instance to prevent XSS - you can define a filter by setting the `transform` property like this:
+* Javascript Tracking API: if you are using `getCustomVariable` function to access custom variables values that were set on previous page views, you now must also call `storeCustomVariablesInCookie` before the first call to `trackPageView`. Read more about [Javascript Tracking here](http://developer.matomo.org/api-reference/tracking-javascript).
+* The [settings](http://developer.matomo.org/guides/piwik-configuration) API will receive the actual entered value and will no longer convert characters like `&` to `&`. If you still want this behavior - for instance to prevent XSS - you can define a filter by setting the `transform` property like this:
`$setting->transform = function ($value) { return Common::sanitizeInputValue($value); }`
* Config setting `disable_merged_assets` moved from `Debug` section to `Development`. The updater will automatically change the section for you.
-* `API.getRowEvolution` will throw an exception if a report is requested that does not have a dimension, for instance `VisitsSummary.get`. This is a fix as an invalid format was returned before see [#5951](https://github.com/piwik/piwik/issues/5951)
-* `MultiSites.getAll` returns from now on always an array of websites. In the past it returned a single object and it didn't contain all properties in case only one website was found which was a bug see [#5987](https://github.com/piwik/piwik/issues/5987)
+* `API.getRowEvolution` will throw an exception if a report is requested that does not have a dimension, for instance `VisitsSummary.get`. This is a fix as an invalid format was returned before see [#5951](https://github.com/matomo-org/piwik/issues/5951)
+* `MultiSites.getAll` returns from now on always an array of websites. In the past it returned a single object and it didn't contain all properties in case only one website was found which was a bug see [#5987](https://github.com/matomo-org/piwik/issues/5987)
### Deprecations
The following events are considered as deprecated and the new structure should be used in the future. We have not scheduled when those events will be removed but probably in Piwik 3.0 which is not scheduled yet and won't be soon. New features will be added only to the new classes.
-* `API.getReportMetadata`, `API.getSegmentDimensionMetadata`, `Goals.getReportsWithGoalMetrics`, `ViewDataTable.configure`, `ViewDataTable.getDefaultType`: use [Report](http://developer.piwik.org/2.x/api-reference/Piwik/Plugin/Report) class instead to define new reports. There is an updated guide as well [Part1](http://developer.piwik.org/guides/getting-started-part-1)
-* `WidgetsList.addWidgets`: use [Widgets](http://developer.piwik.org/2.x/api-reference/Piwik/Plugin/Widgets) class instead to define new widgets
-* `Menu.Admin.addItems`, `Menu.Reporting.addItems`, `Menu.Top.addItems`: use [Menu](http://developer.piwik.org/api-reference/Piwik/Plugin/Menu) class instead
-* `TaskScheduler.getScheduledTasks`: use [Tasks](http://developer.piwik.org/2.x/api-reference/Piwik/Plugin/Tasks) class instead to define new tasks
-* `Tracker.recordEcommerceGoal`, `Tracker.recordStandardGoals`, `Tracker.newConversionInformation`: use [Conversion Dimension](http://developer.piwik.org/api-reference/Piwik/Plugin/Dimension/ConversionDimension) class instead
-* `Tracker.existingVisitInformation`, `Tracker.newVisitorInformation`, `Tracker.getVisitFieldsToPersist`: use [Visit Dimension](http://developer.piwik.org/api-reference/Piwik/Plugin/Dimension/VisitDimension) class instead
+* `API.getReportMetadata`, `API.getSegmentDimensionMetadata`, `Goals.getReportsWithGoalMetrics`, `ViewDataTable.configure`, `ViewDataTable.getDefaultType`: use [Report](http://developer.matomo.org/2.x/api-reference/Piwik/Plugin/Report) class instead to define new reports. There is an updated guide as well [Part1](http://developer.matomo.org/guides/getting-started-part-1)
+* `WidgetsList.addWidgets`: use [Widgets](http://developer.matomo.org/2.x/api-reference/Piwik/Plugin/Widgets) class instead to define new widgets
+* `Menu.Admin.addItems`, `Menu.Reporting.addItems`, `Menu.Top.addItems`: use [Menu](http://developer.matomo.org/api-reference/Piwik/Plugin/Menu) class instead
+* `TaskScheduler.getScheduledTasks`: use [Tasks](http://developer.matomo.org/2.x/api-reference/Piwik/Plugin/Tasks) class instead to define new tasks
+* `Tracker.recordEcommerceGoal`, `Tracker.recordStandardGoals`, `Tracker.newConversionInformation`: use [Conversion Dimension](http://developer.matomo.org/api-reference/Piwik/Plugin/Dimension/ConversionDimension) class instead
+* `Tracker.existingVisitInformation`, `Tracker.newVisitorInformation`, `Tracker.getVisitFieldsToPersist`: use [Visit Dimension](http://developer.matomo.org/api-reference/Piwik/Plugin/Dimension/VisitDimension) class instead
* `ViewDataTable.addViewDataTable`: This event is no longer needed. Visualizations are automatically discovered if they are placed within a `Visualizations` directory inside the plugin.
### New features
#### Translation search
-As a plugin developer you might want to reuse existing translation keys. You can now find all available translations and translation keys by opening the page "Settings => Development:Translation search" in your Piwik installation. Read more about [internationalization](http://developer.piwik.org/guides/internationalization) here.
+As a plugin developer you might want to reuse existing translation keys. You can now find all available translations and translation keys by opening the page "Settings => Development:Translation search" in your Piwik installation. Read more about [internationalization](http://developer.matomo.org/guides/internationalization) here.
#### Reporting API
It is now possible to use the `filter_sort_column` parameter when requesting `Live.getLastVisitDetails`. For instance `&filter_sort_column=visitCount`.
#### @since annotation
-We are using `@since` annotations in case we are introducing new API's to make it easy to see in which Piwik version a new method was added. This information is now displayed in the [Classes API-Reference](http://developer.piwik.org/api-reference/classes).
+We are using `@since` annotations in case we are introducing new API's to make it easy to see in which Piwik version a new method was added. This information is now displayed in the [Classes API-Reference](http://developer.matomo.org/api-reference/classes).
### New APIs
-* [Report](http://developer.piwik.org/2.x/api-reference/Piwik/Plugin/Report) to add a new report
-* [Action Dimension](http://developer.piwik.org/2.x/api-reference/Piwik/Plugin/Dimension/ActionDimension) to add a dimension that tracks action related information
-* [Visit Dimension](http://developer.piwik.org/2.x/api-reference/Piwik/Plugin/Dimension/VisitDimension) to add a dimension that tracks visit related information
-* [Conversion Dimension](http://developer.piwik.org/2.x/api-reference/Piwik/Plugin/Dimension/ConversionDimension) to add a dimension that tracks conversion related information
-* [Dimension](http://developer.piwik.org/2.x/api-reference/Piwik/Columns/Dimension) to add a basic non tracking dimension that can be used in `Reports`
-* [Widgets](http://developer.piwik.org/2.x/api-reference/Piwik/Plugin/Widgets) to add or modfiy widgets
+* [Report](http://developer.matomo.org/2.x/api-reference/Piwik/Plugin/Report) to add a new report
+* [Action Dimension](http://developer.matomo.org/2.x/api-reference/Piwik/Plugin/Dimension/ActionDimension) to add a dimension that tracks action related information
+* [Visit Dimension](http://developer.matomo.org/2.x/api-reference/Piwik/Plugin/Dimension/VisitDimension) to add a dimension that tracks visit related information
+* [Conversion Dimension](http://developer.matomo.org/2.x/api-reference/Piwik/Plugin/Dimension/ConversionDimension) to add a dimension that tracks conversion related information
+* [Dimension](http://developer.matomo.org/2.x/api-reference/Piwik/Columns/Dimension) to add a basic non tracking dimension that can be used in `Reports`
+* [Widgets](http://developer.matomo.org/2.x/api-reference/Piwik/Plugin/Widgets) to add or modfiy widgets
* These Menu classes got new methods that make it easier to add new items to a specific section
- * [MenuAdmin](http://developer.piwik.org/2.x/api-reference/Piwik/Menu/MenuAdmin) to add or modify admin menu items.
- * [MenuReporting](http://developer.piwik.org/2.x/api-reference/Piwik/Menu/MenuReporting) to add or modify reporting menu items
- * [MenuUser](http://developer.piwik.org/2.x/api-reference/Piwik/Menu/MenuUser) to add or modify user menu items
-* [Tasks](http://developer.piwik.org/2.x/api-reference/Piwik/Plugin/Tasks) to add scheduled tasks
+ * [MenuAdmin](http://developer.matomo.org/2.x/api-reference/Piwik/Menu/MenuAdmin) to add or modify admin menu items.
+ * [MenuReporting](http://developer.matomo.org/2.x/api-reference/Piwik/Menu/MenuReporting) to add or modify reporting menu items
+ * [MenuUser](http://developer.matomo.org/2.x/api-reference/Piwik/Menu/MenuUser) to add or modify user menu items
+* [Tasks](http://developer.matomo.org/2.x/api-reference/Piwik/Plugin/Tasks) to add scheduled tasks
### New commands
-* `generate:theme` lets you easily generate a new theme and customize colors, see the [Theming guide](http://developer.piwik.org/guides/theming)
+* `generate:theme` lets you easily generate a new theme and customize colors, see the [Theming guide](http://developer.matomo.org/guides/theming)
* `generate:update` lets you generate an update file
* `generate:report` lets you generate a report
* `generate:dimension` lets you enhance the tracking by adding new dimensions
@@ -666,7 +666,7 @@ We are using `@since` annotations in case we are introducing new API's to make i
* `development:disable` lets you disable the development mode
<!--
-## Template: Piwik version number
+## Template: Matomo version number
### Breaking Changes
### Deprecations
@@ -678,5 +678,5 @@ We are using `@since` annotations in case we are introducing new API's to make i
### Internal change
-->
-Find the general Piwik Changelogs for each release at [piwik.org/changelog](https://piwik.org/changelog/)
+Find the general Matomo Changelogs for each release at [matomo.org/changelog](https://matomo.org/changelog/)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 09fdfbaf542fc6dd5c2f52282676aa335dcebf0a..1616c63c6da51f62b4a386eb5ed37075253ece24 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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)
diff --git a/LEGALNOTICE b/LEGALNOTICE
index c25af1aef0a4c6ead7820f07c7312473e049b77b..f2a8bdab2679ddc2b70ab0506a96cbf9ae3bddb5 100644
--- a/LEGALNOTICE
+++ b/LEGALNOTICE
@@ -1,6 +1,6 @@
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
diff --git a/LICENSE b/LICENSE
index 0ac702120594343f997f6e9b5e23db6b960c8b6c..181b4aeca8c7572336abf4f87c3bcfb0e616ff21 100644
--- a/LICENSE
+++ b/LICENSE
@@ -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
diff --git a/PRIVACY.md b/PRIVACY.md
index e5a860bcbb0d81556575bbf7dc396e9c9fe366c1..7e9f8cbed9a0b0c224391771fef3766643b5a8d1 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -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/).
diff --git a/README.md b/README.md
index c8b4046d03f90b378212d5af605361f2d074e64c..2730f129a9b995b5429b0972edf4a3997797787f 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# Piwik - piwik.org
+# Matomo (formerly Piwik) - matomo.org
-[](https://piwik.org/download/)
+[](https://matomo.org/download/)
[](https://packagist.org/packages/piwik/piwik)
-[](https://piwik.org/free-software/)
+[](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
diff --git a/SECURITY.md b/SECURITY.md
index 9b7ba1035780d6aefc8bb2786517f03658edb5c3..185fdfa4ea3bf0574645336c0f5efce312990ffa 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -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).
diff --git a/composer.json b/composer.json
index 457f8a8d2bc98681501ec8d779c6b02d2960c193..c8f25b72ca79aa4f7e599402994147c925e94280 100644
--- a/composer.json
+++ b/composer.json
@@ -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": {
diff --git a/config/global.ini.php b/config/global.ini.php
index eae5a3a705e1d7865448c3e0a480ca668f1312b6..309a121c4c9948f1d1a26ee4efe7e1680f67c373 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -1,7 +1,7 @@
; <?php exit; ?> DO NOT REMOVE THIS LINE
; If you want to change some of these default values, the best practise is to override
; them in your configuration file in config/config.ini.php. If you directly edit this file,
-; you will lose your changes when you upgrade Piwik.
+; you will lose your changes when you upgrade Matomo.
; For example if you want to override action_title_category_delimiter,
; edit config/config.ini.php and add the following:
; [General]
@@ -21,9 +21,9 @@ port = 3306
adapter = PDO\MYSQL
type = InnoDB
schema = Mysql
-; if charset is set to utf8, Piwik will ensure that it is storing its data using UTF8 charset.
+; if charset is set to utf8, Matomo will ensure that it is storing its data using UTF8 charset.
; it will add a sql query SET at each page view.
-; Piwik should work correctly without this setting but we recommend to have a charset set.
+; Matomo should work correctly without this setting but we recommend to have a charset set.
charset = utf8
[database_tests]
@@ -40,7 +40,7 @@ charset = utf8
[tests]
; needed in order to run tests.
-; if Piwik is available at http://localhost/dev/piwik/ replace @REQUEST_URI@ with /dev/piwik/
+; if Matomo is available at http://localhost/dev/matomo/ replace @REQUEST_URI@ with /dev/matomo/
; note: the REQUEST_URI should not contain "plugins" or "tests" in the PATH
http_host = localhost
remote_addr = "127.0.0.1"
@@ -76,7 +76,7 @@ logger_file_path = tmp/logs/piwik.log
; 'array' will cache data only during one request
; 'null' will not cache anything at all
; 'file' will cache on the filesystem
-; 'redis' will cache on a Redis server, use this if you are running Piwik with multiple servers. Further configuration in [RedisCache] is needed
+; 'redis' will cache on a Redis server, use this if you are running Matomo with multiple servers. Further configuration in [RedisCache] is needed
; 'chained' will chain multiple cache backends. Further configuration in [ChainedCache] is needed
backend = chained
@@ -131,12 +131,12 @@ enabled = 0
; if set to 1, javascript files will be included individually and neither merged nor minified.
; this option must be set to 1 when adding, removing or modifying javascript files
-; Note that for quick debugging, instead of using below setting, you can add `&disable_merged_assets=1` to the Piwik URL
+; Note that for quick debugging, instead of using below setting, you can add `&disable_merged_assets=1` to the Matomo URL
disable_merged_assets = 0
[General]
; the following settings control whether Unique Visitors `nb_uniq_visitors` and Unique users `nb_users` will be processed for different period types.
-; year and range periods are disabled by default, to ensure optimal performance for high traffic Piwik instances
+; year and range periods are disabled by default, to ensure optimal performance for high traffic Matomo instances
; if you set it to 1 and want the Unique Visitors to be re-processed for reports in the past, drop all piwik_archive_* tables
; it is recommended to always enable Unique Visitors and Unique Users processing for 'day' periods
enable_processing_unique_visitors_day = 1
@@ -150,7 +150,7 @@ enable_processing_unique_visitors_range = 0
; would still only be counted as one. only relevant when using plugins that group sites together
enable_processing_unique_visitors_multiple_sites = 0
-; The list of periods that are available in the Piwik calendar
+; The list of periods that are available in the Matomo calendar
; Example use case: custom date range requests are processed in real time,
; so they may take a few minutes on very high traffic website: you may remove "range" below to disable this period
enabled_periods_UI = "day,week,month,year,range"
@@ -164,7 +164,7 @@ segments_subquery_cache_limit = 100000
; TTL: Time to live for cache files, in seconds. Default to 60 minutes
segments_subquery_cache_ttl = 3600
-; when set to 1, all requests to Piwik will return a maintenance message without connecting to the DB
+; when set to 1, all requests to Matomo will return a maintenance message without connecting to the DB
; this is useful when upgrading using the shell command, to prevent other users from accessing the UI while Upgrade is in progress
maintenance_mode = 0
@@ -182,7 +182,7 @@ action_title_category_delimiter = /
; the maximum url category depth to track. if this is set to 2, then a url such as
; "example.com/blog/development/first-post" would be treated as "example.com/blog/development".
-; this setting is used mainly to limit the amount of data that is stored by Piwik.
+; this setting is used mainly to limit the amount of data that is stored by Matomo.
action_category_level_limit = 10
; minimum number of websites to run autocompleter
@@ -216,7 +216,7 @@ browser_archiving_disabled_enforce = 0
enable_create_realtime_segments = 1
; Whether to enable the "Suggest values for segment" in the Segment Editor panel.
-; Set this to 0 in case your Piwik database is very big, and suggested values may not appear in time
+; Set this to 0 in case your Matomo database is very big, and suggested values may not appear in time
enable_segment_suggested_values = 1
; By default, any user with a "view" access for a website can create segment assigned to this website.
@@ -227,7 +227,7 @@ adding_segment_requires_access = "view"
; Whether it is allowed for users to add segments that affect all websites or not. If there are many websites
; this admin option can be used to prevent users from performing an action that will have a major impact
-; on Piwik performance.
+; on Matomo performance.
allow_adding_segments_for_all_websites = 1
; When archiving segments for the first time, this determines the oldest date that will be archived.
@@ -243,7 +243,7 @@ process_new_segments_from = "beginning_of_time"
; it is useful to have an actual string to write in the UI
action_default_name = index
-; default language to use in Piwik
+; default language to use in Matomo
default_language = en
; default number of elements in the datatable
@@ -265,7 +265,7 @@ API_datatable_default_limit = 100
datatable_export_range_as_day = "rss"
; This setting is overridden in the UI, under "User Settings".
-; The date and period loaded by Piwik uses the defaults below. Possible values: yesterday, today.
+; The date and period loaded by Matomo uses the defaults below. Possible values: yesterday, today.
default_day = yesterday
; Possible values: day, week, month, year.
default_period = day
@@ -290,23 +290,23 @@ time_before_year_archive_considered_outdated = -1
time_before_range_archive_considered_outdated = -1
; This setting is overriden in the UI, under "General Settings".
-; The default value is to allow browsers to trigger the Piwik archiving process.
+; The default value is to allow browsers to trigger the Matomo archiving process.
; This setting is only used if it hasn't been overridden via the UI yet, or if enable_general_settings_admin=0
enable_browser_archiving_triggering = 1
-; By default, Piwik will force archiving of range periods from browser requests, even if enable_browser_archiving_triggering
+; By default, Matomo will force archiving of range periods from browser requests, even if enable_browser_archiving_triggering
; is set to 0. This can sometimes create too much of a demand on system resources. Setting this option to 0 and
; disabling browser trigger archiving will make sure ranges are not archived on browser request. Since the cron
; archiver does not archive any custom date ranges, you must either disable range (using enabled_periods_API and enabled_periods_UI)
; or make sure the date ranges users' want to see will be processed somehow.
archiving_range_force_on_browser_request = 1
-; By default Piwik runs OPTIMIZE TABLE SQL queries to free spaces after deleting some data.
-; If your Piwik tracks millions of pages, the OPTIMIZE TABLE queries might run for hours (seen in "SHOW FULL PROCESSLIST \g")
+; By default Matomo runs OPTIMIZE TABLE SQL queries to free spaces after deleting some data.
+; If your Matomo tracks millions of pages, the OPTIMIZE TABLE queries might run for hours (seen in "SHOW FULL PROCESSLIST \g")
; so you can disable these special queries here:
enable_sql_optimize_queries = 1
-; By default Piwik is purging complete date range archives to free spaces after deleting some data.
+; By default Matomo is purging complete date range archives to free spaces after deleting some data.
; If you are pre-processing custom ranges using CLI task to make them easily available in UI,
; you can prevent this action from happening by setting this parameter to value bigger than 1
purge_date_range_archives_after_X_days = 1
@@ -326,22 +326,22 @@ minimum_memory_limit = 128
; Set to "-1" to always use the configured memory_limit value in php.ini file.
minimum_memory_limit_when_archiving = 768
-; Piwik will check that usernames and password have a minimum length, and will check that characters are "allowed"
-; This can be disabled, if for example you wish to import an existing User database in Piwik and your rules are less restrictive
+; Matomo will check that usernames and password have a minimum length, and will check that characters are "allowed"
+; This can be disabled, if for example you wish to import an existing User database in Matomo and your rules are less restrictive
disable_checks_usernames_attributes = 0
-; Piwik will use the configured hash algorithm where possible.
+; Matomo will use the configured hash algorithm where possible.
; For legacy data, fallback or non-security scenarios, we use md5.
hash_algorithm = whirlpool
-; by default, Piwik uses PHP's built-in file-based session save handler with lock files.
+; by default, Matomo uses PHP's built-in file-based session save handler with lock files.
; For clusters, use dbtable.
session_save_handler = files
-; If set to 1, Piwik will automatically redirect all http:// requests to https://
-; If SSL / https is not correctly configured on the server, this will break Piwik
+; If set to 1, Matomo will automatically redirect all http:// requests to https://
+; If SSL / https is not correctly configured on the server, this will break Matomo
; If you set this to 1, and your SSL configuration breaks later on, you can always edit this back to 0
-; it is recommended for security reasons to always use Piwik over https
+; it is recommended for security reasons to always use Matomo over https
force_ssl = 0
; login cookie name
@@ -356,18 +356,18 @@ login_cookie_expire = 1209600
login_cookie_path =
; email address that appears as a Sender in the password recovery email
-; if specified, {DOMAIN} will be replaced by the current Piwik domain
+; if specified, {DOMAIN} will be replaced by the current Matomo domain
login_password_recovery_email_address = "password-recovery@{DOMAIN}"
; name that appears as a Sender in the password recovery email
login_password_recovery_email_name = Piwik
; email address that appears as a Reply-to in the password recovery email
-; if specified, {DOMAIN} will be replaced by the current Piwik domain
+; if specified, {DOMAIN} will be replaced by the current Matomo domain
login_password_recovery_replyto_email_address = "no-reply@{DOMAIN}"
; name that appears as a Reply-to in the password recovery email
login_password_recovery_replyto_email_name = "No-reply"
-; When configured, only users from a configured IP can log into your Piwik. You can define one or multiple
+; When configured, only users from a configured IP can log into your Matomo. You can define one or multiple
; IPv4, IPv6, and IP ranges. This whitelist also affects API requests unless you disabled it via the setting
; "login_whitelist_apply_to_reporting_api_requests" below. Note that neither this setting, nor the
; "login_whitelist_apply_to_reporting_api_requests" restricts authenticated tracking requests (tracking requests
@@ -384,8 +384,8 @@ login_password_recovery_replyto_email_name = "No-reply"
; Set this setting to "0" to allow HTTP Reporting API requests from any IP address.
login_whitelist_apply_to_reporting_api_requests = 1
-; By default when user logs out they are redirected to Piwik "homepage" usually the Login form.
-; Uncomment the next line to set a URL to redirect the user to after they log out of Piwik.
+; By default when user logs out they are redirected to Matomo "homepage" usually the Login form.
+; Uncomment the next line to set a URL to redirect the user to after they log out of Matomo.
; login_logout_url = http://...
; Set to 1 to disable the framebuster on standard Non-widgets pages (a click-jacking countermeasure).
@@ -407,7 +407,7 @@ noreply_email_name = ""
; feedback email address;
; when testing, use your own email address or "nobody"
-feedback_email_address = "feedback@piwik.org"
+feedback_email_address = "feedback@matomo.org"
; using to set reply_to in reports e-mail to login of report creator
scheduled_reports_replyto_is_user_email_and_alias = 0
@@ -417,7 +417,7 @@ scheduled_reports_replyto_is_user_email_and_alias = 0
; 23 rows table fits in one portrait page
scheduled_reports_truncate = 23
-; during archiving, Piwik will limit the number of results recorded, for performance reasons
+; during archiving, Matomo will limit the number of results recorded, for performance reasons
; maximum number of rows for any of the Referrers tables (keywords, search engines, campaigns, etc.)
datatable_archiving_maximum_rows_referrers = 1000
; maximum number of rows for any of the Referrers subtable (search engines by keyword, keyword by campaign, etc.)
@@ -472,23 +472,23 @@ live_visitor_profile_max_visits_to_aggregate = 100
; the page will automatically refresh every 5 minutes. Set to 0 to disable automatic refresh
multisites_refresh_after_seconds = 300
-; by default, an update notification for a new version of Piwik is shown to every user. Set to 1 if only
+; by default, an update notification for a new version of Matomo is shown to every user. Set to 1 if only
; the superusers should see the notification.
show_update_notification_to_superusers_only = 0
-; Set to 1 if you're using https on your Piwik server and Piwik can't detect it,
+; Set to 1 if you're using https on your Matomo server and Matomo can't detect it,
; e.g., a reverse proxy using https-to-http, or a web server that doesn't
; set the HTTPS environment variable.
assume_secure_protocol = 0
-; Set to 1 if you're using more than one server for your Piwik installation. For example if you are using Piwik in a
+; Set to 1 if you're using more than one server for your Matomo installation. For example if you are using Matomo in a
; load balanced environment, if you have configured failover or if you're just using multiple servers in general.
; By enabling this flag we will for example not allow the installation of a plugin via the UI as a plugin would be only
; installed on one server or a config one change would be only made on one server instead of all servers.
multi_server_environment = 0
; List of proxy headers for client IP addresses
-; Piwik will determine the user IP by extracting the first IP address found in this proxy header.
+; Matomo will determine the user IP by extracting the first IP address found in this proxy header.
;
; CloudFlare (CF-Connecting-IP)
;proxy_client_headers[] = HTTP_CF_CONNECTING_IP
@@ -517,7 +517,7 @@ multi_server_environment = 0
; By enabling this flag the header HTTP_X_FORWARDED_URI will be considered for the current script name.
proxy_uri_header = 0
-; Whether to enable trusted host checking. This can be disabled if you're running Piwik
+; Whether to enable trusted host checking. This can be disabled if you're running Matomo
; on several URLs and do not wish to constantly edit the trusted host list.
enable_trusted_host_check = 1
@@ -537,19 +537,19 @@ enable_trusted_host_check = 1
; Or you may allow cross domain requests for all domains with:
;cors_domains[] = *
-; If you use this Piwik instance over multiple hostnames, Piwik will need to know
-; a unique instance_id for this instance, so that Piwik can serve the right custom logo and tmp/* assets,
-; independently of the hostname Piwik is currently running under.
+; If you use this Matomo instance over multiple hostnames, Matomo will need to know
+; a unique instance_id for this instance, so that Matomo can serve the right custom logo and tmp/* assets,
+; independently of the hostname Matomo is currently running under.
; instance_id = stats.example.com
-; The API server is an essential part of the Piwik infrastructure/ecosystem to
-; provide services to Piwik installations, e.g., getLatestVersion and
+; The API server is an essential part of the Matomo infrastructure/ecosystem to
+; provide services to Matomo installations, e.g., getLatestVersion and
; subscribeNewsletter.
-api_service_url = http://api.piwik.org
+api_service_url = http://api.matomo.org
; When the ImageGraph plugin is activated, report metadata have an additional entry : 'imageGraphUrl'.
; This entry can be used to request a static graph for the requested report.
-; When requesting report metadata with $period=range, Piwik needs to translate it to multiple periods for evolution graphs.
+; When requesting report metadata with $period=range, Matomo needs to translate it to multiple periods for evolution graphs.
; eg. $period=range&date=previous10 becomes $period=day&date=previous10. Use this setting to override the $period value.
graphs_default_period_to_plot_when_period_range = day
@@ -569,14 +569,14 @@ enable_custom_logo_check = 1
; If php is running in a chroot environment, when trying to import CSV files with createTableFromCSVFile(),
; Mysql will try to load the chrooted path (which is incomplete). To prevent an error, here you can specify the
-; absolute path to the chroot environment. eg. '/path/to/piwik/chrooted/'
+; absolute path to the chroot environment. eg. '/path/to/matomo/chrooted/'
absolute_chroot_path =
-; The path (relative to the Piwik directory) in which Piwik temporary files are stored.
-; Defaults to ./tmp (the tmp/ folder inside the Piwik directory)
+; The path (relative to the Matomo directory) in which Matomo temporary files are stored.
+; Defaults to ./tmp (the tmp/ folder inside the Matomo directory)
tmp_path = "/tmp"
-; In some rare cases it may be useful to explicitely tell Piwik not to use LOAD DATA INFILE
+; In some rare cases it may be useful to explicitely tell Matomo not to use LOAD DATA INFILE
; This may for example be useful when doing Mysql AWS replication
enable_load_data_infile = 1
@@ -585,9 +585,9 @@ enable_load_data_infile = 1
; - links to Uninstall themes will be disabled (but user can still enable/disable themes)
enable_plugins_admin = 1
-; By setting this option to 1, it will be possible for Super Users to upload Piwik plugin ZIP archives directly in Piwik Administration.
+; By setting this option to 1, it will be possible for Super Users to upload Matomo plugin ZIP archives directly in Matomo Administration.
; Enabling this opens a remote code execution vulnerability where
-; an attacker who gained Super User access could execute custom PHP code in a Piwik plugin.
+; an attacker who gained Super User access could execute custom PHP code in a Matomo plugin.
enable_plugin_upload = 0
; By setting this option to 0 (e.g. in common.config.ini.php) the installer will be disabled.
@@ -606,7 +606,7 @@ enable_delete_old_data_settings_admin = 1
; - "Email server settings"
enable_general_settings_admin = 1
-; Disabling this will disable features like automatic updates for Piwik,
+; Disabling this will disable features like automatic updates for Matomo,
; its plugins and components like the GeoIP database, referrer spam blacklist or search engines and social network definitions
enable_internet_features = 1
@@ -619,7 +619,7 @@ enable_update_communication = 1
-; Comma separated list of plugin names for which console commands should be loaded (applies when Piwik is not installed yet)
+; Comma separated list of plugin names for which console commands should be loaded (applies when Matomo is not installed yet)
always_load_commands_from_plugin=
; This controls whether the pivotBy query parameter can be used with any dimension or just subtable
@@ -633,19 +633,19 @@ pivot_by_filter_enable_fetch_by_segment = 0
; on a per-request basis;
pivot_by_filter_default_column_limit = 10
-; If set to 0 it will disable advertisements for providers of Professional Support for Piwik.
+; If set to 0 it will disable advertisements for providers of Professional Support for Matomo.
piwik_professional_support_ads_enabled = 1
[Tracker]
-; Piwik uses "Privacy by default" model. When one of your users visit multiple of your websites tracked in this Piwik,
-; Piwik will create for this user a fingerprint that will be different across the multiple websites.
+; Matomo uses "Privacy by default" model. When one of your users visit multiple of your websites tracked in this Matomo,
+; Matomo will create for this user a fingerprint that will be different across the multiple websites.
; If you want to track unique users across websites (for example when using the InterSites plugin) you may set this setting to 1.
; Note: setting this to 0 increases your users' privacy.
enable_fingerprinting_across_websites = 0
-; Piwik uses first party cookies by default. If set to 1,
-; the visit ID cookie will be set on the Piwik server domain as well
+; Matomo uses first party cookies by default. If set to 1,
+; the visit ID cookie will be set on the Matomo server domain as well
; this is useful when you want to do cross websites analysis
use_third_party_id_cookie = 0
@@ -659,7 +659,7 @@ debug = 0
; see the log output as well.
debug_on_demand = 0
-; This setting is described in this FAQ: https://piwik.org/faq/how-to/faq_175/
+; This setting is described in this FAQ: https://matomo.org/faq/how-to/faq_175/
; Note: generally this should only be set to 1 in an intranet setting, where most users have the same configuration (browsers, OS)
; and the same IP. If left to 0 in this setting, all visitors will be counted as one single visitor.
trust_visitors_cookies = 0
@@ -668,7 +668,7 @@ trust_visitors_cookies = 0
; This is used only if use_third_party_id_cookie = 1
cookie_name = _pk_uid
-; by default, the Piwik tracking cookie expires in 13 months (365 + 28 days)
+; by default, the Matomo tracking cookie expires in 13 months (365 + 28 days)
; This is used only if use_third_party_id_cookie = 1
cookie_expire = 33955200;
@@ -681,7 +681,7 @@ cookie_path =
record_statistics = 1
; length of a visit in seconds. If a visitor comes back on the website visit_standard_length seconds
-; after their last page view, it will be recorded as a new visit. In case you are using the Piwik JavaScript tracker to
+; after their last page view, it will be recorded as a new visit. In case you are using the Matomo JavaScript tracker to
; calculate the visit count correctly, make sure to call the method "setSessionCookieTimeout" eg
; `_paq.push(['setSessionCookieTimeout', timeoutInSeconds=1800])`
visit_standard_length = 1800
@@ -696,17 +696,17 @@ window_look_back_for_visitor = 0
default_time_one_page_visit = 0
; Comma separated list of URL query string variable names that will be removed from your tracked URLs
-; By default, Piwik will remove the most common parameters which are known to change often (eg. session ID parameters)
+; By default, Matomo will remove the most common parameters which are known to change often (eg. session ID parameters)
url_query_parameter_to_exclude_from_url = "gclid,fb_xd_fragment,fb_comment_id,phpsessid,jsessionid,sessionid,aspsessionid,doing_wp_cron,sid,pk_vid"
-; if set to 1, Piwik attempts a "best guess" at the visitor's country of
+; if set to 1, Matomo attempts a "best guess" at the visitor's country of
; origin when the preferred language tag omits region information.
; The mapping is defined in core/DataFiles/LanguageToCountry.php,
enable_language_to_country_guess = 1
; When the `./console core:archive` cron hasn't been setup, we still need to regularly run some maintenance tasks.
; Visits to the Tracker will try to trigger Scheduled Tasks (eg. scheduled PDF/HTML reports by email).
-; Scheduled tasks will only run if 'Enable Piwik Archiving from Browser' is enabled in the General Settings.
+; Scheduled tasks will only run if 'Enable Matomo Archiving from Browser' is enabled in the General Settings.
; Tasks run once every hour maximum, they might not run every hour if traffic is low.
; Set to 0 to disable Scheduled tasks completely.
scheduled_tasks_min_interval = 3600
@@ -735,7 +735,7 @@ create_new_visit_when_campaign_changes = 1
; absent before, but is present now.
create_new_visit_when_website_referrer_changes = 0
-; ONLY CHANGE THIS VALUE WHEN YOU DO NOT USE PIWIK ARCHIVING, SINCE THIS COULD CAUSE PARTIALLY MISSING ARCHIVE DATA
+; ONLY CHANGE THIS VALUE WHEN YOU DO NOT USE MATOMO ARCHIVING, SINCE THIS COULD CAUSE PARTIALLY MISSING ARCHIVE DATA
; Whether to force a new visit at midnight for every visitor. Default 1.
create_new_visit_after_midnight = 1
@@ -753,16 +753,16 @@ bulk_requests_require_authentication = 0
; This greatly increases performance of Log Analytics and in general any Bulk Tracking API requests.
bulk_requests_use_transaction = 1
-; DO NOT USE THIS SETTING ON PUBLICLY AVAILABLE PIWIK SERVER
-; !!! Security risk: if set to 0, it would allow anyone to push data to Piwik with custom dates in the past/future and even with fake IPs!
+; DO NOT USE THIS SETTING ON PUBLICLY AVAILABLE MATOMO SERVER
+; !!! Security risk: if set to 0, it would allow anyone to push data to Matomo with custom dates in the past/future and even with fake IPs!
; When using the Tracking API, to override either the datetime and/or the visitor IP,
; token_auth with an "admin" access is required. If you set this setting to 0, the token_auth will not be required anymore.
-; DO NOT USE THIS SETTING ON PUBLIC PIWIK SERVERS
+; DO NOT USE THIS SETTING ON PUBLIC MATOMO SERVERS
tracking_requests_require_authentication = 1
-; By default, Piwik accepts only tracking requests for up to 1 day in the past. For tracking requests with a custom date
-; date is older than 1 day, Piwik requires an authenticated tracking requests. By setting this config to another value
-; You can change how far back Piwik will track your requests without authentication. The configured value is in seconds.
+; By default, Matomo accepts only tracking requests for up to 1 day in the past. For tracking requests with a custom date
+; date is older than 1 day, Matomo requires an authenticated tracking requests. By setting this config to another value
+; You can change how far back Matomo will track your requests without authentication. The configured value is in seconds.
tracking_requests_require_authentication_when_custom_timestamp_newer_than = 86400;
[Segments]
@@ -818,7 +818,7 @@ username = ; Proxy username: optional; if specified, password is mandatory
password = ; Proxy password: optional; if specified, username is mandatory
[Plugins]
-; list of plugins (in order they will be loaded) that are activated by default in the Piwik platform
+; list of plugins (in order they will be loaded) that are activated by default in the Matomo platform
Plugins[] = CorePluginsAdmin
Plugins[] = CoreAdminHome
Plugins[] = CoreHome
@@ -894,7 +894,7 @@ PluginsInstalled[] = Intl
[APISettings]
; Any key/value pair can be added in this section, they will be available via the REST call
; index.php?module=API&method=API.getSettings
-; This can be used to expose values from Piwik, to control for example a Mobile app tracking
+; This can be used to expose values from Matomo, to control for example a Mobile app tracking
SDK_batch_size = 10
SDK_interval_value = 30
diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
index 7fd5f39a74403151e630e1d0723eb3c88b8df742..76bb95e7fec63293a4c5ddb2ec79a40fd5bf00a7 100644
--- a/core/API/DataTableManipulator.php
+++ b/core/API/DataTableManipulator.php
@@ -170,7 +170,7 @@ abstract class DataTableManipulator
if (empty($meta)) {
throw new Exception(sprintf(
- "The DataTable cannot be manipulated: Metadata for report %s.%s could not be found. You can define the metadata in a hook, see example at: 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
));
}
diff --git a/core/Application/Kernel/EnvironmentValidator.php b/core/Application/Kernel/EnvironmentValidator.php
index a94c6f98dec35cd7f0377e558cc4acea7e687ebe..862593a108dc7fe8a4943e4b67ff7d64014fb68c 100644
--- a/core/Application/Kernel/EnvironmentValidator.php
+++ b/core/Application/Kernel/EnvironmentValidator.php
@@ -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()) {
diff --git a/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php b/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php
index 8dd2501774d6ef763081a3819aae9aa2cdd8aa7c..0582878d060e29b94ed437603335ea0ed0c1e5ae 100644
--- a/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php
+++ b/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php
@@ -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()
diff --git a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
index 1d4fb4d4d2f0716884e7265e7aaa62883a942e9e..3adbb5bfa9910b940027b8fcb84a763ad9994410 100644
--- a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
+++ b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
@@ -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)
diff --git a/core/AssetManager/UIAssetMinifier.php b/core/AssetManager/UIAssetMinifier.php
index 99eebe0a6c263ef134b18c02347736a11aa9d738..864e917cd59056eb9257fbc5d7447858ff6dd110 100644
--- a/core/AssetManager/UIAssetMinifier.php
+++ b/core/AssetManager/UIAssetMinifier.php
@@ -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");
}
}
}
diff --git a/core/CliMulti/RequestCommand.php b/core/CliMulti/RequestCommand.php
index 7ae2fc44c8238348444be817749809c407752d5a..aae19727fbc46666086f0020850c72ab00b4e894 100644
--- a/core/CliMulti/RequestCommand.php
+++ b/core/CliMulti/RequestCommand.php
@@ -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.');
}
diff --git a/core/Config.php b/core/Config.php
index 3da4d2541da0637430d1147ae151947623a4ad12..e47cd2f1501c96acc31d02ee5df99cef153ae1c4 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -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);
}
diff --git a/core/Console.php b/core/Console.php
index bb6f4f7efff2dc21bd284d178fe5a6ed7ffda033..49fefa60999f257994b96f16ec2fd68534ce01bb 100644
--- a/core/Console.php
+++ b/core/Console.php
@@ -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);
diff --git a/core/CronArchive.php b/core/CronArchive.php
index 64b2b535e1615b77263f983cbff987ae2e22dae6..c2895597ab8eed7384377cc39e666ecbaefb2d2f 100644
--- a/core/CronArchive.php
+++ b/core/CronArchive.php
@@ -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;
}
diff --git a/core/DataTable/Manager.php b/core/DataTable/Manager.php
index 228f13da183a6eb44fc26cd937f5518d68283291..0d6fcd832efa185530ec98afa5541d235d335bae 100644
--- a/core/DataTable/Manager.php
+++ b/core/DataTable/Manager.php
@@ -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];
diff --git a/core/DataTable/Renderer/Rss.php b/core/DataTable/Renderer/Rss.php
index 3d821150fc4eaaa9f8047990aa9555746d15191e..1a98f085e5fbd19bc3884f6631e0beacfe72fade 100644
--- a/core/DataTable/Renderer/Rss.php
+++ b/core/DataTable/Renderer/Rss.php
@@ -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;
diff --git a/core/Db/Adapter.php b/core/Db/Adapter.php
index a3ceebe6cf91d4c97f24eb4da4a6b2f0e14ba3ad..72699f54fd5c9a3bb202e35e0eb174cbac64840c 100644
--- a/core/Db/Adapter.php
+++ b/core/Db/Adapter.php
@@ -69,7 +69,7 @@ class Adapter
{
$className = 'Piwik\Db\Adapter\\' . str_replace(' ', '\\', ucwords(str_replace(array('_', '\\'), ' ', strtolower($adapterName))));
if (!class_exists($className)) {
- throw new \Exception(sprintf("Adapter '%s' is not valid. Maybe check that your Piwik configuration files in config/*.ini.php are readable by the webserver.", $adapterName));
+ throw new \Exception(sprintf("Adapter '%s' is not valid. Maybe check that your Matomo configuration files in config/*.ini.php are readable by the webserver.", $adapterName));
}
return $className;
}
diff --git a/core/ErrorHandler.php b/core/ErrorHandler.php
index 8b1897c1fa9ea663930ac3ebaf60cec1d9a67ebf..2d855c3aeae78e9a9c9f8ec39b42c1aeafe5d857 100644
--- a/core/ErrorHandler.php
+++ b/core/ErrorHandler.php
@@ -108,7 +108,7 @@ class ErrorHandler
private static function createLogMessage($errno, $errstr, $errfile, $errline)
{
return sprintf(
- "%s(%d): %s - %s - Piwik " . (class_exists('Piwik\Version') ? Version::VERSION : '') . " - Please report this message in the Piwik forums: https://forum.piwik.org (please do a search first as it might have been reported already)",
+ "%s(%d): %s - %s - Matomo " . (class_exists('Piwik\Version') ? Version::VERSION : '') . " - Please report this message in the Matomo forums: https://forum.matomo.org (please do a search first as it might have been reported already)",
$errfile,
$errline,
ErrorHandler::getErrNoString($errno),
@@ -122,8 +122,8 @@ class ErrorHandler
$message = ErrorHandler::getErrNoString($errno) . ' - ' . $errstr;
- $html = "<p>There is an error. Please report the message (Piwik " . (class_exists('Piwik\Version') ? Version::VERSION : '') . ")
- and full backtrace in the <a href='?module=Proxy&action=redirect&url=https://forum.piwik.org' target='_blank'>Piwik forums</a> (please do a search first as it might have been reported already!).</p>";
+ $html = "<p>There is an error. Please report the message (Matomo " . (class_exists('Piwik\Version') ? Version::VERSION : '') . ")
+ and full backtrace in the <a href='?module=Proxy&action=redirect&url=https://forum.matomo.org' target='_blank'>Matomo forums</a> (please do a search first as it might have been reported already!).</p>";
$html .= "<p><strong>{$message}</strong> in <em>{$errfile}</em>";
$html .= " on line {$errline}</p>";
$html .= "Backtrace:<pre>";
diff --git a/core/Exception/PluginDeactivatedException.php b/core/Exception/PluginDeactivatedException.php
index d0582840e593e2a1d5e0762fcea7ffcf2306b8bc..753051c516816951d97ed4de708eb5297b81ef0f 100644
--- a/core/Exception/PluginDeactivatedException.php
+++ b/core/Exception/PluginDeactivatedException.php
@@ -15,6 +15,6 @@ class PluginDeactivatedException extends \Exception
{
public function __construct($module)
{
- parent::__construct("The plugin $module is not enabled. You can activate the plugin on Settings > Plugins page in Piwik.");
+ parent::__construct("The plugin $module is not enabled. You can activate the plugin on Settings > Plugins page in Matomo.");
}
}
diff --git a/core/Filechecks.php b/core/Filechecks.php
index 73d641e090fb39b4977bbb4366c5aab3b630314d..64bffb02a2edc1dd2b0dc88e14e562c261dbfb5c 100644
--- a/core/Filechecks.php
+++ b/core/Filechecks.php
@@ -88,13 +88,13 @@ class Filechecks
}
}
- $directoryMessage = "<p><b>Piwik couldn't write to some directories $optionalUserInfo</b>.</p>";
+ $directoryMessage = "<p><b>Matomo couldn't write to some directories $optionalUserInfo</b>.</p>";
$directoryMessage .= "<p>Try to Execute the following commands on your server, to allow Write access on these directories"
. ":</p>"
. "<blockquote>$directoryList</blockquote>"
. "<p>If this doesn't work, you can try to create the directories with your FTP software, and set the CHMOD to 0755 (or 0777 if 0755 is not enough). To do so with your FTP software, right click on the directories then click permissions.</p>"
. "<p>After applying the modifications, you can <a href='index.php'>refresh the page</a>.</p>"
- . "<p>If you need more help, try <a href='?module=Proxy&action=redirect&url=https://piwik.org'>Piwik.org</a>.</p>";
+ . "<p>If you need more help, try <a href='?module=Proxy&action=redirect&url=https://matomo.org'>Matomo.org</a>.</p>";
$ex = new MissingFilePermissionException($directoryMessage);
$ex->setIsHtmlMessage();
diff --git a/core/FrontController.php b/core/FrontController.php
index 3612215c11431ce0a9e81055067186818bd4f5c6..38a44db5da0a73e08ffa6018cfb473854dad7ced 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -88,7 +88,7 @@ class FrontController extends Singleton
$message = $controller->dispatch('CorePluginsAdmin', 'safemode', array($lastError));
} catch(Exception $e) {
// may fail in safe mode (eg. global.ini.php not found)
- $message = sprintf("Piwik encoutered an error: %s (which lead to: %s)", $lastError['message'], $e->getMessage());
+ $message = sprintf("Matomo encoutered an error: %s (which lead to: %s)", $lastError['message'], $e->getMessage());
}
return $message;
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index 3fe7f1f75e1465b13b0b1a377db350c2a06e8fb2..947cc663c7cbd09f11ede7a915630a5d5cda2478 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -797,7 +797,7 @@ abstract class Controller
'</a>'
));
}
- $view->invalidHostMessageHowToFix = '<p><b>How do I fix this problem and how do I login again?</b><br/> The Piwik Super User can manually edit the file piwik/config/config.ini.php
+ $view->invalidHostMessageHowToFix = '<p><b>How do I fix this problem and how do I login again?</b><br/> The Matomo Super User can manually edit the file piwik/config/config.ini.php
and add the following lines: <pre>[General]' . "\n" . 'trusted_hosts[] = "' . $invalidHost . '"</pre>After making the change, you will be able to login again.</p>
<p>You may also <i>disable this security feature (not recommended)</i>. To do so edit config/config.ini.php and add:
<pre>[General]' . "\n" . 'enable_trusted_host_check=0</pre>';
@@ -869,8 +869,8 @@ abstract class Controller
if (Piwik::hasUserSuperUserAccess()) {
$siteTableName = Common::prefixTable('site');
- $message = "Error: no website was found in this Piwik installation.
- <br />Check the table '$siteTableName' in your database, it should contain your Piwik websites.";
+ $message = "Error: no website was found in this Matomo installation.
+ <br />Check the table '$siteTableName' in your database, it should contain your Matomo websites.";
$ex = new NoWebsiteFoundException($message);
$ex->setIsHtmlMessage();
@@ -881,7 +881,7 @@ abstract class Controller
if (!Piwik::isUserIsAnonymous()) {
$currentLogin = Piwik::getCurrentUserLogin();
$emails = implode(',', Piwik::getAllSuperUserAccessEmailAddresses());
- $errorMessage = sprintf(Piwik::translate('CoreHome_NoPrivilegesAskPiwikAdmin'), $currentLogin, "<br/><a href='mailto:" . $emails . "?subject=Access to Piwik for user $currentLogin'>", "</a>");
+ $errorMessage = sprintf(Piwik::translate('CoreHome_NoPrivilegesAskPiwikAdmin'), $currentLogin, "<br/><a href='mailto:" . $emails . "?subject=Access to Matomo for user $currentLogin'>", "</a>");
$errorMessage .= "<br /><br /> <b><a href='index.php?module=" . Piwik::getLoginPluginName() . "&action=logout'>› " . Piwik::translate('General_Logout') . "</a></b><br />";
$ex = new NoPrivilegesException($errorMessage);
@@ -959,7 +959,7 @@ abstract class Controller
throw new NoAccessException(Piwik::translate('General_ExceptionPrivilegeAccessWebsite', array("'view'", $this->idSite)));
} elseif (empty($this->site) || empty($this->idSite)) {
throw new Exception("The requested website idSite is not found in the request, or is invalid.
- Please check that you are logged in Piwik and have permission to access the specified website.");
+ Please check that you are logged in Matomo and have permission to access the specified website.");
}
}
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
index 79ce89863071932a3d8df41b94c6b52bd089e908..b60cd750c3310bfd9f72c0c4f499ca5cf2a199b4 100644
--- a/core/Plugin/ControllerAdmin.php
+++ b/core/Plugin/ControllerAdmin.php
@@ -156,7 +156,7 @@ abstract class ControllerAdmin extends Controller
$message .= " ";
$message .= Piwik::translate('General_ReadThisToLearnMore',
- array('<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/faq_91/">', '</a>')
+ array('<a rel="noreferrer" target="_blank" href="https://matomo.org/faq/how-to/faq_91/">', '</a>')
);
$notification = new Notification($message);
@@ -190,10 +190,10 @@ abstract class ControllerAdmin extends Controller
if (empty($isEacceleratorUsed)) {
return;
}
- $message = sprintf("You are using the PHP accelerator & optimizer eAccelerator which is known to be not compatible with Piwik.
- We have disabled eAccelerator, which might affect the performance of Piwik.
+ $message = sprintf("You are using the PHP accelerator & optimizer eAccelerator which is known to be not compatible with Matomo.
+ We have disabled eAccelerator, which might affect the performance of Matomo.
Read the %srelated ticket%s for more information and how to fix this problem.",
- '<a rel="noreferrer" target="_blank" href="https://github.com/piwik/piwik/issues/4439">', '</a>');
+ '<a rel="noreferrer" target="_blank" href="https://github.com/matomo-org/piwik/issues/4439">', '</a>');
$notification = new Notification($message);
$notification->context = Notification::CONTEXT_WARNING;
@@ -362,7 +362,7 @@ abstract class ControllerAdmin extends Controller
protected static function getPiwikVersion()
{
- return "Piwik " . Version::VERSION;
+ return "Matomo " . Version::VERSION;
}
private static function isPhpVersionAtLeast55()
diff --git a/core/Plugin/Dependency.php b/core/Plugin/Dependency.php
index 127d32eabf3e473ffe4758aafcdaed924fa4ea23..2558c3d3114a81a3e8173f8fe36dc49b89d050a4 100644
--- a/core/Plugin/Dependency.php
+++ b/core/Plugin/Dependency.php
@@ -125,7 +125,7 @@ class Dependency
foreach ($requires as $name => $requiredVersion) {
$nameLower = strtolower($name);
- $isPluginRequire = !in_array($nameLower, array('piwik', 'php'));
+ $isPluginRequire = !in_array($nameLower, array('piwik', 'php', 'matomo'));
if ($isPluginRequire) {
// we do not check version, only whether it's activated. Everything that is not piwik or php is assumed
// a plugin so far.
@@ -141,6 +141,7 @@ class Dependency
private function getCurrentVersion($name)
{
switch (strtolower($name)) {
+ case 'matomo':
case 'piwik':
return $this->piwikVersion;
case 'php':
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index ee4f658b880689bb6c2ee14a1ab688273ab9dde3..2ff3ebbdc1969153f52c55fba1ecfbc12efe7afa 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -393,7 +393,7 @@ class Manager
public function uninstallPlugin($pluginName)
{
if ($this->isPluginLoaded($pluginName)) {
- throw new \Exception("To uninstall the plugin $pluginName, first disable it in Piwik > Settings > Plugins");
+ throw new \Exception("To uninstall the plugin $pluginName, first disable it in Matomo > Settings > Plugins");
}
$this->loadAllPluginsAndGetTheirInfo();
diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php
index 7522e3ab1df963ac91339749ca5b98b03f62cd21..d1218b51b0abb913c14b38c5b2612ba302ea7314 100644
--- a/core/Plugin/MetadataLoader.php
+++ b/core/Plugin/MetadataLoader.php
@@ -82,8 +82,8 @@ class MetadataLoader
$descriptionKey = $this->pluginName . '_PluginDescription';
return array(
'description' => $descriptionKey,
- 'homepage' => 'https://piwik.org/',
- 'authors' => array(array('name' => 'Piwik', 'homepage' => 'https://piwik.org/')),
+ 'homepage' => 'https://matomo.org/',
+ 'authors' => array(array('name' => 'Piwik', 'homepage' => 'https://matomo.org/')),
'license' => 'GPL v3+',
'version' => Version::VERSION,
'theme' => false,
diff --git a/core/Plugin/ViewDataTable.php b/core/Plugin/ViewDataTable.php
index cc9e46db43ff78010aa10b2938164e78426c4871..d892021b25505fcb9f436fbfa41fdd151b1e9fd5 100644
--- a/core/Plugin/ViewDataTable.php
+++ b/core/Plugin/ViewDataTable.php
@@ -525,7 +525,7 @@ abstract class ViewDataTable implements ViewInterface
$nonOverridableParams = $this->getNonOverridableParams($overrideParams);
if(count($nonOverridableParams) > 0) {
throw new \Exception(sprintf(
- "Setting parameters %s is not allowed. Please report this bug to the Piwik team.",
+ "Setting parameters %s is not allowed. Please report this bug to the Matomo team.",
implode(" and ", $nonOverridableParams)
));
}
diff --git a/core/ProfessionalServices/Advertising.php b/core/ProfessionalServices/Advertising.php
index 1c938b5efd2f4d1177ef005b42b7be7a9b3d0793..c2028f99b21dc128186183b028675b565bc86411 100644
--- a/core/ProfessionalServices/Advertising.php
+++ b/core/ProfessionalServices/Advertising.php
@@ -43,7 +43,7 @@ class Advertising
*/
public function areAdsForProfessionalServicesEnabled()
{
- return $this->isAdsEnabledInConfig($this->config->General);
+ return self::isAdsEnabledInConfig($this->config->General);
}
/**
@@ -55,7 +55,7 @@ class Advertising
*/
public function getPromoUrlForProfessionalServices($campaignMedium, $campaignContent = '')
{
- $url = 'https://piwik.org/support/?';
+ $url = 'https://matomo.org/support/?';
$campaign = $this->getCampaignParametersForPromoUrl(
$name = self::CAMPAIGN_NAME_PROFESSIONAL_SERVICES,
diff --git a/core/Profiler.php b/core/Profiler.php
index 12c1e46ff6025394923f306b3b8a92b1af08e36f..0a9ad2b0b2854619087eaffc41e544e8e5d19b56 100644
--- a/core/Profiler.php
+++ b/core/Profiler.php
@@ -271,7 +271,7 @@ class Profiler
if (Development::isEnabled()) {
$out .= "WARNING: Development mode is enabled. Many runtime optimizations are not applied in development mode. ";
- $out .= "Unless you intend to profile Piwik in development mode, your profile may not be accurate.";
+ $out .= "Unless you intend to profile Matomo in development mode, your profile may not be accurate.";
$out .= "\n\n";
}
diff --git a/core/Segment/SegmentExpression.php b/core/Segment/SegmentExpression.php
index 0428a5ca5fde0ad872bb9a08ab62bd16b7a3cc1e..ab037c1a6e46eaab414725d0c22a94a8db1d287a 100644
--- a/core/Segment/SegmentExpression.php
+++ b/core/Segment/SegmentExpression.php
@@ -218,7 +218,7 @@ class SegmentExpression
} else {
// it is not expected to reach this code path
throw new Exception("Unexpected match type $matchType for your segment. " .
- "Please report this issue to the Piwik team with the segment you are using.");
+ "Please report this issue to the Matomo team with the segment you are using.");
}
return array($sqlExpression, $value = null);
diff --git a/core/Session.php b/core/Session.php
index 60bf4642783f7cde3e80eb61a7c916fb9334b3aa..200a17bbb000c72bb937474703945e166cbc777e 100644
--- a/core/Session.php
+++ b/core/Session.php
@@ -121,7 +121,7 @@ class Session extends Zend_Session
$enableDbSessions = '';
if (DbHelper::isInstalled()) {
$enableDbSessions = "<br/>If you still experience issues after trying these changes,
- we recommend that you <a href='https://piwik.org/faq/how-to-install/#faq_133' rel='noreferrer' target='_blank'>enable database session storage</a>.";
+ we recommend that you <a href='https://matomo.org/faq/how-to-install/#faq_133' rel='noreferrer' target='_blank'>enable database session storage</a>.";
}
$pathToSessions = Filechecks::getErrorMessageMissingPermissions(self::getSessionsDirectory());
diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
index ab90a67fcb7e76d76c7adbe9c532a675ffcd76c8..3bc20bed73473bd603cd1997e672c055b0bfae75 100644
--- a/core/SettingsPiwik.php
+++ b/core/SettingsPiwik.php
@@ -393,7 +393,7 @@ class SettingsPiwik
$hasError = false !== strpos($fetched, PAGE_TITLE_WHEN_ERROR);
if ($hasError || $expectedStringNotFound) {
- throw new Exception("\nPiwik should be running at: "
+ throw new Exception("\nMatomo should be running at: "
. $piwikServerUrl
. " but this URL returned an unexpected response: '"
. $fetched . "'\n\n");
diff --git a/core/Tracker/Response.php b/core/Tracker/Response.php
index d5a01d7c24339ae592a6e1baf8eba773d3e3f3a3..b8d28664f006805589c73c8d9b3bab7648eb2134 100644
--- a/core/Tracker/Response.php
+++ b/core/Tracker/Response.php
@@ -60,7 +60,7 @@ class Response
$trailer = '<span style="color: #888888">Backtrace:<br /><pre>' . $e->getTraceAsString() . '</pre></span>';
$headerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Morpheus/templates/simpleLayoutHeader.tpl');
$footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Morpheus/templates/simpleLayoutFooter.tpl');
- $headerPage = str_replace('{$HTML_TITLE}', 'Piwik › Error', $headerPage);
+ $headerPage = str_replace('{$HTML_TITLE}', 'Matomo › Error', $headerPage);
echo $headerPage . '<p>' . $this->getMessageFromException($e) . '</p>' . $trailer . $footerPage;
} else {
@@ -78,8 +78,8 @@ class Response
if (!$this->isHttpGetRequest() || !empty($_GET) || !empty($_POST)) {
Common::sendResponseCode(400);
}
- Common::printDebug("Empty request => Piwik page");
- echo "This resource is part of Piwik. Keep full control of your data with the leading free and open source <a href='https://piwik.org' target='_blank'>digital analytics platform</a> for web and mobile.";
+ Common::printDebug("Empty request => Matomo page");
+ echo "This resource is part of Matomo. Keep full control of your data with the leading free and open source <a href='https://matomo.org' target='_blank'>digital analytics platform</a> for web and mobile.";
} else {
$this->outputApiResponse($tracker);
Common::printDebug("Nothing to notice => default behaviour");
@@ -166,7 +166,7 @@ class Response
// Note: duplicated from FormDatabaseSetup.isAccessDenied
// Avoid leaking the username/db name when access denied
if ($e->getCode() == 1044 || $e->getCode() == 42000) {
- return "Error while connecting to the Piwik database - please check your credentials in config/config.ini.php file";
+ return "Error while connecting to the Matomo database - please check your credentials in config/config.ini.php file";
}
if (Common::isPhpCliMode()) {
@@ -178,6 +178,6 @@ class Response
protected function logExceptionToErrorLog($e)
{
- error_log(sprintf("Error in Piwik (tracker): %s", str_replace("\n", " ", $this->getMessageFromException($e))));
+ error_log(sprintf("Error in Matomo (tracker): %s", str_replace("\n", " ", $this->getMessageFromException($e))));
}
}
diff --git a/core/Tracker/VisitExcluded.php b/core/Tracker/VisitExcluded.php
index 303d45c23b75ebb58e8b885fbf935792e510adb0..9ae5dd572737fbfef79b4987bc24113c5fbe26e2 100644
--- a/core/Tracker/VisitExcluded.php
+++ b/core/Tracker/VisitExcluded.php
@@ -249,7 +249,7 @@ class VisitExcluded
protected function isIgnoreCookieFound()
{
if (IgnoreCookie::isIgnoreCookieFound()) {
- Common::printDebug('Piwik ignore cookie was found, visit not tracked.');
+ Common::printDebug('Matomo ignore cookie was found, visit not tracked.');
return true;
}
diff --git a/core/Updates/0.5.4.php b/core/Updates/0.5.4.php
index d625bb5968f7f3f929f8bd53a0653011eaa825a1..37994e4ff6062540dc4cc221b5346f948ee08caa 100644
--- a/core/Updates/0.5.4.php
+++ b/core/Updates/0.5.4.php
@@ -66,7 +66,7 @@ class Updates_0_5_4 extends Updates
throw new \Exception('optional update failed');
}
} catch (\Exception $e) {
- throw new \Exception("You can now enable the new MultiSites plugin in the Plugins screen in the Piwik admin!");
+ throw new \Exception("You can now enable the new MultiSites plugin in the Plugins screen in the Matomo admin!");
}
}
diff --git a/core/Updates/0.6-rc1.php b/core/Updates/0.6-rc1.php
index b534e0b54ff5b914fb8477e6d82f8eeec3c2e697..07f2734a4b53ad12f569a0affba5929ea506f971 100644
--- a/core/Updates/0.6-rc1.php
+++ b/core/Updates/0.6-rc1.php
@@ -55,8 +55,8 @@ class Updates_0_6_rc1 extends Updates
{
// first we disable the plugins and keep an array of warnings messages
$pluginsToDisableMessage = array(
- 'SearchEnginePosition' => "SearchEnginePosition plugin was disabled, because it is not compatible with the new Piwik 0.6. \n You can download the latest version of the plugin, compatible with Piwik 0.6.\n<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/piwik/piwik/issues/502'>Click here.</a>",
- 'GeoIP' => "GeoIP plugin was disabled, because it is not compatible with the new Piwik 0.6. \nYou can download the latest version of the plugin, compatible with Piwik 0.6.\n<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/piwik/piwik/issues/45'>Click here.</a>"
+ 'SearchEnginePosition' => "SearchEnginePosition plugin was disabled, because it is not compatible with the new Piwik 0.6. \n You can download the latest version of the plugin, compatible with Piwik 0.6.\n<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/matomo-org/piwik/issues/502'>Click here.</a>",
+ 'GeoIP' => "GeoIP plugin was disabled, because it is not compatible with the new Piwik 0.6. \nYou can download the latest version of the plugin, compatible with Piwik 0.6.\n<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/matomo-org/piwik/issues/45'>Click here.</a>"
);
$disabledPlugins = array();
foreach ($pluginsToDisableMessage as $pluginToDisable => $warningMessage) {
diff --git a/core/Updates/1.2-rc1.php b/core/Updates/1.2-rc1.php
index cb2947b72f6d9fb8e3193d046c7f3cdb317049bf..d13210b9d5bfad2992864e28ff0dac0e24b66452 100644
--- a/core/Updates/1.2-rc1.php
+++ b/core/Updates/1.2-rc1.php
@@ -129,8 +129,8 @@ class Updates_1_2_rc1 extends Updates
{
// first we disable the plugins and keep an array of warnings messages
$pluginsToDisableMessage = array(
- 'GeoIP' => "GeoIP plugin was disabled, because it is not compatible with the new Piwik 1.2. \nYou can download the latest version of the plugin, compatible with Piwik 1.2.\n<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/piwik/piwik/issues/45'>Click here.</a>",
- 'EntryPage' => "EntryPage plugin is not compatible with this version of Piwik, it was disabled.",
+ 'GeoIP' => "GeoIP plugin was disabled, because it is not compatible with the new Piwik 1.2. \nYou can download the latest version of the plugin, compatible with Piwik 1.2.\n<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/matomo-org/piwik/issues/45'>Click here.</a>",
+ 'EntryPage' => "EntryPage plugin is not compatible with this version of Matomo, it was disabled.",
);
$disabledPlugins = array();
foreach ($pluginsToDisableMessage as $pluginToDisable => $warningMessage) {
diff --git a/core/Url.php b/core/Url.php
index 279729dccc9e0036bde2fcded95f413b4c6bdd25..3451016a27d5e8e9def8d2e9282a60520622d37e 100644
--- a/core/Url.php
+++ b/core/Url.php
@@ -476,7 +476,7 @@ class Url
}
if (Common::isPhpCliMode()) {
- throw new Exception("If you were using a browser, Piwik would redirect you to this URL: $url \n\n");
+ throw new Exception("If you were using a browser, Matomo would redirect you to this URL: $url \n\n");
}
}
@@ -607,7 +607,7 @@ class Url
public static function getHostSanitized($host)
{
if (!class_exists("Piwik\\Network\\IPUtils")) {
- throw new Exception("Piwik\\Network\\IPUtils could not be found, maybe you are using Piwik from git and need to update Composer. $ php composer.phar update");
+ throw new Exception("Piwik\\Network\\IPUtils could not be found, maybe you are using Matomo from git and need to update Composer. $ php composer.phar update");
}
return IPUtils::sanitizeIp($host);
}
diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php
index 9f4bffd57aa9239094098dcfec8d0a3f38347202..b4b36dabb7c7a7577be1f805c6f8e9a0750f63c6 100644
--- a/core/testMinimumPhpVersion.php
+++ b/core/testMinimumPhpVersion.php
@@ -9,7 +9,7 @@
/**
* This file is executed before anything else.
- * It checks the minimum PHP version required to run Piwik.
+ * It checks the minimum PHP version required to run Matomo.
* This file must be compatible PHP4.
*/
@@ -17,7 +17,7 @@ $piwik_errorMessage = '';
// Minimum requirement: stream_resolve_include_path, working json_encode in 5.3.3, namespaces in 5.3
// NOTE: when changing this variable, we also need to update
-// 1) api.piwik.org
+// 1) api.matomo.org
// 2) tests/travis/generator/Generator.php
// 3) composer.json (in two places)
// 4) tests/PHPUnit/Integration/ReleaseCheckListTest.php
@@ -25,54 +25,54 @@ $piwik_minimumPHPVersion = '5.5.9';
$piwik_currentPHPVersion = PHP_VERSION;
$minimumPhpInvalid = version_compare($piwik_minimumPHPVersion, $piwik_currentPHPVersion) > 0;
if ($minimumPhpInvalid) {
- $piwik_errorMessage .= "<p><strong>To run Piwik you need at least PHP version $piwik_minimumPHPVersion</strong></p>
+ $piwik_errorMessage .= "<p><strong>To run Matomo you need at least PHP version $piwik_minimumPHPVersion</strong></p>
<p>Unfortunately it seems your webserver is using PHP version $piwik_currentPHPVersion. </p>
- <p>Please try to update your PHP version, Piwik is really worth it! Nowadays most web hosts
+ <p>Please try to update your PHP version, Matomo is really worth it! Nowadays most web hosts
support PHP $piwik_minimumPHPVersion.</p>
- <p>Also see the FAQ: <a href='https://piwik.org/faq/how-to-install/#faq_77'>My Web host supports PHP4 by default. How can I enable PHP5?</a></p>";
+ <p>Also see the FAQ: <a href='https://matomo.org/faq/how-to-install/#faq_77'>My Web host supports PHP4 by default. How can I enable PHP5?</a></p>";
} else {
if (!extension_loaded('session')) {
- $piwik_errorMessage .= "<p><strong>Piwik and Zend_Session require the session extension</strong></p>
+ $piwik_errorMessage .= "<p><strong>Matomo and Zend_Session require the session extension</strong></p>
<p>It appears your PHP was compiled with <pre>--disable-session</pre>.
- To enjoy Piwik, you need PHP compiled without that configure option.</p>";
+ To enjoy Matomo, you need PHP compiled without that configure option.</p>";
}
if (!function_exists('ini_set')) {
- $piwik_errorMessage .= "<p><strong>Piwik and Zend_Session require the <code>ini_set()</code> function</strong></p>
+ $piwik_errorMessage .= "<p><strong>Matomo and Zend_Session require the <code>ini_set()</code> function</strong></p>
<p>It appears your PHP has disabled this function.
- To enjoy Piwik, you need remove <pre>ini_set</pre> from your <pre>disable_functions</pre> directive in php.ini, and restart your webserver.</p>";
+ To enjoy Matomo, you need remove <pre>ini_set</pre> from your <pre>disable_functions</pre> directive in php.ini, and restart your webserver.</p>";
}
if (ini_get('mbstring.func_overload')) {
- $piwik_errorMessage .= "<p><strong>Piwik does not work when PHP is configured with <pre>mbstring.func_overload = " . ini_get('mbstring.func_overload') . "</pre></strong></p>
+ $piwik_errorMessage .= "<p><strong>Matomo does not work when PHP is configured with <pre>mbstring.func_overload = " . ini_get('mbstring.func_overload') . "</pre></strong></p>
<p>It appears your mbstring extension in PHP is configured to override string functions.
- To enjoy Piwik, you need to modify php.ini <pre>mbstring.func_overload = 0</pre>, and restart your webserver.</p>";
+ To enjoy Matomo, you need to modify php.ini <pre>mbstring.func_overload = 0</pre>, and restart your webserver.</p>";
}
if (!function_exists('json_encode')) {
- $piwik_errorMessage .= "<p><strong>Piwik requires the php5-json extension which provides the functions <code>json_encode()</code> and <code>json_decode()</code></strong></p>
+ $piwik_errorMessage .= "<p><strong>Matomo requires the php5-json extension which provides the functions <code>json_encode()</code> and <code>json_decode()</code></strong></p>
<p>It appears your PHP has not yet installed the php5-json extension.
- To use Piwik, please ask your web host to install php5-json or install it yourself, for example on debian system: <code>sudo apt-get install php5-json</code>. <br/>Then restart your webserver and refresh this page.</p>";
+ To use Matomo, please ask your web host to install php5-json or install it yourself, for example on debian system: <code>sudo apt-get install php5-json</code>. <br/>Then restart your webserver and refresh this page.</p>";
}
if (!file_exists(PIWIK_VENDOR_PATH . '/autoload.php')) {
- $composerInstall = "In the piwik directory, run in the command line the following (eg. via ssh): \n\n"
+ $composerInstall = "In the matomo directory, run in the command line the following (eg. via ssh): \n\n"
. "<pre> curl -sS https://getcomposer.org/installer | php \n\n php composer.phar install\n\n</pre> ";
if (DIRECTORY_SEPARATOR === '\\' /* ::isWindows() */) {
$composerInstall = "Download and run <a href=\"https://getcomposer.org/Composer-Setup.exe\"><b>Composer-Setup.exe</b></a>, it will install the latest Composer version and set up your PATH so that you can just call composer from any directory in your command line. "
- . " <br>Then run this command in a terminal in the piwik directory: <br> $ php composer.phar install ";
+ . " <br>Then run this command in a terminal in the matomo directory: <br> $ php composer.phar install ";
}
$piwik_errorMessage .= "<p>It appears the <a href='https://getcomposer.org/' rel='noreferrer' target='_blank'>composer</a> tool is not yet installed. You can install Composer in a few easy steps:\n\n".
"<br/>" . $composerInstall.
- " This will initialize composer for Piwik and download libraries we use in vendor/* directory.".
+ " This will initialize composer for Matomo and download libraries we use in vendor/* directory.".
"\n\n<br/><br/>Then reload this page to access your analytics reports." .
- "\n\n<br/><br/>For more information check out this FAQ: <a href='https://piwik.org/faq/how-to-install/faq_18271/' rel='noreferrer' target='_blank'>How do I use Piwik from the Git repository?</a>." .
- "\n\n<br/><br/>Note: if for some reasons you cannot install composer, instead install the latest Piwik release from ".
- "<a href='https://builds.piwik.org/piwik.zip'>builds.piwik.org</a>.</p>";
+ "\n\n<br/><br/>For more information check out this FAQ: <a href='https://matomo.org/faq/how-to-install/faq_18271/' rel='noreferrer' target='_blank'>How do I use Matomo from the Git repository?</a>." .
+ "\n\n<br/><br/>Note: if for some reasons you cannot install composer, instead install the latest Matomo release from ".
+ "<a href='https://builds.matomo.org/piwik.zip'>builds.matomo.org</a>.</p>";
}
}
-define('PAGE_TITLE_WHEN_ERROR', 'Piwik › Error');
+define('PAGE_TITLE_WHEN_ERROR', 'Matomo › Error');
if (!function_exists('Piwik_GetErrorMessagePage')) {
/**
@@ -106,7 +106,7 @@ if (!function_exists('Piwik_GetErrorMessagePage')) {
function Piwik_GetErrorMessagePage($message, $optionalTrace = false, $optionalLinks = false, $optionalLinkBack = false,
$logoUrl = false, $faviconUrl = false, $isCli = null)
{
- error_log(sprintf("Error in Piwik: %s", str_replace("\n", " ", strip_tags($message))));
+ error_log(sprintf("Error in Matomo: %s", str_replace("\n", " ", strip_tags($message))));
if (!headers_sent()) {
header('Content-Type: text/html; charset=utf-8');
@@ -142,11 +142,11 @@ if (!function_exists('Piwik_GetErrorMessagePage')) {
if ($optionalLinks) {
$optionalLinks = '<ul>
- <li><a rel="noreferrer" target="_blank" href="https://piwik.org">Piwik.org homepage</a></li>
- <li><a rel="noreferrer" target="_blank" href="https://piwik.org/faq/">Piwik Frequently Asked Questions</a></li>
- <li><a rel="noreferrer" target="_blank" href="https://piwik.org/docs/">Piwik Documentation</a></li>
- <li><a rel="noreferrer" target="_blank" href="https://forum.piwik.org/">Piwik Forums</a></li>
- <li><a rel="noreferrer" target="_blank" href="https://piwik.org/support/?pk_campaign=App_AnErrorOccured&pk_source=Piwik_App&pk_medium=ProfessionalServicesLink">Professional help for Piwik</a></li>
+ <li><a rel="noreferrer" target="_blank" href="https://matomo.org">Matomo.org homepage</a></li>
+ <li><a rel="noreferrer" target="_blank" href="https://matomo.org/faq/">Matomo Frequently Asked Questions</a></li>
+ <li><a rel="noreferrer" target="_blank" href="https://matomo.org/docs/">Matomo Documentation</a></li>
+ <li><a rel="noreferrer" target="_blank" href="https://forum.matomo.org/">Matomo Forums</a></li>
+ <li><a rel="noreferrer" target="_blank" href="https://matomo.org/support/?pk_campaign=App_AnErrorOccured&pk_source=Piwik_App&pk_medium=ProfessionalServicesLink">Professional help for Matomo</a></li>
</ul>';
}
if ($optionalLinkBack) {
@@ -164,7 +164,7 @@ if (!function_exists('Piwik_GetErrorMessagePage')) {
$content = '<h2>' . $message . '</h2>
<p>'
. $optionalLinkBack
- . ' | <a href="index.php">Go to Piwik</a>'
+ . ' | <a href="index.php">Go to Matomo</a>'
. '</p>'
. ' ' . (Piwik_ShouldPrintBackTraceWithMessage() ? $optionalTrace : '')
. ' ' . $optionalLinks;
diff --git a/js/LICENSE.txt b/js/LICENSE.txt
index 589b9f424494299a38753d2373f0f83e6e67251e..e4a1807f3f5cb5aa26d2c2ba9d329e41f78506a9 100644
--- a/js/LICENSE.txt
+++ b/js/LICENSE.txt
@@ -29,4 +29,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-View online: https://piwik.org/free-software/bsd/
+View online: https://matomo.org/free-software/bsd/
diff --git a/js/README.md b/js/README.md
index 48e024790c99ef8185f4ce0a151eba66af085db2..e30c6d725a7fd28dc328051d71a87f6596bea3a1 100644
--- a/js/README.md
+++ b/js/README.md
@@ -22,7 +22,7 @@ The js/ folder contains:
attempt to block tracking, you can change your tracking code to use "js/"
instead of "piwik.js" and "piwik.php", respectively.
- Note that in order for [Page Overlay](https://piwik.org/docs/page-overlay/) to work, the Piwik tracker method `setAPIUrl()` needs to be called with its parameter pointing to the root directory of Piwik. E.g.:
+ Note that in order for [Page Overlay](https://matomo.org/docs/page-overlay/) to work, the Piwik tracker method `setAPIUrl()` needs to be called with its parameter pointing to the root directory of Piwik. E.g.:
```js
_paq.push(['setAPIUrl', u]);
@@ -56,4 +56,4 @@ The js/ folder contains:
* We use /*! to include Piwik's license header in the minified source. Read
Stallman's "The JavaScript Trap" for more information.
-* Information about the current version number you have installed can be found under [What version of Piwik do I have?](https://piwik.org/faq/how-to-update/faq_8/).
+* Information about the current version number you have installed can be found under [What version of Piwik do I have?](https://matomo.org/faq/how-to-update/faq_8/).
diff --git a/lang/README.md b/lang/README.md
index 24359add2720bbc20c7db584a567e9e32bb8759f..cd12d2e6c11bc047605485f09143ea28a5b7faa3 100644
--- a/lang/README.md
+++ b/lang/README.md
@@ -4,4 +4,4 @@ If you want to improve an existing Piwik translation or contribute a new transla
We cannot accept pull requests for translations on GitHub since we manage all translations in this separate system. Translations will automatically be transferred to GitHub from time to time!
-If you have any questions feel free to contact the team at translations@piwik.org.
+If you have any questions feel free to contact the team at translations@matomo.org.
diff --git a/libs/README.md b/libs/README.md
index 824d7f247360d9ab2231d5fabda1fb78e6b1a7e0..9327ee758e5917c33ae60bd2e9345b3d5606017a 100644
--- a/libs/README.md
+++ b/libs/README.md
@@ -10,7 +10,7 @@ third-party libraries:
* sparkline/
- in r1296, remove require_once
- empty sparklines with floats, off-by-one errors, and locale conflict
- - in 270821ed (https://github.com/piwik/piwik/pull/8410) PHP7 compatibility: renamed the constructors
+ - in 270821ed (https://github.com/matomo-org/piwik/pull/8410) PHP7 compatibility: renamed the constructors
* tcpdf/
- in 6f945465fe40021d579bc2b4b8876468da69b062 fixed a bug reported in the forums
- in 566c63a52e31b2b2d3e1a83f8f63e74e8d661b21 fixed another couple bugs with fopen throwing warnings
diff --git a/misc/How to install Piwik.html b/misc/How to install Piwik.html
index 9d1695b6e71fef07a7025f5f9c21dd18d32f42ba..52a043927d37f31f61abfe84a55500cd2aaec652 100644
--- a/misc/How to install Piwik.html
+++ b/misc/How to install Piwik.html
@@ -1,8 +1,8 @@
<html>
<head>
- <meta http-equiv="refresh" content="0;url=https://piwik.org/docs/installation/"/>
+ <meta http-equiv="refresh" content="0;url=https://matomo.org/docs/installation/"/>
<meta name="robots" content="noindex,nofollow">
</head>
-<body>You will be redirected to the Piwik Installation documentation on <a href='https://piwik.org/docs/installation/'>https://piwik.org/docs/installation/</a>
+<body>You will be redirected to the Piwik Installation documentation on <a href='https://matomo.org/docs/installation/'>https://matomo.org/docs/installation/</a>
</body>
</html>
diff --git a/misc/cron/archive.php b/misc/cron/archive.php
index 97f5e51a869bdc801e558a87b505307bba4cb3a8..dfe5e3a28763b77ad2a13b7559b207277ce4faed 100644
--- a/misc/cron/archive.php
+++ b/misc/cron/archive.php
@@ -40,7 +40,7 @@ if (Piwik\Common::isPhpCliMode()) {
Using this 'archive.php' script is no longer recommended.
Please use '/path/to/php $piwikHome/console core:archive " . implode(' ', $_SERVER['argv']) . "' instead.
To get help use '/path/to/php $piwikHome/console core:archive --help'
-See also: https://piwik.org/docs/setup-auto-archiving/
+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'
@@ -60,7 +60,7 @@ try 'php archive.php --url=http://your.piwik/path'
if(!isset($_GET['token_auth'])) {
echo "
<b>You must specify the Super User token_auth as a parameter to this script, eg. <code>?token_auth=XYZ</code> if you wish to run this script through the browser. </b><br>
-However it is recommended to run it <a href='https://piwik.org/docs/setup-auto-archiving/'>via cron in the command line</a>, since it can take a long time to run.<br/>
+However it is recommended to run it <a href='https://matomo.org/docs/setup-auto-archiving/'>via cron in the command line</a>, since it can take a long time to run.<br/>
In a shell, execute for example the following to trigger archiving on the local Piwik server:<br/>
<code>$ /path/to/php /path/to/piwik/console core:archive --url=http://your-website.org/path/to/piwik/</code>
\n\n";
diff --git a/misc/cron/archive.sh b/misc/cron/archive.sh
index e47a19b8750a59b6c5457399f90432f990ff294e..6b9a9d8ec673bee25fff2611bc7c34e81906cfe0 100755
--- a/misc/cron/archive.sh
+++ b/misc/cron/archive.sh
@@ -32,7 +32,7 @@ PIWIK_PATH="$PIWIK_CRON_FOLDER"/../../console
CONSOLE_CMD="$PHP_BIN -q $PIWIK_PATH core:archive --url=http://example.org"
-MESSAGE="\n\n WARNING: this script archive.sh is DEPRECATED! \n\nPlease update your cron as explained in the documentation: https://piwik.org/docs/setup-auto-archiving/ \n\n"
+MESSAGE="\n\n WARNING: this script archive.sh is DEPRECATED! \n\nPlease update your cron as explained in the documentation: https://matomo.org/docs/setup-auto-archiving/ \n\n"
echo $MESSAGE;
diff --git a/misc/internal-docs/content-tracking.md b/misc/internal-docs/content-tracking.md
index 903ed32c8c6701832daeec7fe4c6b6e5ab448655..d6ad9a02cd204a985067b8f6d07bb3a419e83ebf 100644
--- a/misc/internal-docs/content-tracking.md
+++ b/misc/internal-docs/content-tracking.md
@@ -1,6 +1,6 @@
# Technical concept for implementing Content Tracking [#4996](#4996)
-See https://github.com/piwik/piwik/issues/4996 for explanation of the actual feature.
+See https://github.com/matomo-org/piwik/issues/4996 for explanation of the actual feature.
This is the technical concept for implementing content tracking. We won't plan anything to death but a little bit of thinking upfront makes sense :) Feel free to contribute and let us know if you have any objections! If your thoughts are not technical please comment on the actual issue [#4996](#4996).
diff --git a/misc/others/api_rest_call.php b/misc/others/api_rest_call.php
index b6275f87559f4357738e0831c7d9704ab06703bd..0c7e1436260613c686a6eccc836e67428ed24ac7 100644
--- a/misc/others/api_rest_call.php
+++ b/misc/others/api_rest_call.php
@@ -6,7 +6,7 @@ exit; // REMOVE this line to run the script
$token_auth = 'anonymous';
// we call the REST API and request the 100 first keywords for the last month for the idsite=7
-$url = "http://demo.piwik.org/";
+$url = "https://demo.matomo.org/";
$url .= "?module=API&method=Referrers.getKeywords";
$url .= "&idSite=7&period=month&date=yesterday";
$url .= "&format=PHP&filter_limit=20";
diff --git a/misc/others/uninstall-delete-piwik-directory.php b/misc/others/uninstall-delete-piwik-directory.php
index ac606bb721294b332847b1e0afdc3f07eb42ecfd..9d81e831aa62c6ad635edf1885e28afcbdaa96c8 100644
--- a/misc/others/uninstall-delete-piwik-directory.php
+++ b/misc/others/uninstall-delete-piwik-directory.php
@@ -9,7 +9,7 @@ exit; // Remove this line before using the script
// 4) Go with your browser to http://your-site/uninstall-delete-piwik-directory.php
// 5) The folder http://your-site/piwik/ should now be deleted!
// We hope you enjoyed Piwik. If you have any feedback why you stopped using Piwik,
-// please let us know at hello@piwik.org - we are interested by your experience
+// please let us know at hello@matomo.org - we are interested by your experience
function unlinkRecursive($dir)
{
if (!$dh = @opendir($dir)) return "Warning: folder $dir couldn't be read by PHP";
diff --git a/misc/others/widget_example_lastvisits.html b/misc/others/widget_example_lastvisits.html
index d9aa0478eb32fe82f7518a8a896234784b4e9653..0446fc7672c9b058302e8c07661651a2d1add8f4 100644
--- a/misc/others/widget_example_lastvisits.html
+++ b/misc/others/widget_example_lastvisits.html
@@ -4,7 +4,7 @@
<div id="widgetIframe">
<iframe width="800" height="450"
- src="https://piwik.org/demo/index.php?module=Widgetize&action=iframe&moduleToWidgetize=VisitsSummary&actionToWidgetize=getEvolutionGraph&idSite=1&period=week&date=last52&columns[]=nb_visits&disableLink=1"
+ src="https://matomo.org/demo/index.php?module=Widgetize&action=iframe&moduleToWidgetize=VisitsSummary&actionToWidgetize=getEvolutionGraph&idSite=1&period=week&date=last52&columns[]=nb_visits&disableLink=1"
scrolling="no" frameborder="0" marginheight="0" marginwidth="0"></iframe>
</div>
</body>
diff --git a/misc/user/index.html b/misc/user/index.html
index 876ebadd73fcad645e4d2b0f8f2656662a82f697..c14c54ee99a4a90d0bc219b3af2d2565c57d52e4 100644
--- a/misc/user/index.html
+++ b/misc/user/index.html
@@ -1 +1 @@
-This directory stores the custom logo for this Piwik server. Learn more: <a href="https://piwik.org/faq/new-to-piwik/faq_129/">How do I customise the logo in Piwik?</a>
+This directory stores the custom logo for this Piwik server. Learn more: <a href="https://matomo.org/faq/new-to-piwik/faq_129/">How do I customise the logo in Piwik?</a>
diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php
index 9801005795cf4c9b52967d91e780dbf3e0832cd4..50f149347e283954626d7881632b76c05a981b9c 100644
--- a/plugins/API/Controller.php
+++ b/plugins/API/Controller.php
@@ -52,7 +52,7 @@ class Controller extends \Piwik\Plugin\Controller
Piwik::checkUserHasSomeViewAccess();
$ApiDocumentation = new DocumentationGenerator();
- $prefixUrls = Common::getRequestVar('prefixUrl', 'http://demo.piwik.org/', 'string');
+ $prefixUrls = Common::getRequestVar('prefixUrl', 'https://demo.matomo.org/', 'string');
if (!UrlHelper::isLookLikeUrl($prefixUrls) || strpos($prefixUrls, 'http') !== 0) {
$prefixUrls = '';
}
diff --git a/plugins/API/Menu.php b/plugins/API/Menu.php
index 0d031304a5221b58cc421f9de3c460931133d10b..6202af89f5ace7406365a1f1b8b4cfacac220673 100644
--- a/plugins/API/Menu.php
+++ b/plugins/API/Menu.php
@@ -56,7 +56,7 @@ class Menu extends \Piwik\Plugin\Menu
if (!empty($parsedOS['short_name']) && in_array($parsedOS['short_name'], array(self::DD_SHORT_NAME_ANDROID, self::DD_SHORT_NAME_IOS))) {
- $url = $this->urlForModuleAction('Proxy', 'redirect', array('url' => 'https://piwik.org/mobile/'));
+ $url = $this->urlForModuleAction('Proxy', 'redirect', array('url' => 'https://matomo.org/mobile/'));
if ($url) {
$menu->addItem('Piwik Mobile App', null, $url, 4);
diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig
index 7c5a7004045819ad5d34ee12b726e1f73ea186a2..4c7e9f4794a7f2c04fb9a8abb4aae872dceac4e8 100644
--- a/plugins/API/templates/listAllAPI.twig
+++ b/plugins/API/templates/listAllAPI.twig
@@ -14,7 +14,7 @@
<p>{{ 'API_PluginDescription'|translate }}</p>
<p>
- {{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/analytics-api/reference'>","</a>")|raw }}
+ {{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/docs/analytics-api/reference'>","</a>")|raw }}
</p>
</div>
<div piwik-content-block content-title="{{ 'API_UserAuthentication'|translate|e('html_attr') }}">
diff --git a/plugins/API/tests/Integration/RssRendererTest.php b/plugins/API/tests/Integration/RssRendererTest.php
index 555e3f6bcd92822be315a863207bfa95ea6027d6..826bc1262d65313d46ef3e7b96bfab04fbf7c263 100644
--- a/plugins/API/tests/Integration/RssRendererTest.php
+++ b/plugins/API/tests/Integration/RssRendererTest.php
@@ -151,11 +151,11 @@ class RssRendererTest extends IntegrationTestCase
$this->assertEquals('<?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>
- <generator>piwik</generator>
+ <generator>matomo</generator>
<language>en</language>
</channel>
</rss>', $response);
diff --git a/plugins/Actions/Reports/GetSiteSearchKeywords.php b/plugins/Actions/Reports/GetSiteSearchKeywords.php
index 53a2acfea6c5ac167ede0bb5604bb6535f98a169..a314ccb421e221cec98e68e49a87f558767832d0 100644
--- a/plugins/Actions/Reports/GetSiteSearchKeywords.php
+++ b/plugins/Actions/Reports/GetSiteSearchKeywords.php
@@ -24,7 +24,7 @@ class GetSiteSearchKeywords extends SiteSearchBase
$this->dimension = new Keyword();
$this->name = Piwik::translate('Actions_WidgetSearchKeywords');
$this->documentation = Piwik::translate('Actions_SiteSearchKeywordsDocumentation') . '<br/><br/>' . Piwik::translate('Actions_SiteSearchIntro') . '<br/><br/>'
- . '<a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">' . Piwik::translate('Actions_LearnMoreAboutSiteSearchLink') . '</a>';
+ . '<a href="https://matomo.org/docs/site-search/" rel="noreferrer" target="_blank">' . Piwik::translate('Actions_LearnMoreAboutSiteSearchLink') . '</a>';
$this->metrics = array('nb_visits', 'nb_pages_per_search');
$this->processedMetrics = array(
new AverageTimeOnPage(),
diff --git a/plugins/CoreAdminHome/javascripts/protocolCheck.js b/plugins/CoreAdminHome/javascripts/protocolCheck.js
index 5bd4148e101319b17bf82de49d7bfed81c2c0805..b1331f2162f11c616c41941c61af408f05e6820d 100644
--- a/plugins/CoreAdminHome/javascripts/protocolCheck.js
+++ b/plugins/CoreAdminHome/javascripts/protocolCheck.js
@@ -32,7 +32,7 @@ $(document).ready(function () {
'"config/config.ini.php"',
'"assume_secure_protocol=1"',
'"[General]"',
- '<a href="?module=Proxy&action=redirect&url=https://piwik.org/faq/how-to-install/faq_98/" target="_blank">',
+ '<a href="?module=Proxy&action=redirect&url=https://matomo.org/faq/how-to-install/faq_98/" target="_blank">',
'</a>'
];
var message = _pk_translate('CoreAdminHome_ProtocolNotDetectedCorrectly') + " " + _pk_translate('CoreAdminHome_ProtocolNotDetectedCorrectlySolution', params);
diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
index 625b553003cf51c0a674486f0d31bd3a403e5784..18f88f25d636c909c3ad83b43ef45330b7678968 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.twig
+++ b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -34,14 +34,14 @@
<label for="enableBrowserTriggerArchiving2">
{{ 'General_No'|translate }}
- <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }}</span>
+ <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }}</span>
</label>
</p>
</div><div class="col s12 m6">
<div class="form-help">
{{ 'General_ArchivingInlineHelp'|translate }}
<br/>
- {{ 'General_SeeTheOfficialDocumentationForMoreInformation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }}
+ {{ 'General_SeeTheOfficialDocumentationForMoreInformation'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }}
</div>
</div>
</div>
diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
index bd4cbfffa590a58e679c1354e4ee572a7460d451..1ea4a0f7441a7ef66a93415b4c5f8f19ba97500d 100644
--- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
+++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
@@ -14,7 +14,7 @@
<div piwik-content-block
content-title="{{ title|e('html_attr') }}"
- help-url="https://piwik.org/docs/tracking-api/"
+ help-url="https://matomo.org/docs/tracking-api/"
rate="{{ 'CoreAdminHome_TrackingCode'|translate|e('html_attr') }}">
<div id="js-code-options" ng-controller="JsTrackingCodeController as jsTrackingCode">
@@ -22,11 +22,11 @@
<p>
{{ 'CoreAdminHome_JSTrackingIntro1'|translate }}
<br/><br/>
- {{ 'CoreAdminHome_JSTrackingIntro2'|translate }} {{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}
+ {{ 'CoreAdminHome_JSTrackingIntro2'|translate }} {{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://matomo.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}
<br/><br/>
{{ 'CoreAdminHome_JSTrackingIntro4'|translate('<a href="#image-tracking-link">','</a>')|raw }}
<br/><br/>
- {{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/javascript-tracking/">','</a>')|raw }}
+ {{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="https://matomo.org/docs/javascript-tracking/">','</a>')|raw }}
</p>
<div piwik-field uicontrol="site" name="js-tracker-website"
@@ -42,7 +42,7 @@
{# track across all subdomains #}
<div id="jsTrackAllSubdomainsInlineHelp" class="inline-help-node">
{{ 'CoreAdminHome_JSTracking_MergeSubdomainsDesc'|translate("x.<span class='current-site-host'></span>","y.<span class='current-site-host'></span>")|raw }}
- {{ 'General_LearnMore'|translate(' (<a href="https://developer.piwik.org/guides/tracking-javascript-guide#measuring-domains-andor-sub-domains" rel="noreferrer" target="_blank">', '</a>)')|raw }}
+ {{ 'General_LearnMore'|translate(' (<a href="https://developer.matomo.org/guides/tracking-javascript-guide#measuring-domains-andor-sub-domains" rel="noreferrer" target="_blank">', '</a>)')|raw }}
</div>
<div piwik-field uicontrol="checkbox" name="javascript-tracking-all-subdomains"
@@ -185,7 +185,7 @@
{# custom campaign name/keyword query params #}
<div id="jsTrackCampaignParamsInlineHelp" class="inline-help-node">
- {{ 'CoreAdminHome_JSTracking_CustomCampaignQueryParamDesc'|translate('<a href="https://piwik.org/faq/general/#faq_119" rel="noreferrer" target="_blank">','</a>')|raw }}
+ {{ 'CoreAdminHome_JSTracking_CustomCampaignQueryParamDesc'|translate('<a href="https://matomo.org/faq/general/#faq_119" rel="noreferrer" target="_blank">','</a>')|raw }}
</div>
<div piwik-field uicontrol="checkbox" name="custom-campaign-query-params-check"
@@ -247,7 +247,7 @@
{{ 'CoreAdminHome_ImageTrackingIntro1'|translate }} {{ 'CoreAdminHome_ImageTrackingIntro2'|translate("<code><noscript></noscript></code>")|raw }}
</p>
<p>
- {{ 'CoreAdminHome_ImageTrackingIntro3'|translate('<a href="https://piwik.org/docs/tracking-api/reference/" rel="noreferrer" target="_blank">','</a>')|raw }}
+ {{ 'CoreAdminHome_ImageTrackingIntro3'|translate('<a href="https://matomo.org/docs/tracking-api/reference/" rel="noreferrer" target="_blank">','</a>')|raw }}
</p>
{# website #}
@@ -316,7 +316,7 @@
<div piwik-content-block content-title="{{ 'CoreAdminHome_ImportingServerLogs'|translate|e('html_attr') }}">
<p>
- {{ 'CoreAdminHome_ImportingServerLogsDesc'|translate('<a href="https://piwik.org/log-analytics/" rel="noreferrer" target="_blank">','</a>')|raw }}
+ {{ 'CoreAdminHome_ImportingServerLogsDesc'|translate('<a href="https://matomo.org/log-analytics/" rel="noreferrer" target="_blank">','</a>')|raw }}
</p>
</div>
{% endblock %}
diff --git a/plugins/CoreConsole/Commands/GenerateAngularComponent.php b/plugins/CoreConsole/Commands/GenerateAngularComponent.php
index 6342b78240b5c653325492f3a8867ca476e26ab1..081da16b0081bf9d272616f2c6386d1e36aa67da 100644
--- a/plugins/CoreConsole/Commands/GenerateAngularComponent.php
+++ b/plugins/CoreConsole/Commands/GenerateAngularComponent.php
@@ -68,7 +68,7 @@ class GenerateAngularComponent extends GenerateAngularConstructBase
sprintf('In <comment>%1$s/%2$s.php</comment> you should now require the JS files', $pluginPath, $pluginName),
sprintf('<comment>%1$s%2$s</comment>', $pluginPath, $js1),
sprintf('and the less file <comment>%1$s%2$s</comment>.', $pluginPath, $less1),
- 'If you are not familiar with this have a look at <comment>http://developer.piwik.org/guides/working-with-piwiks-ui</comment>'
+ 'If you are not familiar with this have a look at <comment>https://developer.matomo.org/guides/working-with-piwiks-ui</comment>'
));
}
}
\ No newline at end of file
diff --git a/plugins/CoreConsole/Commands/GenerateAngularDirective.php b/plugins/CoreConsole/Commands/GenerateAngularDirective.php
index 27fb7a65e0ce17245752e3e1ee0a63caed1fd579..c5c0a767c769402be2aa96df16940698b97f5808 100644
--- a/plugins/CoreConsole/Commands/GenerateAngularDirective.php
+++ b/plugins/CoreConsole/Commands/GenerateAngularDirective.php
@@ -72,7 +72,7 @@ class GenerateAngularDirective extends GenerateAngularConstructBase
sprintf('In <comment>%1$s/%2$s.php</comment> you should now require the JS files', $pluginPath, $pluginName),
sprintf('<comment>%1$s%2$s</comment>, <comment>%1$s%3$s</comment>', $pluginPath, $js1, $js2),
sprintf('and the less file <comment>%1$s%2$s</comment>.', $pluginPath, $less1),
- 'If you are not familiar with this have a look at <comment>https://developer.piwik.org/guides/working-with-piwiks-ui</comment>'
+ 'If you are not familiar with this have a look at <comment>https://developer.matomo.org/guides/working-with-piwiks-ui</comment>'
));
}
}
diff --git a/plugins/CoreConsole/Commands/GeneratePlugin.php b/plugins/CoreConsole/Commands/GeneratePlugin.php
index 17d1795db5f76f3f87ecf6e219d587d3dd1ec95c..a214a40a5f19125c1f2a166eb70b0e6ca43f50c1 100644
--- a/plugins/CoreConsole/Commands/GeneratePlugin.php
+++ b/plugins/CoreConsole/Commands/GeneratePlugin.php
@@ -84,13 +84,13 @@ class GeneratePlugin extends GeneratePluginBase
if ($isTheme) {
$this->writeSuccessMessage($output, array(
sprintf('Theme %s %s generated.', $pluginName, $version),
- 'If you have not done yet check out our Theming guide <comment>https://developer.piwik.org/guides/theming</comment>',
+ 'If you have not done yet check out our Theming guide <comment>https://developer.matomo.org/guides/theming</comment>',
'Enjoy!'
));
} else {
$this->writeSuccessMessage($output, array(
sprintf('Plugin %s %s generated.', $pluginName, $version),
- 'Our developer guides will help you developing this plugin, check out <comment>https://developer.piwik.org/guides</comment>',
+ 'Our developer guides will help you developing this plugin, check out <comment>https://developer.matomo.org/guides</comment>',
'To see a list of available generators execute <comment>./console list generate</comment>',
'Enjoy!'
));
diff --git a/plugins/CoreConsole/Commands/GenerateWidget.php b/plugins/CoreConsole/Commands/GenerateWidget.php
index c04c30cd55fe2ae7a7af742043c0f8de7501c546..2b603aa1facecc94dcc81b32b275692e3de82df7 100644
--- a/plugins/CoreConsole/Commands/GenerateWidget.php
+++ b/plugins/CoreConsole/Commands/GenerateWidget.php
@@ -49,7 +49,7 @@ class GenerateWidget extends GeneratePluginBase
$replace = array('ExamplePlugin' => $pluginName,
'MyExampleWidget' => $widgetClass,
'Example Widget Name' => $this->makeTranslationIfPossible($pluginName, $widgetName),
- 'About Piwik' => $category);
+ 'About Matomo' => $category);
$whitelistFiles = array('/Widgets', '/Widgets/MyExampleWidget.php');
$this->copyTemplateToPlugin($exampleFolder, $pluginName, $replace, $whitelistFiles);
diff --git a/plugins/CoreHome/Widgets/GetDonateForm.php b/plugins/CoreHome/Widgets/GetDonateForm.php
index 044a6897c35e94d2fa701aa97315cd0d1989a3a9..f8188596f22eddd0253f4d9958182a0757df7d0b 100644
--- a/plugins/CoreHome/Widgets/GetDonateForm.php
+++ b/plugins/CoreHome/Widgets/GetDonateForm.php
@@ -29,7 +29,7 @@ class GetDonateForm extends Widget
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('About Piwik');
+ $config->setCategoryId('About Matomo');
$config->setName('CoreHome_SupportPiwik');
$config->setOrder(5);
}
diff --git a/plugins/CoreHome/Widgets/GetPromoVideo.php b/plugins/CoreHome/Widgets/GetPromoVideo.php
index 5ceef91f84e75e738d7a9494d5f639209b3a8989..63e4c776d0d6dd390d5df84b9a060c9aeb58d787 100644
--- a/plugins/CoreHome/Widgets/GetPromoVideo.php
+++ b/plugins/CoreHome/Widgets/GetPromoVideo.php
@@ -27,7 +27,7 @@ class GetPromoVideo extends Widget
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('About Piwik');
+ $config->setCategoryId('About Matomo');
$config->setName('Installation_Welcome');
$config->setOrder(10);
}
diff --git a/plugins/CoreHome/Widgets/GetSystemSummary.php b/plugins/CoreHome/Widgets/GetSystemSummary.php
index a90d7b0586ded035ec8e0465aaa3c99fd74dfe24..a4c1a4d128c34b3eabb6bba4141b350485cc0386 100644
--- a/plugins/CoreHome/Widgets/GetSystemSummary.php
+++ b/plugins/CoreHome/Widgets/GetSystemSummary.php
@@ -38,7 +38,7 @@ class GetSystemSummary extends Widget
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('About Piwik');
+ $config->setCategoryId('About Matomo');
$config->setName('CoreHome_SystemSummaryWidget');
$config->setOrder(15);
$config->setIsEnabled(Piwik::hasUserSuperUserAccess());
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index 2bc8361875d9d1bb4feaf00e6911a2def6c350e9..c31b8b1e8c7846236a103ea15c17a0c7c6ef13a0 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -1847,7 +1847,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
},
handleSummaryRow: function (domElem) {
- var details = _pk_translate('General_LearnMore', [' (<a href="https://piwik.org/faq/how-to/faq_54/" rel="noreferrer" target="_blank">', '</a>)']);
+ var details = _pk_translate('General_LearnMore', [' (<a href="https://matomo.org/faq/how-to/faq_54/" rel="noreferrer" target="_blank">', '</a>)']);
domElem.find('tr.summaryRow').each(function () {
var labelSpan = $(this).find('.label .value');
diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig
index 47b06c7cc39aeeda0032b8c4dae18550537b484e..67c9c2aab873e64390c5a214d3c53d3b680a5c3d 100644
--- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig
+++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig
@@ -6,7 +6,7 @@
<p style='{{styleParagraph}}{{fontStyle}}text-align:center;font-size:13px; color:#666; padding:30px'>
{{'General_PoweredBy'|translate}}
- <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
+ <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a>
<br />
{{ 'CoreHome_LeadingAnalyticsPlatformRespectsYourPrivacy'|translate }}
</p>
diff --git a/plugins/CoreHome/templates/_donate.twig b/plugins/CoreHome/templates/_donate.twig
index fff06f2cc148ec37f31af30b3821d7669790c12a..3d0c428e8e89f3118b07280ef02b5bfdca33fa14 100755
--- a/plugins/CoreHome/templates/_donate.twig
+++ b/plugins/CoreHome/templates/_donate.twig
@@ -5,7 +5,7 @@
{% else %}
<p>{{ 'CoreHome_DonateCall1'|translate }}</p>
<p><strong>{{ 'CoreHome_DonateCall2'|translate }}</strong></p>
- <p>{{ 'CoreHome_DonateCall3'|translate('<strong>','</strong>', '<a target="_blank" rel="nofollow" href="https://piwik.org/recommends/premium-plugins/"><strong>', '</strong></a>')|raw }}</p>
+ <p>{{ 'CoreHome_DonateCall3'|translate('<strong>','</strong>', '<a target="_blank" rel="nofollow" href="https://matomo.org/recommends/premium-plugins/"><strong>', '</strong></a>')|raw }}</p>
{% endif %}
</div>
diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig
index 323383ad5558ce9b78d9e00d2f1ca1b8338f4519..b14cc6ea0a30e4f2d51f97a9528f653f77d80529 100644
--- a/plugins/CoreHome/templates/_headerMessage.twig
+++ b/plugins/CoreHome/templates/_headerMessage.twig
@@ -1,7 +1,7 @@
{# testing, remove test_ from var names #}
{% set test_latest_version_available="4.0.0" %}
-{% set test_piwikUrl='http://demo.piwik.org/' %}
-{% set isPiwikDemo %}{{ piwikUrl == 'http://demo.piwik.org/' or piwikUrl == 'https://demo.piwik.org/' }}{% endset %}
+{% set test_piwikUrl='https://demo.matomo.org/' %}
+{% set isPiwikDemo %}{{ piwikUrl == 'http://demo.matomo.org/' or piwikUrl == 'https://demo.matomo.org/' }}{% endset %}
{% set updateCheck %}
<span id="updateCheckLinkContainer">
@@ -30,14 +30,14 @@
<div class="dropdown positionInViewport">
{% if latest_version_available and isSuperUser %}
{% if isMultiServerEnvironment %}
- {{ 'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment'|translate("<a rel='noreferrer' href='https://builds.piwik.org/piwik-" ~ latest_version_available ~ ".zip'>","</a>")|raw }}
+ {{ 'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment'|translate("<a rel='noreferrer' href='https://builds.matomo.org/piwik-" ~ latest_version_available ~ ".zip'>","</a>")|raw }}
{% else %}
- {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=https://piwik.org/changelog/' target='_blank'>","</a>")|raw }}
+ {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=https://matomo.org/changelog/' target='_blank'>","</a>")|raw }}
{% endif %}
<br />
{% elseif latest_version_available and not isPiwikDemo and hasSomeViewAccess and not isUserIsAnonymous %}
{% set updateSubject = 'General_NewUpdatePiwikX'|translate(latest_version_available)|e('url') %}
- {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=https://piwik.org/changelog/' target='_blank'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }}
+ {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=https://piwik.org/changelog/' target='_blank'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }}
<br />
{% endif %}
diff --git a/plugins/CoreHome/templates/_warningInvalidHost.twig b/plugins/CoreHome/templates/_warningInvalidHost.twig
index 1caf03b791af3d36a7662cc724956c6d2059fa9c..86d1247967bb4b9cd9bd14304ee4bea8c0da4e67 100644
--- a/plugins/CoreHome/templates/_warningInvalidHost.twig
+++ b/plugins/CoreHome/templates/_warningInvalidHost.twig
@@ -1,7 +1,7 @@
{# untrusted host warning #}
{% if (isValidHost is defined and invalidHostMessage is defined and isValidHost == false) %}
{% set invalidHostText %}
- <a class="btn btn-link" style="float:right;" href="https://piwik.org/faq/troubleshooting/#faq_171" rel="noreferrer" target="_blank">
+ <a class="btn btn-link" style="float:right;" href="https://matomo.org/faq/troubleshooting/#faq_171" rel="noreferrer" target="_blank">
<span class="icon-help"></span>
{{ 'General_Help'|translate }}
</a>
diff --git a/plugins/CoreHome/templates/getPromoVideo.twig b/plugins/CoreHome/templates/getPromoVideo.twig
index 3b911b63ed38cbc869d980ff5e21ffa74e4e9956..8da27c773add7767ee19e5ecc4594aa1068209aa 100755
--- a/plugins/CoreHome/templates/getPromoVideo.twig
+++ b/plugins/CoreHome/templates/getPromoVideo.twig
@@ -8,7 +8,7 @@
</div>
</div>
- <a id="piwik-promo-videos-link" href="https://piwik.org/blog/2012/12/piwik-how-to-videos/" rel="noreferrer" target="_blank">
+ <a id="piwik-promo-videos-link" href="https://matomo.org/blog/2012/12/piwik-how-to-videos/" rel="noreferrer" target="_blank">
{{ 'CoreHome_ViewAllPiwikVideoTutorials'|translate }}
</a>
diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
index b3ceafe741c616f7e845ad91df1c05fd179d292b..f7c9dc7785f88d050fe6978162398b563f4cd82a 100644
--- a/plugins/CorePluginsAdmin/templates/macros.twig
+++ b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -145,7 +145,9 @@
{% if plugin.info.homepage|default is not empty and plugin.info.homepage not in [
'http://piwik.org', 'http://www.piwik.org', 'http://piwik.org/', 'http://www.piwik.org/',
- 'https://piwik.org', 'https://www.piwik.org', 'https://piwik.org/', 'https://www.piwik.org/'
+ 'https://piwik.org', 'https://www.piwik.org', 'https://piwik.org/', 'https://www.piwik.org/',
+ 'http://matomo.org', 'http://www.matomo.org', 'http://matomo.org/', 'http://www.matomo.org/',
+ 'https://matomo.org', 'https://www.matomo.org', 'https://matomo.org/', 'https://www.matomo.org/'
] %}
<span class="plugin-homepage">
<a target="_blank" href="{{ plugin.info.homepage }}">({{ 'CorePluginsAdmin_PluginHomepage'|translate|replace({' ': ' '})|raw }})</a>
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index 6caf7cafc9f9fcf1636f961b37eb73d853473657..7f6e062a66b48b2bdc8a9897de2e1b9d46309e78 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -74,7 +74,7 @@ class CoreUpdater extends \Piwik\Plugin
if ($updater->getComponentUpdates() !== null) {
if (FrontController::shouldRethrowException()) {
throw new Exception("Piwik and/or some plugins have been upgraded to a new version. \n" .
- "--> Please run the update process first. See documentation: https://piwik.org/docs/update/ \n");
+ "--> Please run the update process first. See documentation: https://matomo.org/docs/update/ \n");
} elseif ($module === 'API') {
$outputFormat = strtolower(Common::getRequestVar('format', 'xml', 'string', $_GET + $_POST));
diff --git a/plugins/CoreUpdater/ReleaseChannel.php b/plugins/CoreUpdater/ReleaseChannel.php
index 23c84971a41c007ecf88de2d2013663429c7df6d..815438ff08d194c79e7cc6d03401d0a905402f2d 100644
--- a/plugins/CoreUpdater/ReleaseChannel.php
+++ b/plugins/CoreUpdater/ReleaseChannel.php
@@ -40,6 +40,6 @@ abstract class ReleaseChannel extends BaseReleaseChannel
public function getDownloadUrlWithoutScheme($version)
{
- return sprintf('://builds.piwik.org/piwik-%s.zip', $version);
+ return sprintf('://builds.matomo.org/piwik-%s.zip', $version);
}
}
\ No newline at end of file
diff --git a/plugins/CoreUpdater/ReleaseChannel/LatestStable.php b/plugins/CoreUpdater/ReleaseChannel/LatestStable.php
index 1a7088ab10ec50e5aa5373e54e855db98326f3f1..935da67da75c053e980fe06a3b97547a4d6ecfbd 100644
--- a/plugins/CoreUpdater/ReleaseChannel/LatestStable.php
+++ b/plugins/CoreUpdater/ReleaseChannel/LatestStable.php
@@ -30,7 +30,7 @@ class LatestStable extends ReleaseChannel
public function getDownloadUrlWithoutScheme($version)
{
- return '://builds.piwik.org/piwik.zip';
+ return '://builds.matomo.org/piwik.zip';
}
public function getOrder()
diff --git a/plugins/CoreUpdater/SystemSettings.php b/plugins/CoreUpdater/SystemSettings.php
index f8db4e1d49f45e83ec990ac8ccb731c33bd712b7..604c0c6e9ea85eedca1e34526d2841aa23e9c9d1 100644
--- a/plugins/CoreUpdater/SystemSettings.php
+++ b/plugins/CoreUpdater/SystemSettings.php
@@ -84,11 +84,11 @@ class SystemSettings extends \Piwik\Settings\Plugin\SystemSettings
};
$field->inlineHelp = Piwik::translate('CoreAdminHome_DevelopmentProcess',
- array("<a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>",
+ array("<a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>",
"</a>"))
. Piwik::translate('<br/>')
. Piwik::translate('CoreAdminHome_StableReleases',
- array("<a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>",
+ array("<a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>",
"</a>"))
. Piwik::translate('<br />')
. Piwik::translate('CoreAdminHome_LtsReleases');
diff --git a/plugins/CoreUpdater/Test/Integration/ReleaseChannelTest.php b/plugins/CoreUpdater/Test/Integration/ReleaseChannelTest.php
index 13b2422be5c6c07c2975303209193c4e7acc648f..f26cec94dee03f50463d638ed0eba8177fee81f7 100644
--- a/plugins/CoreUpdater/Test/Integration/ReleaseChannelTest.php
+++ b/plugins/CoreUpdater/Test/Integration/ReleaseChannelTest.php
@@ -50,7 +50,7 @@ class ReleaseChannelTest extends IntegrationTestCase
public function test_getDownloadUrlWithoutScheme_shouldReturnUrlWithVersionNumberButWithoutScheme()
{
- $this->assertSame('://builds.piwik.org/piwik-2.15.0-b5.zip', $this->channel->getDownloadUrlWithoutScheme('2.15.0-b5'));
+ $this->assertSame('://builds.matomo.org/piwik-2.15.0-b5.zip', $this->channel->getDownloadUrlWithoutScheme('2.15.0-b5'));
}
public function test_getUrlToCheckForLatestAvailableVersion()
@@ -62,7 +62,7 @@ class ReleaseChannelTest extends IntegrationTestCase
$urlToCheck = $this->channel->getUrlToCheckForLatestAvailableVersion();
- $this->assertStringStartsWith("http://api.piwik.org/1.0/getLatestVersion/?piwik_version=$version&php_version=$phpVersion&mysql_version=$mysqlVersion&release_channel=my_channel&url=$url&trigger=&timezone=", $urlToCheck);
+ $this->assertStringStartsWith("http://api.matomo.org/1.0/getLatestVersion/?piwik_version=$version&php_version=$phpVersion&mysql_version=$mysqlVersion&release_channel=my_channel&url=$url&trigger=&timezone=", $urlToCheck);
}
public function test_doesPreferStable()
diff --git a/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php b/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php
index 34870e4f2ff724ea1306181f7835402461469f21..b0315381342b792dd934825064f79d7c76779096 100644
--- a/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php
+++ b/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php
@@ -77,12 +77,12 @@ CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage
{$rootUrl}index.php?module=CoreUpdater&action=newVersionAvailable
CoreUpdater_ViewVersionChangelog
-https://piwik.org/changelog/piwik-33-0-0/
+https://matomo.org/changelog/piwik-33-0-0/
CoreUpdater_ReceiveEmailBecauseIsSuperUser
CoreUpdater_FeedbackRequest
-https://piwik.org/contact/";
+https://matomo.org/contact/";
$this->assertEmailForVersion('33.0.0', $message);
}
@@ -100,7 +100,7 @@ CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage
CoreUpdater_ReceiveEmailBecauseIsSuperUser
CoreUpdater_FeedbackRequest
-https://piwik.org/contact/";
+https://matomo.org/contact/";
$this->assertEmailForVersion('33.0.0-b1', $message);
}
diff --git a/plugins/CoreUpdater/Test/Mock/UpdaterMock.php b/plugins/CoreUpdater/Test/Mock/UpdaterMock.php
index c72510e006d7514b47c38a8032be60eee688a150..d0089e08fb8b103ec5aa66bec0536b9a6173f663 100644
--- a/plugins/CoreUpdater/Test/Mock/UpdaterMock.php
+++ b/plugins/CoreUpdater/Test/Mock/UpdaterMock.php
@@ -36,7 +36,7 @@ class UpdaterMock extends Updater
public function getArchiveUrl($version, $https = true)
{
- return 'http://builds.piwik.org/piwik.zip';
+ return 'http://builds.matomo.org/piwik.zip';
}
public function updatePiwik($https = true)
diff --git a/plugins/CoreUpdater/UpdateCommunication.php b/plugins/CoreUpdater/UpdateCommunication.php
index def5f97a2a2f6c4c86f1a91eb826196b6a238127..35b0971a7b15268d0a41efe8020a365c666a811b 100644
--- a/plugins/CoreUpdater/UpdateCommunication.php
+++ b/plugins/CoreUpdater/UpdateCommunication.php
@@ -87,7 +87,7 @@ class UpdateCommunication
$message .= "\n\n";
$message .= Piwik::translate('CoreUpdater_FeedbackRequest');
$message .= "\n";
- $message .= 'https://piwik.org/contact/';
+ $message .= 'https://matomo.org/contact/';
$this->sendEmailNotification($subject, $message);
}
@@ -96,7 +96,7 @@ class UpdateCommunication
{
$version = str_replace('.', '-', $version);
- $link = sprintf('https://piwik.org/changelog/piwik-%s/', $version);
+ $link = sprintf('https://matomo.org/changelog/piwik-%s/', $version);
return $link;
}
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
index 4afc51ac17661fe958e61ed34967dca5b59aede7..0d9f60882256f585dd1668be6933014449635983 100644
--- a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
@@ -1,6 +1,6 @@
{% extends '@CoreUpdater/layout.twig' %}
{% set helpMessage %}
- {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/faq/">','</a>','</li><li>')|raw }}
+ {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/faq/">','</a>','</li><li>')|raw }}
{% endset %}
{% block content %}
@@ -24,7 +24,7 @@
<ul>
<li>{{ 'CoreUpdater_ErrorDIYHelp_1'|translate }}</li>
<li>{{ 'CoreUpdater_ErrorDIYHelp_2'|translate }}</li>
- <li>{{ 'CoreUpdater_ErrorDIYHelp_3'|translate }} <a href='https://piwik.org/faq/how-to-update/#faq_179' rel='noreferrer' target='_blank'>(see FAQ)</a></li>
+ <li>{{ 'CoreUpdater_ErrorDIYHelp_3'|translate }} <a href='https://matomo.org/faq/how-to-update/#faq_179' rel='noreferrer' target='_blank'>(see FAQ)</a></li>
<li>{{ 'CoreUpdater_ErrorDIYHelp_4'|translate }}</li>
<li>{{ 'CoreUpdater_ErrorDIYHelp_5'|translate }}</li>
</ul>
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
index 679b56e254809daf354f951f0ce40c37c1e24527..64155b037216ef3ad5d8f60e35e2884bf3cb6fd3 100644
--- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
@@ -11,7 +11,7 @@
<div class="content" style="text-align:left;">
{% set helpMessage %}
- {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/faq/">','</a>','</li><li>')|raw }}
+ {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/faq/">','</a>','</li><li>')|raw }}
{% endset %}
{% if coreError %}
@@ -61,7 +61,7 @@
{% endif %}
<h2>{{ 'CoreUpdater_NeedHelpUpgrading'|translate }}</h2>
- <p>{{ 'CoreUpdater_NeedHelpUpgradingText'|translate("<a rel='noreferrer' target='_blank' href='https://piwik.org/support/upgrading-piwik/'>", "</a>")|raw }}</p>
+ <p>{{ 'CoreUpdater_NeedHelpUpgradingText'|translate("<a rel='noreferrer' target='_blank' href='https://matomo.org/support/upgrading-piwik/'>", "</a>")|raw }}</p>
<h2>{{ 'CoreUpdater_ReadyToGo'|translate }}</h2>
<p>{{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}</p>
diff --git a/plugins/CoreUpdater/templates/updateHttpError.twig b/plugins/CoreUpdater/templates/updateHttpError.twig
index 74f1d4ff7c0da1997cfedee1a75d431b7c0d1fc1..7666bb3d52eb59ee04ccb21e982b670ce92582bb 100644
--- a/plugins/CoreUpdater/templates/updateHttpError.twig
+++ b/plugins/CoreUpdater/templates/updateHttpError.twig
@@ -18,7 +18,7 @@
</div>
<p>
- {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/update/'>","</a>")|raw }}
+ {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/docs/update/'>","</a>")|raw }}
</p>
</div>
diff --git a/plugins/CoreUpdater/templates/updateSuccess.twig b/plugins/CoreUpdater/templates/updateSuccess.twig
index d1897777d96d1bd55d29c2643ae3e044d2040bae..7642cd54f84fbae3495586c0d6cfc71baf76a90a 100644
--- a/plugins/CoreUpdater/templates/updateSuccess.twig
+++ b/plugins/CoreUpdater/templates/updateSuccess.twig
@@ -24,7 +24,7 @@
<div class="row">
<div class="col s5 offset-s1">
- <a href="https://piwik.org/support/?pk_medium=Update_Success_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_ServicesSupport'|translate }}</a>
+ <a href="https://matomo.org/support/?pk_medium=Update_Success_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_ServicesSupport'|translate }}</a>
</div>
<div class="col s5">
<a href="https://www.innocraft.cloud/?pk_medium=App_Cloud_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_CloudHosting'|translate }}</a>
diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions
index 097b3454fdf99554a5ba1bca102c0a2de728e902..baa5d8e2e7fa7f600861a9e01e5f10b8c2997ce0 160000
--- a/plugins/CustomDimensions
+++ b/plugins/CustomDimensions
@@ -1 +1 @@
-Subproject commit 097b3454fdf99554a5ba1bca102c0a2de728e902
+Subproject commit baa5d8e2e7fa7f600861a9e01e5f10b8c2997ce0
diff --git a/plugins/CustomVariables/Reports/GetCustomVariables.php b/plugins/CustomVariables/Reports/GetCustomVariables.php
index c97746330a29e49e199612668446453863e6c3e8..9e1c473ebbd7b4e0db5620d4fec526fdfb407eb0 100644
--- a/plugins/CustomVariables/Reports/GetCustomVariables.php
+++ b/plugins/CustomVariables/Reports/GetCustomVariables.php
@@ -21,7 +21,7 @@ class GetCustomVariables extends Base
$this->dimension = new CustomVariableName();
$this->name = Piwik::translate('CustomVariables_CustomVariables');
$this->documentation = Piwik::translate('CustomVariables_CustomVariablesReportDocumentation',
- array('<br />', '<a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">', '</a>'));
+ array('<br />', '<a href="https://matomo.org/docs/custom-variables/" rel="noreferrer" target="_blank">', '</a>'));
$this->actionToLoadSubTables = 'getCustomVariablesValuesFromNameId';
$this->order = 10;
diff --git a/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php b/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php
index 44c63fd2d50c1d119fda24f1823d38140e895e52..397aa911a89d52a83b51e6212bd827621d5ec549 100644
--- a/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php
+++ b/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php
@@ -20,7 +20,7 @@ class GetCustomVariablesValuesFromNameId extends Base
$this->dimension = new CustomVariableValue();
$this->name = Piwik::translate('CustomVariables_CustomVariables');
$this->documentation = Piwik::translate('CustomVariables_CustomVariablesReportDocumentation',
- array('<br />', '<a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">', '</a>'));
+ array('<br />', '<a href="https://matomo.org/docs/custom-variables/" rel="noreferrer" target="_blank">', '</a>'));
$this->isSubtableReport = true;
$this->order = 15;
}
diff --git a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html b/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html
index 286ec3d06454ddc9f65d0f633542dccac0534a81..9c6b18420457db5686503efcb86dabf8735ade63 100644
--- a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html
+++ b/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html
@@ -1,7 +1,7 @@
<div class="manageCustomVars">
<div piwik-content-intro>
<h2 piwik-enriched-headline
- help-url="https://piwik.org/docs/custom-variables/">
+ help-url="https://matomo.org/docs/custom-variables/">
{{ 'CustomVariables_CustomVariables'|translate }}
</h2>
diff --git a/plugins/CustomVariables/lang/en.json b/plugins/CustomVariables/lang/en.json
index 1ecccedc5ae2ea6317fd7aa5428e0ebdaf943185..39c22ba1e2f61f6cf3a3d24b05dd3ad88b94b4da 100644
--- a/plugins/CustomVariables/lang/en.json
+++ b/plugins/CustomVariables/lang/en.json
@@ -4,7 +4,7 @@
"ColumnCustomVariableValue": "Custom Variable value",
"CustomVariables": "Custom Variables",
"CustomVariablesReportDocumentation": "This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. %1$s For more information about Custom Variables in general, read the %2$sCustom Variables documentation on piwik.org%3$s",
- "PluginDescription": "Custom Variables are (name, value) pairs that you can assign using the Javascript API to visitors or any of their action. Piwik will then report how many visits, pages, conversions for each of these custom names and values. View the detailed Custom Variables for each user and action in the Visitor Log.<br />Required to use <a href=\"https://piwik.org/docs/ecommerce-analytics/\">Ecommerce Analytics</a> feature!",
+ "PluginDescription": "Custom Variables are (name, value) pairs that you can assign using the Javascript API to visitors or any of their action. Piwik will then report how many visits, pages, conversions for each of these custom names and values. View the detailed Custom Variables for each user and action in the Visitor Log.<br />Required to use <a href=\"https://matomo.org/docs/ecommerce-analytics/\">Ecommerce Analytics</a> feature!",
"ScopePage": "scope page",
"ScopeVisit": "scope visit",
"ScopeConversion": "scope conversion",
diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig
index 08b900ecf1a81f3ba9dad0f19acb175730228e9b..a3f9e808973c3393dd12fb5642f54224ec677c57 100755
--- a/plugins/DBStats/templates/index.twig
+++ b/plugins/DBStats/templates/index.twig
@@ -9,7 +9,7 @@
</h2>
<p>
{{ 'DBStats_MainDescription'|translate(totalSpaceUsed) }}<br/>
- {{ 'DBStats_LearnMore'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/setup-auto-archiving/' target='_blank'>Piwik Auto Archiving</a>")|raw }}
+ {{ 'DBStats_LearnMore'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/docs/setup-auto-archiving/' target='_blank'>Matomo Auto Archiving</a>")|raw }}
</p>
</div>
diff --git a/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php b/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php
index 15bf5d83dfbf5005bb11ed8800a924c068ac1ce5..1064cf9d3d032f331c7371aae4db36a8918e50e8 100644
--- a/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php
+++ b/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php
@@ -78,7 +78,7 @@ class LoadDataInfileCheck implements Diagnostic
'<br/><strong>%s:</strong> %s<br/>%s',
$this->translator->translate('General_Error'),
$errorMessage,
- 'Troubleshooting: <a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/faq/troubleshooting/%23faq_194">FAQ on piwik.org</a>'
+ 'Troubleshooting: <a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/faq/troubleshooting/%23faq_194">FAQ on matomo.org</a>'
);
}
diff --git a/plugins/ExampleAPI/plugin.json b/plugins/ExampleAPI/plugin.json
index 544965416e8311cb61393fc949ccb78f743f1412..11fe754447a7e47dbbc8803eb8862052cf1fce72 100644
--- a/plugins/ExampleAPI/plugin.json
+++ b/plugins/ExampleAPI/plugin.json
@@ -1,15 +1,15 @@
{
"name": "ExampleAPI",
- "description": "Piwik Platform showcase: how to create an API for your plugin to let your users export your data in multiple formats.",
+ "description": "Matomo Platform showcase: how to create an API for your plugin to let your users export your data in multiple formats.",
"version": "1.0",
"keywords": ["example", "api"],
- "homepage": "https://piwik.org",
+ "homepage": "https://matomo.org",
"license": "GPL v3+",
"authors": [
{
- "name": "Piwik",
- "email": "hello@piwik.org",
- "homepage": "https://piwik.org"
+ "name": "Matomo",
+ "email": "hello@matomo.org",
+ "homepage": "https://matomo.org"
}
]
}
\ No newline at end of file
diff --git a/plugins/ExamplePlugin/Widgets/MyExampleWidget.php b/plugins/ExamplePlugin/Widgets/MyExampleWidget.php
index 2ca69752d89c4532ee7d6b31543d9f7514bd93d7..4d055cd0b6b2abd462c1a12184cfc5de9b26e30a 100644
--- a/plugins/ExamplePlugin/Widgets/MyExampleWidget.php
+++ b/plugins/ExamplePlugin/Widgets/MyExampleWidget.php
@@ -26,7 +26,7 @@ class MyExampleWidget extends Widget
* Set the category the widget belongs to. You can reuse any existing widget category or define
* your own category.
*/
- $config->setCategoryId('About Piwik');
+ $config->setCategoryId('About Matomo');
/**
* Set the subcategory the widget belongs to. If a subcategory is set, the widget will be shown in the UI.
diff --git a/plugins/ExampleVisualization/plugin.json b/plugins/ExampleVisualization/plugin.json
index 1fa9d6c281870edffd12de429992caa595fc42fa..7b9a9227089ecc39189ef80205bf41a91b2c2a8d 100644
--- a/plugins/ExampleVisualization/plugin.json
+++ b/plugins/ExampleVisualization/plugin.json
@@ -1,16 +1,16 @@
{
"name": "ExampleVisualization",
"version": "0.1.0",
- "description": "Piwik Platform showcase: how to create a new custom data visualization.",
+ "description": "Matomo Platform showcase: how to create a new custom data visualization.",
"theme": false,
"license": "GPL v3+",
"keywords": ["SimpleTable"],
- "homepage": "https://piwik.org",
+ "homepage": "https://matomo.org",
"authors": [
{
- "name": "The Piwik Team",
- "email": "hello@piwik.org",
- "homepage": "https://piwik.org"
+ "name": "The Matomo Team",
+ "email": "hello@matomo.org",
+ "homepage": "https://matomo.org"
}
]
}
\ No newline at end of file
diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig
index d90c1caebea2129eccce5aea8c3fd053e8a08cf7..1399052957c7c9eacd8c050d7c9471bb03a3bbfb 100644
--- a/plugins/Feedback/templates/index.twig
+++ b/plugins/Feedback/templates/index.twig
@@ -1,7 +1,7 @@
{% extends 'dashboard.twig' %}
-{% set test_piwikUrl='http://demo.piwik.org/' %}
-{% set isPiwikDemo %}{{ piwikUrl == 'http://demo.piwik.org/' or piwikUrl == 'https://demo.piwik.org/'}}{% endset %}
+{% set test_piwikUrl='http://demo.matomo.org/' %}
+{% set isPiwikDemo %}{{ piwikUrl == 'http://demo.matomo.org/' or piwikUrl == 'https://demo.matomo.org/'}}{% endset %}
{% set headline %}{{ 'General_AboutPiwikX'|translate(piwikVersion) }}{% endset %}
@@ -12,22 +12,22 @@
content-title="{{ headline|e('html_attr') }}"
feature="{{ 'General_Help'|translate|e('html_attr') }}">
<p>{{ 'General_PiwikIsACollaborativeProjectYouCanContributeAndDonateNextRelease'|translate(
- "<a href='?module=Proxy&action=redirect&url=https://piwik.org' target='_blank'>",
+ "<a href='?module=Proxy&action=redirect&url=https://matomo.org' target='_blank'>",
"</a>",
- "<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/get-involved/'>",
+ "<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/get-involved/'>",
"</a>",
"<a href='#donate'>",
"</a>",
- "<a href='?module=Proxy&action=redirect&url=https://piwik.org/team/' target='_blank'>",
+ "<a href='?module=Proxy&action=redirect&url=https://matomo.org/team/' target='_blank'>",
"</a>"
)|raw }}
</p>
</div>
<div piwik-content-block content-title="{{ 'Feedback_CommunityHelp'|translate|e('html_attr') }}">
- <p> • {{ 'Feedback_ViewUserGuides'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/'>","</a>")|raw }}.</p>
- <p> • {{ 'Feedback_ViewAnswersToFAQ'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/faq/'>","</a>")|raw }}.</p>
- <p> • {{ 'Feedback_VisitTheForums'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://forum.piwik.org/'>","</a>")|raw }}.</p>
+ <p> • {{ 'Feedback_ViewUserGuides'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/docs/'>","</a>")|raw }}.</p>
+ <p> • {{ 'Feedback_ViewAnswersToFAQ'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/faq/'>","</a>")|raw }}.</p>
+ <p> • {{ 'Feedback_VisitTheForums'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://forum.matomo.org/'>","</a>")|raw }}.</p>
<p> • {{ 'API_LearnAboutCommonlyUsedTerms'|translate(
'<a href="'~ linkTo({'module':"API",'action':"glossary"}) ~ '#metrics">' ~ 'General_Metrics'|translate ~ '</a>',
'<a href="'~ linkTo({'module':"API",'action':"glossary"}) ~ '#reports">' ~ 'General_Reports'|translate ~ '</a>')|raw
@@ -42,11 +42,11 @@
<p> • {{ 'Feedback_ProfessionalServicesOptimizationMaintenance'|translate }}</p>
<p> • {{ 'Feedback_ProfessionalServicesPhoneEmailSupport'|translate }}</p>
<p> • {{ 'Feedback_ProfessionalServicesTraining'|translate }}</p>
- <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/premium-plugins'>{{ 'Feedback_ProfessionalServicesPremiumFeatures'|translate }}</a></p>
+ <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/premium-plugins'>{{ 'Feedback_ProfessionalServicesPremiumFeatures'|translate }}</a></p>
<p> • {{ 'Feedback_ProfessionalServicesCustomDevelopment'|translate }}</p>
<p> • {{ 'Feedback_ProfessionalServicesAnalystConsulting'|translate }}</p>
- <form target="_blank" action="https://piwik.org/support/">
+ <form target="_blank" action="https://matomo.org/support/">
<input type="hidden" name="pk_campaign" value="App_Help">
<input type="hidden" name="pk_source" value="Piwik_App">
<input type="hidden" name="pk_medium" value="App_ContactUs_button">
@@ -57,27 +57,27 @@
<div piwik-content-block content-title="Premium products">
<p>Grow your business, understand your audience better and increase your sales and conversions with a premium plugin:
- <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/users-flow/'>Users Flow</a>: a visual representation of the most popular paths your users take through your website or app.</p>
- <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/ab-testing-learn-more/'>A/B Testing</a>: compare different versions of your websites or apps and detect the winning variation.</p>
- <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/conversion-funnels'>Funnels</a>: identify and understand where your visitors drop off in your conversion funnels.</p>
- <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/form-analytics/'>Form Analytics</a>: increase conversions and get better leads from your website forms.</p>
- <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/media-analytics-website/'>Video and Audio Analytics</a>: powerful insights into how your audience watches your videos and listens to your audio.</p>
- <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/roll-up-reporting/'>Roll-Up Reporting</a>: aggregate data from multiple websites, apps and shops into a Roll-Up site to gain new insights.</p>
- <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/search-keywords-performance/'>Search Keywords Performance</a>: all keywords searched by your users on Google+Bing+Yahoo into your Piwik reports.</p>
- <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/activity-log/'>Audit log</a>: better security and problem diagnostic with a detailed audit log of Piwik user activities.</p>
- <p> • <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/white-label/'>White Label</a>: give your clients access to their analytics reports where all Piwik-branded widgets are removed.</p>
- <p> • <strong><a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/premium-plugins'>All premium plugins.</a></strong></p>
+ <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/users-flow/'>Users Flow</a>: a visual representation of the most popular paths your users take through your website or app.</p>
+ <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/ab-testing-learn-more/'>A/B Testing</a>: compare different versions of your websites or apps and detect the winning variation.</p>
+ <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/conversion-funnels'>Funnels</a>: identify and understand where your visitors drop off in your conversion funnels.</p>
+ <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/form-analytics/'>Form Analytics</a>: increase conversions and get better leads from your website forms.</p>
+ <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/media-analytics-website/'>Video and Audio Analytics</a>: powerful insights into how your audience watches your videos and listens to your audio.</p>
+ <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/roll-up-reporting/'>Roll-Up Reporting</a>: aggregate data from multiple websites, apps and shops into a Roll-Up site to gain new insights.</p>
+ <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/search-keywords-performance/'>Search Keywords Performance</a>: all keywords searched by your users on Google+Bing+Yahoo into your Piwik reports.</p>
+ <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/activity-log/'>Audit log</a>: better security and problem diagnostic with a detailed audit log of Piwik user activities.</p>
+ <p> • <a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/white-label/'>White Label</a>: give your clients access to their analytics reports where all Piwik-branded widgets are removed.</p>
+ <p> • <strong><a rel='noreferrer' target='_blank' href='https://matomo.org/recommends/premium-plugins'>All premium plugins.</a></strong></p>
</div>
<div piwik-content-block content-title="{{ 'Feedback_DoYouHaveBugReportOrFeatureRequest'|translate|e('html_attr') }}">
<p>{{ 'Feedback_HowToCreateTicket'|translate(
- "<a target='_blank' href='?module=Proxy&action=redirect&url=https://developer.piwik.org/guides/core-team-workflow%23submitting-a-bug-report'>",
+ "<a target='_blank' href='?module=Proxy&action=redirect&url=https://developer.matomo.org/guides/core-team-workflow%23submitting-a-bug-report'>",
"</a>",
- "<a target='_blank' href='?module=Proxy&action=redirect&url=https://developer.piwik.org/guides/core-team-workflow%23submitting-a-feature-request'>",
+ "<a target='_blank' href='?module=Proxy&action=redirect&url=https://developer.matomo.org/guides/core-team-workflow%23submitting-a-feature-request'>",
"</a>",
- "<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/piwik/piwik/issues'>",
+ "<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/matomo-org/piwik/issues'>",
"</a>",
- "<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/piwik/piwik/issues/new'>",
+ "<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/matomo-org/piwik/issues/new'>",
"</a>"
)|raw }}</p>
</div>
@@ -85,35 +85,35 @@
<div class="footer">
<ul class="social">
<li>
- <a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/newsletter/"><img class="icon" src="plugins/Feedback/images/newsletter.png"></a>
- <a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/newsletter/">Newsletter</a>
+ <a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/newsletter/"><img class="icon" src="plugins/Feedback/images/newsletter.png"></a>
+ <a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/newsletter/">Newsletter</a>
</li>
<li>
- <a rel="noreferrer" target="_blank" href="https://www.facebook.com/Piwik"><img class="icon" src="plugins/Feedback/images/facebook.png"></a>
- <a rel="noreferrer" target="_blank" href="https://www.facebook.com/Piwik">Facebook</a>
+ <a rel="noreferrer" target="_blank" href="https://www.facebook.com/Matomo.org"><img class="icon" src="plugins/Feedback/images/facebook.png"></a>
+ <a rel="noreferrer" target="_blank" href="https://www.facebook.com/Matomo.org">Facebook</a>
</li>
<li>
- <a rel="noreferrer" target="_blank" href="https://twitter.com/piwik"><img class="icon" src="plugins/Feedback/images/twitter.png"></a>
- <a rel="noreferrer" target="_blank" href="https://twitter.com/piwik">Twitter</a>
+ <a rel="noreferrer" target="_blank" href="https://twitter.com/matomo_org"><img class="icon" src="plugins/Feedback/images/twitter.png"></a>
+ <a rel="noreferrer" target="_blank" href="https://twitter.com/matomo_org">Twitter</a>
</li>
<li>
<a rel="noreferrer" target="_blank" href="https://www.linkedin.com/groups?gid=867857"><img class="icon" src="plugins/Feedback/images/linkedin.png"></a>
<a rel="noreferrer" target="_blank" href="https://www.linkedin.com/groups?gid=867857">Linkedin</a>
</li>
<li>
- <a rel="noreferrer" target="_blank" href="https://github.com/piwik/piwik"><img class="icon" src="plugins/Feedback/images/github.png"></a>
- <a rel="noreferrer" target="_blank" href="https://github.com/piwik/piwik">GitHub</a>
+ <a rel="noreferrer" target="_blank" href="https://github.com/matomo-org/piwik"><img class="icon" src="plugins/Feedback/images/github.png"></a>
+ <a rel="noreferrer" target="_blank" href="https://github.com/matomo-org/piwik">GitHub</a>
</li>
</ul>
<ul class="menu">
- <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/blog/">Blog</a></li>
- <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/about/sponsors/">Sponsors</a></li>
- <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://developer.piwik.org">Developers</a></li>
- <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://plugins.piwik.org">Marketplace</a></li>
- <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/thank-you-all/">Credits</a></li>
+ <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/blog/">Blog</a></li>
+ <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/about/sponsors/">Sponsors</a></li>
+ <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://developer.matomo.org">Developers</a></li>
+ <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://plugins.matomo.org">Marketplace</a></li>
+ <li><a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/thank-you-all/">Credits</a></li>
</ul>
<p class="claim"><small>{{ 'Feedback_PrivacyClaim'|translate(
- "<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/privacy/'>",
+ "<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/privacy/'>",
"</a>"
)|raw}}</small></p>
</div>
diff --git a/plugins/Goals/Visualizations/Goals.php b/plugins/Goals/Visualizations/Goals.php
index b6a3e573ac5568204b2fad5a15e6964d8ff08dd1..36af135dc62719a2d2adce0fc67fc823d12e5877 100644
--- a/plugins/Goals/Visualizations/Goals.php
+++ b/plugins/Goals/Visualizations/Goals.php
@@ -48,7 +48,7 @@ class Goals extends HtmlTable
if (1 == Common::getRequestVar('documentationForGoalsPage', 0, 'int')) {
// TODO: should not use query parameter
$this->config->documentation = Piwik::translate('Goals_ConversionByTypeReportDocumentation',
- array('<br />', '<br />', '<a href="https://piwik.org/docs/tracking-goals-web-analytics/" rel="noreferrer" target="_blank">', '</a>'));
+ array('<br />', '<br />', '<a href="https://matomo.org/docs/tracking-goals-web-analytics/" rel="noreferrer" target="_blank">', '</a>'));
}
parent::beforeRender();
diff --git a/plugins/Goals/templates/_formAddGoal.twig b/plugins/Goals/templates/_formAddGoal.twig
index b0c68aaf87d18d8a705edc2dbebd0152d539d483..94703f0588ab570fd973ec5ee0855f83d1d94f0f 100644
--- a/plugins/Goals/templates/_formAddGoal.twig
+++ b/plugins/Goals/templates/_formAddGoal.twig
@@ -37,7 +37,7 @@
</div>
<div class="col s12 m6">
<div piwik-alert="info" ng-show="manageGoals.goal.triggerType == 'manually'">
- {{ 'Goals_WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/javascript-tracking/%23toc-manually-trigger-a-conversion-for-a-goal'>","</a>")|raw }}
+ {{ 'Goals_WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/docs/javascript-tracking/%23toc-manually-trigger-a-conversion-for-a-goal'>","</a>")|raw }}
</div>
<div piwik-field uicontrol="radio" name="match_attribute"
diff --git a/plugins/Goals/templates/_listGoalEdit.twig b/plugins/Goals/templates/_listGoalEdit.twig
index 6fab4baec8b75a229f38a0a9a5f341e8c63990d3..bd65be9f7157d0264a27b8f54fecd1641049575a 100644
--- a/plugins/Goals/templates/_listGoalEdit.twig
+++ b/plugins/Goals/templates/_listGoalEdit.twig
@@ -6,7 +6,7 @@
<div piwik-activity-indicator loading="manageGoals.isLoading"></div>
<div class="contentHelp">
- {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}
+ {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}
{% if not ecommerceEnabled %}
<br /><br/>
@@ -14,7 +14,7 @@
<a href='{{ linkTo({'module':'SitesManager','action':'index' }) }}'>{{ 'SitesManager_WebsitesManagement'|translate }}</a>
{% endset %}
{% set ecommerceReportText %}
- <a href="https://piwik.org/docs/ecommerce-analytics/" rel="noreferrer" target="_blank">{{ 'Goals_EcommerceReports'|translate }}</a>
+ <a href="https://matomo.org/docs/ecommerce-analytics/" rel="noreferrer" target="_blank">{{ 'Goals_EcommerceReports'|translate }}</a>
{% endset %}
{{ 'Goals_Optional'|translate }} {{ 'Goals_Ecommerce'|translate }}: {{ 'Goals_YouCanEnableEcommerceReports'|translate(ecommerceReportText,websiteManageText)|raw }}
{% endif %}
diff --git a/plugins/Goals/templates/addNewGoal.twig b/plugins/Goals/templates/addNewGoal.twig
index 5ce89449d621ddfb88034a2411b984aa3876fa1b..29b8766864022f58bfa1deba9d2e8d221ebce439 100644
--- a/plugins/Goals/templates/addNewGoal.twig
+++ b/plugins/Goals/templates/addNewGoal.twig
@@ -1,7 +1,7 @@
{% if userCanEditGoals %}
{% set addNewGoalIntro %}
<p>{{ 'Goals_NewGoalIntro'|translate }}</p>
- <p>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}</p>
+ <p>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}</p>
{% endset %}
{% include "@Goals/_addEditGoal.twig" %}
@@ -14,7 +14,7 @@
{{ 'Goals_NoGoalsNeedAccess'|translate|raw }}
</p>
<p>
- {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}
+ {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://matomo.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}
</p>
</div>
{{ postEvent("Template.afterGoalCannotAddNewGoal") }}
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 47b33fe9d474eb2e130d0ae250d7fc27bea0e0f7..a99ee07929fc7f04c3a20c0a77f45a51b41adc6e 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -403,7 +403,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
$form = new FormDefaultSettings();
/**
- * Triggered on initialization of the form to customize default Piwik settings (at the end of the installation process).
+ * Triggered on initialization of the form to customize default Matomo settings (at the end of the installation process).
*
* @param \Piwik\Plugins\Installation\FormDefaultSettings $form
*/
@@ -414,7 +414,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
if ($form->validate()) {
try {
/**
- * Triggered on submission of the form to customize default Piwik settings (at the end of the installation process).
+ * Triggered on submission of the form to customize default Matomo settings (at the end of the installation process).
*
* @param \Piwik\Plugins\Installation\FormDefaultSettings $form
*/
@@ -451,7 +451,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
/**
* This controller action renders an admin tab that runs the installation
* system check, so people can see if there are any issues w/ their running
- * Piwik installation.
+ * Matomo installation.
*
* This admin tab is only viewable by the Super User.
*/
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
index 8d04cf04812e8c4544cbac4f0d169a7c12b295a2..9364f498707143dce597c94be62d5ae672453c88 100644
--- a/plugins/Installation/FormDatabaseSetup.php
+++ b/plugins/Installation/FormDatabaseSetup.php
@@ -153,7 +153,7 @@ class FormDatabaseSetup extends QuickForm2
/**
* Validation rule that checks that the supplied DB user has enough privileges.
*
- * The following privileges are required for Piwik to run:
+ * The following privileges are required for Matomo to run:
* - CREATE
* - ALTER
* - SELECT
@@ -229,7 +229,7 @@ class Rule_checkUserPrivileges extends HTML_QuickForm2_Rule
}
/**
- * Returns an array describing the database privileges required for Piwik to run. The
+ * Returns an array describing the database privileges required for Matomo to run. The
* array maps privilege names with one or more SQL queries that can be used to test
* if the current user has the privilege.
*
@@ -262,7 +262,7 @@ class Rule_checkUserPrivileges extends HTML_QuickForm2_Rule
}
/**
- * Returns a string description of the database privileges required for Piwik to run.
+ * Returns a string description of the database privileges required for Matomo to run.
*
* @return string
*/
diff --git a/plugins/Installation/FormSuperUser.php b/plugins/Installation/FormSuperUser.php
index b6be3f4f929ad3a0c8ff803f7f5f1019e55af50d..9793af9a56e1939c2a3a6ba026fe3efb2cf1098a 100644
--- a/plugins/Installation/FormSuperUser.php
+++ b/plugins/Installation/FormSuperUser.php
@@ -59,7 +59,7 @@ class FormSuperUser extends QuickForm2
));
$professionalServicesNewsletter = Piwik::translate('Installation_ProfessionalServicesNewsletter',
- array("<a href='https://piwik.org/support/?pk_medium=App_Newsletter_link&pk_source=Piwik_App&pk_campaign=App_Installation' style='color:#444;' rel='noreferrer' target='_blank'>", "</a>")
+ array("<a href='https://matomo.org/support/?pk_medium=App_Newsletter_link&pk_source=Piwik_App&pk_campaign=App_Installation' style='color:#444;' rel='noreferrer' target='_blank'>", "</a>")
);
$currentLanguage = StaticContainer::get('Piwik\Translation\Translator')->getCurrentLanguage();
diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php
index 758d0dc0f63e88f0428bae8bf62e2f3cf050ce1e..a9e19b38d29ee93a53ba5937eed67daca6c631a6 100644
--- a/plugins/Installation/Installation.php
+++ b/plugins/Installation/Installation.php
@@ -64,7 +64,7 @@ class Installation extends \Piwik\Plugin
$general = Config::getInstance()->General;
if (!SettingsPiwik::isPiwikInstalled() && !$general['enable_installer']) {
- throw new \Exception('Piwik is not set up yet');
+ throw new \Exception('Matomo is not set up yet');
}
if (empty($general['installation_in_progress'])) {
diff --git a/plugins/Installation/ServerFilesGenerator.php b/plugins/Installation/ServerFilesGenerator.php
index 1207024bfda06baa7521bbf0621feadb3d0a99a2..9118894efb2dc38d473dfe10714ab5755f9a62ea 100644
--- a/plugins/Installation/ServerFilesGenerator.php
+++ b/plugins/Installation/ServerFilesGenerator.php
@@ -89,7 +89,7 @@ class ServerFilesGenerator
{
$file = $path . '/.htaccess';
- $content = "# This file is auto generated by Piwik, do not edit directly\n# Please report any issue or improvement directly to the Piwik team.\n\n" . $content;
+ $content = "# This file is auto generated by Matomo, do not edit directly\n# Please report any issue or improvement directly to the Matomo team.\n\n" . $content;
if ($overwrite || !file_exists($file)) {
@file_put_contents($file, $content);
}
@@ -279,7 +279,7 @@ HTACCESS_ALLOW;
}
/**
- * Deletes all existing .htaccess files and web.config files that Piwik may have created,
+ * Deletes all existing .htaccess files and web.config files that Matomo may have created,
*/
public static function deleteHtAccessFiles()
{
diff --git a/plugins/Installation/Widgets/GetSystemCheck.php b/plugins/Installation/Widgets/GetSystemCheck.php
index a3a4cd60bec5093a3493e0c3ffcba02a9d0bfee5..8dd73aaae74a756800aa813792e8118a714a815b 100644
--- a/plugins/Installation/Widgets/GetSystemCheck.php
+++ b/plugins/Installation/Widgets/GetSystemCheck.php
@@ -30,7 +30,7 @@ class GetSystemCheck extends Widget
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('About Piwik');
+ $config->setCategoryId('About Matomo');
$config->setName('Installation_SystemCheck');
$config->setOrder(16);
diff --git a/plugins/Installation/templates/finished.twig b/plugins/Installation/templates/finished.twig
index 59191eff1e02c767d041114962d33ef46092d9df..1be63b10b1c4aa96464266b52c14512aeb846f0a 100644
--- a/plugins/Installation/templates/finished.twig
+++ b/plugins/Installation/templates/finished.twig
@@ -11,8 +11,8 @@
{{ 'Installation_CollaborativeProject'|translate }}
</p>
<p>
- {{ 'Installation_GetInvolved'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/get-involved/">','</a>')|raw }}
- {{ 'General_HelpTranslatePiwik'|translate("<a rel='noreferrer' target='_blank' href=\'https://piwik.org/translations/\'>","<\/a>")|raw }}
+ {{ 'Installation_GetInvolved'|translate('<a rel="noreferrer" target="_blank" href="https://matomo.org/get-involved/">','</a>')|raw }}
+ {{ 'General_HelpTranslatePiwik'|translate("<a rel='noreferrer' target='_blank' href=\'https://matomo.org/translations/\'>","<\/a>")|raw }}
</p>
<p>{{ 'Installation_WeHopeYouWillEnjoyPiwik'|translate }}</p>
<p><i>{{ 'Installation_HappyAnalysing'|translate }}</i></p>
diff --git a/plugins/Installation/templates/layout.twig b/plugins/Installation/templates/layout.twig
index df9e7a538f79facc9c1c022d500c79772f1340d6..ff227761df1196df52915fb6bdf64060fb6a0f55 100644
--- a/plugins/Installation/templates/layout.twig
+++ b/plugins/Installation/templates/layout.twig
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="robots" content="noindex,nofollow">
- <title>Piwik {{ piwikVersion }} › {{ 'Installation_Installation'|translate }}</title>
+ <title>Matomo {{ piwikVersion }} › {{ 'Installation_Installation'|translate }}</title>
<link rel="stylesheet" type="text/css" href="index.php?module=Installation&action=getInstallationCss"/>
<script type="text/javascript" src="index.php?module=Installation&action=getInstallationJs"></script>
@@ -16,7 +16,7 @@
<div class="header">
<div class="logo">
- <img title="Piwik {{ piwikVersion }} - {{ 'General_OpenSourceWebAnalytics'|translate|escape('html_attr') }}" src="plugins/Morpheus/images/logo.png"/>
+ <img title="Matomo {{ piwikVersion }} - {{ 'General_OpenSourceWebAnalytics'|translate|escape('html_attr') }}" src="plugins/Morpheus/images/logo.png"/>
<p>{{ 'General_OpenSourceWebAnalytics'|translate }}</p>
</div>
<div class="language-selector">
diff --git a/plugins/Installation/templates/reuseTables.twig b/plugins/Installation/templates/reuseTables.twig
index 3e90d026fbb4dd595f2891e057d0b4dd50841410..28ac5d0e11c6dc7660146e04df79c70aedbd8252 100644
--- a/plugins/Installation/templates/reuseTables.twig
+++ b/plugins/Installation/templates/reuseTables.twig
@@ -25,7 +25,7 @@
<ul>
<li>{{ 'CoreUpdater_ErrorDIYHelp_1'|translate }}</li>
<li>{{ 'CoreUpdater_ErrorDIYHelp_2'|translate }}</li>
- <li>{{ 'CoreUpdater_ErrorDIYHelp_3'|translate }} <a href='https://piwik.org/faq/how-to-update/#faq_179' rel='noreferrer' target='_blank'>(see FAQ)</a></li>
+ <li>{{ 'CoreUpdater_ErrorDIYHelp_3'|translate }} <a href='https://matomo.org/faq/how-to-update/#faq_179' rel='noreferrer' target='_blank'>(see FAQ)</a></li>
<li>{{ 'CoreUpdater_ErrorDIYHelp_4'|translate }}</li>
<li>{{ 'CoreUpdater_ErrorDIYHelp_5'|translate }}</li>
</ul>
diff --git a/plugins/Installation/templates/systemCheck.twig b/plugins/Installation/templates/systemCheck.twig
index acdb965a8142f8cbf2e370b4dfe0412453aa2715..d7b5c4b9a912a33e242e6f92f1409de123416978 100644
--- a/plugins/Installation/templates/systemCheck.twig
+++ b/plugins/Installation/templates/systemCheck.twig
@@ -23,7 +23,7 @@
{% if not showNextStep %}
<p>
<span class="icon-export"></span>
- <a href="?module=Proxy&action=redirect&url=https://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a>
+ <a href="?module=Proxy&action=redirect&url=https://matomo.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a>
</p>
{% include "@Installation/_systemCheckLegend.twig" %}
{% endif %}
diff --git a/plugins/Installation/templates/trackingCode.twig b/plugins/Installation/templates/trackingCode.twig
index f51f74383ab0fb1b6f70bb7530607fe46d3c7c9b..e3ecf9db16191adfd5bebd28a90ce8a887cab2c3 100644
--- a/plugins/Installation/templates/trackingCode.twig
+++ b/plugins/Installation/templates/trackingCode.twig
@@ -12,10 +12,10 @@
<h3>{{ 'Installation_LargePiwikInstances'|translate }}</h3>
<p>
- {{ 'Installation_JsTagArchivingHelp1'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/setup-auto-archiving/">','</a>')|raw }}
+ {{ 'Installation_JsTagArchivingHelp1'|translate('<a rel="noreferrer" target="_blank" href="https://matomo.org/docs/setup-auto-archiving/">','</a>')|raw }}
</p>
<p>
- {{ 'General_ReadThisToLearnMore'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/optimize/">','</a>')|raw }}
+ {{ 'General_ReadThisToLearnMore'|translate('<a rel="noreferrer" target="_blank" href="https://matomo.org/docs/optimize/">','</a>')|raw }}
</p>
{% endblock %}
diff --git a/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html b/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html
index f7f87f4479b6e18001e7173020235cdbcfc4eb39..42674c174a3443761a17505031b743fe58540c93 100644
--- a/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html
+++ b/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html
@@ -2,7 +2,7 @@
<p>
This page helps you to find existing translations that you can reuse in your Plugin.
- If you want to know more about translations have a look at our <a href="https://developer.piwik.org/guides/internationalization" rel="noreferrer" target="_blank">Internationalization guide</a>.
+ If you want to know more about translations have a look at our <a href="https://developer.matomo.org/guides/internationalization" rel="noreferrer" target="_blank">Internationalization guide</a>.
Enter a search term to find translations and their corresponding keys:
</p>
diff --git a/plugins/LanguagesManager/templates/getLanguagesSelector.twig b/plugins/LanguagesManager/templates/getLanguagesSelector.twig
index 5265bf24c532995eebe0acb6f5d8b999ad9de292..94b84413df62f099bab40085cf0b3a796fc8eb42 100644
--- a/plugins/LanguagesManager/templates/getLanguagesSelector.twig
+++ b/plugins/LanguagesManager/templates/getLanguagesSelector.twig
@@ -3,7 +3,7 @@
menu-title="{{ currentLanguageName|e('html_attr') }}"
piwik-menudropdown>
<a class="item"
- href="?module=Proxy&action=redirect&url=https://piwik.org/translations/">{{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a>
+ href="?module=Proxy&action=redirect&url=https://matomo.org/translations/">{{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a>
{% for language in languages %}
<a class="item {% if language.code == currentLanguageCode %}active{% endif %}"
value="{{ language.code }}"
diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig
index 77fe92a742181d150f63dfd2417ec2e0adc86182..0ba189c3acd9b29f2b2bbf09188ccdd039a49d0b 100644
--- a/plugins/Live/templates/getVisitorProfilePopup.twig
+++ b/plugins/Live/templates/getVisitorProfilePopup.twig
@@ -8,7 +8,7 @@
tabindex="0">
<div class="visitor-profile-options">
<a href class="visitor-profile-close" title="{{ 'General_Close'|translate }} "></a>
- <a href="https://piwik.org/docs/user-profile/" class="visitor-profile-help" rel="noreferrer"
+ <a href="https://matomo.org/docs/user-profile/" class="visitor-profile-help" rel="noreferrer"
target="_blank"
title="{{ 'General_ViewDocumentationFor'|translate("Live_VisitorProfile"|translate|ucwords) }}">
</a>
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index a32eeb5e9af0564158d5005bba9d6b7b21ee8ce5..50545fc719ca69b8cc674edb0800b4fa58d60520 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -215,7 +215,7 @@ class Controller extends \Piwik\Plugin\Controller
protected function getMessageExceptionNoAccess()
{
- $message = Piwik::translate('Login_InvalidNonceOrHeadersOrReferrer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('https://piwik.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>'));
+ $message = Piwik::translate('Login_InvalidNonceOrHeadersOrReferrer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('https://matomo.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>'));
$message .= $this->getMessageExceptionNoAccessWhenInsecureConnectionMayBeUsed();
@@ -234,7 +234,7 @@ class Controller extends \Piwik\Plugin\Controller
if(Url::isSecureConnectionAssumedByPiwikButNotForcedYet()) {
$message = '<br/><br/>' . Piwik::translate('Login_InvalidNonceSSLMisconfigured',
array(
- '<a href="?module=Proxy&action=redirect&url=' . urlencode('<a href="https://piwik.org/faq/how-to/faq_91/">') . '">',
+ '<a href="?module=Proxy&action=redirect&url=' . urlencode('<a href="https://matomo.org/faq/how-to/faq_91/">') . '">',
'</a>',
'config/config.ini.php',
'<pre>force_ssl=1</pre>',
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index c7375b773e8c17b89c5fb117e18bdaab22236b69..638328515e47f57d204f7dda0460886275b388ae 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -30,7 +30,7 @@
<span id="logo" class="brand-logo center">
{% if isCustomLogo == false %}
- <a href="https://piwik.org" title="{{ linkTitle }}">
+ <a href="https://matomo.org" title="{{ linkTitle }}">
{% endif %}
{% if hasSVGLogo %}
<img src='{{ logoSVG }}' class="{% if not isCustomLogo %}default-piwik-logo{% endif %}" title="{{ linkTitle }}" alt="Piwik"/>
@@ -114,7 +114,7 @@
{% if isCustomLogo %}
<p id="piwik">
- <i><a href="https://piwik.org/" rel="noreferrer" target="_blank">{{ linkTitle }}</a></i>
+ <i><a href="https://matomo.org/" rel="noreferrer" target="_blank">{{ linkTitle }}</a></i>
</p>
{% endif %}
diff --git a/plugins/Marketplace/Widgets/GetNewPlugins.php b/plugins/Marketplace/Widgets/GetNewPlugins.php
index 0d973943cceb890ce3a43d2f1600bbf660f05653..4f814a6d7ea8cb80667ca12ff5528d95d242f32f 100644
--- a/plugins/Marketplace/Widgets/GetNewPlugins.php
+++ b/plugins/Marketplace/Widgets/GetNewPlugins.php
@@ -29,7 +29,7 @@ class GetNewPlugins extends Widget
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('About Piwik');
+ $config->setCategoryId('About Matomo');
$config->setName('Latest Marketplace Updates');
$config->setOrder(19);
}
diff --git a/plugins/Marketplace/Widgets/GetPremiumFeatures.php b/plugins/Marketplace/Widgets/GetPremiumFeatures.php
index 5d13a838039b766b009e6c21d974f3d9d7f24803..a928be6067d0a80b177d855735b753845aa1913a 100644
--- a/plugins/Marketplace/Widgets/GetPremiumFeatures.php
+++ b/plugins/Marketplace/Widgets/GetPremiumFeatures.php
@@ -31,7 +31,7 @@ class GetPremiumFeatures extends Widget
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('About Piwik');
+ $config->setCategoryId('About Matomo');
$config->setName(Piwik::translate('Marketplace_PaidPlugins'));
$config->setOrder(20);
}
diff --git a/plugins/Marketplace/templates/licenseform.twig b/plugins/Marketplace/templates/licenseform.twig
index 17cc2d2a524dac1a6a2802ef4e45377a6e2b1fa7..ffa6da07e666dcb05304b93846aa71e115d4cc05 100644
--- a/plugins/Marketplace/templates/licenseform.twig
+++ b/plugins/Marketplace/templates/licenseform.twig
@@ -49,7 +49,7 @@
{% else %}
{% if isSuperUser %}
- {{ 'Marketplace_PaidPluginsNoLicenseKeyIntro'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/recommends/premium-plugins/'>", "</a>")|raw }}
+ {{ 'Marketplace_PaidPluginsNoLicenseKeyIntro'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/recommends/premium-plugins/'>", "</a>")|raw }}
<br/>
@@ -60,7 +60,7 @@
<div piwik-activity-indicator loading="licenseController.isUpdating"></div>
{% else %}
- {{ 'Marketplace_PaidPluginsNoLicenseKeyIntroNoSuperUserAccess'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/recommends/premium-plugins/'>", "</a>")|raw }}
+ {{ 'Marketplace_PaidPluginsNoLicenseKeyIntroNoSuperUserAccess'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/recommends/premium-plugins/'>", "</a>")|raw }}
{% endif %}
{% endif %}
diff --git a/plugins/Marketplace/templates/overview.twig b/plugins/Marketplace/templates/overview.twig
index 4d20b79bd20e5075b1cf46b142d2a14b30130859..7237fdb9145245492e3880550c48218de761bde5 100644
--- a/plugins/Marketplace/templates/overview.twig
+++ b/plugins/Marketplace/templates/overview.twig
@@ -70,14 +70,14 @@
{% include '@Marketplace/plugin-list.twig' %}
<div class="footer-message center">
- {{ 'Marketplace_DevelopersLearnHowToDevelopPlugins'|translate('<a href="?module=Proxy&action=redirect&url=https://developer.piwik.org/develop" target="_blank">', '</a>')|raw }}
+ {{ 'Marketplace_DevelopersLearnHowToDevelopPlugins'|translate('<a href="?module=Proxy&action=redirect&url=https://developer.matomo.org/develop" target="_blank">', '</a>')|raw }}
<br />
<br />
<br />
- <a rel="noreferrer" href="https://shop.piwik.org/faq/" target="_blank">FAQ</a> |
- <a rel="noreferrer" href="https://shop.piwik.org/terms-conditions/" target="_blank">Terms</a> |
- <a rel="noreferrer" href="https://piwik.org/privacy-policy/" target="_blank">Privacy</a> |
- <a rel="noreferrer" href="https://piwik.org/contact/" target="_blank">Contact</a>
+ <a rel="noreferrer" href="https://shop.matomo.org/faq/" target="_blank">FAQ</a> |
+ <a rel="noreferrer" href="https://shop.matomo.org/terms-conditions/" target="_blank">Terms</a> |
+ <a rel="noreferrer" href="https://matomo.org/privacy-policy/" target="_blank">Privacy</a> |
+ <a rel="noreferrer" href="https://matomo.org/contact/" target="_blank">Contact</a>
</div>
</div>
diff --git a/plugins/MobileAppMeasurable/Type.php b/plugins/MobileAppMeasurable/Type.php
index 2c6de23b66df18854ba7e13931928936ea34ef76..fd687a37a71a4bf012ec394bf4997275d5c9372c 100644
--- a/plugins/MobileAppMeasurable/Type.php
+++ b/plugins/MobileAppMeasurable/Type.php
@@ -14,7 +14,7 @@ class Type extends \Piwik\Measurable\Type
protected $name = 'MobileAppMeasurable_MobileApp';
protected $namePlural = 'MobileAppMeasurable_MobileApps';
protected $description = 'MobileAppMeasurable_MobileAppDescription';
- protected $howToSetupUrl = 'https://developer.piwik.org/guides/tracking-api-clients#mobile-sdks';
+ protected $howToSetupUrl = 'https://developer.matomo.org/guides/tracking-api-clients#mobile-sdks';
}
diff --git a/plugins/Morpheus/templates/ajaxMacros.twig b/plugins/Morpheus/templates/ajaxMacros.twig
index b526ae8b196da1d16a8b96cdee2312d49edb20ca..d4a7dc95767faaf03967f8aa74571da2ccc3749c 100644
--- a/plugins/Morpheus/templates/ajaxMacros.twig
+++ b/plugins/Morpheus/templates/ajaxMacros.twig
@@ -26,12 +26,12 @@
<br /><br />
{{ 'General_NeedMoreHelp'|translate }}
- <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> –
- <a rel="noreferrer" target="_blank" href="https://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a>
+ <a rel="noreferrer" target="_blank" href="https://matomo.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> –
+ <a rel="noreferrer" target="_blank" href="https://forum.matomo.org/">{{ 'Feedback_CommunityHelp'|translate }}</a>
{%- if areAdsForProfessionalServicesEnabled %}
–
- {% set supportUrl = 'https://piwik.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=' ~ currentModule ~ '&pk_source=Piwik_App' %}
+ {% set supportUrl = 'https://matomo.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=' ~ currentModule ~ '&pk_source=Piwik_App' %}
<a rel="noreferrer" target="_blank" href="{{ supportUrl|e('html_attr') }}">{{ 'Feedback_ProfessionalHelp'|translate }}</a>
{%- endif %}.
</div>
diff --git a/plugins/Morpheus/templates/demo.twig b/plugins/Morpheus/templates/demo.twig
index 5c2fdae95a5711a8bcab93fc9f16cd0babc7d175..a0d16d638c430a71592e0a917e0f950fc7900fb4 100644
--- a/plugins/Morpheus/templates/demo.twig
+++ b/plugins/Morpheus/templates/demo.twig
@@ -571,12 +571,12 @@
<h2>Content blocks</h2>
<div class="demo">
- <div piwik-content-block content-title="My title" help-url="https://piwik.org">
+ <div piwik-content-block content-title="My title" help-url="https://matomo.org">
<p>My text goes is in here</p>
</div>
</div>
<div class="demo-code">
- <pre><div piwik-content-block content-title="My title" help-url="https://piwik.org">
+ <pre><div piwik-content-block content-title="My title" help-url="https://matomo.org">
<p>My text goes is in here</p>
</div></pre>
</div>
@@ -584,7 +584,7 @@
<h3>Content Table</h3>
<div class="demo">
- <div piwik-content-block content-title="My title" help-url="https://piwik.org">
+ <div piwik-content-block content-title="My title" help-url="https://matomo.org">
<p>My intro text is here</p>
<table piwik-content-table>
<thead><tr><th>Column 1</th><th>Column 2</th></tr></thead>
@@ -596,7 +596,7 @@
</div>
</div>
<div class="demo-code">
- <pre><div piwik-content-block content-title="My title" help-url="https://piwik.org">
+ <pre><div piwik-content-block content-title="My title" help-url="https://matomo.org">
<p>My intro text is here</p>
<table piwik-content-table>
<thead><tr><th>Column 1</th><th>Column 2</th></tr></thead>
diff --git a/plugins/Morpheus/templates/maintenance.tpl b/plugins/Morpheus/templates/maintenance.tpl
index 2a6b281fe3fa72bf74b8e062260a7d09121de061..9d2cccab8f307cfaecf209495f8528b7e5f5168b 100644
--- a/plugins/Morpheus/templates/maintenance.tpl
+++ b/plugins/Morpheus/templates/maintenance.tpl
@@ -3,22 +3,22 @@
<head>
<meta charset="utf-8">
<meta name="robots" content="noindex,nofollow">
- <title>Piwik is undergoing maintenance</title>
+ <title>Matomo is undergoing maintenance</title>
<link rel="shortcut icon" href="%faviconUrl%" />
<link rel="stylesheet" type="text/css" href="plugins/Morpheus/stylesheets/simple_structure.css" />
</head>
<body id="simple">
<div class="logo">
- <img title="Piwik" alt="Piwik" style="height: 40px;" src="%logoUrl%" />
+ <img title="Matomo" alt="Matomo" style="height: 40px;" src="%logoUrl%" />
<br/>
- <a href='https://piwik.org/'>%piwikTitle%</a>
+ <a href='https://matomo.org/'>%piwikTitle%</a>
</div>
<div class="box">
<div class="header">
- <h1>Piwik is undergoing maintenance</h1>
+ <h1>Matomo is undergoing maintenance</h1>
</div>
<div class="content">
diff --git a/plugins/Morpheus/templates/simpleLayoutFooter.tpl b/plugins/Morpheus/templates/simpleLayoutFooter.tpl
index f308a692e87a8592c6a866aa06db1db7ed651209..2c976ae9c3e990c0d3d9b40d8231552a76a0fa66 100644
--- a/plugins/Morpheus/templates/simpleLayoutFooter.tpl
+++ b/plugins/Morpheus/templates/simpleLayoutFooter.tpl
@@ -1,7 +1,7 @@
</div>
<div class="footer">
- <a href="index.php">« Back to Piwik</a>
+ <a href="index.php">« Back to Matomo</a>
</div>
</div>
diff --git a/plugins/Morpheus/templates/simpleLayoutHeader.tpl b/plugins/Morpheus/templates/simpleLayoutHeader.tpl
index 8244492ad8e49e3348e18d599bf0ca8bd50c1a60..26bdd724623f101419e431ea64b1547fb346507c 100644
--- a/plugins/Morpheus/templates/simpleLayoutHeader.tpl
+++ b/plugins/Morpheus/templates/simpleLayoutHeader.tpl
@@ -10,7 +10,7 @@
<body id="simple">
<div class="logo">
- <img title="Piwik" alt="Piwik" style="height: 40px;" src="%logoUrl%"/>
+ <img title="Matomo" alt="Matomo" style="height: 40px;" src="%logoUrl%"/>
</div>
<div class="box">
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
index 25e57c802e69c2d0b9cfdb77c5655f804dee3c24..d48293da5bd6c8b54aeff0f464ece681fcb7aff5 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
@@ -1,7 +1,7 @@
<div>
<h2 piwik-enriched-headline
class="card-title"
- help-url="https://piwik.org/docs/manage-websites/#all-websites-dashboard"
+ help-url="https://matomo.org/docs/manage-websites/#all-websites-dashboard"
feature-name="{{ 'General_AllWebsitesDashboard'|translate }}">
{{ 'General_AllWebsitesDashboard'|translate }}
<span class='smallTitle'
@@ -63,11 +63,11 @@
<br /><br />
{{ 'General_NeedMoreHelp'|translate }}
- <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a>
+ <a rel="noreferrer" target="_blank" href="https://matomo.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a>
–
- <a rel="noreferrer" target="_blank" href="https://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a>
+ <a rel="noreferrer" target="_blank" href="https://forum.matomo.org/">{{ 'Feedback_CommunityHelp'|translate }}</a>
<span ng-show="areAdsForProfessionalServicesEnabled"> – </span>
- <a ng-show="areAdsForProfessionalServicesEnabled" rel="noreferrer" target="_blank" href="https://piwik.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Piwik_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>.
+ <a ng-show="areAdsForProfessionalServicesEnabled" rel="noreferrer" target="_blank" href="https://matomo.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Piwik_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>.
</div>
</td>
</tr>
diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig
index 1d4ed41db2b2dd0536ac206845e5ae6a4d993824..8d51270764711aba8184b352059d73f7b87e6152 100644
--- a/plugins/Overlay/templates/index.twig
+++ b/plugins/Overlay/templates/index.twig
@@ -8,7 +8,7 @@
{% block content %}
<div class="overlay-sidebar-container">
- <a id="overlayTitle" href="https://piwik.org/docs/page-overlay/" rel="noreferrer" target="_blank">
+ <a id="overlayTitle" href="https://matomo.org/docs/page-overlay/" rel="noreferrer" target="_blank">
{{ 'Overlay_Overlay'|translate }}
<span class="icon-info2"></span>
</a>
@@ -37,7 +37,7 @@
</p>
<p>
- <a href="https://piwik.org/docs/page-overlay/#toc-page-overlay-troubleshooting" rel="noreferrer" target="_blank">
+ <a href="https://matomo.org/docs/page-overlay/#toc-page-overlay-troubleshooting" rel="noreferrer" target="_blank">
{{ 'Overlay_ErrorNotLoadingLink'|translate }}
</a>
</p>
diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig
index 056ac36065e470695ef2cd08ba2b186665089867..fe0e63ec7abf3a29c7f3e8b54e1425b1b164d654 100644
--- a/plugins/PrivacyManager/templates/privacySettings.twig
+++ b/plugins/PrivacyManager/templates/privacySettings.twig
@@ -7,10 +7,10 @@
{% if isSuperUser %}
<div piwik-content-intro>
- <h2 piwik-enriched-headline help-url="https://piwik.org/docs/privacy/">{{ title }}</h2>
+ <h2 piwik-enriched-headline help-url="https://matomo.org/docs/privacy/">{{ title }}</h2>
<p>{{ 'PrivacyManager_Teaser'|translate('<a href="#anonymizeIPAnchor">',"</a>",'<a href="#deleteLogsAnchor">',"</a>",'<a href="#optOutAnchor">',"</a>")|raw }}
- {{'PrivacyManager_SeeAlsoOurOfficialGuidePrivacy'|translate('<a href="https://piwik.org/privacy/" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
+ {{'PrivacyManager_SeeAlsoOurOfficialGuidePrivacy'|translate('<a href="https://matomo.org/privacy/" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
</div>
<div piwik-content-block
@@ -94,7 +94,7 @@
<div class="alert alert-warning" style="width: 50%;">
{{ 'PrivacyManager_DeleteLogDescription2'|translate|raw }}
- <a href="https://piwik.org/faq/general/#faq_125" rel="noreferrer" target="_blank">
+ <a href="https://matomo.org/faq/general/#faq_125" rel="noreferrer" target="_blank">
{{ 'General_ClickHere'|translate }}
</a>
</div>
diff --git a/plugins/ProfessionalServices/Promo.php b/plugins/ProfessionalServices/Promo.php
index ee480776f6437e198e789a3eb36c1510351b7313..d1aed844f3e7023d71bdcae51d51d347bbd0e932 100644
--- a/plugins/ProfessionalServices/Promo.php
+++ b/plugins/ProfessionalServices/Promo.php
@@ -23,13 +23,13 @@ class Promo
array(
'campaignContent' => 'abTesting',
'title' => 'A/B Testing',
- 'url' => 'https://piwik.org/recommends/ab-testing-learn-more',
+ 'url' => 'https://matomo.org/recommends/ab-testing-learn-more',
'text' => 'Ever wondered what A/B testing is and why it is so important? Check out how you can increase conversions and sales on your website and app.'
),
array(
'campaignContent' => 'abTesting',
'title' => 'A/B Testing',
- 'url' => ' https://piwik.org/recommends/ab-testing-website',
+ 'url' => ' https://matomo.org/recommends/ab-testing-website',
'text' => 'Increase revenue and conversions by comparing different versions of your websites or apps, ad detect the winning variation that will grow your business!'
),
@@ -37,13 +37,13 @@ class Promo
array(
'campaignContent' => 'mediaAnalytics',
'title' => 'Media Analytics',
- 'url' => 'https://piwik.org/recommends/media-analytics-website',
+ 'url' => 'https://matomo.org/recommends/media-analytics-website',
'text' => 'Ever wondered how people interact and engage with videos or audios on your website? Well now you can, and it integrates perfectly into your Piwik.',
),
array(
'campaignContent' => 'mediaAnalytics',
'title' => 'Media Analytics',
- 'url' => 'https://piwik.org/recommends/media-analytics',
+ 'url' => 'https://matomo.org/recommends/media-analytics',
'text' => 'Get powerful insights into how your audience watches your videos and listens to your audio. Media Analytics is now available on the Marketplace.',
),
@@ -51,7 +51,7 @@ class Promo
array(
'campaignContent' => 'formAnalytics',
'title' => 'Form Analytics',
- 'url' => 'https://piwik.org/recommends/form-analytics',
+ 'url' => 'https://matomo.org/recommends/form-analytics',
'text' => 'Increase the conversions on your online forms, by learning everything about your users behavior and their pain points on your forms',
),
@@ -59,7 +59,7 @@ class Promo
array(
'campaignContent' => 'funnels',
'title' => 'Funnels',
- 'url' => 'https://piwik.org/recommends/conversion-funnels',
+ 'url' => 'https://matomo.org/recommends/conversion-funnels',
'text' => 'Increase your conversions, sales and revenue by understanding your conversion funnels and where your visitors drop off with Funnels for Piwik.'
),
@@ -67,47 +67,47 @@ class Promo
array(
'campaignContent' => 'userTraining',
'title' => 'Training',
- 'url' => 'https://piwik.org/training/?pk_campaign=' . Advertising::CAMPAIGN_NAME_PROFESSIONAL_SERVICES . '&pk_source=Piwik_App',
+ 'url' => 'https://matomo.org/training/?pk_campaign=' . Advertising::CAMPAIGN_NAME_PROFESSIONAL_SERVICES . '&pk_source=Piwik_App',
'text' => 'Want to know how to use all the exciting features in Piwik? Try a User training to be up to speed with working with Piwik.'
),
// Keywords performance
array(
'campaignContent' => 'searchKeywords',
'title' => 'Search Keywords',
- 'url' => 'https://piwik.org/recommends/search-keywords-performance/',
+ 'url' => 'https://matomo.org/recommends/search-keywords-performance/',
'text' => 'Which queries caused your website to appear in search results? Improve your SEO efforts and monitor your position and performance for each Keyword directly in your Piwik reports.',
),
// Roll-Up Reporting
array(
'campaignContent' => 'rollUp',
'title' => 'Roll-Up Reporting',
- 'url' => 'https://piwik.org/recommends/roll-up-reporting/',
+ 'url' => 'https://matomo.org/recommends/roll-up-reporting/',
'text' => 'Did you know you can aggregate the collected data across hundreds of sites and display it in a single dashboard?',
),
// White label
array(
'campaignContent' => 'whiteLabel',
'title' => 'White Label',
- 'url' => 'https://piwik.org/recommends/white-label/',
+ 'url' => 'https://matomo.org/recommends/white-label/',
'text' => 'Did you know you can give your clients access to their analytics reports where all Piwik-branded widgets are removed? Try the White Label product!',
),
// Enterprise
array(
'campaignContent' => 'bringEnterpriseLevel',
'title' => 'Enterprise',
- 'url' => 'https://piwik.org/recommends/enterprise/',
+ 'url' => 'https://matomo.org/recommends/enterprise/',
'text' => 'Bring your analytics to enterprise level. Upgrade your Piwik platform and receive access to numerous premium features and assistance from experts.'
),
array(
'campaignContent' => 'slowingDown',
'title' => 'Enterprise',
- 'url' => 'https://piwik.org/recommends/enterprise/',
+ 'url' => 'https://matomo.org/recommends/enterprise/',
'text' => 'Is your Piwik slowing down? Piwik experts can help with your server setup!'
),
array(
'campaignContent' => 'discoverPower',
'title' => 'Enterprise',
- 'url' => 'https://piwik.org/recommends/enterprise/',
+ 'url' => 'https://matomo.org/recommends/enterprise/',
'text' => 'Discover the power of open-source combined with enterprise-grade support and premium functionalities.'
),
);
diff --git a/plugins/ProfessionalServices/Widgets/PromoServices.php b/plugins/ProfessionalServices/Widgets/PromoServices.php
index 35eca8d35aaa7865898c0a901e0f7a0ced06d04c..26a29395153c9f1a8e96cd41f463efecf3520792 100644
--- a/plugins/ProfessionalServices/Widgets/PromoServices.php
+++ b/plugins/ProfessionalServices/Widgets/PromoServices.php
@@ -34,7 +34,7 @@ class PromoServices extends \Piwik\Widget\Widget
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('About Piwik');
+ $config->setCategoryId('About Matomo');
$config->setName('ProfessionalServices_WidgetPremiumServicesForPiwik');
$advertising = StaticContainer::get('Piwik\ProfessionalServices\Advertising');
diff --git a/plugins/ProfessionalServices/Widgets/Rss.php b/plugins/ProfessionalServices/Widgets/Rss.php
index 41d98f3dc82902eecb24eec1fb3b1639ddb5f70d..3786360ec67acaf645cc36ea4a3cbcb1fe658b9e 100644
--- a/plugins/ProfessionalServices/Widgets/Rss.php
+++ b/plugins/ProfessionalServices/Widgets/Rss.php
@@ -14,7 +14,7 @@ class Rss extends \Piwik\Widget\Widget
{
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('About Piwik');
+ $config->setCategoryId('About Matomo');
$config->setIsEnabled(false);
}
diff --git a/plugins/ProfessionalServices/templates/promoBelowCampaigns.twig b/plugins/ProfessionalServices/templates/promoBelowCampaigns.twig
index f929642bd5d81708013ca2b5841fac4cf5c82ad7..2b9efc0bf3e0476c5793d2c50dd3d6a26afcd060 100644
--- a/plugins/ProfessionalServices/templates/promoBelowCampaigns.twig
+++ b/plugins/ProfessionalServices/templates/promoBelowCampaigns.twig
@@ -1,7 +1,7 @@
<p style="margin-top:3em" class=" alert-info alert">Did you know?
- <br/> <a target="_blank" rel="noreferrer" href="https://piwik.org/docs/tracking-campaigns/">Campaign tracking</a> lets you measure the effectiveness of your marketing campaigns such as emails marketing, paid search, banner ads, affiliates links, etc.
- Use the <a target="_blank" rel="noreferrer" href="https://piwik.org/docs/tracking-campaigns/">URL Builder tool</a> to create your links with new URL campaign parameters.
+ <br/> <a target="_blank" rel="noreferrer" href="https://matomo.org/docs/tracking-campaigns/">Campaign tracking</a> lets you measure the effectiveness of your marketing campaigns such as emails marketing, paid search, banner ads, affiliates links, etc.
+ Use the <a target="_blank" rel="noreferrer" href="https://matomo.org/docs/tracking-campaigns/">URL Builder tool</a> to create your links with new URL campaign parameters.
{% if displayMarketingCampaignsReportingAd %}
- <br/> Install our <a target="_blank" rel="noreferrer" href="https://plugins.piwik.org/MarketingCampaignsReporting">Marketing Campaigns Reporting plugin</a> to get even more campaigns reports and new segments for up to five marketing channels (campaign, source, medium, keyword, content).
+ <br/> Install our <a target="_blank" rel="noreferrer" href="https://plugins.matomo.org/MarketingCampaignsReporting">Marketing Campaigns Reporting plugin</a> to get even more campaigns reports and new segments for up to five marketing channels (campaign, source, medium, keyword, content).
{% endif %}
</p>
\ No newline at end of file
diff --git a/plugins/ProfessionalServices/templates/promoBelowEvents.twig b/plugins/ProfessionalServices/templates/promoBelowEvents.twig
index ef7d95bb675bcbf4bc1e5aa5086cc110dde55234..ae2af80dde40f214cf7fe98d6157dc53e2157758 100644
--- a/plugins/ProfessionalServices/templates/promoBelowEvents.twig
+++ b/plugins/ProfessionalServices/templates/promoBelowEvents.twig
@@ -1,7 +1,7 @@
<p style="margin-top:3em" class=" alert-info alert">Did you know?
- <br/>Using Events you can measure any user interaction and gain amazing insights into your audience. <a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/docs/event-tracking/">Learn more</a>.
- <br/> To measure blocks of content such as image galleries, listings or ads: use <a target="_blank" href="?module=Proxy&action=redirect&url=https://developer.piwik.org/guides/content-tracking">Content Tracking</a> and see exactly which content is viewed and clicked.
+ <br/>Using Events you can measure any user interaction and gain amazing insights into your audience. <a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/docs/event-tracking/">Learn more</a>.
+ <br/> To measure blocks of content such as image galleries, listings or ads: use <a target="_blank" href="?module=Proxy&action=redirect&url=https://developer.matomo.org/guides/content-tracking">Content Tracking</a> and see exactly which content is viewed and clicked.
{% if displayMediaAnalyticsAd %}
- <br/>When you publish videos or audios, <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/media-analytics-website">Media Analytics gives deep insights into your audience</a> and how they watch your videos or listens to your music.
+ <br/>When you publish videos or audios, <a target="_blank" rel="noreferrer" href="https://matomo.org/recommends/media-analytics-website">Media Analytics gives deep insights into your audience</a> and how they watch your videos or listens to your music.
{% endif %}
</p>
\ No newline at end of file
diff --git a/plugins/ProfessionalServices/templates/promoExperiments.twig b/plugins/ProfessionalServices/templates/promoExperiments.twig
index cfef975e0c189a0f430aea6f605f33f0fcf9804d..1d5ab7a39a194e2224a2e2a1dd11434671e4e5c5 100644
--- a/plugins/ProfessionalServices/templates/promoExperiments.twig
+++ b/plugins/ProfessionalServices/templates/promoExperiments.twig
@@ -1,3 +1,3 @@
<p style="margin-top:3em" class=" alert-info alert">Did you know?
- With <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/ab-testing-learn-more/">A/B Testing for Piwik</a> you can immediately increase conversions and sales by creating different versions of a page to see which one grows your business.
+ With <a target="_blank" rel="noreferrer" href="https://matomo.org/recommends/ab-testing-learn-more/">A/B Testing for Piwik</a> you can immediately increase conversions and sales by creating different versions of a page to see which one grows your business.
</p>
\ No newline at end of file
diff --git a/plugins/ProfessionalServices/templates/promoFunnel.twig b/plugins/ProfessionalServices/templates/promoFunnel.twig
index 4e1118a0ef33860f9c202cdd3949c63d7450e880..85c78a14fccaef80938d39734519064b65341738 100644
--- a/plugins/ProfessionalServices/templates/promoFunnel.twig
+++ b/plugins/ProfessionalServices/templates/promoFunnel.twig
@@ -1,5 +1,5 @@
<p style="margin-top:3em;margin-bottom:3em" class="alert-info alert">Did you know?
A Funnel defines a series of actions that you expect your visitors to take on their way to converting a goal.
- <br/>With <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/conversion-funnel/">Funnels for Piwik</a>,
+ <br/>With <a target="_blank" rel="noreferrer" href="https://matomo.org/recommends/conversion-funnel/">Funnels for Piwik</a>,
you can easily determine your funnel and see where your visitors drop off and how to focus efforts to increase your conversions.
</p>
\ No newline at end of file
diff --git a/plugins/ProfessionalServices/templates/promoHeatmaps.twig b/plugins/ProfessionalServices/templates/promoHeatmaps.twig
index 7aab5fe6c531bcfaeaff74ad740cace540eaa7e7..9d4901048021b6e6bcece187048e962ed885ad31 100644
--- a/plugins/ProfessionalServices/templates/promoHeatmaps.twig
+++ b/plugins/ProfessionalServices/templates/promoHeatmaps.twig
@@ -1,3 +1,3 @@
<p style="margin-top:24px;font-size:13px;" class="alert-info alert">Did you know?
- With <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/heatmap-session-recording-learn-more/">Heatmap & Session Recording</a> you understand your visitors much better. See where your visitors click, move the mouse, scroll, type, and more.
+ With <a target="_blank" rel="noreferrer" href="https://matomo.org/recommends/heatmap-session-recording-learn-more/">Heatmap & Session Recording</a> you understand your visitors much better. See where your visitors click, move the mouse, scroll, type, and more.
</p>
diff --git a/plugins/ProfessionalServices/templates/promoSearchKeywords.twig b/plugins/ProfessionalServices/templates/promoSearchKeywords.twig
index aaa283b68f54568de399ca216f1f375c1ce3b665..6829c0f9ecee1982c17b4ade11d69d076527fd92 100644
--- a/plugins/ProfessionalServices/templates/promoSearchKeywords.twig
+++ b/plugins/ProfessionalServices/templates/promoSearchKeywords.twig
@@ -1,5 +1,5 @@
<p style="margin-top:3em;margin-bottom:3em" class=" alert-info alert">Did you know?<br/>
- Use <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/search-keywords-performance/">Search Keywords Performance</a>
+ Use <a target="_blank" rel="noreferrer" href="https://matomo.org/recommends/search-keywords-performance/">Search Keywords Performance</a>
to see all keywords behind 'keyword not defined'.
All keywords searched by your users on Google, Bing and other search engines will be listed
and you can even monitor the SEO position of your website in their search results.
diff --git a/plugins/ProfessionalServices/templates/promoSessionRecordings.twig b/plugins/ProfessionalServices/templates/promoSessionRecordings.twig
index 17e350f0fd646aa97c76c77e20994daa7f82d9cd..4646ff66320a5e76cdf17b8794b1dc6ce9db998b 100644
--- a/plugins/ProfessionalServices/templates/promoSessionRecordings.twig
+++ b/plugins/ProfessionalServices/templates/promoSessionRecordings.twig
@@ -1,3 +1,3 @@
<p class="alert-info alert">Did you know?
- With <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/heatmap-session-recording-learn-more/">Heatmap & Session Recording</a> you can record all clicks, mouse movements, scrolls and form interactions of your visitors and replay them in a video to truly understand your visitors.
+ With <a target="_blank" rel="noreferrer" href="https://matomo.org/recommends/heatmap-session-recording-learn-more/">Heatmap & Session Recording</a> you can record all clicks, mouse movements, scrolls and form interactions of your visitors and replay them in a video to truly understand your visitors.
</p>
\ No newline at end of file
diff --git a/plugins/Provider/Reports/GetProvider.php b/plugins/Provider/Reports/GetProvider.php
index a5ff778f0a0d02827ec6d325839c6aca6b67af1f..ad2858a6ba9910f6aeb8f35b85b2dfb744da0ef2 100644
--- a/plugins/Provider/Reports/GetProvider.php
+++ b/plugins/Provider/Reports/GetProvider.php
@@ -44,7 +44,7 @@ class GetProvider extends Report
if (! Common::getRequestVar('disableLink', 0, 'int')) {
$message .= ' ' . Piwik::translate(
'General_SeeThisFaq',
- array('<a href="https://piwik.org/faq/general/faq_52/" rel="noreferrer" target="_blank">', '</a>')
+ array('<a href="https://matomo.org/faq/general/faq_52/" rel="noreferrer" target="_blank">', '</a>')
);
}
$view->config->show_footer_message = $message;
diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php
index 550078e2d73d2e5427e9f314e4b79095f9cf98f3..03d48ba267a1fda2b2581a16d7eabb263070283b 100644
--- a/plugins/Proxy/Controller.php
+++ b/plugins/Proxy/Controller.php
@@ -119,6 +119,10 @@ class Controller extends \Piwik\Plugin\Controller
return true;
}
+ if (preg_match('~^http://(qa\.|demo\.|dev\.|forum\.)?matomo.org([#?/]|$)~', $url)) {
+ return true;
+ }
+
// Allow clockworksms domain
if (strpos($url, 'http://www.clockworksms.com/') === 0) {
return true;
diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking
index a30f808fe5fa399114bfc268639dd033a2512dd2..b6b3ab7640e8ff1904258750ee18d24ff17c9dff 160000
--- a/plugins/QueuedTracking
+++ b/plugins/QueuedTracking
@@ -1 +1 @@
-Subproject commit a30f808fe5fa399114bfc268639dd033a2512dd2
+Subproject commit b6b3ab7640e8ff1904258750ee18d24ff17c9dff
diff --git a/plugins/Referrers/Reports/GetCampaigns.php b/plugins/Referrers/Reports/GetCampaigns.php
index 36df4fead4464757d150782acf2372f92e45edd0..da3e0edfdb4ce1c22e596366da335f7493ea62b2 100644
--- a/plugins/Referrers/Reports/GetCampaigns.php
+++ b/plugins/Referrers/Reports/GetCampaigns.php
@@ -21,7 +21,7 @@ class GetCampaigns extends Base
$this->dimension = new Campaign();
$this->name = Piwik::translate('Referrers_Campaigns');
$this->documentation = Piwik::translate('Referrers_CampaignsReportDocumentation',
- array('<br />', '<a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>'));
+ array('<br />', '<a href="https://matomo.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>'));
$this->actionToLoadSubTables = 'getKeywordsFromCampaignId';
$this->hasGoalMetrics = true;
$this->order = 9;
diff --git a/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php b/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php
index d3f2fd1784859505ca5af7d9b6cd31f0257dd9f9..7885bd0940379c821ca2eab235c996c2369176b9 100644
--- a/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php
+++ b/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php
@@ -20,7 +20,7 @@ class GetKeywordsFromCampaignId extends Base
$this->dimension = new Keyword();
$this->name = Piwik::translate('Referrers_Campaigns');
$this->documentation = Piwik::translate('Referrers_CampaignsReportDocumentation',
- array('<br />', '<a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>'));
+ array('<br />', '<a href="https://matomo.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>'));
$this->isSubtableReport = true;
$this->order = 10;
}
diff --git a/plugins/Referrers/SearchEngine.php b/plugins/Referrers/SearchEngine.php
index 02e4338d95fc96374897d1eecb43a0cc75bc3e0c..431c72c87f289e08cdb7020ed192f5f1625c6855 100644
--- a/plugins/Referrers/SearchEngine.php
+++ b/plugins/Referrers/SearchEngine.php
@@ -485,7 +485,7 @@ class SearchEngine extends Singleton
public function getBackLinkFromUrlAndKeyword($url, $keyword)
{
if ($keyword === API::LABEL_KEYWORD_NOT_DEFINED) {
- return 'https://piwik.org/faq/general/#faq_144';
+ return 'https://matomo.org/faq/general/#faq_144';
}
$keyword = urlencode($keyword);
$keyword = str_replace(urlencode('+'), urlencode(' '), $keyword);
diff --git a/plugins/RssWidget/Widgets/RssChangelog.php b/plugins/RssWidget/Widgets/RssChangelog.php
index bdd02843ef578fa190b0660f507ce3cc0fabdbac..73a269aa0a41f60bc47ef2e4881cc5be227744e0 100644
--- a/plugins/RssWidget/Widgets/RssChangelog.php
+++ b/plugins/RssWidget/Widgets/RssChangelog.php
@@ -16,7 +16,7 @@ class RssChangelog extends \Piwik\Widget\Widget
{
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('About Piwik');
+ $config->setCategoryId('About Matomo');
$config->setName('Piwik Changelog');
}
diff --git a/plugins/RssWidget/Widgets/RssPiwik.php b/plugins/RssWidget/Widgets/RssPiwik.php
index 41ee9152921aac12a88c164f0d2b44df532475c1..f0fd500f8a71297902b6df06c5a39fe505979096 100644
--- a/plugins/RssWidget/Widgets/RssPiwik.php
+++ b/plugins/RssWidget/Widgets/RssPiwik.php
@@ -16,7 +16,7 @@ class RssPiwik extends \Piwik\Widget\Widget
{
public static function configure(WidgetConfig $config)
{
- $config->setCategoryId('About Piwik');
+ $config->setCategoryId('About Matomo');
$config->setName('Piwik.org Blog');
}
diff --git a/plugins/RssWidget/plugin.json b/plugins/RssWidget/plugin.json
index a9a6472345a28e8168376220b5cc6d171bfb2d34..630f3dddd326b1bb99bd86c93d19058c2eca28f0 100644
--- a/plugins/RssWidget/plugin.json
+++ b/plugins/RssWidget/plugin.json
@@ -1,15 +1,15 @@
{
"name": "RssWidget",
- "description": "Piwik Platform showcase: how to create a new widget that displays a user submitted RSS feed.",
+ "description": "Matomo Platform showcase: how to create a new widget that displays a user submitted RSS feed.",
"version": "1.0",
"keywords": ["example", "feed", "widget"],
- "homepage": "https://piwik.org",
+ "homepage": "https://matomo.org",
"license": "GPL v3+",
"authors": [
{
- "name": "Piwik",
- "email": "hello@piwik.org",
- "homepage": "https://piwik.org"
+ "name": "Matomo",
+ "email": "hello@matomo.org",
+ "homepage": "https://matomo.org"
}
]
}
\ No newline at end of file
diff --git a/plugins/ScheduledReports/templates/_listReports.twig b/plugins/ScheduledReports/templates/_listReports.twig
index ffbeeeb5646866df3199e76d6bd5fed7a463babf..030803810da8119e320105055d809f938fce7920 100644
--- a/plugins/ScheduledReports/templates/_listReports.twig
+++ b/plugins/ScheduledReports/templates/_listReports.twig
@@ -1,7 +1,7 @@
<div id='entityEditContainer' class="entityTableContainer"
piwik-content-block
content-title="{{ title|e('html_attr') }}"
- help-url="https://piwik.org/docs/email-reports/"
+ help-url="https://matomo.org/docs/email-reports/"
feature="true"
ng-show="manageScheduledReport.showReportsList">
diff --git a/plugins/SitesManager/templates/_displayJavascriptCode.twig b/plugins/SitesManager/templates/_displayJavascriptCode.twig
index 6425e1fc416c0fa629eaa2fef6d4624596cc98aa..aad6523a4b2f272dbb5d6b4cffc367d025de3512 100644
--- a/plugins/SitesManager/templates/_displayJavascriptCode.twig
+++ b/plugins/SitesManager/templates/_displayJavascriptCode.twig
@@ -3,7 +3,7 @@
<div class='trackingHelp'>
<p>{{ 'Installation_JSTracking_Intro'|translate }}</p>
- <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
+ <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://matomo.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
<h3>{{ 'General_JsTrackingTag'|translate }}</h3>
@@ -11,7 +11,7 @@
<pre piwik-select-on-focus>{{ jsTag|raw }}</pre>
- <p>{{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/javascript-tracking/">','</a>')|raw }}</p>
+ <p>{{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="https://matomo.org/docs/javascript-tracking/">','</a>')|raw }}</p>
{% if isInstall is defined %}
<p>{{ 'Installation_JSTracking_EndNote'|translate('', '')|raw }}</p>
@@ -21,11 +21,11 @@
<h3>{{ 'SitesManager_LogAnalytics'|translate }}</h3>
- <p>{{ 'SitesManager_LogAnalyticsDescription'|translate('<a href="https://piwik.org/log-analytics/" rel="noreferrer" target="_blank">', '</a>')|raw }}</p>
+ <p>{{ 'SitesManager_LogAnalyticsDescription'|translate('<a href="https://matomo.org/log-analytics/" rel="noreferrer" target="_blank">', '</a>')|raw }}</p>
<h3>{{ 'SitesManager_MobileAppsAndSDKs'|translate }}</h3>
- <p>{{ 'SitesManager_MobileAppsAndSDKsDescription'|translate('<a href="https://piwik.org/integrate/#programming-language-platforms-and-frameworks" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
+ <p>{{ 'SitesManager_MobileAppsAndSDKsDescription'|translate('<a href="https://matomo.org/integrate/#programming-language-platforms-and-frameworks" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
<p></p>
</div>
\ No newline at end of file
diff --git a/plugins/SitesManager/templates/siteWithoutData.twig b/plugins/SitesManager/templates/siteWithoutData.twig
index a767fb3c0420a081f29561d6a2a984720fe3c2d7..2200d0900cbe5f2212b863a8edd5138bffb31117 100644
--- a/plugins/SitesManager/templates/siteWithoutData.twig
+++ b/plugins/SitesManager/templates/siteWithoutData.twig
@@ -42,9 +42,9 @@
'module': 'Goals',
'action': 'manage',
}) ~ '">', "</a>",
- '<a href="https://piwik.org/features/" rel="noreferrer" target="_blank">', "</a>",
- '<a href="https://piwik.org/docs/" rel="noreferrer" target="_blank">', "</a>",
- '<a href="https://piwik.org/faq/" rel="noreferrer" target="_blank">', "</a>")|raw }}
+ '<a href="https://matomo.org/features/" rel="noreferrer" target="_blank">', "</a>",
+ '<a href="https://matomo.org/docs/" rel="noreferrer" target="_blank">', "</a>",
+ '<a href="https://matomo.org/faq/" rel="noreferrer" target="_blank">', "</a>")|raw }}
<br />
<br />
diff --git a/plugins/SitesManager/templates/sites-manager-header.html b/plugins/SitesManager/templates/sites-manager-header.html
index a677cc196854bc5faec674f8b8ce85978a591471..e031e4f08f04db084c6c5e6568be2ac16802bd0a 100644
--- a/plugins/SitesManager/templates/sites-manager-header.html
+++ b/plugins/SitesManager/templates/sites-manager-header.html
@@ -2,7 +2,7 @@
<h2
ng-show="availableTypes"
piwik-enriched-headline
- help-url="https://piwik.org/docs/manage-websites/"
+ help-url="https://matomo.org/docs/manage-websites/"
feature-name="{{ 'SitesManager_WebsitesManagement'|translate }}">
{{ 'SitesManager_XManagement'|translate:(availableTypes.length > 1 ? ('General_Measurables'|translate) : ('SitesManager_Sites'|translate)) }}
</h2>
diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
index a0aa7be1acdb96576b8b28d3082e436022e72ebf..a19da6ec04c1b69fec412fbd36679d8a6cd9e317 100644
--- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
+++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
@@ -210,7 +210,7 @@
<row>Ecommerce enabled</row>
</availableValues>
<description />
- <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://piwik.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp>
+ <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp>
<templateFile />
<introduction />
<condition />
diff --git a/plugins/Transitions/javascripts/transitions.js b/plugins/Transitions/javascripts/transitions.js
index f26470e0b3df7da90ec9424ac9a945fd410ff7a6..7a759455437c877b4bbd60973b580b6e424c37c9 100644
--- a/plugins/Transitions/javascripts/transitions.js
+++ b/plugins/Transitions/javascripts/transitions.js
@@ -188,7 +188,7 @@ Piwik_Transitions.prototype.showPopover = function () {
var self = this;
this.popover = Piwik_Popover.showLoading('Transitions', self.actionName, 550);
- Piwik_Popover.addHelpButton('https://piwik.org/docs/transitions');
+ Piwik_Popover.addHelpButton('https://matomo.org/docs/transitions');
var bothLoaded = function () {
Piwik_Popover.setContent(Piwik_Transitions.popoverHtml);
diff --git a/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php b/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php
index 432d57d44422b10b72ae7f53c1331bff87a6bf77..5a7ce0a69a1880f5a8c1d19b0091ace39278c97a 100644
--- a/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php
+++ b/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php
@@ -50,12 +50,12 @@ class GeolocationDiagnostic implements Diagnostic
if ($isProviderInstalled) {
$comment = $this->translator->translate('UserCountry_GeoIpLocationProviderNotRecomnended') . ' ';
$comment .= $this->translator->translate('UserCountry_GeoIpLocationProviderDesc_ServerBased2', array(
- '<a href="https://piwik.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>'
+ '<a href="https://matomo.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>'
));
} else {
$comment = $this->translator->translate('UserCountry_DefaultLocationProviderDesc1') . ' ';
$comment .= $this->translator->translate('UserCountry_DefaultLocationProviderDesc2', array(
- '<a href="https://piwik.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>'
+ '<a href="https://matomo.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>'
));
}
diff --git a/plugins/UserCountry/LocationProvider/DefaultProvider.php b/plugins/UserCountry/LocationProvider/DefaultProvider.php
index 6a0cf82f1720b453dd77db28026c3c22e552f558..b5b32ec8c2bb2f143154c87aed395f3f54fbe77b 100755
--- a/plugins/UserCountry/LocationProvider/DefaultProvider.php
+++ b/plugins/UserCountry/LocationProvider/DefaultProvider.php
@@ -104,7 +104,7 @@ class DefaultProvider extends LocationProvider
$desc = Piwik::translate('UserCountry_DefaultLocationProviderDesc1') . ' '
. Piwik::translate('UserCountry_DefaultLocationProviderDesc2',
array('<strong>', '', '', '</strong>'))
- . '<p><a href="https://piwik.org/faq/how-to/#faq_163" rel="noreferrer" target="_blank">'
+ . '<p><a href="https://matomo.org/faq/how-to/#faq_163" rel="noreferrer" target="_blank">'
. Piwik::translate('UserCountry_HowToInstallGeoIPDatabases')
. '</a></p>';
return array('id' => self::ID, 'title' => self::TITLE, 'description' => $desc, 'order' => 1);
diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php
index 965740824f95037c79eb423aa9fcffe902a76190..ed83a697557432cca7b05616fb395004a1b7c2d0 100755
--- a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php
+++ b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php
@@ -217,7 +217,7 @@ class Pecl extends GeoIp
{
$desc = Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Pecl1') . '<br/><br/>'
. Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Pecl2');
- $installDocs = '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_164">'
+ $installDocs = '<a rel="noreferrer" target="_blank" href="https://matomo.org/faq/how-to/#faq_164">'
. Piwik::translate('UserCountry_HowToInstallGeoIpPecl')
. '</a>';
diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Php.php b/plugins/UserCountry/LocationProvider/GeoIp/Php.php
index 35c505f7b97c79a051387d7453725a0b25629e9c..a0bdc15ae22c2512657f59cc4bf9148326d7f3ae 100755
--- a/plugins/UserCountry/LocationProvider/GeoIp/Php.php
+++ b/plugins/UserCountry/LocationProvider/GeoIp/Php.php
@@ -324,7 +324,7 @@ class Php extends GeoIp
$desc = Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Php1') . '<br/><br/>'
. Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Php2',
array('<strong>', '</strong>', '<strong>', '</strong>'));
- $installDocs = '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_163">'
+ $installDocs = '<a rel="noreferrer" target="_blank" href="https://matomo.org/faq/how-to/#faq_163">'
. Piwik::translate('UserCountry_HowToInstallGeoIPDatabases')
. '</a>';
diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
index fe27a5dd2e0a796c1972ce2f99beb2f94eaa8e34..a30c5f0400c77ac81eb776848ccbed6a63e3a95a 100755
--- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
+++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
@@ -223,10 +223,10 @@ class ServerBased extends GeoIp
. Piwik::translate('UserCountry_GeoIpLocationProviderDesc_ServerBased2',
array('<strong>', '</strong>', '<strong>', '</strong>'));
$installDocs =
- '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_165">'
+ '<a rel="noreferrer" target="_blank" href="https://matomo.org/faq/how-to/#faq_165">'
. Piwik::translate('UserCountry_HowToInstallApacheModule')
. '</a><br/>'
- . '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_166">'
+ . '<a rel="noreferrer" target="_blank" href="https://matomo.org/faq/how-to/#faq_166">'
. Piwik::translate('UserCountry_HowToInstallNginxModule')
. '</a>';
diff --git a/plugins/UserCountry/Reports/Base.php b/plugins/UserCountry/Reports/Base.php
index a1ec96e4270c83aee861e0b6ebac7b242cfa5cf5..7a6166dec4b17090b62c6bb5382d88ab61d312d4 100644
--- a/plugins/UserCountry/Reports/Base.php
+++ b/plugins/UserCountry/Reports/Base.php
@@ -54,7 +54,7 @@ abstract class Base extends \Piwik\Plugin\Report
'</a>'));
} else {
$footerMessage .= ' ' . Piwik::translate('UserCountry_ToGeolocateOldVisits',
- array('<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_167">', '</a>'));
+ array('<a rel="noreferrer" target="_blank" href="https://matomo.org/faq/how-to/#faq_167">', '</a>'));
}
$view->config->show_footer_message = $footerMessage;
diff --git a/plugins/UserCountry/Reports/GetCountry.php b/plugins/UserCountry/Reports/GetCountry.php
index 9e5c7faae1720eaa54b54e94fc0a9d20b50e30e3..f3e8f2fcd38e4ff0c4b02f058a61ab2bacafa77a 100644
--- a/plugins/UserCountry/Reports/GetCountry.php
+++ b/plugins/UserCountry/Reports/GetCountry.php
@@ -39,7 +39,7 @@ class GetCountry extends Base
// if we're using the default location provider, add a note explaining how it works
$footerMessage = Piwik::translate("General_Note") . ': '
. Piwik::translate('UserCountry_DefaultLocationProviderExplanation',
- array('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/geo-locate/">', '</a>'));
+ array('<a rel="noreferrer" target="_blank" href="https://matomo.org/docs/geo-locate/">', '</a>'));
$view->config->show_footer_message = $footerMessage;
}
diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig
index 0e45d899f60369108cd959c080d3c6f8ee35e790..2cca082a8a6b6d0df3be05299f01bd1e06fb7e45 100755
--- a/plugins/UserCountry/templates/adminIndex.twig
+++ b/plugins/UserCountry/templates/adminIndex.twig
@@ -7,7 +7,7 @@
<div piwik-content-intro>
<h2 piwik-enriched-headline
- help-url="https://piwik.org/docs/geo-locate/"
+ help-url="https://matomo.org/docs/geo-locate/"
id="location-providers">{{ title }}</h2>
<p>{{ 'UserCountry_GeolocationPageDesc'|translate }}</p>
</div>
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index 902b95e24df4d95d9f2b79bcbf73024e2662ff86..0f927179987ac8b203401912eda9350a1d474bd2 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -8,7 +8,7 @@
content-title="{{ title|e('html_attr') }}"
feature="true"
style="width:800px;"
- help-url="https://piwik.org/docs/manage-users/"
+ help-url="https://matomo.org/docs/manage-users/"
>
<div ng-controller="ManageUserAccessController as manageUserAccess">
<div id="sites" class="usersManager">
@@ -54,8 +54,8 @@
<th class='first'>{{ 'UsersManager_User'|translate }}</th>
<th>{{ 'UsersManager_Alias'|translate }}</th>
<th>{{ 'UsersManager_PrivNone'|translate }}</th>
- <th>{{ 'UsersManager_PrivView'|translate }} <a href="https://piwik.org/faq/general/faq_70/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th>
- <th>{{ 'UsersManager_PrivAdmin'|translate }} <a href="https://piwik.org/faq/general/faq_69/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th>
+ <th>{{ 'UsersManager_PrivView'|translate }} <a href="https://matomo.org/faq/general/faq_70/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th>
+ <th>{{ 'UsersManager_PrivAdmin'|translate }} <a href="https://matomo.org/faq/general/faq_69/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th>
</tr>
</thead>
@@ -268,7 +268,7 @@
<tr>
<th class='first'>{{ 'UsersManager_User'|translate }}</th>
<th>{{ 'UsersManager_Alias'|translate }}</th>
- <th>{{ 'Installation_SuperUser'|translate }} <a href="https://piwik.org/faq/general/faq_35/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th>
+ <th>{{ 'Installation_SuperUser'|translate }} <a href="https://matomo.org/faq/general/faq_35/" rel="noreferrer" target="_blank" class="helpLink"><span class="icon-help"></span></a></th>
</tr>
</thead>
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index 2217ce28ae2d3e675070515713081720de4204ad..da76435406f4cd053701b91c48cd708eff11348c 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -35,7 +35,7 @@
</div>
<div id="languageHelp" class="inline-help-node">
- <a href="?module=Proxy&action=redirect&url=https://piwik.org/translations/" target="_blank">
+ <a href="?module=Proxy&action=redirect&url=https://matomo.org/translations/" target="_blank">
{{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a>
</div>
diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php
index 76606885db0ad2b45f9d960f8033e91e711b1521..0a53a0aff2fc5373084379ed2baed9698f7f70fe 100644
--- a/plugins/VisitsSummary/API.php
+++ b/plugins/VisitsSummary/API.php
@@ -146,7 +146,7 @@ class API extends \Piwik\Plugin\API
if (!SettingsPiwik::isUniqueVisitorsEnabled($period)) {
throw new \Exception(
"The metric " . $metric . " is not enabled for the requested period. " .
- "Please see this FAQ: https://piwik.org/faq/how-to/faq_113/"
+ "Please see this FAQ: https://matomo.org/faq/how-to/faq_113/"
);
}
}
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index fc158281497b981e89ce714cf2d0924b9942fd2f..0f51480296b12bbe645a5d59f07576ea8e71d681 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -77,7 +77,7 @@ class Controller extends \Piwik\Plugin\Controller
. $this->translator->translate('General_ColumnNbActionsDocumentation') . '<br />'
. '<b>' . $this->translator->translate('General_ColumnNbUsers') . ':</b> '
- . $this->translator->translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/user-id/">User ID</a>)<br />'
+ . $this->translator->translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer" target="_blank" href="https://matomo.org/docs/user-id/">User ID</a>)<br />'
. '<b>' . $this->translator->translate('General_ColumnActionsPerVisit') . ':</b> '
. $this->translator->translate('General_ColumnActionsPerVisitDocumentation');
diff --git a/plugins/WebsiteMeasurable/MeasurableSettings.php b/plugins/WebsiteMeasurable/MeasurableSettings.php
index a0e696a842b3b6bd007848301bff22dd4ddec2a8..7f3b5ce9c20c0ba15021b93395f0bb08102dbfaf 100644
--- a/plugins/WebsiteMeasurable/MeasurableSettings.php
+++ b/plugins/WebsiteMeasurable/MeasurableSettings.php
@@ -334,7 +334,7 @@ class MeasurableSettings extends \Piwik\Settings\Measurable\MeasurableSettings
$field->inlineHelp = Piwik::translate('SitesManager_EcommerceHelp')
. '<br />'
. Piwik::translate('SitesManager_PiwikOffersEcommerceAnalytics',
- array("<a href='https://piwik.org/docs/ecommerce-analytics/' target='_blank'>", '</a>'));
+ array("<a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'>", '</a>'));
$field->uiControl = FieldConfig::UI_CONTROL_SINGLE_SELECT;
$field->availableValues = array(
0 => Piwik::translate('SitesManager_NotAnEcommerceSite'),
diff --git a/tests/PHPUnit/Integration/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/ArchiveProcessingTest.php
index 358528270f3b80963f2c6465f8f9ba4ee086750f..e09a3bcfd0f4ed2ea64f0962914a54a6036fa27a 100644
--- a/tests/PHPUnit/Integration/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Integration/ArchiveProcessingTest.php
@@ -338,7 +338,7 @@ class ArchiveProcessingTest extends IntegrationTestCase
. ' The error Messages from MySQL were: '
. $didWeUseBulk
. "\n\n Learn more how to enable LOAD LOCAL DATA INFILE see the Mysql doc (http://dev.mysql.com/doc/refman/5.0/en/load-data-local.html) "
- . "\n or ask in this Piwik ticket (https://github.com/piwik/piwik/issues/3605)"
+ . "\n or ask in this Piwik ticket (https://github.com/matomo-org/piwik/issues/3605)"
);
}
return $didWeUseBulk;
diff --git a/tests/PHPUnit/Integration/AssetManagerTest.php b/tests/PHPUnit/Integration/AssetManagerTest.php
index 1dd88e778732f0e29948e8add70e84574103ca2a..7ff300b909b872c083adf97c83ca312d39f61e39 100644
--- a/tests/PHPUnit/Integration/AssetManagerTest.php
+++ b/tests/PHPUnit/Integration/AssetManagerTest.php
@@ -468,7 +468,7 @@ class AssetManagerTest extends IntegrationTestCase
$this->triggerGetMergedNonCoreJavaScript();
- $expectedContent = $this->adjustExpectedJsContent('/* Piwik Javascript - cb={{{CACHE-BUSTER-JS}}}*/' . "\n");
+ $expectedContent = $this->adjustExpectedJsContent('/* Matomo Javascript - cb={{{CACHE-BUSTER-JS}}}*/' . "\n");
$this->validateExpectedContent($expectedContent);
}
diff --git a/tests/PHPUnit/Integration/CronArchiveTest.php b/tests/PHPUnit/Integration/CronArchiveTest.php
index e8ab6d3bbef1a16a1aaf0e2c494e2f972e8a790b..c70a70a349479434d5a399e35fd9637bfd8444d4 100644
--- a/tests/PHPUnit/Integration/CronArchiveTest.php
+++ b/tests/PHPUnit/Integration/CronArchiveTest.php
@@ -87,12 +87,12 @@ class CronArchiveTest extends IntegrationTestCase
$expected = <<<LOG
---------------------------
INIT
-Running Piwik %s as Super User
+Running Matomo %s as Super User
---------------------------
NOTES
-- If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings.
- See the doc at: https://piwik.org/docs/setup-auto-archiving/
-- Reports for today will be processed at most every %s seconds. You can change this value in Piwik UI > Settings > General Settings.
+- 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.
+ See the doc at: https://matomo.org/docs/setup-auto-archiving/
+- Reports for today will be processed at most every %s seconds. You can change this value in Matomo UI > Settings > General Settings.
- Reports for the current week/month/year will be requested at most every %s seconds.
- Will process all 1 websites
- Limiting segment archiving to following segments:
@@ -100,7 +100,7 @@ NOTES
* actions>=2
---------------------------
START
-Starting Piwik reports archiving...
+Starting Matomo reports archiving...
Will pre-process for website id = 1, period = day, date = last%s
- pre-processing all visits
- skipping segment archiving for 'actions>=4'.
@@ -160,7 +160,7 @@ LOG;
Will ignore websites and help finish a previous started queue instead. IDs: 1
---------------------------
START
-Starting Piwik reports archiving...
+Starting Matomo reports archiving...
Will pre-process for website id = 1, period = day, date = last52
- pre-processing all visits
LOG;
diff --git a/tests/PHPUnit/Integration/HttpTest.php b/tests/PHPUnit/Integration/HttpTest.php
index db4e370862e83e5deacbde1345cad7b01b7a39f4..1e9a734dc7c70400079b0f22f76b65be927251a5 100644
--- a/tests/PHPUnit/Integration/HttpTest.php
+++ b/tests/PHPUnit/Integration/HttpTest.php
@@ -258,7 +258,7 @@ class HttpTest extends \PHPUnit_Framework_TestCase
*/
public function testHttpsWorksWithValidCertificate($method)
{
- $result = Http::sendHttpRequestBy($method, 'https://builds.piwik.org/LATEST', 10);
+ $result = Http::sendHttpRequestBy($method, 'https://builds.matomo.org/LATEST', 10);
$this->assertStringMatchesFormat('%d.%d.%d', $result);
}
diff --git a/tests/PHPUnit/Integration/Tracker/HandlerTest.php b/tests/PHPUnit/Integration/Tracker/HandlerTest.php
index 812c3413363b2b8859fa79dbc298c1154f34a71f..eb691a31b33fea1183478486aa0a9f5582459636 100644
--- a/tests/PHPUnit/Integration/Tracker/HandlerTest.php
+++ b/tests/PHPUnit/Integration/Tracker/HandlerTest.php
@@ -90,7 +90,7 @@ class HandlerTest extends IntegrationTestCase
$this->handler->finish($this->tracker, $this->requestSet);
$this->fail('An expected exception was not thrown');
} catch (Exception $e) {
- $this->assertContains('Piwik would redirect you to this URL: ' . $_GET['redirecturl'], $e->getMessage());
+ $this->assertContains('Matomo would redirect you to this URL: ' . $_GET['redirecturl'], $e->getMessage());
unset($_GET['redirecturl']);
}
}
@@ -105,7 +105,7 @@ class HandlerTest extends IntegrationTestCase
$this->handler->finish($this->tracker, $this->requestSet);
$this->fail('An expected exception was not thrown');
} catch (Exception $e) {
- $this->assertContains('Piwik would redirect you to this URL: http://piwik.net/', $e->getMessage());
+ $this->assertContains('Matomo would redirect you to this URL: http://piwik.net/', $e->getMessage());
unset($_GET['redirecturl']);
}
}
@@ -182,7 +182,7 @@ class HandlerTest extends IntegrationTestCase
$this->handler->onException($this->tracker, $this->requestSet, $this->buildException());
$this->fail('An expected exception was not thrown');
} catch (Exception $e) {
- $this->assertContains('Piwik would redirect you to this URL: ' . $_GET['redirecturl'], $e->getMessage());
+ $this->assertContains('Matomo would redirect you to this URL: ' . $_GET['redirecturl'], $e->getMessage());
unset($_GET['redirecturl']);
}
}
diff --git a/tests/PHPUnit/Integration/TrackerTest.php b/tests/PHPUnit/Integration/TrackerTest.php
index 13b3821bc412f9f5c3dde221158591cf42838d4c..bf4b2a90f00151462633115b1b50f004de03e384 100644
--- a/tests/PHPUnit/Integration/TrackerTest.php
+++ b/tests/PHPUnit/Integration/TrackerTest.php
@@ -251,7 +251,7 @@ class TrackerTest extends IntegrationTestCase
$response = $this->tracker->main($this->getDefaultHandler(), $requestSet);
- $expected = "This resource is part of Piwik. Keep full control of your data with the leading free and open source <a href='https://piwik.org' target='_blank'>digital analytics platform</a> for web and mobile.";
+ $expected = "This resource is part of Matomo. Keep full control of your data with the leading free and open source <a href='https://matomo.org' target='_blank'>digital analytics platform</a> for web and mobile.";
$this->assertEquals($expected, $response);
}
diff --git a/tests/PHPUnit/Integration/ViewDataTable/ManagerTest.php b/tests/PHPUnit/Integration/ViewDataTable/ManagerTest.php
index e4bf7a23f60a5149870701798d94f1f2aa606f1e..06c4e6d3af2aeb453bc1a76110acf8f896a4efe0 100644
--- a/tests/PHPUnit/Integration/ViewDataTable/ManagerTest.php
+++ b/tests/PHPUnit/Integration/ViewDataTable/ManagerTest.php
@@ -43,7 +43,7 @@ class ManagerTest extends IntegrationTestCase
/**
* @expectedException \Exception
- * @expectedExceptionMessage Setting parameters translations is not allowed. Please report this bug to the Piwik team.
+ * @expectedExceptionMessage Setting parameters translations is not allowed. Please report this bug to the Matomo team.
*/
public function test_setViewDataTableParameters_inConfigProperty_shouldOnlyAllowOverridableParams()
{
@@ -60,7 +60,7 @@ class ManagerTest extends IntegrationTestCase
/**
* @expectedException \Exception
- * @expectedExceptionMessage Setting parameters filters is not allowed. Please report this bug to the Piwik team.
+ * @expectedExceptionMessage Setting parameters filters is not allowed. Please report this bug to the Matomo team.
*/
public function test_setViewDataTableParameters_inConfigProperty_shouldOnlyAllowOverridableParams_bis()
{
@@ -77,7 +77,7 @@ class ManagerTest extends IntegrationTestCase
/**
* @expectedException \Exception
- * @expectedExceptionMessage Setting parameters apiMethodToRequestDataTable is not allowed. Please report this bug to the Piwik team.
+ * @expectedExceptionMessage Setting parameters apiMethodToRequestDataTable is not allowed. Please report this bug to the Matomo team.
*/
public function test_setViewDataTableParameters_inRequestConfigProperty_shouldOnlyAllowOverridableParams()
{
diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php
index f4c335a037c75064975d2d31040a404ddf6e6f39..f775b60dfad4e087ed00b76c9f4edcaa15c0cf6a 100644
--- a/tests/PHPUnit/Integration/WidgetsListTest.php
+++ b/tests/PHPUnit/Integration/WidgetsListTest.php
@@ -49,7 +49,7 @@ class WidgetsListTest extends IntegrationTestCase
'Insights_WidgetCategory' => 2,
'ExampleUI_UiFramework' => 8,
'Referrers_Referrers' => 9,
- 'About Piwik' => 10,
+ 'About Matomo' => 10,
);
// number of main categories
$this->assertEquals(count($numberOfWidgets), count($widgetsPerCategory));
diff --git a/tests/PHPUnit/System/ArchiveWebTest.php b/tests/PHPUnit/System/ArchiveWebTest.php
index 745b12e0ec76e9d4870e52a9c4be76f72cbf1ecf..196f8e1906025578cebf6c660089443c03619227 100644
--- a/tests/PHPUnit/System/ArchiveWebTest.php
+++ b/tests/PHPUnit/System/ArchiveWebTest.php
@@ -64,7 +64,7 @@ class ArchiveWebTest extends SystemTestCase
private function assertWebArchivingDone($output, $checkArchivedSite = true)
{
- $this->assertContains('Starting Piwik reports archiving...', $output);
+ $this->assertContains('Starting Matomo reports archiving...', $output);
if ($checkArchivedSite) {
$this->assertContains('Archived website id = 1', $output);
}
diff --git a/tests/PHPUnit/System/EnvironmentValidationTest.php b/tests/PHPUnit/System/EnvironmentValidationTest.php
index 27554553248e830bc48ffd32ea73d46211647b62..5c47714f4ed485f1157ab62ecb1ba011a798388a 100644
--- a/tests/PHPUnit/System/EnvironmentValidationTest.php
+++ b/tests/PHPUnit/System/EnvironmentValidationTest.php
@@ -57,7 +57,7 @@ class EnvironmentValidationTest extends SystemTestCase
$this->simulateAbsentConfigFile('config.ini.php');
$output = $this->triggerPiwikFrom('tracker');
- $this->assertContains('As Piwik is not installed yet, the Tracking API cannot proceed and will exit without error.', $output);
+ $this->assertContains('As Matomo is not installed yet, the Tracking API cannot proceed and will exit without error.', $output);
}
public function test_NoLocalConfigFile_TriggersError_inConsole()
@@ -135,7 +135,7 @@ class EnvironmentValidationTest extends SystemTestCase
private function assertInstallationProcessStarted($output)
{
- $this->assertContains('<title>Piwik '. Version::VERSION .' › Installation</title>', $output);
+ $this->assertContains('<title>Matomo '. Version::VERSION .' › Installation</title>', $output);
}
private function simulateAbsentConfigFile($fileName)
diff --git a/tests/PHPUnit/System/TrackerResponseTest.php b/tests/PHPUnit/System/TrackerResponseTest.php
index 98cd27baa06003a63c5856bc2d0a678d8ab33207..a0c6c6021e0504735adc865d2a5d09e2338729e4 100755
--- a/tests/PHPUnit/System/TrackerResponseTest.php
+++ b/tests/PHPUnit/System/TrackerResponseTest.php
@@ -101,7 +101,7 @@ class TrackerResponseTest extends SystemTestCase
$url = Fixture::getTrackerUrl();
$this->assertResponseCode(200, $url);
- $expected = "This resource is part of Piwik. Keep full control of your data with the leading free and open source <a href='https://piwik.org' target='_blank'>digital analytics platform</a> for web and mobile.";
+ $expected = "This resource is part of Matomo. Keep full control of your data with the leading free and open source <a href='https://matomo.org' target='_blank'>digital analytics platform</a> for web and mobile.";
$this->assertHttpResponseText($expected, $url);
}
@@ -110,7 +110,7 @@ class TrackerResponseTest extends SystemTestCase
$url = Fixture::getTrackerUrl();
$this->assertResponseCode(400, $url . '?rec=1');
- $expected = "This resource is part of Piwik. Keep full control of your data with the leading free and open source <a href='https://piwik.org' target='_blank'>digital analytics platform</a> for web and mobile.";
+ $expected = "This resource is part of Matomo. Keep full control of your data with the leading free and open source <a href='https://matomo.org' target='_blank'>digital analytics platform</a> for web and mobile.";
$this->assertHttpResponseText($expected, $url);
}
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
index a20f089dce5d8f47d1fe92bdffd62a6afe28c441..b271da4a4a7713fbc040679cc99914a45b13e04d 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
@@ -1,104 +1,105 @@
-------------------------------------------------------
Using this 'archive.php' script is no longer recommended.
-Please use '/path/to/php /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console core:archive --url=http://localhost/tests/PHPUnit/proxy/index.php' instead.
-To get help use '/path/to/php /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console core:archive --help'
-See also: http://piwik.org/docs/setup-auto-archiving/
+Please use '/path/to/php /home/travis/build/matomo-org/piwik/tests/PHPUnit/proxy/../../..//console core:archive --url=http://localhost/tests/PHPUnit/proxy/index.php' instead.
+To get help use '/path/to/php /home/travis/build/matomo-org/piwik/tests/PHPUnit/proxy/../../..//console core:archive --help'
+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'
-------------------------------------------------------
-INFO [2017-01-22 00:03:37] ---------------------------
-INFO [2017-01-22 00:03:37] INIT
-INFO [2017-01-22 00:03:37] Running Piwik 3.0.1 as Super User
-INFO [2017-01-22 00:03:37] ---------------------------
-INFO [2017-01-22 00:03:37] NOTES
-INFO [2017-01-22 00:03:37] - 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.
-INFO [2017-01-22 00:03:37] See the doc at: http://piwik.org/docs/setup-auto-archiving/
-INFO [2017-01-22 00:03:37] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings.
-INFO [2017-01-22 00:03:37] - Reports for the current week/month/year will be requested at most every 3600 seconds.
-INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1
-INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1
-INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1
-INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3
-INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1
-INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3
-INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3
-INFO [2017-01-22 00:03:37] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script or the InvalidateReports plugin) , IDs: 1, 2, 3
-INFO [2017-01-22 00:03:37] ---------------------------
-INFO [2017-01-22 00:03:37] START
-INFO [2017-01-22 00:03:37] Starting Piwik reports archiving...
-INFO [2017-01-22 00:03:37] Old report was invalidated for website id 1
-INFO [2017-01-22 00:03:37] Will pre-process for website id = 1, period = day, date = last52
-INFO [2017-01-22 00:03:37] - pre-processing all visits
-INFO [2017-01-22 00:03:39] - pre-processing segment 1/3 browserCode==IE
-INFO [2017-01-22 00:03:39] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2017-01-22 00:03:39] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2017-01-22 00:03:44] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 6.567s
-INFO [2017-01-22 00:03:44] Will pre-process for website id = 1, period = week, date = last260
-INFO [2017-01-22 00:03:44] - pre-processing all visits
-INFO [2017-01-22 00:03:44] - pre-processing segment 1/3 browserCode==IE
-INFO [2017-01-22 00:03:44] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2017-01-22 00:05:14] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2017-01-22 00:05:58] Archived website id = 1, period = week, 3 segments, 41 visits in last 260 weeks, 0 visits this week, Time elapsed: 134.312s
-INFO [2017-01-22 00:05:58] Will pre-process for website id = 1, period = month, date = last52
-INFO [2017-01-22 00:05:58] - pre-processing all visits
-INFO [2017-01-22 00:05:58] - pre-processing segment 1/3 browserCode==IE
-INFO [2017-01-22 00:05:58] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2017-01-22 00:06:10] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2017-01-22 00:06:16] Archived website id = 1, period = month, 3 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 17.904s
-INFO [2017-01-22 00:06:16] Will pre-process for website id = 1, period = year, date = last7
-INFO [2017-01-22 00:06:16] - pre-processing all visits
-INFO [2017-01-22 00:06:16] - pre-processing segment 1/3 browserCode==IE
-INFO [2017-01-22 00:06:16] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2017-01-22 00:06:23] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2017-01-22 00:06:26] Archived website id = 1, period = year, 3 segments, 41 visits in last 7 years, 0 visits this year, Time elapsed: 10.251s
-INFO [2017-01-22 00:06:26] Archived website id = 1, 16 API requests, Time elapsed: 169.041s [1/3 done]
-INFO [2017-01-22 00:06:26] Old report was invalidated for website id 2
-INFO [2017-01-22 00:06:26] Will pre-process for website id = 2, period = day, date = last52
-INFO [2017-01-22 00:06:26] - pre-processing all visits
-INFO [2017-01-22 00:06:28] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.963s
-INFO [2017-01-22 00:06:28] Will pre-process for website id = 2, period = week, date = last260
-INFO [2017-01-22 00:06:28] - pre-processing all visits
-INFO [2017-01-22 00:06:59] Archived website id = 2, period = week, 0 segments, 1 visits in last 260 weeks, 0 visits this week, Time elapsed: 31.146s
-INFO [2017-01-22 00:06:59] Will pre-process for website id = 2, period = month, date = last52
-INFO [2017-01-22 00:06:59] - pre-processing all visits
-INFO [2017-01-22 00:07:03] Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 4.273s
-INFO [2017-01-22 00:07:03] Will pre-process for website id = 2, period = year, date = last7
-INFO [2017-01-22 00:07:03] - pre-processing all visits
-INFO [2017-01-22 00:07:05] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 1.745s
-INFO [2017-01-22 00:07:05] Archived website id = 2, 4 API requests, Time elapsed: 39.131s [2/3 done]
-INFO [2017-01-22 00:07:05] Old report was invalidated for website id 3
-INFO [2017-01-22 00:07:05] Will pre-process for website id = 3, period = day, date = last52
-INFO [2017-01-22 00:07:05] - pre-processing all visits
-INFO [2017-01-22 00:07:07] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.947s
-INFO [2017-01-22 00:07:07] Will pre-process for website id = 3, period = week, date = last260
-INFO [2017-01-22 00:07:07] - pre-processing all visits
-INFO [2017-01-22 00:07:39] Archived website id = 3, period = week, 0 segments, 15 visits in last 260 weeks, 0 visits this week, Time elapsed: 31.604s
-INFO [2017-01-22 00:07:39] Will pre-process for website id = 3, period = month, date = last52
-INFO [2017-01-22 00:07:39] - pre-processing all visits
-INFO [2017-01-22 00:07:44] Archived website id = 3, period = month, 0 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 4.779s
-INFO [2017-01-22 00:07:44] Will pre-process for website id = 3, period = year, date = last7
-INFO [2017-01-22 00:07:44] - pre-processing all visits
-INFO [2017-01-22 00:07:46] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 2.549s
-INFO [2017-01-22 00:07:46] Archived website id = 3, 4 API requests, Time elapsed: 40.884s [3/3 done]
-INFO [2017-01-22 00:07:46] Done archiving!
-INFO [2017-01-22 00:07:46] ---------------------------
-INFO [2017-01-22 00:07:46] SUMMARY
-INFO [2017-01-22 00:07:46] Total visits for today across archived websites: 0
-INFO [2017-01-22 00:07:46] Archived today's reports for 3 websites
-INFO [2017-01-22 00:07:46] Archived week/month/year for 3 websites
-INFO [2017-01-22 00:07:46] Skipped 0 websites
-INFO [2017-01-22 00:07:46] - 0 skipped because no new visit since the last script execution
-INFO [2017-01-22 00:07:46] - 0 skipped because existing daily reports are less than 150 seconds old
-INFO [2017-01-22 00:07:46] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old
-INFO [2017-01-22 00:07:46] Total API requests: 24
-INFO [2017-01-22 00:07:46] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 249195 ms, no error
-INFO [2017-01-22 00:07:46] Time elapsed: 249.195s
-INFO [2017-01-22 00:07:46] ---------------------------
-INFO [2017-01-22 00:07:46] SCHEDULED TASKS
-INFO [2017-01-22 00:07:46] Starting Scheduled tasks...
-INFO [2017-01-22 00:07:46] done
-INFO [2017-01-22 00:07:46] ---------------------------
\ No newline at end of file
+INFO [2018-01-09 22:42:32] ---------------------------
+INFO [2018-01-09 22:42:32] INIT
+INFO [2018-01-09 22:42:32] Running Matomo 3.3.0-b1 as Super User
+INFO [2018-01-09 22:42:32] ---------------------------
+INFO [2018-01-09 22:42:32] NOTES
+INFO [2018-01-09 22:42:32] - 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.
+INFO [2018-01-09 22:42:32] See the doc at: https://matomo.org/docs/setup-auto-archiving/
+INFO [2018-01-09 22:42:32] - Reports for today will be processed at most every 150 seconds. You can change this value in Matomo UI > Settings > General Settings.
+INFO [2018-01-09 22:42:32] - Reports for the current week/month/year will be requested at most every 3600 seconds.
+INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1
+INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1
+INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1
+INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3
+INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-08-19 for following websites ids: 1
+INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1
+INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3
+INFO [2018-01-09 22:42:32] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3
+INFO [2018-01-09 22:42:32] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script or the InvalidateReports plugin) , IDs: 1, 2, 3
+INFO [2018-01-09 22:42:33] ---------------------------
+INFO [2018-01-09 22:42:33] START
+INFO [2018-01-09 22:42:33] Starting Matomo reports archiving...
+INFO [2018-01-09 22:42:33] Old report was invalidated for website id 1
+INFO [2018-01-09 22:42:33] Will pre-process for website id = 1, period = day, date = last52
+INFO [2018-01-09 22:42:33] - pre-processing all visits
+INFO [2018-01-09 22:42:35] - pre-processing segment 1/3 browserCode==IE
+INFO [2018-01-09 22:42:35] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2018-01-09 22:42:35] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2018-01-09 22:42:40] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 7.147s
+INFO [2018-01-09 22:42:40] Will pre-process for website id = 1, period = week, date = last260
+INFO [2018-01-09 22:42:40] - pre-processing all visits
+INFO [2018-01-09 22:42:40] - pre-processing segment 1/3 browserCode==IE
+INFO [2018-01-09 22:42:40] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2018-01-09 22:44:15] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2018-01-09 22:45:02] Archived website id = 1, period = week, 3 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 142.765s
+INFO [2018-01-09 22:45:02] Will pre-process for website id = 1, period = month, date = last52
+INFO [2018-01-09 22:45:02] - pre-processing all visits
+INFO [2018-01-09 22:45:03] - pre-processing segment 1/3 browserCode==IE
+INFO [2018-01-09 22:45:03] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2018-01-09 22:45:14] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2018-01-09 22:45:20] Archived website id = 1, period = month, 3 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 17.817s
+INFO [2018-01-09 22:45:20] Will pre-process for website id = 1, period = year, date = last7
+INFO [2018-01-09 22:45:20] - pre-processing all visits
+INFO [2018-01-09 22:45:20] - pre-processing segment 1/3 browserCode==IE
+INFO [2018-01-09 22:45:20] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2018-01-09 22:45:41] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2018-01-09 22:45:51] Archived website id = 1, period = year, 3 segments, 46 visits in last 7 years, 0 visits this year, Time elapsed: 30.356s
+INFO [2018-01-09 22:45:51] Archived website id = 1, 16 API requests, Time elapsed: 198.094s [1/3 done]
+INFO [2018-01-09 22:45:51] Old report was invalidated for website id 2
+INFO [2018-01-09 22:45:51] Will pre-process for website id = 2, period = day, date = last52
+INFO [2018-01-09 22:45:51] - pre-processing all visits
+INFO [2018-01-09 22:45:53] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 2.067s
+INFO [2018-01-09 22:45:53] Will pre-process for website id = 2, period = week, date = last260
+INFO [2018-01-09 22:45:53] - pre-processing all visits
+INFO [2018-01-09 22:46:28] Archived website id = 2, period = week, 0 segments, 0 visits in last 260 weeks, 0 visits this week, Time elapsed: 34.977s
+INFO [2018-01-09 22:46:28] Will pre-process for website id = 2, period = month, date = last52
+INFO [2018-01-09 22:46:28] - pre-processing all visits
+INFO [2018-01-09 22:46:32] Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 4.380s
+INFO [2018-01-09 22:46:32] Will pre-process for website id = 2, period = year, date = last7
+INFO [2018-01-09 22:46:32] - pre-processing all visits
+INFO [2018-01-09 22:46:37] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 5.078s
+INFO [2018-01-09 22:46:37] Archived website id = 2, 4 API requests, Time elapsed: 46.506s [2/3 done]
+INFO [2018-01-09 22:46:37] Old report was invalidated for website id 3
+INFO [2018-01-09 22:46:37] Will pre-process for website id = 3, period = day, date = last52
+INFO [2018-01-09 22:46:37] - pre-processing all visits
+INFO [2018-01-09 22:46:39] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 2.056s
+INFO [2018-01-09 22:46:39] Will pre-process for website id = 3, period = week, date = last260
+INFO [2018-01-09 22:46:39] - pre-processing all visits
+INFO [2018-01-09 22:47:15] Archived website id = 3, period = week, 0 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 35.840s
+INFO [2018-01-09 22:47:15] Will pre-process for website id = 3, period = month, date = last52
+INFO [2018-01-09 22:47:15] - pre-processing all visits
+INFO [2018-01-09 22:47:20] Archived website id = 3, period = month, 0 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 4.767s
+INFO [2018-01-09 22:47:20] Will pre-process for website id = 3, period = year, date = last7
+INFO [2018-01-09 22:47:20] - pre-processing all visits
+INFO [2018-01-09 22:47:26] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 6.206s
+INFO [2018-01-09 22:47:26] Archived website id = 3, 4 API requests, Time elapsed: 48.873s [3/3 done]
+INFO [2018-01-09 22:47:26] Done archiving!
+INFO [2018-01-09 22:47:26] ---------------------------
+INFO [2018-01-09 22:47:26] SUMMARY
+INFO [2018-01-09 22:47:26] Total visits for today across archived websites: 0
+INFO [2018-01-09 22:47:26] Archived today's reports for 3 websites
+INFO [2018-01-09 22:47:26] Archived week/month/year for 3 websites
+INFO [2018-01-09 22:47:26] Skipped 0 websites
+INFO [2018-01-09 22:47:26] - 0 skipped because no new visit since the last script execution
+INFO [2018-01-09 22:47:26] - 0 skipped because existing daily reports are less than 150 seconds old
+INFO [2018-01-09 22:47:26] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old
+INFO [2018-01-09 22:47:26] Total API requests: 24
+INFO [2018-01-09 22:47:26] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 293679 ms, no error
+INFO [2018-01-09 22:47:26] Time elapsed: 293.679s
+INFO [2018-01-09 22:47:26] ---------------------------
+INFO [2018-01-09 22:47:26] SCHEDULED TASKS
+INFO [2018-01-09 22:47:26] Starting Scheduled tasks...
+INFO [2018-01-09 22:47:26] done
+INFO [2018-01-09 22:47:26] ---------------------------
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml
index fa92d64f222ffd419d24e85b42f357e8fb8e0dc4..4edaf88364b01024143bcaa656cc1129935efb98 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml
@@ -20,7 +20,7 @@
<latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta>
</availableValues>
<description />
- <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp>
+ <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp>
<templateFile />
<introduction>Release channel</introduction>
<condition />
@@ -156,7 +156,7 @@ Another line</defaultValue>
</row>
<row>
<name>trackToPiwik</name>
- <title>Send usage data to Piwik.org</title>
+ <title>Send usage data to Matomo.org</title>
<value>0</value>
<defaultValue>1</defaultValue>
<type>boolean</type>
@@ -164,10 +164,10 @@ Another line</defaultValue>
<uiControlAttributes>
</uiControlAttributes>
<availableValues />
- <description>If enabled, anonymized usage data will be sent to demo-anonymous.piwik.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Piwik. Thank you for making Piwik better!</description>
+ <description>If enabled, anonymized usage data will be sent to demo-anonymous.matomo.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Matomo. Thank you for making Matomo better!</description>
<inlineHelp />
<templateFile />
- <introduction>Send anonmyized usage data to the creators of Piwik</introduction>
+ <introduction>Send anonmyized usage data to the creators of Matomo</introduction>
<condition />
</row>
<row>
@@ -180,10 +180,10 @@ Another line</defaultValue>
<uiControlAttributes>
</uiControlAttributes>
<availableValues />
- <description>If specified, anonymized usage data will be sent to the specified site in this Piwik.</description>
+ <description>If specified, anonymized usage data will be sent to the specified site in this Matomo.</description>
<inlineHelp />
<templateFile />
- <introduction>Send anonymize usage data to this Piwik</introduction>
+ <introduction>Send anonymize usage data to this Matomo</introduction>
<condition />
</row>
<row>
@@ -204,19 +204,19 @@ Another line</defaultValue>
</row>
<row>
<name>customSiteUrl</name>
- <title>Piwik Url</title>
+ <title>Matomo Url</title>
<value />
<defaultValue />
<type>string</type>
<uiControl>text</uiControl>
<uiControlAttributes>
- <placeHolder>eg. http://example.com/piwik</placeHolder>
+ <placeHolder>eg. http://example.com/matomo</placeHolder>
</uiControlAttributes>
<availableValues />
<description />
<inlineHelp />
<templateFile />
- <introduction>Send anonymize usage data to a custom Piwik</introduction>
+ <introduction>Send anonymize usage data to a custom Matomo</introduction>
<condition />
</row>
<row>
@@ -230,7 +230,7 @@ Another line</defaultValue>
<placeHolder>eg. "2"</placeHolder>
</uiControlAttributes>
<availableValues />
- <description>If a URL and Site Id is specified, usage data will be sent to the custom Piwik instance.</description>
+ <description>If a URL and Site Id is specified, usage data will be sent to the custom Matomo instance.</description>
<inlineHelp />
<templateFile />
<introduction />
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml
index 385469b2dfadf86458c7c690790a9fefd162a0d4..8ce4b17685cf8f6d5e8e289fd9b816059c60be69 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml
@@ -65,7 +65,7 @@
<settings>
<row>
<name>userTrackingEnabled</name>
- <title>Piwik usage tracking enabled</title>
+ <title>Matomo usage tracking enabled</title>
<value>1</value>
<defaultValue>1</defaultValue>
<type>boolean</type>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml
index fa92d64f222ffd419d24e85b42f357e8fb8e0dc4..4edaf88364b01024143bcaa656cc1129935efb98 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml
@@ -20,7 +20,7 @@
<latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta>
</availableValues>
<description />
- <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp>
+ <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp>
<templateFile />
<introduction>Release channel</introduction>
<condition />
@@ -156,7 +156,7 @@ Another line</defaultValue>
</row>
<row>
<name>trackToPiwik</name>
- <title>Send usage data to Piwik.org</title>
+ <title>Send usage data to Matomo.org</title>
<value>0</value>
<defaultValue>1</defaultValue>
<type>boolean</type>
@@ -164,10 +164,10 @@ Another line</defaultValue>
<uiControlAttributes>
</uiControlAttributes>
<availableValues />
- <description>If enabled, anonymized usage data will be sent to demo-anonymous.piwik.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Piwik. Thank you for making Piwik better!</description>
+ <description>If enabled, anonymized usage data will be sent to demo-anonymous.matomo.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Matomo. Thank you for making Matomo better!</description>
<inlineHelp />
<templateFile />
- <introduction>Send anonmyized usage data to the creators of Piwik</introduction>
+ <introduction>Send anonmyized usage data to the creators of Matomo</introduction>
<condition />
</row>
<row>
@@ -180,10 +180,10 @@ Another line</defaultValue>
<uiControlAttributes>
</uiControlAttributes>
<availableValues />
- <description>If specified, anonymized usage data will be sent to the specified site in this Piwik.</description>
+ <description>If specified, anonymized usage data will be sent to the specified site in this Matomo.</description>
<inlineHelp />
<templateFile />
- <introduction>Send anonymize usage data to this Piwik</introduction>
+ <introduction>Send anonymize usage data to this Matomo</introduction>
<condition />
</row>
<row>
@@ -204,19 +204,19 @@ Another line</defaultValue>
</row>
<row>
<name>customSiteUrl</name>
- <title>Piwik Url</title>
+ <title>Matomo Url</title>
<value />
<defaultValue />
<type>string</type>
<uiControl>text</uiControl>
<uiControlAttributes>
- <placeHolder>eg. http://example.com/piwik</placeHolder>
+ <placeHolder>eg. http://example.com/matomo</placeHolder>
</uiControlAttributes>
<availableValues />
<description />
<inlineHelp />
<templateFile />
- <introduction>Send anonymize usage data to a custom Piwik</introduction>
+ <introduction>Send anonymize usage data to a custom Matomo</introduction>
<condition />
</row>
<row>
@@ -230,7 +230,7 @@ Another line</defaultValue>
<placeHolder>eg. "2"</placeHolder>
</uiControlAttributes>
<availableValues />
- <description>If a URL and Site Id is specified, usage data will be sent to the custom Piwik instance.</description>
+ <description>If a URL and Site Id is specified, usage data will be sent to the custom Matomo instance.</description>
<inlineHelp />
<templateFile />
<introduction />
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml
index 385469b2dfadf86458c7c690790a9fefd162a0d4..8ce4b17685cf8f6d5e8e289fd9b816059c60be69 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml
@@ -65,7 +65,7 @@
<settings>
<row>
<name>userTrackingEnabled</name>
- <title>Piwik usage tracking enabled</title>
+ <title>Matomo usage tracking enabled</title>
<value>1</value>
<defaultValue>1</defaultValue>
<type>boolean</type>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml
index 32180cf06856b08475de33eb06e1ede408f1098c..8b26d43ba3b9083321acc553cbbb8e751813a1bb 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml
@@ -9,7 +9,7 @@
<module>Actions</module>
<action>getSiteSearchKeywords</action>
<dimension>Keyword</dimension>
- <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation>
+ <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://matomo.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation>
<metrics>
<nb_visits>Searches</nb_visits>
<nb_pages_per_search>Search Results pages</nb_pages_per_search>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml
index cc68783ae403f28a130eb804236f4d93fcc42e1e..8377a9f04037aafdd266c17ab0d69e8210cb0c6f 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml
@@ -9,7 +9,7 @@
<module>Actions</module>
<action>getSiteSearchKeywords</action>
<dimension>Keyword</dimension>
- <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation>
+ <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://matomo.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation>
<metrics>
<nb_visits>Searches</nb_visits>
<nb_pages_per_search>Search Results pages</nb_pages_per_search>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
index 7cdae8f7027ab37117be48c570ea6cfa4438ef11..aa7ced88fc81b3d1c372b88ed9fad6d852af5464 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
@@ -9,7 +9,7 @@
<module>CustomVariables</module>
<action>getCustomVariables</action>
<dimension>Custom Variable name</dimension>
- <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation>
+ <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
index 2592d92de7fb7cb70ec9fb4ed821386d8ded4faf..636bb3183daaa829e0f7174e2519cea036586061 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
@@ -9,7 +9,7 @@
<module>CustomVariables</module>
<action>getCustomVariables</action>
<dimension>Custom Variable name</dimension>
- <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation>
+ <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_actions>Actions</nb_actions>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
index bc0c63f7375b08b77f35aa8e2bc7a13aace6cda7..806cd18d6222a08fe316614335ea1f1b5e058c3b 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
@@ -60,7 +60,7 @@
<p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
Powered by
- <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
+ <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a>
<br />
The leading open analytics platform that respects your privacy.
</p>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
index b3907eca2f3cad8bfa6687e931832006529dd4ef..7c19110eeb98951bfdbf37b8895ecb04ae2a4741 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
@@ -5627,7 +5627,7 @@
<p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
Powered by
- <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
+ <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a>
<br />
The leading open analytics platform that respects your privacy.
</p>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index ad317c6dd0e764d08b8fce07b891c7ca766c4473..5ce1b712263aa1ad447781120360505afd4222aa 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -5347,7 +5347,7 @@
<p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
Powered by
- <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
+ <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a>
<br />
The leading open analytics platform that respects your privacy.
</p>
diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml
index dc37118e2b89b9fcaf746dc95c85cee61b5d4265..79ddb3823132f995fd587a19cfcff73313f71805 100644
--- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <error message="The metric nb_users is not enabled for the requested period. Please see this FAQ: https://piwik.org/faq/how-to/faq_113/
+ <error message="The metric nb_users is not enabled for the requested period. Please see this FAQ: https://matomo.org/faq/how-to/faq_113/
--> To temporarily debug this error further, set const PIWIK_PRINT_ERROR_BACKTRACE=true; in index.php" />
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml
index 60e6c159934c61491c3c8e67d6b73731984f0eb4..90df60e9d4a94307066f7281aed0d8b16ced09d8 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml
@@ -213,7 +213,7 @@
<row>Ecommerce enabled</row>
</availableValues>
<description />
- <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://piwik.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp>
+ <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp>
<templateFile />
<introduction />
<condition />
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
index 896ea015bcd919fbc4930fc9cb5f0d7846fbf10f..f5645a049fb532f4c4b17a77a310991d9b4eec65 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
@@ -18,7 +18,7 @@
</row>
<row>
<name>Campaigns (Referrers)</name>
- <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a></documentation>
+ <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://matomo.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a></documentation>
</row>
<row>
<name>City (Visitors)</name>
@@ -38,7 +38,7 @@
</row>
<row>
<name>Custom Variables (Visitors)</name>
- <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation>
+ <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation>
</row>
<row>
<name>Downloads (Actions)</name>
@@ -114,7 +114,7 @@
</row>
<row>
<name>Site Search Keywords (Actions)</name>
- <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation>
+ <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://matomo.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation>
</row>
<row>
<name>Social Networks (Referrers)</name>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index 998faacdb87514650fd4f673e411cd00e3654f5f..0509ff030caa98ed514c1c8eb29960e5dbc0f8d1 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -135,7 +135,7 @@
<module>CustomVariables</module>
<action>getCustomVariables</action>
<dimension>Custom Variable name</dimension>
- <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation>
+ <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
@@ -1309,7 +1309,7 @@
<module>Actions</module>
<action>getSiteSearchKeywords</action>
<dimension>Keyword</dimension>
- <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation>
+ <documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="https://matomo.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation>
<metrics>
<nb_visits>Searches</nb_visits>
<nb_pages_per_search>Search Results pages</nb_pages_per_search>
@@ -1843,7 +1843,7 @@
<module>Referrers</module>
<action>getCampaigns</action>
<dimension>Campaign</dimension>
- <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a></documentation>
+ <documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="https://matomo.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a></documentation>
<metrics>
<nb_visits>Visits</nb_visits>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
index 3bf0a56ac327f22cb56d636e02a3c3f4808346ed..2292e958aa3ea37d37a2a67de69e0c2d5f8ee3eb 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
@@ -3214,8 +3214,8 @@
<row>
<name>Premium Features</name>
<category>
- <id>About Piwik</id>
- <name>About Piwik</name>
+ <id>About Matomo</id>
+ <name>About Matomo</name>
<order>99</order>
<icon />
</category>
@@ -3233,8 +3233,8 @@
<row>
<name>Piwik Changelog</name>
<category>
- <id>About Piwik</id>
- <name>About Piwik</name>
+ <id>About Matomo</id>
+ <name>About Matomo</name>
<order>99</order>
<icon />
</category>
@@ -3252,8 +3252,8 @@
<row>
<name>Example Widget Name</name>
<category>
- <id>About Piwik</id>
- <name>About Piwik</name>
+ <id>About Matomo</id>
+ <name>About Matomo</name>
<order>99</order>
<icon />
</category>
@@ -3309,8 +3309,8 @@
<row>
<name>System Summary</name>
<category>
- <id>About Piwik</id>
- <name>About Piwik</name>
+ <id>About Matomo</id>
+ <name>About Matomo</name>
<order>99</order>
<icon />
</category>
@@ -3328,8 +3328,8 @@
<row>
<name>Latest Marketplace Updates</name>
<category>
- <id>About Piwik</id>
- <name>About Piwik</name>
+ <id>About Matomo</id>
+ <name>About Matomo</name>
<order>99</order>
<icon />
</category>
@@ -3347,8 +3347,8 @@
<row>
<name>Welcome!</name>
<category>
- <id>About Piwik</id>
- <name>About Piwik</name>
+ <id>About Matomo</id>
+ <name>About Matomo</name>
<order>99</order>
<icon />
</category>
@@ -3366,8 +3366,8 @@
<row>
<name>Premium Features & Services for Piwik</name>
<category>
- <id>About Piwik</id>
- <name>About Piwik</name>
+ <id>About Matomo</id>
+ <name>About Matomo</name>
<order>99</order>
<icon />
</category>
@@ -3385,8 +3385,8 @@
<row>
<name>Support Piwik!</name>
<category>
- <id>About Piwik</id>
- <name>About Piwik</name>
+ <id>About Matomo</id>
+ <name>About Matomo</name>
<order>99</order>
<icon />
</category>
@@ -3423,8 +3423,8 @@
<row>
<name>Piwik.org Blog</name>
<category>
- <id>About Piwik</id>
- <name>About Piwik</name>
+ <id>About Matomo</id>
+ <name>About Matomo</name>
<order>99</order>
<icon />
</category>
@@ -3461,8 +3461,8 @@
<row>
<name>System Check</name>
<category>
- <id>About Piwik</id>
- <name>About Piwik</name>
+ <id>About Matomo</id>
+ <name>About Matomo</name>
<order>99</order>
<icon />
</category>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html
index 4302aed3be4381c3234f0b7fc4fbf53b642e1ff7..1d3cdbb1c786ba912c9fa7b0b8628907b3a171a5 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html
@@ -60,7 +60,7 @@
<p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
Powered by
- <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
+ <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a>
<br />
The leading open analytics platform that respects your privacy.
</p>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
index 8a6c167ef7367edc402ae24dbc343937950973ff..74334d0e47f7dc9882fe83c13957501f21a69575 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
@@ -7114,7 +7114,7 @@
<p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
Powered by
- <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
+ <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a>
<br />
The leading open analytics platform that respects your privacy.
</p>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index 552ff56ce2d76be8e9dab8069db4c10d139fe253..1893834e5036db14c371f9b92f2ed50641c678f0 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -6750,7 +6750,7 @@
<p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
Powered by
- <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
+ <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a>
<br />
The leading open analytics platform that respects your privacy.
</p>
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml
index fa92d64f222ffd419d24e85b42f357e8fb8e0dc4..4edaf88364b01024143bcaa656cc1129935efb98 100644
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml
@@ -20,7 +20,7 @@
<latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta>
</availableValues>
<description />
- <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp>
+ <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp>
<templateFile />
<introduction>Release channel</introduction>
<condition />
@@ -156,7 +156,7 @@ Another line</defaultValue>
</row>
<row>
<name>trackToPiwik</name>
- <title>Send usage data to Piwik.org</title>
+ <title>Send usage data to Matomo.org</title>
<value>0</value>
<defaultValue>1</defaultValue>
<type>boolean</type>
@@ -164,10 +164,10 @@ Another line</defaultValue>
<uiControlAttributes>
</uiControlAttributes>
<availableValues />
- <description>If enabled, anonymized usage data will be sent to demo-anonymous.piwik.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Piwik. Thank you for making Piwik better!</description>
+ <description>If enabled, anonymized usage data will be sent to demo-anonymous.matomo.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Matomo. Thank you for making Matomo better!</description>
<inlineHelp />
<templateFile />
- <introduction>Send anonmyized usage data to the creators of Piwik</introduction>
+ <introduction>Send anonmyized usage data to the creators of Matomo</introduction>
<condition />
</row>
<row>
@@ -180,10 +180,10 @@ Another line</defaultValue>
<uiControlAttributes>
</uiControlAttributes>
<availableValues />
- <description>If specified, anonymized usage data will be sent to the specified site in this Piwik.</description>
+ <description>If specified, anonymized usage data will be sent to the specified site in this Matomo.</description>
<inlineHelp />
<templateFile />
- <introduction>Send anonymize usage data to this Piwik</introduction>
+ <introduction>Send anonymize usage data to this Matomo</introduction>
<condition />
</row>
<row>
@@ -204,19 +204,19 @@ Another line</defaultValue>
</row>
<row>
<name>customSiteUrl</name>
- <title>Piwik Url</title>
+ <title>Matomo Url</title>
<value />
<defaultValue />
<type>string</type>
<uiControl>text</uiControl>
<uiControlAttributes>
- <placeHolder>eg. http://example.com/piwik</placeHolder>
+ <placeHolder>eg. http://example.com/matomo</placeHolder>
</uiControlAttributes>
<availableValues />
<description />
<inlineHelp />
<templateFile />
- <introduction>Send anonymize usage data to a custom Piwik</introduction>
+ <introduction>Send anonymize usage data to a custom Matomo</introduction>
<condition />
</row>
<row>
@@ -230,7 +230,7 @@ Another line</defaultValue>
<placeHolder>eg. "2"</placeHolder>
</uiControlAttributes>
<availableValues />
- <description>If a URL and Site Id is specified, usage data will be sent to the custom Piwik instance.</description>
+ <description>If a URL and Site Id is specified, usage data will be sent to the custom Matomo instance.</description>
<inlineHelp />
<templateFile />
<introduction />
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml
index 385469b2dfadf86458c7c690790a9fefd162a0d4..8ce4b17685cf8f6d5e8e289fd9b816059c60be69 100644
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml
@@ -65,7 +65,7 @@
<settings>
<row>
<name>userTrackingEnabled</name>
- <title>Piwik usage tracking enabled</title>
+ <title>Matomo usage tracking enabled</title>
<value>1</value>
<defaultValue>1</defaultValue>
<type>boolean</type>
diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml
index fa92d64f222ffd419d24e85b42f357e8fb8e0dc4..4edaf88364b01024143bcaa656cc1129935efb98 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml
@@ -20,7 +20,7 @@
<latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta>
</availableValues>
<description />
- <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp>
+ <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp>
<templateFile />
<introduction>Release channel</introduction>
<condition />
@@ -156,7 +156,7 @@ Another line</defaultValue>
</row>
<row>
<name>trackToPiwik</name>
- <title>Send usage data to Piwik.org</title>
+ <title>Send usage data to Matomo.org</title>
<value>0</value>
<defaultValue>1</defaultValue>
<type>boolean</type>
@@ -164,10 +164,10 @@ Another line</defaultValue>
<uiControlAttributes>
</uiControlAttributes>
<availableValues />
- <description>If enabled, anonymized usage data will be sent to demo-anonymous.piwik.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Piwik. Thank you for making Piwik better!</description>
+ <description>If enabled, anonymized usage data will be sent to demo-anonymous.matomo.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Matomo. Thank you for making Matomo better!</description>
<inlineHelp />
<templateFile />
- <introduction>Send anonmyized usage data to the creators of Piwik</introduction>
+ <introduction>Send anonmyized usage data to the creators of Matomo</introduction>
<condition />
</row>
<row>
@@ -180,10 +180,10 @@ Another line</defaultValue>
<uiControlAttributes>
</uiControlAttributes>
<availableValues />
- <description>If specified, anonymized usage data will be sent to the specified site in this Piwik.</description>
+ <description>If specified, anonymized usage data will be sent to the specified site in this Matomo.</description>
<inlineHelp />
<templateFile />
- <introduction>Send anonymize usage data to this Piwik</introduction>
+ <introduction>Send anonymize usage data to this Matomo</introduction>
<condition />
</row>
<row>
@@ -204,19 +204,19 @@ Another line</defaultValue>
</row>
<row>
<name>customSiteUrl</name>
- <title>Piwik Url</title>
+ <title>Matomo Url</title>
<value />
<defaultValue />
<type>string</type>
<uiControl>text</uiControl>
<uiControlAttributes>
- <placeHolder>eg. http://example.com/piwik</placeHolder>
+ <placeHolder>eg. http://example.com/matomo</placeHolder>
</uiControlAttributes>
<availableValues />
<description />
<inlineHelp />
<templateFile />
- <introduction>Send anonymize usage data to a custom Piwik</introduction>
+ <introduction>Send anonymize usage data to a custom Matomo</introduction>
<condition />
</row>
<row>
@@ -230,7 +230,7 @@ Another line</defaultValue>
<placeHolder>eg. "2"</placeHolder>
</uiControlAttributes>
<availableValues />
- <description>If a URL and Site Id is specified, usage data will be sent to the custom Piwik instance.</description>
+ <description>If a URL and Site Id is specified, usage data will be sent to the custom Matomo instance.</description>
<inlineHelp />
<templateFile />
<introduction />
diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml
index 385469b2dfadf86458c7c690790a9fefd162a0d4..8ce4b17685cf8f6d5e8e289fd9b816059c60be69 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml
@@ -65,7 +65,7 @@
<settings>
<row>
<name>userTrackingEnabled</name>
- <title>Piwik usage tracking enabled</title>
+ <title>Matomo usage tracking enabled</title>
<value>1</value>
<defaultValue>1</defaultValue>
<type>boolean</type>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
index 2e710b0d907f1ed4317164a5d472b2b28d853381..7c7cbee48d4fae7218b44469b8350aab63d5ac89 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
@@ -8,7 +8,7 @@
<module>CustomVariables</module>
<action>getCustomVariablesValuesFromNameId</action>
<dimension>Custom Variable value</dimension>
- <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation>
+ <documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. <br /> For more information about Custom Variables in general, read the <a href="https://matomo.org/docs/custom-variables/" rel="noreferrer" target="_blank">Custom Variables documentation on piwik.org</a></documentation>
<isSubtableReport>1</isSubtableReport>
<metrics>
<nb_visits>Visits</nb_visits>
diff --git a/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultCore.js b/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultCore.js
index 823fc76cdb6bde35f859f65b0aef826ae49a9558..08c20ce37ac77e962eb4dabb66625bdb4157577d 100644
--- a/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultCore.js
+++ b/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultCore.js
@@ -1,4 +1,4 @@
-/* Piwik Javascript - cb={{{CACHE-BUSTER-JS}}}*/
+/* Matomo Javascript - cb={{{CACHE-BUSTER-JS}}}*/
if(typeof SimpleObject!=='object'){SimpleObject=(function(){var privateVar;function privateMethod(param){privateVar=param;}
return{publicMethod:function(){privateMethod('val');}}}());}
diff --git a/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultNonCore.js b/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultNonCore.js
index f004dcc5015e19d56314317f47739be157e8aee2..f1cf2469322a883716e4c8e3c0c84fe8070731b1 100644
--- a/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultNonCore.js
+++ b/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultNonCore.js
@@ -1,3 +1,3 @@
-/* Piwik Javascript - cb={{{CACHE-BUSTER-JS}}}*/
+/* Matomo Javascript - cb={{{CACHE-BUSTER-JS}}}*/
alert('test');
\ No newline at end of file
diff --git a/tests/PHPUnit/Unit/AssetManager/stylesheets/ExpectedMergeResult.css b/tests/PHPUnit/Unit/AssetManager/stylesheets/ExpectedMergeResult.css
index 903190bb0220e188808953dc1ab4a8c50fda3d97..6637cea7b7b958708af9d8720aaa90698c1973af 100644
--- a/tests/PHPUnit/Unit/AssetManager/stylesheets/ExpectedMergeResult.css
+++ b/tests/PHPUnit/Unit/AssetManager/stylesheets/ExpectedMergeResult.css
@@ -1,5 +1,5 @@
/* compile_me_once={{{CACHE-BUSTER-JS}}} */
-/* Piwik CSS file is compiled with Less. You may be interested in writing a custom Theme for Piwik! */
+/* Matomo CSS file is compiled with Less. You may be interested in writing a custom Theme for Matomo! */
#page #header { color:white; }
#footer { color:red; }
.box {
diff --git a/tests/PHPUnit/Unit/ConfigTest.php b/tests/PHPUnit/Unit/ConfigTest.php
index d92e1525b61d5e68216f5906f5d1aab5999c77cc..afea25a47a11c2d4cd3c28a91997366ce05361f7 100644
--- a/tests/PHPUnit/Unit/ConfigTest.php
+++ b/tests/PHPUnit/Unit/ConfigTest.php
@@ -148,7 +148,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
public function getDumpConfigData()
{
$header = "; <?php exit; ?> DO NOT REMOVE THIS LINE\n" .
- "; 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";
+ "; 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 array(
// Test name, array(
diff --git a/tests/PHPUnit/Unit/Tracker/ResponseTest.php b/tests/PHPUnit/Unit/Tracker/ResponseTest.php
index 597ee513dbfc84e17c0cb22bf520fb6389785125..8ef48ed39457e48acb4ca78e041984d13c89f269 100644
--- a/tests/PHPUnit/Unit/Tracker/ResponseTest.php
+++ b/tests/PHPUnit/Unit/Tracker/ResponseTest.php
@@ -65,7 +65,7 @@ class ResponseTest extends \PHPUnit_Framework_TestCase
$content = $this->response->getOutput();
- $this->assertContains('<title>Piwik › Error</title>', $content);
+ $this->assertContains('<title>Matomo › Error</title>', $content);
$this->assertContains('<p>My Custom Message', $content);
}
@@ -127,17 +127,17 @@ class ResponseTest extends \PHPUnit_Framework_TestCase
$tracker->setCountOfLoggedRequests(0);
$this->response->outputResponse($tracker);
- $this->assertEquals("This resource is part of Piwik. Keep full control of your data with the leading free and open source <a href='https://piwik.org' target='_blank'>digital analytics platform</a> for web and mobile.",
+ $this->assertEquals("This resource is part of Matomo. Keep full control of your data with the leading free and open source <a href='https://matomo.org' target='_blank'>digital analytics platform</a> for web and mobile.",
$this->response->getOutput());
}
public function test_getMessageFromException_ShouldNotOutputAnyDetails_IfErrorContainsDbCredentials()
{
$message = $this->response->getMessageFromException(new Exception('Test Message', 1044));
- $this->assertStringStartsWith("Error while connecting to the Piwik database", $message);
+ $this->assertStringStartsWith("Error while connecting to the Matomo database", $message);
$message = $this->response->getMessageFromException(new Exception('Test Message', 42000));
- $this->assertStringStartsWith("Error while connecting to the Piwik database", $message);
+ $this->assertStringStartsWith("Error while connecting to the Matomo database", $message);
}
public function test_getMessageFromException_ShouldReturnMessageAndTrace_InCaseIsCli()
diff --git a/tests/README.md b/tests/README.md
index 0f71ec8ce295ee91038723f7f68b3d49d083ccce..26297a8b647d2ae1504b873234e7d2c378eb4a3c 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -7,7 +7,7 @@ We use Travis CI for our continuous integration server. It automatically runs ou
after each commit to our GIT repo. More information at the links:
* Piwik on Travis CI: https://travis-ci.org/piwik/piwik
- * QA in Piwik: https://piwik.org/qa/
+ * QA in Piwik: https://matomo.org/qa/
Each core Piwik developer is responsible to keep the build green. If a developer breaks the build, he will receive an email from Travis CI.
@@ -104,7 +104,7 @@ Otherwise, if you didn't expect to modify the API outputs, it might be that your
System tests use Fixtures to generate controlled web usage data (visits, goals, pageviews, events, site searches, content tracking, custom variables, etc.).
-Fixtures are stored in [tests/PHPUnit/Fixtures](https://github.com/piwik/piwik/tree/master/tests/PHPUnit/Fixtures)
+Fixtures are stored in [tests/PHPUnit/Fixtures](https://github.com/matomo-org/piwik/tree/master/tests/PHPUnit/Fixtures)
#### OmniFixture
@@ -112,7 +112,7 @@ We also have an OmniFixture that includes all other Fixtures. OmniFixture is use
#### Keep OmniFixture up to date
-Remember to update the [Omnifixture SQL dump](https://github.com/piwik/piwik/blob/master/tests/resources/OmniFixture-dump.sql) whenever you make any change to any fixture. You can use:
+Remember to update the [Omnifixture SQL dump](https://github.com/matomo-org/piwik/blob/master/tests/resources/OmniFixture-dump.sql) whenever you make any change to any fixture. You can use:
./console tests:setup-fixture OmniFixture --sqldump=OmniFixture-dump.sql
@@ -129,7 +129,7 @@ The characteristics of the integration server are described in `SystemTestCase::
### Running tests on Ubuntu
-If you use Ubuntu or another Linux distribution, you must make one change to the filesystem configuration to make tests run fast. [Read more here](https://github.com/piwik/piwik/blob/master/tests/README.troubleshooting.md#important-note-for-linux-users-fix-for-slow-tests).
+If you use Ubuntu or another Linux distribution, you must make one change to the filesystem configuration to make tests run fast. [Read more here](https://github.com/matomo-org/piwik/blob/master/tests/README.troubleshooting.md#important-note-for-linux-users-fix-for-slow-tests).
## JavaScript Tests
@@ -137,11 +137,11 @@ piwik.js is unit tested and you can run the Javascript tests at: /piwik/tests/ja
## Testing Data
-See [tests/README.testing-data.md](https://github.com/piwik/piwik/blob/master/tests/README.testing-data.md) to import testing data in Piwik.
+See [tests/README.testing-data.md](https://github.com/matomo-org/piwik/blob/master/tests/README.testing-data.md) to import testing data in Piwik.
## UI Screenshots Tests
-See [tests/README.screenshots.md](https://github.com/piwik/piwik/blob/master/tests/README.screenshots.md)
+See [tests/README.screenshots.md](https://github.com/matomo-org/piwik/blob/master/tests/README.screenshots.md)
## Build artifacts
@@ -153,7 +153,7 @@ You can retrieve the files generated during the build (the build artifacts) at [
By default tests running on Travis CI will log all messages of at least `INFO` level in `$PIWIK_ROOT_DIR/tmp/logs/piwik.log`. In a given travis build output, you can view the logs by clicking on the line `$ cat $PIWIK_ROOT_DIR/tmp/logs/piwik.log` at the end of the build output text.
-Note: `DEBUG` and `VERBOSE` messages are not logged by default (to keep Travis page loading fast). At any time you can temporarirly enable logging by [modifying this file](https://github.com/piwik/piwik/blob/master/tests/PHPUnit/config.ini.travis.php#L23-27) and changing `log_level = info` to `log_level = debug` or `log_level = verbose`.
+Note: `DEBUG` and `VERBOSE` messages are not logged by default (to keep Travis page loading fast). At any time you can temporarirly enable logging by [modifying this file](https://github.com/matomo-org/piwik/blob/master/tests/PHPUnit/config.ini.travis.php#L23-27) and changing `log_level = info` to `log_level = debug` or `log_level = verbose`.
### Screenshot tests build artifacts
@@ -161,7 +161,7 @@ The screenshot tests generated by the continuous integration server are uploaded
## Troubleshooting
-See [tests/README.troubleshooting.md](https://github.com/piwik/piwik/blob/master/tests/README.troubleshooting.md) for troubleshooting the tests.
+See [tests/README.troubleshooting.md](https://github.com/matomo-org/piwik/blob/master/tests/README.troubleshooting.md) for troubleshooting the tests.
## Advanced users
@@ -172,17 +172,17 @@ As a software developer writing tests it can be useful to be able to set breakpo
### Benchmarks
-See [tests/PHPUnit/Benchmarks/README.md](https://github.com/piwik/piwik/blob/master/tests/PHPUnit/Benchmarks/README.md) to learn about running Benchmark tests.
+See [tests/PHPUnit/Benchmarks/README.md](https://github.com/matomo-org/piwik/blob/master/tests/PHPUnit/Benchmarks/README.md) to learn about running Benchmark tests.
### Profiling
-See [tests/README.xhprof.md](https://github.com/piwik/piwik/blob/master/tests/README.xhprof.md) for help on how to profile Piwik with XHProf.
+See [tests/README.xhprof.md](https://github.com/matomo-org/piwik/blob/master/tests/README.xhprof.md) for help on how to profile Piwik with XHProf.
## Participate
You can help by improving existing tests, or identify some missing tests and implement them.
-See https://piwik.org/participate/development-process
-Please contact us at hello@piwik.org
+See https://matomo.org/participate/development-process
+Please contact us at hello@matomo.org
diff --git a/tests/UI/expected-screenshots/DBStats_admin_page.png b/tests/UI/expected-screenshots/DBStats_admin_page.png
index e5954624fe39f7c08067c2e337ff92d51028ab05..26024c7e570d98b6df46f9843708725eb203d1f9 100644
Binary files a/tests/UI/expected-screenshots/DBStats_admin_page.png and b/tests/UI/expected-screenshots/DBStats_admin_page.png differ
diff --git a/tests/UI/expected-screenshots/DashboardManager_expanded.png b/tests/UI/expected-screenshots/DashboardManager_expanded.png
index c05adbd2927b8bd32127f4be6fa187299e4bae05..888ff860147323661a3be99cfed34e8ce7989fa4 100644
Binary files a/tests/UI/expected-screenshots/DashboardManager_expanded.png and b/tests/UI/expected-screenshots/DashboardManager_expanded.png differ
diff --git a/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png b/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png
index bf02de8fa437d7c565aefca65eb0e838a4195361..bf09d6a7613eef2747eb45ff3d41b4fcb7e86f95 100644
Binary files a/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png and b/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png differ
diff --git a/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/tests/UI/expected-screenshots/DashboardManager_widget_preview.png
index 231383627e2fbc0e3ce087d66763d99737cdc54a..8c5185b427fe9ff59ad278f3203474d3e9549420 100644
Binary files a/tests/UI/expected-screenshots/DashboardManager_widget_preview.png and b/tests/UI/expected-screenshots/DashboardManager_widget_preview.png differ
diff --git a/tests/UI/expected-screenshots/Login_ip_not_whitelisted.png b/tests/UI/expected-screenshots/Login_ip_not_whitelisted.png
index 6abd00d2c29f16a3c0ceecf55ecbdf9e2c21bfaf..56dfde8dd0d1178d7fcfb258eeb8cb89aa136e36 100644
Binary files a/tests/UI/expected-screenshots/Login_ip_not_whitelisted.png and b/tests/UI/expected-screenshots/Login_ip_not_whitelisted.png differ
diff --git a/tests/UI/expected-screenshots/Morpheus_load.png b/tests/UI/expected-screenshots/Morpheus_load.png
index b61ec93cb0726ceaf72bcc660c0c5330bf6b5188..7b89abb94b7c56485d98c57272c71748c1da2a9b 100644
Binary files a/tests/UI/expected-screenshots/Morpheus_load.png and b/tests/UI/expected-screenshots/Morpheus_load.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
index fccf3f5944f42c80c88789032731840070ebe88a..4c1c79c223256548d580b83a0303168be1362f3d 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
index 84a1b3e615b682bdc048e12119a119264c057e3d..4f6b638cfafb2077007b65e96a16d0de87b2136d 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
index 7d494c8c1671eca9f0345fde616ddf42a5190a27..1e41e3d51f7ac7ab098c160bfe85b2650bd6242c 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_user_settings.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_user_settings.png
index 512be3f426d26fd1aa4fede0c3b46d331d9d6bf1..8178410301518bbfcb09f2b2014b5cc9a56227de 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_admin_user_settings.png and b/tests/UI/expected-screenshots/UIIntegrationTest_admin_user_settings.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png
index d885e1302a65f971452bea592b781afda45f3b4b..d32297183aa6ff9e85f7377c8d6c97bdf45a0e33 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png and b/tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite_superuser.png b/tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite_superuser.png
index 7128cf882620220b578c7241d29710073b62f1b7..bb5e31a8e66f7466b69354f9a58d929d482a6174 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite_superuser.png and b/tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite_superuser.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png
index d73169dfd6799229546fe63411fde0b4f8137c11..3313699270aaebc8df58529219f9a0452c5db13b 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png and b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png
index 5e0a6b765cbbc626c22b874aa632058204526b4f..a2930eb966b50cefaf23aed85257ab6d97c0a51f 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png and b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png differ
diff --git a/tests/angularjs/README.md b/tests/angularjs/README.md
index a50b688e1bf3124ec6ca921720351a90de72e9f4..ed021cd8ff1ff342f91bac208bcff1f5bd23452f 100644
--- a/tests/angularjs/README.md
+++ b/tests/angularjs/README.md
@@ -3,7 +3,7 @@
`[sudo] npm install .`
#### Ubuntu
-On Ubuntu you might be able to use the `scripts/install-ubuntu.sh` script. Have a [look](https://github.com/piwik/piwik/blob/master/tests/angularjs/install-ubuntu.sh) and give it a try
+On Ubuntu you might be able to use the `scripts/install-ubuntu.sh` script. Have a [look](https://github.com/matomo-org/piwik/blob/master/tests/angularjs/install-ubuntu.sh) and give it a try
#### Requirements
* node.js > 0.10
diff --git a/tests/angularjs/bootstrap.js b/tests/angularjs/bootstrap.js
index 7809c39e5375fd7f53765678284f04abbadc7246..4b0ee79a10e372fb0377b1d8d569a9d2d94361db 100644
--- a/tests/angularjs/bootstrap.js
+++ b/tests/angularjs/bootstrap.js
@@ -5,7 +5,7 @@ piwik.cacheBuster = "5da0272c4b354bd1ec3a2e24e6049984";
piwik.userLogin = "root";
piwik.idSite = "1";
piwik.siteName = "Example\x20Site";
-piwik.siteMainUrl = "http\x3A\x2F\x2Fdeveloper.piwik.org";
+piwik.siteMainUrl = "http\x3A\x2F\x2Fdeveloper.matomo.org";
piwik.period = "day";
piwik.currentDateString = "2014-03-28";
piwik.startDateString = "2014-03-28";
@@ -33,7 +33,7 @@ var piwikUsageTracking = {
visitorCustomVariables: [
{id: 1, name: 'Access', value: 'user'}
],
- trackingDomain: 'http://demo.piwik.org',
+ trackingDomain: 'http://demo.matomo.org',
exampleDomain: 'http://example.com'
};
diff --git a/tests/index.html b/tests/index.html
index ac1498927483175449d5f12c2bb6bf54dd85de29..d29d390ca338bd618bb576eb231b8412d94b8073 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -5,11 +5,11 @@
<p>Today looks like an ideal day to write & run tests.</p>
<ul>
- <li><a href="https://github.com/piwik/piwik/blob/master/tests/README.md">Setup PHPUnit tests</a></li>
+ <li><a href="https://github.com/matomo-org/piwik/blob/master/tests/README.md">Setup PHPUnit tests</a></li>
<li><a href="javascript/">Run piwik.js Javascript unit & integration tests</a>. <br/></li>
</ul>
-<p>If you are new to the wonderful world of testing, <a href='https://github.com/piwik/piwik/blob/master/tests/README.md'>see the README</a> for an introduction.</p>
+<p>If you are new to the wonderful world of testing, <a href='https://github.com/matomo-org/piwik/blob/master/tests/README.md'>see the README</a> for an introduction.</p>
<img src='resources/disturbing-image.jpg' alt='I find your lack of tests disturbing'>
<br/><i><a href='http://www.flickr.com/photos/sebastian_bergmann/2282734669/'>Photo source & license</a></i>