https://github.com/matomo-org/matomo/commit/82a9b1b0a01dc20928d50134233e167f0116472d - Mouve

Site d'origine

Permalink
Browse files
Further Piwik.org => Matomo.org replacements (#12415)
* renaming more Piwik mentions

* some more updates

* fix some tests

* support matomo partially as require string

* fix tests

* fix failing system test

* fix tests

* fix system test

* fix test
  • Loading branch information
tsteur committed Jan 10, 2018
1 parent 92cb21b commit 82a9b1b0a01dc20928d50134233e167f0116472d
Showing with 822 additions and 814 deletions.
  1. +66 −66 CHANGELOG.md
  2. +4 −4 CONTRIBUTING.md
  3. +15 −15 LEGALNOTICE
  4. +1 −1 LICENSE
  5. +7 −7 PRIVACY.md
  6. +33 −33 README.md
  7. +4 −4 SECURITY.md
  8. +9 −9 composer.json
  9. +73 −73 config/global.ini.php
  10. +1 −1 core/API/DataTableManipulator.php
  11. +1 −1 core/Application/Kernel/EnvironmentValidator.php
  12. +1 −1 core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php
  13. +1 −1 core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
  14. +1 −1 core/AssetManager/UIAssetMinifier.php
  15. +1 −1 core/CliMulti/RequestCommand.php
  16. +2 −2 core/Config.php
  17. +1 −1 core/Console.php
  18. +7 −7 core/CronArchive.php
  19. +1 −1 core/DataTable/Manager.php
  20. +5 −5 core/DataTable/Renderer/Rss.php
  21. +1 −1 core/Db/Adapter.php
  22. +3 −3 core/ErrorHandler.php
  23. +1 −1 core/Exception/PluginDeactivatedException.php
  24. +2 −2 core/Filechecks.php
  25. +1 −1 core/FrontController.php
  26. +5 −5 core/Plugin/Controller.php
  27. +5 −5 core/Plugin/ControllerAdmin.php
  28. +2 −1 core/Plugin/Dependency.php
  29. +1 −1 core/Plugin/Manager.php
  30. +2 −2 core/Plugin/MetadataLoader.php
  31. +1 −1 core/Plugin/ViewDataTable.php
  32. +2 −2 core/ProfessionalServices/Advertising.php
  33. +1 −1 core/Profiler.php
  34. +1 −1 core/Segment/SegmentExpression.php
  35. +1 −1 core/Session.php
  36. +1 −1 core/SettingsPiwik.php
  37. +5 −5 core/Tracker/Response.php
  38. +1 −1 core/Tracker/VisitExcluded.php
  39. +1 −1 core/Updates/0.5.4.php
  40. +2 −2 core/Updates/0.6-rc1.php
  41. +2 −2 core/Updates/1.2-rc1.php
  42. +2 −2 core/Url.php
  43. +27 −27 core/testMinimumPhpVersion.php
  44. +1 −1 js/LICENSE.txt
  45. +2 −2 js/README.md
  46. +1 −1 lang/README.md
  47. +1 −1 libs/README.md
  48. +2 −2 misc/How to install Piwik.html
  49. +2 −2 misc/cron/archive.php
  50. +1 −1 misc/cron/archive.sh
  51. +1 −1 misc/internal-docs/content-tracking.md
  52. +1 −1 misc/others/api_rest_call.php
  53. +1 −1 misc/others/uninstall-delete-piwik-directory.php
  54. +1 −1 misc/others/widget_example_lastvisits.html
  55. +1 −1 misc/user/index.html
  56. +1 −1 plugins/API/Controller.php
  57. +1 −1 plugins/API/Menu.php
  58. +1 −1 plugins/API/templates/listAllAPI.twig
  59. +4 −4 plugins/API/tests/Integration/RssRendererTest.php
  60. +1 −1 plugins/Actions/Reports/GetSiteSearchKeywords.php
  61. +1 −1 plugins/CoreAdminHome/javascripts/protocolCheck.js
  62. +2 −2 plugins/CoreAdminHome/templates/generalSettings.twig
  63. +7 −7 plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
  64. +1 −1 plugins/CoreConsole/Commands/GenerateAngularComponent.php
  65. +1 −1 plugins/CoreConsole/Commands/GenerateAngularDirective.php
  66. +2 −2 plugins/CoreConsole/Commands/GeneratePlugin.php
  67. +1 −1 plugins/CoreConsole/Commands/GenerateWidget.php
  68. +1 −1 plugins/CoreHome/Widgets/GetDonateForm.php
  69. +1 −1 plugins/CoreHome/Widgets/GetPromoVideo.php
  70. +1 −1 plugins/CoreHome/Widgets/GetSystemSummary.php
  71. +1 −1 plugins/CoreHome/javascripts/dataTable.js
  72. +1 −1 plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig
  73. +1 −1 plugins/CoreHome/templates/_donate.twig
  74. +5 −5 plugins/CoreHome/templates/_headerMessage.twig
  75. +1 −1 plugins/CoreHome/templates/_warningInvalidHost.twig
  76. +1 −1 plugins/CoreHome/templates/getPromoVideo.twig
  77. +3 −1 plugins/CorePluginsAdmin/templates/macros.twig
  78. +1 −1 plugins/CoreUpdater/CoreUpdater.php
  79. +1 −1 plugins/CoreUpdater/ReleaseChannel.php
  80. +1 −1 plugins/CoreUpdater/ReleaseChannel/LatestStable.php
  81. +2 −2 plugins/CoreUpdater/SystemSettings.php
  82. +2 −2 plugins/CoreUpdater/Test/Integration/ReleaseChannelTest.php
  83. +3 −3 plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php
  84. +1 −1 plugins/CoreUpdater/Test/Mock/UpdaterMock.php
  85. +2 −2 plugins/CoreUpdater/UpdateCommunication.php
  86. +2 −2 plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
  87. +2 −2 plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
  88. +1 −1 plugins/CoreUpdater/templates/updateHttpError.twig
  89. +1 −1 plugins/CoreUpdater/templates/updateSuccess.twig
  90. +1 −1 plugins/CustomDimensions
  91. +1 −1 plugins/CustomVariables/Reports/GetCustomVariables.php
  92. +1 −1 plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php
  93. +1 −1 plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html
  94. +1 −1 plugins/CustomVariables/lang/en.json
  95. +1 −1 plugins/DBStats/templates/index.twig
  96. +1 −1 plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php
  97. +5 −5 plugins/ExampleAPI/plugin.json
  98. +1 −1 plugins/ExamplePlugin/Widgets/MyExampleWidget.php
  99. +5 −5 plugins/ExampleVisualization/plugin.json
  100. +38 −38 plugins/Feedback/templates/index.twig
  101. +1 −1 plugins/Goals/Visualizations/Goals.php
  102. +1 −1 plugins/Goals/templates/_formAddGoal.twig
  103. +2 −2 plugins/Goals/templates/_listGoalEdit.twig
  104. +2 −2 plugins/Goals/templates/addNewGoal.twig
  105. +3 −3 plugins/Installation/Controller.php
  106. +3 −3 plugins/Installation/FormDatabaseSetup.php
  107. +1 −1 plugins/Installation/FormSuperUser.php
  108. +1 −1 plugins/Installation/Installation.php
  109. +2 −2 plugins/Installation/ServerFilesGenerator.php
  110. +1 −1 plugins/Installation/Widgets/GetSystemCheck.php
  111. +2 −2 plugins/Installation/templates/finished.twig
  112. +2 −2 plugins/Installation/templates/layout.twig
  113. +1 −1 plugins/Installation/templates/reuseTables.twig
  114. +1 −1 plugins/Installation/templates/systemCheck.twig
  115. +2 −2 plugins/Installation/templates/trackingCode.twig
  116. +1 −1 plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html
  117. +1 −1 plugins/LanguagesManager/templates/getLanguagesSelector.twig
  118. +1 −1 plugins/Live/templates/getVisitorProfilePopup.twig
  119. +2 −2 plugins/Login/Controller.php
  120. +2 −2 plugins/Login/templates/login.twig
  121. +1 −1 plugins/Marketplace/Widgets/GetNewPlugins.php
  122. +1 −1 plugins/Marketplace/Widgets/GetPremiumFeatures.php
  123. +2 −2 plugins/Marketplace/templates/licenseform.twig
  124. +5 −5 plugins/Marketplace/templates/overview.twig
  125. +1 −1 plugins/MobileAppMeasurable/Type.php
  126. +3 −3 plugins/Morpheus/templates/ajaxMacros.twig
  127. +4 −4 plugins/Morpheus/templates/demo.twig
  128. +4 −4 plugins/Morpheus/templates/maintenance.tpl
  129. +1 −1 plugins/Morpheus/templates/simpleLayoutFooter.tpl
  130. +1 −1 plugins/Morpheus/templates/simpleLayoutHeader.tpl
  131. +4 −4 plugins/MultiSites/angularjs/dashboard/dashboard.directive.html
  132. +2 −2 plugins/Overlay/templates/index.twig
  133. +3 −3 plugins/PrivacyManager/templates/privacySettings.twig
  134. +13 −13 plugins/ProfessionalServices/Promo.php
  135. +1 −1 plugins/ProfessionalServices/Widgets/PromoServices.php
  136. +1 −1 plugins/ProfessionalServices/Widgets/Rss.php
  137. +3 −3 plugins/ProfessionalServices/templates/promoBelowCampaigns.twig
  138. +3 −3 plugins/ProfessionalServices/templates/promoBelowEvents.twig
  139. +1 −1 plugins/ProfessionalServices/templates/promoExperiments.twig
  140. +1 −1 plugins/ProfessionalServices/templates/promoFunnel.twig
  141. +1 −1 plugins/ProfessionalServices/templates/promoHeatmaps.twig
  142. +1 −1 plugins/ProfessionalServices/templates/promoSearchKeywords.twig
  143. +1 −1 plugins/ProfessionalServices/templates/promoSessionRecordings.twig
  144. +1 −1 plugins/Provider/Reports/GetProvider.php
  145. +4 −0 plugins/Proxy/Controller.php
  146. +1 −1 plugins/QueuedTracking
  147. +1 −1 plugins/Referrers/Reports/GetCampaigns.php
  148. +1 −1 plugins/Referrers/Reports/GetKeywordsFromCampaignId.php
  149. +1 −1 plugins/Referrers/SearchEngine.php
  150. +1 −1 plugins/RssWidget/Widgets/RssChangelog.php
  151. +1 −1 plugins/RssWidget/Widgets/RssPiwik.php
  152. +5 −5 plugins/RssWidget/plugin.json
  153. +1 −1 plugins/ScheduledReports/templates/_listReports.twig
  154. +4 −4 plugins/SitesManager/templates/_displayJavascriptCode.twig
  155. +3 −3 plugins/SitesManager/templates/siteWithoutData.twig
  156. +1 −1 plugins/SitesManager/templates/sites-manager-header.html
  157. +1 −1 plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
  158. +1 −1 plugins/Transitions/javascripts/transitions.js
  159. +2 −2 plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php
  160. +1 −1 plugins/UserCountry/LocationProvider/DefaultProvider.php
  161. +1 −1 plugins/UserCountry/LocationProvider/GeoIp/Pecl.php
  162. +1 −1 plugins/UserCountry/LocationProvider/GeoIp/Php.php
  163. +2 −2 plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
  164. +1 −1 plugins/UserCountry/Reports/Base.php
  165. +1 −1 plugins/UserCountry/Reports/GetCountry.php
  166. +1 −1 plugins/UserCountry/templates/adminIndex.twig
  167. +4 −4 plugins/UsersManager/templates/index.twig
  168. +1 −1 plugins/UsersManager/templates/userSettings.twig
  169. +1 −1 plugins/VisitsSummary/API.php
  170. +1 −1 plugins/VisitsSummary/Controller.php
  171. +1 −1 plugins/WebsiteMeasurable/MeasurableSettings.php
  172. +1 −1 tests/PHPUnit/Integration/ArchiveProcessingTest.php
  173. +1 −1 tests/PHPUnit/Integration/AssetManagerTest.php
  174. +6 −6 tests/PHPUnit/Integration/CronArchiveTest.php
  175. +1 −1 tests/PHPUnit/Integration/HttpTest.php
  176. +3 −3 tests/PHPUnit/Integration/Tracker/HandlerTest.php
  177. +1 −1 tests/PHPUnit/Integration/TrackerTest.php
  178. +3 −3 tests/PHPUnit/Integration/ViewDataTable/ManagerTest.php
  179. +1 −1 tests/PHPUnit/Integration/WidgetsListTest.php
  180. +1 −1 tests/PHPUnit/System/ArchiveWebTest.php
  181. +2 −2 tests/PHPUnit/System/EnvironmentValidationTest.php
  182. +2 −2 tests/PHPUnit/System/TrackerResponseTest.php
  183. +96 −95 tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
  184. +10 −10 tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml
  185. +1 −1 tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml
  186. +10 −10 tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml
  187. +1 −1 tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml
  188. +1 −1 ...ted/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml
  189. +1 −1 ...d/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml
  190. +1 −1 ...est_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
  191. +1 −1 ...t_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
  192. +1 −1 ...scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
  193. +1 −1 ...ys_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
  194. +1 −1 ...entDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
  195. +1 −1 tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml
  196. +1 −1 tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml
  197. +3 −3 tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
  198. +3 −3 tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
  199. +20 −20 tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
  200. +1 −1 ..._scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html
  201. +1 −1 ...ems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
  202. +1 −1 ...ithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
  203. +10 −10 tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml
  204. +1 −1 tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml
  205. +10 −10 tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml
  206. +1 −1 tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml
  207. +1 −1 ...PUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
  208. +1 −1 tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultCore.js
  209. +1 −1 tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultNonCore.js
  210. +1 −1 tests/PHPUnit/Unit/AssetManager/stylesheets/ExpectedMergeResult.css
  211. +1 −1 tests/PHPUnit/Unit/ConfigTest.php
  212. +4 −4 tests/PHPUnit/Unit/Tracker/ResponseTest.php
  213. +12 −12 tests/README.md
  214. +2 −2 tests/UI/expected-screenshots/DBStats_admin_page.png
  215. +2 −2 tests/UI/expected-screenshots/DashboardManager_expanded.png
  216. +2 −2 tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png
  217. +2 −2 tests/UI/expected-screenshots/DashboardManager_widget_preview.png
  218. +2 −2 tests/UI/expected-screenshots/Login_ip_not_whitelisted.png
  219. +2 −2 tests/UI/expected-screenshots/Morpheus_load.png
  220. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
  221. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
  222. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
  223. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_admin_user_settings.png
  224. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_db_connect_error.png
  225. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_invalid_idsite_superuser.png
  226. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_widgetize_apidisallowed.png
  227. +2 −2 tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png
  228. +1 −1 tests/angularjs/README.md
  229. +2 −2 tests/angularjs/bootstrap.js
  230. +2 −2 tests/index.html

Large diffs are not rendered by default.

@@ -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)
@@ -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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

Piwik Copyright (C) 2007-2017 Piwik.org
Matomo Copyright (C) 2007-2018 Matomo.org

This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
@@ -9,31 +9,31 @@ In this section we document how to protect the privacy of visitors who are track
By default, Piwik stores the visitor IP address (IPv4 or IPv6 format) in the database for each new visitor.
If a visitor has a static IP address this means her browsing history can be easily identified across several days and
even across several websites tracked within the same Piwik server. You can anonymize IP addresses to ensure visitors cannot
be tracked this way: [How to anonymise IP addresses.](https://piwik.org/docs/privacy/#step-1-automatically-anonymize-visitor-ips)
be tracked this way: [How to anonymise IP addresses.](https://matomo.org/docs/privacy/#step-1-automatically-anonymize-visitor-ips)

### Delete old visitors logs
By default, Piwik stores tracked data forever. To better respect the privacy of your users, it is recommended to regularly
purge old data. You can configure Piwik to automatically delete log data older than a specified number of months:
[How to delete old visitors log data.](https://piwik.org/docs/privacy/#step-2-delete-old-visitors-logs)
[How to delete old visitors log data.](https://matomo.org/docs/privacy/#step-2-delete-old-visitors-logs)

### Include a tracking Opt-Out feature on your site
In your website, we recommended providing an easy way for your visitors to “opt-out” of being tracked by Piwik.
You can use the Opt-Out feature to display a link your website that sets a special browser cookie (`piwik_ignore`) when
clicked. Visitors that click that link will be ignored by Piwik in the future:
[How to include a tracking opt-out iframe.](https://piwik.org/docs/privacy/#step-3-include-a-web-analytics-opt-out-feature-on-your-site-using-an-iframe)
[How to include a tracking opt-out iframe.](https://matomo.org/docs/privacy/#step-3-include-a-web-analytics-opt-out-feature-on-your-site-using-an-iframe)

### Respect DoNotTrack preference
Do Not Track is a browser-level technology and policy proposal that lets visitors opt out of tracking by websites they
do not visit. Visitors can enable this preference in their browser, and then it's up to Piwik to respect it. By default,
Piwik is configured to ignore visitors that have enabled it:
[How to check if your Piwik respects DoNotTrack.] (https://piwik.org/docs/privacy/#step-4-respect-donottrack-preference)
[How to check if your Piwik respects DoNotTrack.] (https://matomo.org/docs/privacy/#step-4-respect-donottrack-preference)

### Disable tracking cookies
A cookie is a collection of information that a website stores on a visitor’s computer and accesses each time the visitor
returns. By default, Piwik uses cookies to aid in tracking visitor behavior. If someone gains access to a visitor's
computer, they could learn a few things about how the visitor visited your website. For many websites, this isn't a
problem, but for others where a strong level of privacy is required (like online banking), disabling tracking cookies may
be a good idea: [How to disable tracking cookies.](https://piwik.org/faq/general/faq_157/)
be a good idea: [How to disable tracking cookies.](https://matomo.org/faq/general/faq_157/)

### Keep your visitors details private
Any user that has at least `view` access (the default access level) to Piwik can view detailed information for all users
@@ -49,12 +49,12 @@ 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.
If an update is available, a notification is displayed allowing you to upgrade Piwik. To disable the update check,
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/).
@@ -1,8 +1,8 @@
# Piwik - piwik.org
# Matomo (formerly Piwik) - matomo.org

[![Latest Stable Version](https://poser.pugx.org/piwik/piwik/v/stable)](https://piwik.org/download/)
[![Latest Stable Version](https://poser.pugx.org/piwik/piwik/v/stable)](https://matomo.org/download/)
[![Latest Unstable Version](https://poser.pugx.org/piwik/piwik/v/unstable)](https://packagist.org/packages/piwik/piwik)
[![License](https://poser.pugx.org/piwik/piwik/license)](https://piwik.org/free-software/)
[![License](https://poser.pugx.org/piwik/piwik/license)](https://matomo.org/free-software/)

## Code Status

@@ -14,13 +14,13 @@

## Description

Piwik is the leading Free/Libre open analytics platform.
Matomo is the leading Free/Libre open analytics platform.

Piwik is a full featured PHP MySQL software program that you download and install on your own webserver.
Matomo is a full featured PHP MySQL software program that you download and install on your own webserver.
At the end of the five minute installation process you will be given a JavaScript code.
Simply copy and paste this tag on websites you wish to track and access your analytics reports in real time.

Piwik aims to be a Free software alternative to Google Analytics, and is already used on more than 1,000,000 websites. Privacy is built-in!
Matomo aims to be a Free software alternative to Google Analytics, and is already used on more than 1,000,000 websites. Privacy is built-in!

## Mission Statement

@@ -31,92 +31,92 @@ 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

* PHP 5.5.9 or greater
* MySQL version 5.5 or greater, or MariaDB
* PHP extension pdo and pdo_mysql, or the MySQLi extension.
* Piwik is OS / server independent
* Matomo is OS / server independent

See https://piwik.org/docs/requirements/
See https://matomo.org/docs/requirements/

## Install

* Upload piwik to your webserver
* Upload matomo to your webserver
* Point your browser to the directory
* Follow the steps
* Add the given javascript code to your pages
* (You may also generate fake data to experiment, by enabling the plugin VisitorGenerator)

See https://piwik.org/docs/installation/
See https://matomo.org/docs/installation/

## Free trial

If you do not have a server or don't want to host yourself you can use our Piwik Cloud partner service (30 day free trial): https://www.innocraft.cloud/
If you do not have a server or don't want to host yourself you can use our Matomo Cloud partner service (30 day free trial): https://www.innocraft.cloud/

## Online Demo

Check out the online demo for Piwik at [demo.piwik.org](https://demo.piwik.org/)
Check out the online demo for Matomo at [demo.matomo.org](https://demo.matomo.org/)

## Changelog

For the list of all tickets closed in the current and past releases, see https://piwik.org/changelog/. For the list of technical changes in the Piwik platform, see [https://developer.piwik.org/changelog](https://developer.piwik.org/changelog).
For the list of all tickets closed in the current and past releases, see https://matomo.org/changelog/. For the list of technical changes in the Matomo platform, see [https://developer.matomo.org/changelog](https://developer.matomo.org/changelog).

## Get involved!

We believe in liberating Web Analytics, providing a free platform for simple and advanced analytics. Piwik was built by dozens of people like you,
and we need your help to make Piwik better… Why not participate in a useful project today? [Learn how you can contribute to Piwik.](https://piwik.org/get-involved)
We believe in liberating Web Analytics, providing a free platform for simple and advanced analytics. Matomo was built by dozens of people like you,
and we need your help to make Matomo better… Why not participate in a useful project today? [Learn how you can contribute to Matomo.](https://matomo.org/get-involved)

## Quality Assurance

The Piwik project uses an ever-expanding comprehensive set of thousands of unit tests and hundreds of automated integration tests, system tests, JavaScript tests, and screenshot UI tests, running on a continuous integration server as part of its software quality assurance. [Learn more](https://piwik.org/qa/)
The Matomo project uses an ever-expanding comprehensive set of thousands of unit tests and hundreds of automated integration tests, system tests, JavaScript tests, and screenshot UI tests, running on a continuous integration server as part of its software quality assurance. [Learn more](https://matomo.org/qa/)

We use [BrowserStack.com](https://www.browserstack.com/) testing tool to help check the Piwik user interface is compatible with many browsers.
We use [BrowserStack.com](https://www.browserstack.com/) testing tool to help check the Matomo user interface is compatible with many browsers.

## Security

Security is a top priority at Piwik. As potential issues are discovered, we validate, patch and release fixes as quickly as we can. We have a security bug bounty program in place that rewards researchers for finding security issues and disclosing them to us.
Security is a top priority at Matomo. As potential issues are discovered, we validate, patch and release fixes as quickly as we can. We have a security bug bounty program in place that rewards researchers for finding security issues and disclosing them to us.

[Learn more](https://piwik.org/security/)
[Learn more](https://matomo.org/security/)

## Support for Piwik
## Support for Matomo

For **Free support**, post a message in our community forums: [forum.piwik.org](https://forum.piwik.org/)
For **Free support**, post a message in our community forums: [forum.matomo.org](https://forum.matomo.org/)

For **Professional paid support**, send a message to our network of Piwik professionals: [piwik.org/support](https://piwik.org/contact/)
For **Professional paid support**, send a message to our network of Matomo professionals: [matomo.org/support](https://matomo.org/contact/)

## Contact

Website: [piwik.org](https://piwik.org)
Website: [matomo.org](https://matomo.org)

About us: [piwik.org/team/](https://piwik.org/team/)
About us: [matomo.org/team/](https://matomo.org/team/)

Contact us: [piwik.org/contact/](https://piwik.org/contact/)
Contact us: [matomo.org/contact/](https://matomo.org/contact/)

## More information

What makes Piwik unique from the competition:
What makes Matomo unique from the competition:

* Real time web analytics reports: in Piwik, reports are by default generated in real time.
* Real time web analytics reports: in Matomo, reports are by default generated in real time.
For high traffic websites, you can choose the frequency for reports to be processed.

* You own your web analytics data: since Piwik is installed on your server, the data is stored in your own database and you can get all the statistics using the powerful Piwik Analytics API.
* You own your web analytics data: since Matomo is installed on your server, the data is stored in your own database and you can get all the statistics using the powerful Matomo Analytics API.

* Piwik is a Free Software which can easily be configured to respect your visitors' privacy.
* Matomo is a Free Software which can easily be configured to respect your visitors' privacy.

* Modern, easy to use User Interface: you can fully customize your dashboard, drag and drop widgets and more.

* Piwik features are built inside plugins: you can add new features and remove the ones you don’t need.
You can build your own web analytics plugins or hire a consultant to have your custom feature built in Piwik
* Matomo features are built inside plugins: you can add new features and remove the ones you don’t need.
You can build your own web analytics plugins or hire a consultant to have your custom feature built in Matomo

* Vibrant international Open community of more than 200,000 active users (tracking even more websites!)

* Advanced Web Analytics capabilities such as Ecommerce Tracking, Goal tracking, Campaign tracking,
Custom Variables, Email Reports, Custom Segment Editor, Geo Location, Real time maps, and more!

Documentation and more info on https://piwik.org
Documentation and more info on https://matomo.org
@@ -7,15 +7,15 @@ The Piwik Security Bug Bounty Program is designed to encourage security research

## Responsible disclosure by email

If you have found a security issue in Piwik please read [our security notes](https://piwik.org/security/) regarding responsible disclosures.
If you have found a security issue in Piwik please read [our security notes](https://matomo.org/security/) regarding responsible disclosures.

[Email your Report Vulnerability to the Piwik Security team](mailto:security@piwik.org?subject=Reporting%20Vulnerability%20in%20Piwik)
[Email your Report Vulnerability to the Piwik Security team](mailto:security@matomo.org?subject=Reporting%20Vulnerability%20in%20Piwik)

## Improve your Piwik Server Security

[Secure Piwik server](https://piwik.org/docs/how-to-secure-piwik/): follow these steps to keep your Piwik data safe.
[Secure Piwik server](https://matomo.org/docs/how-to-secure-piwik/): follow these steps to keep your Piwik data safe.

## Security announcements

Please subscribe to [the Changelog](https://piwik.org/changelog/) ([rss feed](https://piwik.org/changelog/feed/)) to be notified of new releases (including security releases).
Please subscribe to [the Changelog](https://matomo.org/changelog/) ([rss feed](https://matomo.org/changelog/feed/)) to be notified of new releases (including security releases).

0 comments on commit 82a9b1b

Please sign in to comment.

level de log mis à 1

Récupération du document https://github.com/matomo-org/matomo/commit/82a9b1b0a01dc20928d50134233e167f0116472d.

Récupération de l'URL https://github.com/matomo-org/matomo/commit/82a9b1b0a01dc20928d50134233e167f0116472d...

Raccourcis

Commandes

Fermer