diff options
918 files changed, 1394 insertions, 1965 deletions
diff --git a/LEGALNOTICE b/LEGALNOTICE index 14ee74c553..f6ad6267c9 100644 --- a/LEGALNOTICE +++ b/LEGALNOTICE @@ -1,6 +1,6 @@ COPYRIGHT - Piwik - Open Source Web Analytics + Piwik - free/libre analytics platform The software package is: @@ -77,40 +77,40 @@ THIRD-PARTY COMPONENTS AND LIBRARIES Name: jqPlot Link: http://www.jqplot.com/ - License: Dual-licensed: MIT or GPL v2 + License: Dual-licensed: MIT (Expat) or GPL v2 Name: jQuery Link: http://jquery.com/ - License: Dual-licensed: MIT or GPL + License: Dual-licensed: MIT (Expat) or GPL Notes: - GPL version not explicitly stated in source but GPL v2 is in git - - includes Sizzle.js - multi-licensed: MIT, New BSD, or GPL [v2] + - includes Sizzle.js - multi-licensed: MIT (Expat), New BSD, or GPL [v2] Name: jQuery UI Link: http://jqueryui.com/ - License: Dual-licensed: MIT or GPL + License: Dual-licensed: MIT (Expat) or GPL Notes: - GPL version not explicitly stated in source but GPL v2 is in git Name: jquery.history Link: http://tkyk.github.com/jquery-history-plugin/ - License: MIT + License: MIT (Expat) Name: jquery.scrollTo Link: http://plugins.jquery.com/project/ScrollTo - License: Dual licensed: MIT or GPL + License: Dual licensed: MIT (Expat) or GPL Name: jquery Tooltip Link: http://bassistance.de/jquery-plugins/jquery-plugin-tooltip/ - License: Dual licensed: MIT or GPL + License: Dual licensed: MIT (Expat) or GPL Name: jquery placeholder Link: http://mths.be/placeholder - License: Dual licensed: MIT or GPL + License: Dual licensed: MIT (Expat) or GPL Name: jquery smartbanner Link: https://github.com/jasny/jquery.smartbanner - License: Dual licensed: MIT + License: Dual licensed: MIT (Expat) Name: json2.js Link: http://json.org/ @@ -206,19 +206,19 @@ THIRD-PARTY COMPONENTS AND LIBRARIES Name: Raphaël - JavaScript Vector Library Link: http://raphaeljs.com/ - License: MIT + License: MIT (Expat) Name: lessphp Link: http://leafo.net/lessphp - License: GPL3/MIT + License: GPL3, MIT (Expat) Name: Symfony Console Component Link: https://github.com/symfony/Console - License: MIT + License: MIT (Expat) Name: AngularJS Link: https://github.com/angular/angular.js - License: MIT + License: MIT (Expat) Name: Mousetrap Link: https://github.com/ccampbell/mousetrap @@ -267,7 +267,6 @@ THIRD-PARTY CONTENT Notes: - the "New BSD" license refers to either the "Modified BSD" and "Simplified BSD" licenses (2- or 3-clause), which are GPL compatible. -- the "MIT" license is also referred to as the "X11" license - icons for browsers, operating systems, browser plugins, search engines, and and flags of countries are nominative use of third-party trademarks when referring to the corresponding product or entity @@ -1,8 +1,8 @@ # Piwik - piwik.org -## We’re seeking a talented open source Software Engineer! +## We’re seeking a talented Software Engineer -Are you looking for a new challenge? We are currently seeking a software engineer or software developer who is passionate about data processing, security, privacy, the open source philosophy and usable interface design. +Are you looking for a new challenge? We are currently seeking a software engineer or software developer who is passionate about data processing, security, privacy, the open source and free/libre philosophy and usable interface design. [View Job Description](http://piwik.org/blog/2014/05/piwik-expanding-seeking-talented-software-engineer-new-zealand-poland/) - [Apply online](http://piwik.org/jobs/) @@ -10,13 +10,13 @@ We are grateful if you can share the Job Description with your friends and colle ## Description -Piwik is the leading Free/Libre open source Web Analytics platform. +Piwik 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. 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. +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! ## Mission Statement diff --git a/composer.json b/composer.json index 0cfa4c9f06..de87087718 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "piwik/piwik", "type": "application", - "description": "Open Source Real Time Web Analytics Platform", + "description": "the leading free/libre analytics platform", "keywords": ["piwik","web","analytics"], "homepage": "http://piwik.org", "license": "GPL-3.0+", diff --git a/config/global.ini.php b/config/global.ini.php index cb5017b642..b5b21294bc 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -375,7 +375,7 @@ enable_trusted_host_check = 1 ; The release server is an essential part of the Piwik infrastructure/ecosystem ; to provide the latest software version. -latest_version_url = http://builds.piwik.org/latest.zip +latest_version_url = http://builds.piwik.org/piwik-latest.zip ; The API server is an essential part of the Piwik infrastructure/ecosystem to ; provide services to Piwik installations, e.g., getLatestVersion and @@ -609,6 +609,7 @@ Plugins[] = Dashboard Plugins[] = MultiSites Plugins[] = Referrers Plugins[] = UserSettings +Plugins[] = DevicesDetection Plugins[] = Goals Plugins[] = SEO Plugins[] = Events diff --git a/core/API/DataTableGenericFilter.php b/core/API/DataTableGenericFilter.php index 0fe56c57d0..6db2f2b476 100644 --- a/core/API/DataTableGenericFilter.php +++ b/core/API/DataTableGenericFilter.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php index 5ebdd2fbcf..69dc62063b 100644 --- a/core/API/DataTableManipulator.php +++ b/core/API/DataTableManipulator.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/API/DataTableManipulator/Flattener.php b/core/API/DataTableManipulator/Flattener.php index 20fe2c028f..211af52d2b 100644 --- a/core/API/DataTableManipulator/Flattener.php +++ b/core/API/DataTableManipulator/Flattener.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/API/DataTableManipulator/LabelFilter.php b/core/API/DataTableManipulator/LabelFilter.php index 05c594b35a..20c3ccd430 100644 --- a/core/API/DataTableManipulator/LabelFilter.php +++ b/core/API/DataTableManipulator/LabelFilter.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/API/DataTableManipulator/ReportTotalsCalculator.php b/core/API/DataTableManipulator/ReportTotalsCalculator.php index a0b336ffd8..517c5e8f18 100644 --- a/core/API/DataTableManipulator/ReportTotalsCalculator.php +++ b/core/API/DataTableManipulator/ReportTotalsCalculator.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/API/DocumentationGenerator.php b/core/API/DocumentationGenerator.php index ae46ee3162..b44b56d4da 100644 --- a/core/API/DocumentationGenerator.php +++ b/core/API/DocumentationGenerator.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/API/Proxy.php b/core/API/Proxy.php index 8f1e20c988..6c19224200 100644 --- a/core/API/Proxy.php +++ b/core/API/Proxy.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/API/Request.php b/core/API/Request.php index 21a21fb15d..2be21e179e 100644 --- a/core/API/Request.php +++ b/core/API/Request.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php index 692a2ceb71..63d3f8f728 100644 --- a/core/API/ResponseBuilder.php +++ b/core/API/ResponseBuilder.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Access.php b/core/Access.php index a858765c1f..a1b823a2cc 100644 --- a/core/Access.php +++ b/core/Access.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Archive.php b/core/Archive.php index 99be7fd503..84facb267f 100644 --- a/core/Archive.php +++ b/core/Archive.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Archive/DataCollection.php b/core/Archive/DataCollection.php index 5f57e6c356..89b435f9dc 100644 --- a/core/Archive/DataCollection.php +++ b/core/Archive/DataCollection.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Archive/DataTableFactory.php b/core/Archive/DataTableFactory.php index 44beba0273..41806c62f9 100644 --- a/core/Archive/DataTableFactory.php +++ b/core/Archive/DataTableFactory.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Archive/Parameters.php b/core/Archive/Parameters.php index a8d769b098..d1a540dce0 100644 --- a/core/Archive/Parameters.php +++ b/core/Archive/Parameters.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php index 1a5fec8a7d..e490d12dcb 100644 --- a/core/ArchiveProcessor.php +++ b/core/ArchiveProcessor.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ArchiveProcessor/Loader.php b/core/ArchiveProcessor/Loader.php index 03a054a617..d832d4be2f 100644 --- a/core/ArchiveProcessor/Loader.php +++ b/core/ArchiveProcessor/Loader.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ArchiveProcessor/Parameters.php b/core/ArchiveProcessor/Parameters.php index 9d9a908822..b6aa1c63f9 100644 --- a/core/ArchiveProcessor/Parameters.php +++ b/core/ArchiveProcessor/Parameters.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ArchiveProcessor/PluginsArchiver.php b/core/ArchiveProcessor/PluginsArchiver.php index 8d3703c522..10f61287ed 100644 --- a/core/ArchiveProcessor/PluginsArchiver.php +++ b/core/ArchiveProcessor/PluginsArchiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php index fa19fa82be..71f6760d58 100644 --- a/core/ArchiveProcessor/Rules.php +++ b/core/ArchiveProcessor/Rules.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/AssetManager.php b/core/AssetManager.php index 4cb359a599..4bf29afef0 100644 --- a/core/AssetManager.php +++ b/core/AssetManager.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -363,7 +363,7 @@ class AssetManager extends Singleton /** * @param UIAsset[] $uiAssets */ - private function removeAssets($uiAssets) + public function removeAssets($uiAssets) { foreach($uiAssets as $uiAsset) { $uiAsset->delete(); diff --git a/core/AssetManager/UIAsset.php b/core/AssetManager/UIAsset.php index 4361812e9c..c380ed4a8d 100644 --- a/core/AssetManager/UIAsset.php +++ b/core/AssetManager/UIAsset.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/AssetManager/UIAsset/InMemoryUIAsset.php b/core/AssetManager/UIAsset/InMemoryUIAsset.php index b1131a85d9..f3e3d47b6e 100644 --- a/core/AssetManager/UIAsset/InMemoryUIAsset.php +++ b/core/AssetManager/UIAsset/InMemoryUIAsset.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/AssetManager/UIAsset/OnDiskUIAsset.php b/core/AssetManager/UIAsset/OnDiskUIAsset.php index f008f8aacd..1c24420770 100644 --- a/core/AssetManager/UIAsset/OnDiskUIAsset.php +++ b/core/AssetManager/UIAsset/OnDiskUIAsset.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/AssetManager/UIAssetCacheBuster.php b/core/AssetManager/UIAssetCacheBuster.php index 800de15d38..fcbd0720a9 100644 --- a/core/AssetManager/UIAssetCacheBuster.php +++ b/core/AssetManager/UIAssetCacheBuster.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/AssetManager/UIAssetCatalog.php b/core/AssetManager/UIAssetCatalog.php index a2b0fc51b3..8c7ba10e3b 100644 --- a/core/AssetManager/UIAssetCatalog.php +++ b/core/AssetManager/UIAssetCatalog.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/AssetManager/UIAssetCatalogSorter.php b/core/AssetManager/UIAssetCatalogSorter.php index 6588274408..b6d00b359a 100644 --- a/core/AssetManager/UIAssetCatalogSorter.php +++ b/core/AssetManager/UIAssetCatalogSorter.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/AssetManager/UIAssetFetcher.php b/core/AssetManager/UIAssetFetcher.php index 6a51018da4..955ced51a7 100644 --- a/core/AssetManager/UIAssetFetcher.php +++ b/core/AssetManager/UIAssetFetcher.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php b/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php index a06071f565..d63134c08f 100644 --- a/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php +++ b/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/AssetManager/UIAssetFetcher/StaticUIAssetFetcher.php b/core/AssetManager/UIAssetFetcher/StaticUIAssetFetcher.php index 0d9027f137..984282e4a7 100644 --- a/core/AssetManager/UIAssetFetcher/StaticUIAssetFetcher.php +++ b/core/AssetManager/UIAssetFetcher/StaticUIAssetFetcher.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/AssetManager/UIAssetFetcher/StylesheetUIAssetFetcher.php b/core/AssetManager/UIAssetFetcher/StylesheetUIAssetFetcher.php index 7b003e9508..414a5d44e7 100644 --- a/core/AssetManager/UIAssetFetcher/StylesheetUIAssetFetcher.php +++ b/core/AssetManager/UIAssetFetcher/StylesheetUIAssetFetcher.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -21,8 +21,6 @@ class StylesheetUIAssetFetcher extends UIAssetFetcher 'plugins/Morpheus/stylesheets/base.less', 'plugins\/((?!Morpheus).)*\/', 'plugins/Dashboard/stylesheets/dashboard.less', - 'plugins/Morpheus/stylesheets/theme.less', - 'plugins/Morpheus/stylesheets/', 'tests/', ); } diff --git a/core/AssetManager/UIAssetMerger.php b/core/AssetManager/UIAssetMerger.php index f15ea135a8..8850de512b 100644 --- a/core/AssetManager/UIAssetMerger.php +++ b/core/AssetManager/UIAssetMerger.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php b/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php index 93b7d7bf6d..bfb2442279 100644 --- a/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php +++ b/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php index ae47646396..f943a918d3 100644 --- a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php +++ b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/AssetManager/UIAssetMinifier.php b/core/AssetManager/UIAssetMinifier.php index 4388ecaaa9..e9bc541959 100644 --- a/core/AssetManager/UIAssetMinifier.php +++ b/core/AssetManager/UIAssetMinifier.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Auth.php b/core/Auth.php index b86af5d100..6ae99687b3 100644 --- a/core/Auth.php +++ b/core/Auth.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/CacheFile.php b/core/CacheFile.php index 5d9000332f..94ad253020 100644 --- a/core/CacheFile.php +++ b/core/CacheFile.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/CliMulti.php b/core/CliMulti.php index 5b34faae25..af576f685d 100644 --- a/core/CliMulti.php +++ b/core/CliMulti.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/CliMulti/Output.php b/core/CliMulti/Output.php index 6b67435525..67ecf3543b 100644 --- a/core/CliMulti/Output.php +++ b/core/CliMulti/Output.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/CliMulti/Process.php b/core/CliMulti/Process.php index dec394af7b..905523cbf2 100644 --- a/core/CliMulti/Process.php +++ b/core/CliMulti/Process.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/CliMulti/RequestCommand.php b/core/CliMulti/RequestCommand.php index 253102db88..a13b10c488 100644 --- a/core/CliMulti/RequestCommand.php +++ b/core/CliMulti/RequestCommand.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Common.php b/core/Common.php index 6156eb2ac1..cfcf6dad34 100644 --- a/core/Common.php +++ b/core/Common.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Config.php b/core/Config.php index dc990c0d0c..1f91d554f0 100644 --- a/core/Config.php +++ b/core/Config.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -148,16 +148,6 @@ class Config extends Singleton // for unit tests, we set that no plugin is installed. This will force // the test initialization to create the plugins tables, execute ALTER queries, etc. $this->configCache['PluginsInstalled'] = array('PluginsInstalled' => array()); - - // DevicesDetection plugin is not yet enabled by default - if (isset($configGlobal['Plugins'])) { - $this->configCache['Plugins'] = $this->configGlobal['Plugins']; - $this->configCache['Plugins']['Plugins'][] = 'DevicesDetection'; - } - if (isset($configGlobal['Plugins_Tracker'])) { - $this->configCache['Plugins_Tracker'] = $this->configGlobal['Plugins_Tracker']; - $this->configCache['Plugins_Tracker']['Plugins_Tracker'][] = 'DevicesDetection'; - } } /** diff --git a/core/Console.php b/core/Console.php index 097da68b45..d03fe0501f 100644 --- a/core/Console.php +++ b/core/Console.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Cookie.php b/core/Cookie.php index 08db35802e..d081ec944e 100644 --- a/core/Cookie.php +++ b/core/Cookie.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/CronArchive.php b/core/CronArchive.php index 959ad8e603..0a2903ac57 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/CronArchive/FixedSiteIds.php b/core/CronArchive/FixedSiteIds.php index 73db0b9d6c..8a48fb24cc 100644 --- a/core/CronArchive/FixedSiteIds.php +++ b/core/CronArchive/FixedSiteIds.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/CronArchive/SharedSiteIds.php b/core/CronArchive/SharedSiteIds.php index c36b449b60..50f95ea2dd 100644 --- a/core/CronArchive/SharedSiteIds.php +++ b/core/CronArchive/SharedSiteIds.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php index be580b00f6..cd7d0a044c 100644 --- a/core/DataAccess/ArchiveSelector.php +++ b/core/DataAccess/ArchiveSelector.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataAccess/ArchiveTableCreator.php b/core/DataAccess/ArchiveTableCreator.php index 6f8d0b90c6..c6436132cd 100644 --- a/core/DataAccess/ArchiveTableCreator.php +++ b/core/DataAccess/ArchiveTableCreator.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php index bab3b26bdd..ad51698d83 100644 --- a/core/DataAccess/ArchiveWriter.php +++ b/core/DataAccess/ArchiveWriter.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php index 9c330715c0..debdad0761 100644 --- a/core/DataAccess/LogAggregator.php +++ b/core/DataAccess/LogAggregator.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataArray.php b/core/DataArray.php index 72b31fe37e..f0b4b4d0f5 100644 --- a/core/DataArray.php +++ b/core/DataArray.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataFiles/Countries.php b/core/DataFiles/Countries.php index 38a60827b1..4d752d75ae 100644 --- a/core/DataFiles/Countries.php +++ b/core/DataFiles/Countries.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataFiles/Currencies.php b/core/DataFiles/Currencies.php index ccf10f61a7..4ebdf810e9 100644 --- a/core/DataFiles/Currencies.php +++ b/core/DataFiles/Currencies.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataFiles/LanguageToCountry.php b/core/DataFiles/LanguageToCountry.php index 7e3ffafdc8..fdfbb97e72 100644 --- a/core/DataFiles/LanguageToCountry.php +++ b/core/DataFiles/LanguageToCountry.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataFiles/Languages.php b/core/DataFiles/Languages.php index 477201497d..d41b443ff4 100644 --- a/core/DataFiles/Languages.php +++ b/core/DataFiles/Languages.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataFiles/Providers.php b/core/DataFiles/Providers.php index ff26661ca8..d26d85b691 100644 --- a/core/DataFiles/Providers.php +++ b/core/DataFiles/Providers.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataFiles/SearchEngines.php b/core/DataFiles/SearchEngines.php index 170bffadb8..0315f2a1d8 100644 --- a/core/DataFiles/SearchEngines.php +++ b/core/DataFiles/SearchEngines.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataFiles/Socials.php b/core/DataFiles/Socials.php index ebe28da774..41f7f565c0 100755 --- a/core/DataFiles/Socials.php +++ b/core/DataFiles/Socials.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable.php b/core/DataTable.php index 81eeaff4fe..627fa98ff6 100644 --- a/core/DataTable.php +++ b/core/DataTable.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/BaseFilter.php b/core/DataTable/BaseFilter.php index 22c926e5a6..7e8f1c4dd4 100644 --- a/core/DataTable/BaseFilter.php +++ b/core/DataTable/BaseFilter.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Bridges.php b/core/DataTable/Bridges.php index c2b2467d72..d085d8a2d7 100644 --- a/core/DataTable/Bridges.php +++ b/core/DataTable/Bridges.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/DataTableInterface.php b/core/DataTable/DataTableInterface.php index 91ef77a5d5..801f3358a4 100644 --- a/core/DataTable/DataTableInterface.php +++ b/core/DataTable/DataTableInterface.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/AddColumnsProcessedMetrics.php b/core/DataTable/Filter/AddColumnsProcessedMetrics.php index 26c666e3a9..8ad329e610 100644 --- a/core/DataTable/Filter/AddColumnsProcessedMetrics.php +++ b/core/DataTable/Filter/AddColumnsProcessedMetrics.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php index 4e5014fd24..7f828a1f62 100644 --- a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php +++ b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/AddSummaryRow.php b/core/DataTable/Filter/AddSummaryRow.php index 20de397a23..09f6725db0 100644 --- a/core/DataTable/Filter/AddSummaryRow.php +++ b/core/DataTable/Filter/AddSummaryRow.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/BeautifyRangeLabels.php b/core/DataTable/Filter/BeautifyRangeLabels.php index dac3aad298..7f60bdd714 100644 --- a/core/DataTable/Filter/BeautifyRangeLabels.php +++ b/core/DataTable/Filter/BeautifyRangeLabels.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/BeautifyTimeRangeLabels.php b/core/DataTable/Filter/BeautifyTimeRangeLabels.php index fc4416fbcd..1841d94f48 100644 --- a/core/DataTable/Filter/BeautifyTimeRangeLabels.php +++ b/core/DataTable/Filter/BeautifyTimeRangeLabels.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/CalculateEvolutionFilter.php b/core/DataTable/Filter/CalculateEvolutionFilter.php index 24c8612185..28022952e0 100755 --- a/core/DataTable/Filter/CalculateEvolutionFilter.php +++ b/core/DataTable/Filter/CalculateEvolutionFilter.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/ColumnCallbackAddColumn.php b/core/DataTable/Filter/ColumnCallbackAddColumn.php index b7c18400fa..0084fd076b 100755 --- a/core/DataTable/Filter/ColumnCallbackAddColumn.php +++ b/core/DataTable/Filter/ColumnCallbackAddColumn.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php b/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php index 78841bcb80..de1e5e950a 100644 --- a/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php +++ b/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php b/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php index 10d53024f1..68ce02f613 100644 --- a/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php +++ b/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/ColumnCallbackAddMetadata.php b/core/DataTable/Filter/ColumnCallbackAddMetadata.php index 34b36c4d7f..1a2b9b27f7 100644 --- a/core/DataTable/Filter/ColumnCallbackAddMetadata.php +++ b/core/DataTable/Filter/ColumnCallbackAddMetadata.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/ColumnCallbackDeleteRow.php b/core/DataTable/Filter/ColumnCallbackDeleteRow.php index a51e1df848..f5883d1b6a 100644 --- a/core/DataTable/Filter/ColumnCallbackDeleteRow.php +++ b/core/DataTable/Filter/ColumnCallbackDeleteRow.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/ColumnCallbackReplace.php b/core/DataTable/Filter/ColumnCallbackReplace.php index 0b16aedbab..2d48954ae1 100644 --- a/core/DataTable/Filter/ColumnCallbackReplace.php +++ b/core/DataTable/Filter/ColumnCallbackReplace.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/ColumnDelete.php b/core/DataTable/Filter/ColumnDelete.php index 1b724109fc..7631c7a9c2 100644 --- a/core/DataTable/Filter/ColumnDelete.php +++ b/core/DataTable/Filter/ColumnDelete.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/ExcludeLowPopulation.php b/core/DataTable/Filter/ExcludeLowPopulation.php index 6e6fbf33d5..e346ea28fc 100644 --- a/core/DataTable/Filter/ExcludeLowPopulation.php +++ b/core/DataTable/Filter/ExcludeLowPopulation.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/GroupBy.php b/core/DataTable/Filter/GroupBy.php index 093aee0ac8..d783db8bca 100755 --- a/core/DataTable/Filter/GroupBy.php +++ b/core/DataTable/Filter/GroupBy.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/Limit.php b/core/DataTable/Filter/Limit.php index d1174293e5..c06bac49c5 100644 --- a/core/DataTable/Filter/Limit.php +++ b/core/DataTable/Filter/Limit.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/MetadataCallbackAddMetadata.php b/core/DataTable/Filter/MetadataCallbackAddMetadata.php index 767ecc4fd2..0f7af76a29 100644 --- a/core/DataTable/Filter/MetadataCallbackAddMetadata.php +++ b/core/DataTable/Filter/MetadataCallbackAddMetadata.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/MetadataCallbackReplace.php b/core/DataTable/Filter/MetadataCallbackReplace.php index 2d472c9cc1..50e773c98e 100644 --- a/core/DataTable/Filter/MetadataCallbackReplace.php +++ b/core/DataTable/Filter/MetadataCallbackReplace.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/Pattern.php b/core/DataTable/Filter/Pattern.php index 30a7907bd2..99caf7a234 100644 --- a/core/DataTable/Filter/Pattern.php +++ b/core/DataTable/Filter/Pattern.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/PatternRecursive.php b/core/DataTable/Filter/PatternRecursive.php index ed4c137ff1..10bf918f68 100644 --- a/core/DataTable/Filter/PatternRecursive.php +++ b/core/DataTable/Filter/PatternRecursive.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/RangeCheck.php b/core/DataTable/Filter/RangeCheck.php index d8229a4d64..4cee80d11f 100644 --- a/core/DataTable/Filter/RangeCheck.php +++ b/core/DataTable/Filter/RangeCheck.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/ReplaceColumnNames.php b/core/DataTable/Filter/ReplaceColumnNames.php index fd842ad0ff..1b5d5cb79c 100644 --- a/core/DataTable/Filter/ReplaceColumnNames.php +++ b/core/DataTable/Filter/ReplaceColumnNames.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/ReplaceSummaryRowLabel.php b/core/DataTable/Filter/ReplaceSummaryRowLabel.php index b89a306a1a..23a5926691 100644 --- a/core/DataTable/Filter/ReplaceSummaryRowLabel.php +++ b/core/DataTable/Filter/ReplaceSummaryRowLabel.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/SafeDecodeLabel.php b/core/DataTable/Filter/SafeDecodeLabel.php index eb44c8d72b..8922482398 100644 --- a/core/DataTable/Filter/SafeDecodeLabel.php +++ b/core/DataTable/Filter/SafeDecodeLabel.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/Sort.php b/core/DataTable/Filter/Sort.php index ce25898e97..e11749a0e4 100644 --- a/core/DataTable/Filter/Sort.php +++ b/core/DataTable/Filter/Sort.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Filter/Truncate.php b/core/DataTable/Filter/Truncate.php index fa5389650b..13d2a619c0 100644 --- a/core/DataTable/Filter/Truncate.php +++ b/core/DataTable/Filter/Truncate.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Manager.php b/core/DataTable/Manager.php index b9703c14dd..c19060b803 100644 --- a/core/DataTable/Manager.php +++ b/core/DataTable/Manager.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Map.php b/core/DataTable/Map.php index 7985afb1d8..7c97ed32b2 100644 --- a/core/DataTable/Map.php +++ b/core/DataTable/Map.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php index 7820f3e53a..427eaedde9 100644 --- a/core/DataTable/Renderer.php +++ b/core/DataTable/Renderer.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Renderer/Console.php b/core/DataTable/Renderer/Console.php index 7959c644a3..b9d8cc33a7 100644 --- a/core/DataTable/Renderer/Console.php +++ b/core/DataTable/Renderer/Console.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php index 75d6d68fc0..cf28d3ca6c 100644 --- a/core/DataTable/Renderer/Csv.php +++ b/core/DataTable/Renderer/Csv.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Renderer/Html.php b/core/DataTable/Renderer/Html.php index ca4cd653ee..eb130ec05b 100644 --- a/core/DataTable/Renderer/Html.php +++ b/core/DataTable/Renderer/Html.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Renderer/Json.php b/core/DataTable/Renderer/Json.php index 664f14f40e..ae1bf3ef05 100644 --- a/core/DataTable/Renderer/Json.php +++ b/core/DataTable/Renderer/Json.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Renderer/Php.php b/core/DataTable/Renderer/Php.php index 80e49bc22d..a1475f1969 100644 --- a/core/DataTable/Renderer/Php.php +++ b/core/DataTable/Renderer/Php.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Renderer/Rss.php b/core/DataTable/Renderer/Rss.php index f5c98ee700..86af06d53b 100644 --- a/core/DataTable/Renderer/Rss.php +++ b/core/DataTable/Renderer/Rss.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Renderer/Tsv.php b/core/DataTable/Renderer/Tsv.php index 949874daf6..79a8cd6a23 100644 --- a/core/DataTable/Renderer/Tsv.php +++ b/core/DataTable/Renderer/Tsv.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Renderer/Xml.php b/core/DataTable/Renderer/Xml.php index 15f4f52e8b..d50de41f88 100644 --- a/core/DataTable/Renderer/Xml.php +++ b/core/DataTable/Renderer/Xml.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php index 0571093a0b..ac29965b2e 100644 --- a/core/DataTable/Row.php +++ b/core/DataTable/Row.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Row/DataTableSummaryRow.php b/core/DataTable/Row/DataTableSummaryRow.php index 479ac745fa..480631f2b8 100644 --- a/core/DataTable/Row/DataTableSummaryRow.php +++ b/core/DataTable/Row/DataTableSummaryRow.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/Simple.php b/core/DataTable/Simple.php index 010e6586c4..f21aa62b9d 100644 --- a/core/DataTable/Simple.php +++ b/core/DataTable/Simple.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DataTable/TableNotFoundException.php b/core/DataTable/TableNotFoundException.php index 6ccd5e12bc..e722d96b55 100644 --- a/core/DataTable/TableNotFoundException.php +++ b/core/DataTable/TableNotFoundException.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Date.php b/core/Date.php index 1be421cad5..09205abac7 100644 --- a/core/Date.php +++ b/core/Date.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Db.php b/core/Db.php index a418e490ea..0bcfd68f47 100644 --- a/core/Db.php +++ b/core/Db.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Db/Adapter.php b/core/Db/Adapter.php index ea01773326..4df8cb403e 100644 --- a/core/Db/Adapter.php +++ b/core/Db/Adapter.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Db/Adapter/Mysqli.php b/core/Db/Adapter/Mysqli.php index c3990bfe70..c864d057b0 100644 --- a/core/Db/Adapter/Mysqli.php +++ b/core/Db/Adapter/Mysqli.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Db/Adapter/Pdo/Mssql.php b/core/Db/Adapter/Pdo/Mssql.php index cca882b36c..fd0248958e 100644 --- a/core/Db/Adapter/Pdo/Mssql.php +++ b/core/Db/Adapter/Pdo/Mssql.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Db/Adapter/Pdo/Mysql.php b/core/Db/Adapter/Pdo/Mysql.php index 368c781075..59c3880bc9 100644 --- a/core/Db/Adapter/Pdo/Mysql.php +++ b/core/Db/Adapter/Pdo/Mysql.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Db/Adapter/Pdo/Pgsql.php b/core/Db/Adapter/Pdo/Pgsql.php index b93d5191e7..c68280fe28 100644 --- a/core/Db/Adapter/Pdo/Pgsql.php +++ b/core/Db/Adapter/Pdo/Pgsql.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Db/AdapterInterface.php b/core/Db/AdapterInterface.php index 38a81a9e54..cd0e4cdeb9 100644 --- a/core/Db/AdapterInterface.php +++ b/core/Db/AdapterInterface.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Db/BatchInsert.php b/core/Db/BatchInsert.php index 3a05e516d6..f8325c0209 100644 --- a/core/Db/BatchInsert.php +++ b/core/Db/BatchInsert.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Db/Schema.php b/core/Db/Schema.php index b7de26b6e3..834dfdda36 100644 --- a/core/Db/Schema.php +++ b/core/Db/Schema.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Db/Schema/Mysql.php b/core/Db/Schema/Mysql.php index 2a0a8144f2..7521634080 100644 --- a/core/Db/Schema/Mysql.php +++ b/core/Db/Schema/Mysql.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Db/SchemaInterface.php b/core/Db/SchemaInterface.php index 71bc1b7d41..a8a3771ac5 100644 --- a/core/Db/SchemaInterface.php +++ b/core/Db/SchemaInterface.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/DbHelper.php b/core/DbHelper.php index 761bce2684..df616b2cd6 100644 --- a/core/DbHelper.php +++ b/core/DbHelper.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Error.php b/core/Error.php index 486ee7d593..ac0029d987 100644 --- a/core/Error.php +++ b/core/Error.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/EventDispatcher.php b/core/EventDispatcher.php index 88e84d888d..42d35c6b0e 100644 --- a/core/EventDispatcher.php +++ b/core/EventDispatcher.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ExceptionHandler.php b/core/ExceptionHandler.php index 5c8adc5afd..8d5f9c595e 100644 --- a/core/ExceptionHandler.php +++ b/core/ExceptionHandler.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Filechecks.php b/core/Filechecks.php index 3fccf2c8a2..ddfade4e6e 100644 --- a/core/Filechecks.php +++ b/core/Filechecks.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Filesystem.php b/core/Filesystem.php index 2a4062931e..bcf36d29e1 100644 --- a/core/Filesystem.php +++ b/core/Filesystem.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/FrontController.php b/core/FrontController.php index ec21cef3bf..c67d313337 100644 --- a/core/FrontController.php +++ b/core/FrontController.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -64,8 +64,6 @@ class FrontController extends Singleton /** * Executes the requested plugin controller method. * - * See also {@link fetchDispatch()}. - * * @throws Exception|\Piwik\PluginDeactivatedException in case the plugin doesn't exist, the action doesn't exist, * there is not enough permission, etc. * diff --git a/core/Http.php b/core/Http.php index ab7973f0cb..996c3885a9 100644 --- a/core/Http.php +++ b/core/Http.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/IP.php b/core/IP.php index 4e804b6e22..66f3b30209 100644 --- a/core/IP.php +++ b/core/IP.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Loader.php b/core/Loader.php index b7c2af39d2..9cdf282fcb 100644 --- a/core/Loader.php +++ b/core/Loader.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Log.php b/core/Log.php index ab4093cb5f..c568bdb0a2 100644 --- a/core/Log.php +++ b/core/Log.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Mail.php b/core/Mail.php index 1fc1faf780..8bbb581dd5 100644 --- a/core/Mail.php +++ b/core/Mail.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Menu/MenuAbstract.php b/core/Menu/MenuAbstract.php index 06d972f064..3f624b117f 100644 --- a/core/Menu/MenuAbstract.php +++ b/core/Menu/MenuAbstract.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Menu/MenuAdmin.php b/core/Menu/MenuAdmin.php index f0c38c0a0c..8b11500c12 100644 --- a/core/Menu/MenuAdmin.php +++ b/core/Menu/MenuAdmin.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Menu/MenuMain.php b/core/Menu/MenuMain.php index 4738562f58..aed7760752 100644 --- a/core/Menu/MenuMain.php +++ b/core/Menu/MenuMain.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Menu/MenuReporting.php b/core/Menu/MenuReporting.php index c30e04016b..67f95bb8a6 100644 --- a/core/Menu/MenuReporting.php +++ b/core/Menu/MenuReporting.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Menu/MenuTop.php b/core/Menu/MenuTop.php index 774fbd652d..1b3b543179 100644 --- a/core/Menu/MenuTop.php +++ b/core/Menu/MenuTop.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Menu/MenuUser.php b/core/Menu/MenuUser.php index b3d140e6ae..25048a8682 100755 --- a/core/Menu/MenuUser.php +++ b/core/Menu/MenuUser.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Metrics.php b/core/Metrics.php index b576ea7c9f..1eee0caf24 100644 --- a/core/Metrics.php +++ b/core/Metrics.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Metrics/Base.php b/core/Metrics/Base.php index 6699c978a2..838d7c2ee6 100644 --- a/core/Metrics/Base.php +++ b/core/Metrics/Base.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Metrics/Processed.php b/core/Metrics/Processed.php index 204604fb31..bbc638828a 100644 --- a/core/Metrics/Processed.php +++ b/core/Metrics/Processed.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Metrics/ProcessedGoals.php b/core/Metrics/ProcessedGoals.php index b7ad0b69f3..6fb62231f3 100644 --- a/core/Metrics/ProcessedGoals.php +++ b/core/Metrics/ProcessedGoals.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/MetricsFormatter.php b/core/MetricsFormatter.php index e6c9867516..049850496a 100644 --- a/core/MetricsFormatter.php +++ b/core/MetricsFormatter.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Nonce.php b/core/Nonce.php index 1538e31244..5e558da1e3 100644 --- a/core/Nonce.php +++ b/core/Nonce.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Notification.php b/core/Notification.php index b7465fd608..fcf1357a78 100644 --- a/core/Notification.php +++ b/core/Notification.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Notification/Manager.php b/core/Notification/Manager.php index 57471e1a7f..54727fcfb6 100644 --- a/core/Notification/Manager.php +++ b/core/Notification/Manager.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Option.php b/core/Option.php index 7f6ae85cab..8b676ea60b 100644 --- a/core/Option.php +++ b/core/Option.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Period.php b/core/Period.php index 66d7aa7c65..fd99954021 100644 --- a/core/Period.php +++ b/core/Period.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Period/Day.php b/core/Period/Day.php index 422843e16f..5f64627e45 100644 --- a/core/Period/Day.php +++ b/core/Period/Day.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Period/Factory.php b/core/Period/Factory.php index 2494da0a50..996e2e792a 100644 --- a/core/Period/Factory.php +++ b/core/Period/Factory.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Period/Month.php b/core/Period/Month.php index 4132c9c8ea..167280f15b 100644 --- a/core/Period/Month.php +++ b/core/Period/Month.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Period/Range.php b/core/Period/Range.php index b2717b4824..1910581aec 100644 --- a/core/Period/Range.php +++ b/core/Period/Range.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Period/Week.php b/core/Period/Week.php index 0cf18c0668..45e9eab278 100644 --- a/core/Period/Week.php +++ b/core/Period/Week.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Period/Year.php b/core/Period/Year.php index 97fb8fa084..3582161e3a 100644 --- a/core/Period/Year.php +++ b/core/Period/Year.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Piwik.php b/core/Piwik.php index d31b1a9888..7e64d9021e 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -233,11 +233,11 @@ class Piwik 'Analytics', 'Real Time Analytics', 'Analytics in Real time', - 'Open Source Analytics', - 'Open Source Web Analytics', + 'Free/Libre Web Analytics', 'Free Website Analytics', 'Free Web Analytics', 'Analytics Platform', + 'Data Platform', ); $id = abs(intval(md5(Url::getCurrentHost()))); $title = $titles[$id % count($titles)]; diff --git a/core/Plugin.php b/core/Plugin.php index 2a8d0b4846..e9cbe2feae 100644 --- a/core/Plugin.php +++ b/core/Plugin.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Plugin/API.php b/core/Plugin/API.php index 3a4e26a548..58de9e6461 100644 --- a/core/Plugin/API.php +++ b/core/Plugin/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Plugin/Archiver.php b/core/Plugin/Archiver.php index 0390a26ee5..fa79d07b26 100644 --- a/core/Plugin/Archiver.php +++ b/core/Plugin/Archiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Plugin/ConsoleCommand.php b/core/Plugin/ConsoleCommand.php index 1d9a62696a..8db956df45 100644 --- a/core/Plugin/ConsoleCommand.php +++ b/core/Plugin/ConsoleCommand.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php index 9fd08fd2d0..43e385f263 100644 --- a/core/Plugin/Controller.php +++ b/core/Plugin/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -29,8 +29,7 @@ use Piwik\Piwik; use Piwik\Plugins\CoreAdminHome\CustomLogo; use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution; use Piwik\Plugins\LanguagesManager\LanguagesManager; -use Piwik\Plugins\SitesManager\API as APISitesManager; -use Piwik\Plugins\UsersManager\API as APIUsersManager; +use Piwik\Plugins\UsersManager\UserPreferences; use Piwik\Registry; use Piwik\SettingsPiwik; use Piwik\Site; @@ -769,14 +768,17 @@ abstract class Controller public function redirectToIndex($moduleToRedirect, $actionToRedirect, $websiteId = null, $defaultPeriod = null, $defaultDate = null, $parameters = array()) { + + $userPreferences = new UserPreferences(); + if (empty($websiteId)) { - $websiteId = $this->getDefaultWebsiteId(); + $websiteId = $userPreferences->getDefaultWebsiteId(); } if (empty($defaultDate)) { - $defaultDate = $this->getDefaultDate(); + $defaultDate = $userPreferences->getDefaultDate(); } if (empty($defaultPeriod)) { - $defaultPeriod = $this->getDefaultPeriod(); + $defaultPeriod = $userPreferences->getDefaultPeriod(); } $parametersString = ''; if (!empty($parameters)) { @@ -814,82 +816,6 @@ abstract class Controller } /** - * Returns default site ID that Piwik should load. - * - * _Note: This value is a Piwik setting set by each user._ - * - * @return bool|int - * @api - */ - protected function getDefaultWebsiteId() - { - $defaultWebsiteId = false; - - // User preference: default website ID to load - $defaultReport = APIUsersManager::getInstance()->getUserPreference(Piwik::getCurrentUserLogin(), APIUsersManager::PREFERENCE_DEFAULT_REPORT); - if (is_numeric($defaultReport)) { - $defaultWebsiteId = $defaultReport; - } - - if ($defaultWebsiteId && Piwik::isUserHasViewAccess($defaultWebsiteId)) { - return $defaultWebsiteId; - } - - $sitesId = APISitesManager::getInstance()->getSitesIdWithAtLeastViewAccess(); - if (!empty($sitesId)) { - return $sitesId[0]; - } - return false; - } - - /** - * Returns default date for Piwik reports. - * - * _Note: This value is a Piwik setting set by each user._ - * - * @return string `'today'`, `'2010-01-01'`, etc. - * @api - */ - protected function getDefaultDate() - { - // NOTE: a change in this function might mean a change in plugins/UsersManager/javascripts/usersSettings.js as well - $userSettingsDate = APIUsersManager::getInstance()->getUserPreference(Piwik::getCurrentUserLogin(), APIUsersManager::PREFERENCE_DEFAULT_REPORT_DATE); - if ($userSettingsDate == 'yesterday') { - return $userSettingsDate; - } - // if last7, last30, etc. - if (strpos($userSettingsDate, 'last') === 0 - || strpos($userSettingsDate, 'previous') === 0 - ) { - return $userSettingsDate; - } - return 'today'; - } - - /** - * Returns default period type for Piwik reports. - * - * @return string `'day'`, `'week'`, `'month'`, `'year'` or `'range'` - * @api - */ - protected function getDefaultPeriod() - { - $userSettingsDate = APIUsersManager::getInstance()->getUserPreference(Piwik::getCurrentUserLogin(), APIUsersManager::PREFERENCE_DEFAULT_REPORT_DATE); - if ($userSettingsDate === false) { - return PiwikConfig::getInstance()->General['default_period']; - } - if (in_array($userSettingsDate, array('today', 'yesterday'))) { - return 'day'; - } - if (strpos($userSettingsDate, 'last') === 0 - || strpos($userSettingsDate, 'previous') === 0 - ) { - return 'range'; - } - return $userSettingsDate; - } - - /** * Checks that the token_auth in the URL matches the currently logged-in user's token_auth. * * This is a protection against CSRF and should be used in all controller diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php index b3799c2ac6..4254cdbb2c 100644 --- a/core/Plugin/ControllerAdmin.php +++ b/core/Plugin/ControllerAdmin.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -206,13 +206,4 @@ abstract class ControllerAdmin extends Controller $view->phpVersion = PHP_VERSION; $view->phpIsNewEnough = version_compare($view->phpVersion, '5.3.0', '>='); } - - protected function getDefaultWebsiteId() - { - $sitesId = \Piwik\Plugins\SitesManager\API::getInstance()->getSitesIdWithAdminAccess(); - if (!empty($sitesId)) { - return $sitesId[0]; - } - return parent::getDefaultWebsiteId(); - } } diff --git a/core/Plugin/Dependency.php b/core/Plugin/Dependency.php index 4e5a574966..7e87324612 100644 --- a/core/Plugin/Dependency.php +++ b/core/Plugin/Dependency.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php index a4cb4cfa70..3f9611c385 100644 --- a/core/Plugin/Manager.php +++ b/core/Plugin/Manager.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -68,7 +68,6 @@ class Manager extends Singleton // Plugins bundled with core package, disabled by default protected $corePluginsDisabledByDefault = array( 'DBStats', - 'DevicesDetection', 'ExampleCommand', 'ExampleSettingsPlugin', 'ExampleUI', diff --git a/core/Plugin/Menu.php b/core/Plugin/Menu.php index e7caceb307..9f7240b1f3 100644 --- a/core/Plugin/Menu.php +++ b/core/Plugin/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php index 088c6b29e5..25f48ce0a0 100644 --- a/core/Plugin/MetadataLoader.php +++ b/core/Plugin/MetadataLoader.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Plugin/Settings.php b/core/Plugin/Settings.php index c68316fc1a..ff21452968 100644 --- a/core/Plugin/Settings.php +++ b/core/Plugin/Settings.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Plugin/Tasks.php b/core/Plugin/Tasks.php index 30e4b4fd29..1e357575a7 100644 --- a/core/Plugin/Tasks.php +++ b/core/Plugin/Tasks.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Plugin/ViewDataTable.php b/core/Plugin/ViewDataTable.php index b72dd1aad3..2a14ff4cfe 100644 --- a/core/Plugin/ViewDataTable.php +++ b/core/Plugin/ViewDataTable.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php index fc4002948d..e86274c5ea 100644 --- a/core/Plugin/Visualization.php +++ b/core/Plugin/Visualization.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -179,7 +179,12 @@ class Visualization extends ViewDataTable } catch (\Exception $e) { Log::warning("Failed to get data from API: " . $e->getMessage() . "\n" . $e->getTraceAsString()); - $loadingError = array('message' => $e->getMessage()); + $message = $e->getMessage(); + if (\Piwik_ShouldPrintBackTraceWithMessage()) { + $message .= "\n" . $e->getTraceAsString(); + } + + $loadingError = array('message' => $message); } $view = new View("@CoreHome/_dataTable"); diff --git a/core/Profiler.php b/core/Profiler.php index ae9c5e8b76..bcbf67019c 100644 --- a/core/Profiler.php +++ b/core/Profiler.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ProxyHeaders.php b/core/ProxyHeaders.php index 802d1c311e..5cd8e74edd 100644 --- a/core/ProxyHeaders.php +++ b/core/ProxyHeaders.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ProxyHttp.php b/core/ProxyHttp.php index 1f6bfb19af..f0a5ddec9d 100644 --- a/core/ProxyHttp.php +++ b/core/ProxyHttp.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/QuickForm2.php b/core/QuickForm2.php index dc2ba9ab88..1580f012c6 100644 --- a/core/QuickForm2.php +++ b/core/QuickForm2.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/RankingQuery.php b/core/RankingQuery.php index de05ab39aa..0f4db68ab4 100644 --- a/core/RankingQuery.php +++ b/core/RankingQuery.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Registry.php b/core/Registry.php index 166a48f772..a3383a84c0 100644 --- a/core/Registry.php +++ b/core/Registry.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php index 42a5f72570..6c33a9fbe3 100644 --- a/core/ReportRenderer.php +++ b/core/ReportRenderer.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -122,6 +122,16 @@ abstract class ReportRenderer abstract public function renderReport($processedReport); /** + * Get report attachments, ex. graph images + * + * @param $report + * @param $processedReports + * @param $prettyDate + * @return array + */ + abstract public function getAttachments($report, $processedReports, $prettyDate); + + /** * Append $extension to $filename * * @static diff --git a/core/ReportRenderer/Csv.php b/core/ReportRenderer/Csv.php index 6262a1cd6d..23ace2ac4d 100644 --- a/core/ReportRenderer/Csv.php +++ b/core/ReportRenderer/Csv.php @@ -148,4 +148,17 @@ class Csv extends ReportRenderer { return str_replace("_", ".", $uniqueId); } + + /** + * Get report attachments, ex. graph images + * + * @param $report + * @param $processedReports + * @param $prettyDate + * @return array + */ + public function getAttachments($report, $processedReports, $prettyDate) + { + return array(); + } } diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php index 53fbe90a68..c929c9a449 100644 --- a/core/ReportRenderer/Html.php +++ b/core/ReportRenderer/Html.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -8,6 +8,7 @@ */ namespace Piwik\ReportRenderer; +use Piwik\Piwik; use Piwik\Plugins\API\API; use Piwik\ReportRenderer; use Piwik\SettingsPiwik; @@ -161,4 +162,58 @@ class Html extends ReportRenderer $this->rendering .= $reportView->render(); } + + public function getAttachments($report, $processedReports, $prettyDate) + { + $additionalFiles = array(); + + foreach ($processedReports as $processedReport) { + if ($processedReport['displayGraph']) { + + $additionalFiles[] = $this->getAttachment($report, $processedReport, $prettyDate); + } + } + + return $additionalFiles; + } + + protected function getAttachment($report, $processedReport, $prettyDate) + { + $additionalFile = array(); + + $segment = \Piwik\Plugins\ScheduledReports\API::getSegment($report['idsegment']); + + $segmentName = $segment != null ? sprintf(' (%s)', $segment['name']) : ''; + + $processedReportMetadata = $processedReport['metadata']; + + $additionalFile['filename'] = + sprintf( + '%s - %s - %s %d - %s %d%s.png', + $processedReportMetadata['name'], + $prettyDate, + Piwik::translate('General_Website'), + $report['idsite'], + Piwik::translate('General_Report'), + $report['idreport'], + $segmentName + ); + + $additionalFile['cid'] = $processedReportMetadata['uniqueId']; + + $additionalFile['content'] = + ReportRenderer::getStaticGraph( + $processedReportMetadata, + Html::IMAGE_GRAPH_WIDTH, + Html::IMAGE_GRAPH_HEIGHT, + $processedReport['evolutionGraph'], + $segment + ); + + $additionalFile['mimeType'] = 'image/png'; + + $additionalFile['encoding'] = \Zend_Mime::ENCODING_BASE64; + + return $additionalFile; + } } diff --git a/core/ReportRenderer/Pdf.php b/core/ReportRenderer/Pdf.php index 66f47df27b..47c2ebf900 100644 --- a/core/ReportRenderer/Pdf.php +++ b/core/ReportRenderer/Pdf.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -523,4 +523,17 @@ class Pdf extends ReportRenderer $this->TCPDF->Write("1em", $message); $this->TCPDF->Ln(); } + + /** + * Get report attachments, ex. graph images + * + * @param $report + * @param $processedReports + * @param $prettyDate + * @return array + */ + public function getAttachments($report, $processedReports, $prettyDate) + { + return array(); + } } diff --git a/core/ScheduledTask.php b/core/ScheduledTask.php index de1d582b7b..18cb2aa94e 100644 --- a/core/ScheduledTask.php +++ b/core/ScheduledTask.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ScheduledTaskTimetable.php b/core/ScheduledTaskTimetable.php index 13e48b8c54..75d79e688a 100644 --- a/core/ScheduledTaskTimetable.php +++ b/core/ScheduledTaskTimetable.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ScheduledTime.php b/core/ScheduledTime.php index 53e1e86793..34b7ec950d 100644 --- a/core/ScheduledTime.php +++ b/core/ScheduledTime.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ScheduledTime/Daily.php b/core/ScheduledTime/Daily.php index 8566ef9b34..df05dc2f38 100644 --- a/core/ScheduledTime/Daily.php +++ b/core/ScheduledTime/Daily.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ScheduledTime/Hourly.php b/core/ScheduledTime/Hourly.php index dd9e646f76..4fc8c3ed16 100644 --- a/core/ScheduledTime/Hourly.php +++ b/core/ScheduledTime/Hourly.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ScheduledTime/Monthly.php b/core/ScheduledTime/Monthly.php index bb02b36076..d4900530e8 100644 --- a/core/ScheduledTime/Monthly.php +++ b/core/ScheduledTime/Monthly.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ScheduledTime/Weekly.php b/core/ScheduledTime/Weekly.php index 7a9769baa9..e5715b5fd0 100644 --- a/core/ScheduledTime/Weekly.php +++ b/core/ScheduledTime/Weekly.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Segment.php b/core/Segment.php index bf83454380..99d2382ef8 100644 --- a/core/Segment.php +++ b/core/Segment.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/SegmentExpression.php b/core/SegmentExpression.php index 96cac35c49..d41e353d66 100644 --- a/core/SegmentExpression.php +++ b/core/SegmentExpression.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Session.php b/core/Session.php index 7cf8ab4f9c..cb08f0f697 100644 --- a/core/Session.php +++ b/core/Session.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Session/SaveHandler/DbTable.php b/core/Session/SaveHandler/DbTable.php index 20494fe98e..0b91f4c366 100644 --- a/core/Session/SaveHandler/DbTable.php +++ b/core/Session/SaveHandler/DbTable.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Session/SessionNamespace.php b/core/Session/SessionNamespace.php index 8f31a7e5a9..74b11e0ce8 100644 --- a/core/Session/SessionNamespace.php +++ b/core/Session/SessionNamespace.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Settings/Manager.php b/core/Settings/Manager.php index 730f62f3d6..fbda2c9b94 100644 --- a/core/Settings/Manager.php +++ b/core/Settings/Manager.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Settings/Setting.php b/core/Settings/Setting.php index 3e0d5d0d63..41cffbe526 100644 --- a/core/Settings/Setting.php +++ b/core/Settings/Setting.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Settings/SystemSetting.php b/core/Settings/SystemSetting.php index 35878da8ed..f26c979ae1 100644 --- a/core/Settings/SystemSetting.php +++ b/core/Settings/SystemSetting.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Settings/UserSetting.php b/core/Settings/UserSetting.php index 5d23a5bd51..8f56f7104d 100644 --- a/core/Settings/UserSetting.php +++ b/core/Settings/UserSetting.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php index 29d4ba362b..f2b8d147b3 100644 --- a/core/SettingsPiwik.php +++ b/core/SettingsPiwik.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/SettingsServer.php b/core/SettingsServer.php index f50156d7fe..679a00192d 100644 --- a/core/SettingsServer.php +++ b/core/SettingsServer.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Singleton.php b/core/Singleton.php index c1f8682dcf..e2a0d60569 100644 --- a/core/Singleton.php +++ b/core/Singleton.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Site.php b/core/Site.php index 77ddeeb0be..7541e5e940 100644 --- a/core/Site.php +++ b/core/Site.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/TCPDF.php b/core/TCPDF.php index 8a2669b50e..9f44d8d372 100644 --- a/core/TCPDF.php +++ b/core/TCPDF.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/TaskScheduler.php b/core/TaskScheduler.php index 497de8c299..8a2487a02c 100644 --- a/core/TaskScheduler.php +++ b/core/TaskScheduler.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Theme.php b/core/Theme.php index 48ebbb6732..b0fe5abecb 100644 --- a/core/Theme.php +++ b/core/Theme.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Timer.php b/core/Timer.php index 76bbd3a569..82addaa1cd 100644 --- a/core/Timer.php +++ b/core/Timer.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker.php b/core/Tracker.php index 48851007f1..fed184a51e 100644 --- a/core/Tracker.php +++ b/core/Tracker.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -510,7 +510,7 @@ class Tracker case self::STATE_EMPTY_REQUEST: Common::printDebug("Empty request => Piwik page"); - echo "<a href='/'>Piwik</a> is a free open source web <a href='http://piwik.org'>analytics</a> that lets you keep control of your data."; + echo "<a href='/'>Piwik</a> is a free/libre web <a href='http://piwik.org'>analytics</a> that lets you keep control of your data."; break; case self::STATE_NOSCRIPT_REQUEST: diff --git a/core/Tracker/Action.php b/core/Tracker/Action.php index a3650a9ad4..f7d1f2ccb8 100644 --- a/core/Tracker/Action.php +++ b/core/Tracker/Action.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/ActionPageview.php b/core/Tracker/ActionPageview.php index 2eab5c95c9..1dc8ea77a2 100644 --- a/core/Tracker/ActionPageview.php +++ b/core/Tracker/ActionPageview.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/Cache.php b/core/Tracker/Cache.php index 1572c7099c..9183b191b7 100644 --- a/core/Tracker/Cache.php +++ b/core/Tracker/Cache.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/Db.php b/core/Tracker/Db.php index 495eb683f4..4ce13a0891 100644 --- a/core/Tracker/Db.php +++ b/core/Tracker/Db.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/Db/DbException.php b/core/Tracker/Db/DbException.php index fc3ffea91d..a067f09f33 100644 --- a/core/Tracker/Db/DbException.php +++ b/core/Tracker/Db/DbException.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/Db/Mysqli.php b/core/Tracker/Db/Mysqli.php index a815636047..737719e51f 100644 --- a/core/Tracker/Db/Mysqli.php +++ b/core/Tracker/Db/Mysqli.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/Db/Pdo/Mysql.php b/core/Tracker/Db/Pdo/Mysql.php index 4fc78527ac..a4d148e415 100644 --- a/core/Tracker/Db/Pdo/Mysql.php +++ b/core/Tracker/Db/Pdo/Mysql.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/Db/Pdo/Pgsql.php b/core/Tracker/Db/Pdo/Pgsql.php index 60087c651b..b70122aa4a 100644 --- a/core/Tracker/Db/Pdo/Pgsql.php +++ b/core/Tracker/Db/Pdo/Pgsql.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php index d34a7ca1fd..d33a331ba8 100644 --- a/core/Tracker/GoalManager.php +++ b/core/Tracker/GoalManager.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/IgnoreCookie.php b/core/Tracker/IgnoreCookie.php index 3f78d566d7..56489b19e2 100644 --- a/core/Tracker/IgnoreCookie.php +++ b/core/Tracker/IgnoreCookie.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/PageUrl.php b/core/Tracker/PageUrl.php index c38bae5106..083141a249 100644 --- a/core/Tracker/PageUrl.php +++ b/core/Tracker/PageUrl.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php index 0f62596b40..ccd044320d 100644 --- a/core/Tracker/Request.php +++ b/core/Tracker/Request.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/Settings.php b/core/Tracker/Settings.php index 142c071446..6b43ebcb5f 100644 --- a/core/Tracker/Settings.php +++ b/core/Tracker/Settings.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/TableLogAction.php b/core/Tracker/TableLogAction.php index 1eb237d3d3..979aaf8a5e 100644 --- a/core/Tracker/TableLogAction.php +++ b/core/Tracker/TableLogAction.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php index 57b4ecac3c..75dc1e4877 100644 --- a/core/Tracker/Visit.php +++ b/core/Tracker/Visit.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/VisitExcluded.php b/core/Tracker/VisitExcluded.php index e3c47d09e9..19fa96dc4f 100644 --- a/core/Tracker/VisitExcluded.php +++ b/core/Tracker/VisitExcluded.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/VisitInterface.php b/core/Tracker/VisitInterface.php index 250d5565e2..66bd37becc 100644 --- a/core/Tracker/VisitInterface.php +++ b/core/Tracker/VisitInterface.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/Visitor.php b/core/Tracker/Visitor.php index 697697c6a5..63320d00b8 100644 --- a/core/Tracker/Visitor.php +++ b/core/Tracker/Visitor.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Tracker/VisitorNotFoundInDb.php b/core/Tracker/VisitorNotFoundInDb.php index e3dfce506a..f1a0b71a04 100644 --- a/core/Tracker/VisitorNotFoundInDb.php +++ b/core/Tracker/VisitorNotFoundInDb.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Translate.php b/core/Translate.php index fecfbdf9c2..e2fb58ee02 100644 --- a/core/Translate.php +++ b/core/Translate.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Translate/Filter/ByBaseTranslations.php b/core/Translate/Filter/ByBaseTranslations.php index 2883d3011f..1c265debe7 100644 --- a/core/Translate/Filter/ByBaseTranslations.php +++ b/core/Translate/Filter/ByBaseTranslations.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Translate/Filter/ByParameterCount.php b/core/Translate/Filter/ByParameterCount.php index 91a24d50a0..3832c8f262 100644 --- a/core/Translate/Filter/ByParameterCount.php +++ b/core/Translate/Filter/ByParameterCount.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Translate/Filter/EmptyTranslations.php b/core/Translate/Filter/EmptyTranslations.php index a92e8a4cd5..1d77de7b98 100644 --- a/core/Translate/Filter/EmptyTranslations.php +++ b/core/Translate/Filter/EmptyTranslations.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Translate/Filter/EncodedEntities.php b/core/Translate/Filter/EncodedEntities.php index 2bd604f8e9..7c35614fb2 100644 --- a/core/Translate/Filter/EncodedEntities.php +++ b/core/Translate/Filter/EncodedEntities.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Translate/Filter/FilterAbstract.php b/core/Translate/Filter/FilterAbstract.php index 949b99c64c..4e7ecc064d 100644 --- a/core/Translate/Filter/FilterAbstract.php +++ b/core/Translate/Filter/FilterAbstract.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Translate/Filter/UnnecassaryWhitespaces.php b/core/Translate/Filter/UnnecassaryWhitespaces.php index 4fb7c5ef58..38df742e41 100644 --- a/core/Translate/Filter/UnnecassaryWhitespaces.php +++ b/core/Translate/Filter/UnnecassaryWhitespaces.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Translate/Validate/CoreTranslations.php b/core/Translate/Validate/CoreTranslations.php index 96ea1da72d..68de662f23 100644 --- a/core/Translate/Validate/CoreTranslations.php +++ b/core/Translate/Validate/CoreTranslations.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Translate/Validate/NoScripts.php b/core/Translate/Validate/NoScripts.php index 1c58e955e3..0ee0fc9a57 100644 --- a/core/Translate/Validate/NoScripts.php +++ b/core/Translate/Validate/NoScripts.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Translate/Validate/ValidateAbstract.php b/core/Translate/Validate/ValidateAbstract.php index d05881aceb..c732d31d25 100644 --- a/core/Translate/Validate/ValidateAbstract.php +++ b/core/Translate/Validate/ValidateAbstract.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Translate/Writer.php b/core/Translate/Writer.php index 6067a403d2..d15f14e4da 100644 --- a/core/Translate/Writer.php +++ b/core/Translate/Writer.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Twig.php b/core/Twig.php index c2022572c0..7fa19ef247 100755 --- a/core/Twig.php +++ b/core/Twig.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Unzip.php b/core/Unzip.php index 2ba8cfcd16..f878dcfa8f 100644 --- a/core/Unzip.php +++ b/core/Unzip.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Unzip/Gzip.php b/core/Unzip/Gzip.php index bd19b6740b..aa7d07f315 100755 --- a/core/Unzip/Gzip.php +++ b/core/Unzip/Gzip.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Unzip/PclZip.php b/core/Unzip/PclZip.php index 79fd796306..4d0ce536a9 100644 --- a/core/Unzip/PclZip.php +++ b/core/Unzip/PclZip.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Unzip/Tar.php b/core/Unzip/Tar.php index 919fcc9104..2c87882611 100755 --- a/core/Unzip/Tar.php +++ b/core/Unzip/Tar.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Unzip/UncompressInterface.php b/core/Unzip/UncompressInterface.php index d3dccf20b3..072f476bb4 100644 --- a/core/Unzip/UncompressInterface.php +++ b/core/Unzip/UncompressInterface.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Unzip/ZipArchive.php b/core/Unzip/ZipArchive.php index e02615054e..7ad126e004 100644 --- a/core/Unzip/ZipArchive.php +++ b/core/Unzip/ZipArchive.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/UpdateCheck.php b/core/UpdateCheck.php index 76b3a24845..228ac23a85 100644 --- a/core/UpdateCheck.php +++ b/core/UpdateCheck.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updater.php b/core/Updater.php index d579fd28f1..6d46bbf147 100644 --- a/core/Updater.php +++ b/core/Updater.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates.php b/core/Updates.php index 00c10c0b29..b410effd21 100644 --- a/core/Updates.php +++ b/core/Updates.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.2.10.php b/core/Updates/0.2.10.php index bb3bba97d1..b42449aacc 100644 --- a/core/Updates/0.2.10.php +++ b/core/Updates/0.2.10.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.2.12.php b/core/Updates/0.2.12.php index ff8fa18bc1..975ba373cd 100644 --- a/core/Updates/0.2.12.php +++ b/core/Updates/0.2.12.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.2.13.php b/core/Updates/0.2.13.php index 93228ad605..eb65347c45 100644 --- a/core/Updates/0.2.13.php +++ b/core/Updates/0.2.13.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.2.24.php b/core/Updates/0.2.24.php index e627f64f97..b4762ad15d 100644 --- a/core/Updates/0.2.24.php +++ b/core/Updates/0.2.24.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.2.27.php b/core/Updates/0.2.27.php index 4b505194d4..483d915a0f 100644 --- a/core/Updates/0.2.27.php +++ b/core/Updates/0.2.27.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.2.32.php b/core/Updates/0.2.32.php index 7f697cc478..15264ebef2 100644 --- a/core/Updates/0.2.32.php +++ b/core/Updates/0.2.32.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.2.33.php b/core/Updates/0.2.33.php index 0b4d281f0e..b1e8886dbf 100644 --- a/core/Updates/0.2.33.php +++ b/core/Updates/0.2.33.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.2.34.php b/core/Updates/0.2.34.php index 49c128f14f..5bdf982d8c 100644 --- a/core/Updates/0.2.34.php +++ b/core/Updates/0.2.34.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.2.35.php b/core/Updates/0.2.35.php index 4c0c53ff9a..658d896856 100644 --- a/core/Updates/0.2.35.php +++ b/core/Updates/0.2.35.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.2.37.php b/core/Updates/0.2.37.php index 47c8e78d6f..6e7bb6da92 100644 --- a/core/Updates/0.2.37.php +++ b/core/Updates/0.2.37.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.4.1.php b/core/Updates/0.4.1.php index b4562d4fe5..1448b4c013 100644 --- a/core/Updates/0.4.1.php +++ b/core/Updates/0.4.1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.4.2.php b/core/Updates/0.4.2.php index 1503936716..b4b44053bd 100644 --- a/core/Updates/0.4.2.php +++ b/core/Updates/0.4.2.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.4.4.php b/core/Updates/0.4.4.php index 44cc1690a8..51972e2cbf 100644 --- a/core/Updates/0.4.4.php +++ b/core/Updates/0.4.4.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.4.php b/core/Updates/0.4.php index dfcbe97f3d..fe3f1426d2 100644 --- a/core/Updates/0.4.php +++ b/core/Updates/0.4.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.5.4.php b/core/Updates/0.5.4.php index 235391dbea..502da855bc 100644 --- a/core/Updates/0.5.4.php +++ b/core/Updates/0.5.4.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.5.5.php b/core/Updates/0.5.5.php index aaacf0e944..28822ddbea 100644 --- a/core/Updates/0.5.5.php +++ b/core/Updates/0.5.5.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.5.php b/core/Updates/0.5.php index f90f7f4890..81d73db841 100644 --- a/core/Updates/0.5.php +++ b/core/Updates/0.5.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.6-rc1.php b/core/Updates/0.6-rc1.php index 43ab8e4e7d..cac08f47d6 100644 --- a/core/Updates/0.6-rc1.php +++ b/core/Updates/0.6-rc1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.6.2.php b/core/Updates/0.6.2.php index 15236ed05e..0fd9651736 100644 --- a/core/Updates/0.6.2.php +++ b/core/Updates/0.6.2.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.6.3.php b/core/Updates/0.6.3.php index 87ef2d27a1..b91b67fd3b 100644 --- a/core/Updates/0.6.3.php +++ b/core/Updates/0.6.3.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.7.php b/core/Updates/0.7.php index 3c6daad6ff..5af49b8d8b 100644 --- a/core/Updates/0.7.php +++ b/core/Updates/0.7.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/0.9.1.php b/core/Updates/0.9.1.php index 5b11099bc5..db81f8d14d 100644 --- a/core/Updates/0.9.1.php +++ b/core/Updates/0.9.1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.1.php b/core/Updates/1.1.php index df58645c48..5e533c5e07 100644 --- a/core/Updates/1.1.php +++ b/core/Updates/1.1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.10-b4.php b/core/Updates/1.10-b4.php index 5628487ff6..2079e24546 100755 --- a/core/Updates/1.10-b4.php +++ b/core/Updates/1.10-b4.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.10.1.php b/core/Updates/1.10.1.php index e6051a7b9a..743a4dda4c 100755 --- a/core/Updates/1.10.1.php +++ b/core/Updates/1.10.1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.10.2-b1.php b/core/Updates/1.10.2-b1.php index bf58008b32..03943f63a1 100755 --- a/core/Updates/1.10.2-b1.php +++ b/core/Updates/1.10.2-b1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.10.2-b2.php b/core/Updates/1.10.2-b2.php index de17743231..a1a88de66e 100644 --- a/core/Updates/1.10.2-b2.php +++ b/core/Updates/1.10.2-b2.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.11-b1.php b/core/Updates/1.11-b1.php index dc11871453..2c0c02c877 100644 --- a/core/Updates/1.11-b1.php +++ b/core/Updates/1.11-b1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.12-b1.php b/core/Updates/1.12-b1.php index 5318a7cb33..cf0663853e 100644 --- a/core/Updates/1.12-b1.php +++ b/core/Updates/1.12-b1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.12-b15.php b/core/Updates/1.12-b15.php index 96a0696c87..2187fc8816 100644 --- a/core/Updates/1.12-b15.php +++ b/core/Updates/1.12-b15.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.12-b16.php b/core/Updates/1.12-b16.php index d109067489..853de0ad85 100644 --- a/core/Updates/1.12-b16.php +++ b/core/Updates/1.12-b16.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.2-rc1.php b/core/Updates/1.2-rc1.php index cb46b767b9..7d9a200a75 100644 --- a/core/Updates/1.2-rc1.php +++ b/core/Updates/1.2-rc1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.2-rc2.php b/core/Updates/1.2-rc2.php index 02cb3208a7..a991f4e0a6 100644 --- a/core/Updates/1.2-rc2.php +++ b/core/Updates/1.2-rc2.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.2.3.php b/core/Updates/1.2.3.php index cf5c4559a0..ae28ee7e9e 100644 --- a/core/Updates/1.2.3.php +++ b/core/Updates/1.2.3.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.2.5-rc1.php b/core/Updates/1.2.5-rc1.php index 09c4dea6e7..a4f6ee02bb 100644 --- a/core/Updates/1.2.5-rc1.php +++ b/core/Updates/1.2.5-rc1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.2.5-rc7.php b/core/Updates/1.2.5-rc7.php index c4a51afc4b..08284dd07f 100644 --- a/core/Updates/1.2.5-rc7.php +++ b/core/Updates/1.2.5-rc7.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.4-rc1.php b/core/Updates/1.4-rc1.php index d8cc139701..3697864ce1 100644 --- a/core/Updates/1.4-rc1.php +++ b/core/Updates/1.4-rc1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.4-rc2.php b/core/Updates/1.4-rc2.php index 1f2ba56bcf..b2a3b3176c 100644 --- a/core/Updates/1.4-rc2.php +++ b/core/Updates/1.4-rc2.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.5-b1.php b/core/Updates/1.5-b1.php index 0ccd81e08d..36b0b27724 100644 --- a/core/Updates/1.5-b1.php +++ b/core/Updates/1.5-b1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.5-b2.php b/core/Updates/1.5-b2.php index 00c748f891..377c26f112 100644 --- a/core/Updates/1.5-b2.php +++ b/core/Updates/1.5-b2.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.5-b3.php b/core/Updates/1.5-b3.php index 781056db45..e7e8754ac3 100644 --- a/core/Updates/1.5-b3.php +++ b/core/Updates/1.5-b3.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.5-b4.php b/core/Updates/1.5-b4.php index 32c37bf2a8..318552e3b7 100644 --- a/core/Updates/1.5-b4.php +++ b/core/Updates/1.5-b4.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.5-b5.php b/core/Updates/1.5-b5.php index 5e4b10fa89..8f3ef447f2 100644 --- a/core/Updates/1.5-b5.php +++ b/core/Updates/1.5-b5.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.5-rc6.php b/core/Updates/1.5-rc6.php index 56e87e6495..fa940cab0a 100644 --- a/core/Updates/1.5-rc6.php +++ b/core/Updates/1.5-rc6.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.6-b1.php b/core/Updates/1.6-b1.php index 2b73ed9563..c200e5bf12 100644 --- a/core/Updates/1.6-b1.php +++ b/core/Updates/1.6-b1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.6-rc1.php b/core/Updates/1.6-rc1.php index 8255786ce5..75ca3fd032 100644 --- a/core/Updates/1.6-rc1.php +++ b/core/Updates/1.6-rc1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.7-b1.php b/core/Updates/1.7-b1.php index 04e45c9cef..91f63e0309 100644 --- a/core/Updates/1.7-b1.php +++ b/core/Updates/1.7-b1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.7.2-rc5.php b/core/Updates/1.7.2-rc5.php index 19388cc901..4fb21e72fe 100644 --- a/core/Updates/1.7.2-rc5.php +++ b/core/Updates/1.7.2-rc5.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.7.2-rc7.php b/core/Updates/1.7.2-rc7.php index ac1871de9c..2f479c0522 100755 --- a/core/Updates/1.7.2-rc7.php +++ b/core/Updates/1.7.2-rc7.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.8.3-b1.php b/core/Updates/1.8.3-b1.php index 85f9f66900..33ddbeeeaa 100644 --- a/core/Updates/1.8.3-b1.php +++ b/core/Updates/1.8.3-b1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.8.4-b1.php b/core/Updates/1.8.4-b1.php index 97e70daa8d..efd5e8b76c 100644 --- a/core/Updates/1.8.4-b1.php +++ b/core/Updates/1.8.4-b1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.9-b16.php b/core/Updates/1.9-b16.php index 3c82828d2b..ceded83024 100755 --- a/core/Updates/1.9-b16.php +++ b/core/Updates/1.9-b16.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.9-b19.php b/core/Updates/1.9-b19.php index d2496cbb3a..da223fabb6 100755 --- a/core/Updates/1.9-b19.php +++ b/core/Updates/1.9-b19.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.9-b9.php b/core/Updates/1.9-b9.php index dce8c9e2f0..39176d7f96 100755 --- a/core/Updates/1.9-b9.php +++ b/core/Updates/1.9-b9.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.9.1-b2.php b/core/Updates/1.9.1-b2.php index d79dd9925e..81e64b938b 100644 --- a/core/Updates/1.9.1-b2.php +++ b/core/Updates/1.9.1-b2.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.9.3-b10.php b/core/Updates/1.9.3-b10.php index 22583103a3..a2d7a179a0 100755 --- a/core/Updates/1.9.3-b10.php +++ b/core/Updates/1.9.3-b10.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.9.3-b3.php b/core/Updates/1.9.3-b3.php index 0a511b14db..875a5754cf 100644 --- a/core/Updates/1.9.3-b3.php +++ b/core/Updates/1.9.3-b3.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/1.9.3-b8.php b/core/Updates/1.9.3-b8.php index 03f75ce11a..867ac817ac 100755 --- a/core/Updates/1.9.3-b8.php +++ b/core/Updates/1.9.3-b8.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.0-a12.php b/core/Updates/2.0-a12.php index cc202d4ebf..995d75deee 100644 --- a/core/Updates/2.0-a12.php +++ b/core/Updates/2.0-a12.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.0-a13.php b/core/Updates/2.0-a13.php index 70ca059084..b428daef5a 100644 --- a/core/Updates/2.0-a13.php +++ b/core/Updates/2.0-a13.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.0-a17.php b/core/Updates/2.0-a17.php index ec00c2ab57..2df452c1ab 100644 --- a/core/Updates/2.0-a17.php +++ b/core/Updates/2.0-a17.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.0-a7.php b/core/Updates/2.0-a7.php index cdbbc7e24c..9898d80a89 100644 --- a/core/Updates/2.0-a7.php +++ b/core/Updates/2.0-a7.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.0-b10.php b/core/Updates/2.0-b10.php index 273c4d08c8..0a2152ed4a 100644 --- a/core/Updates/2.0-b10.php +++ b/core/Updates/2.0-b10.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.0-b13.php b/core/Updates/2.0-b13.php index 875a173ab9..78cc791566 100644 --- a/core/Updates/2.0-b13.php +++ b/core/Updates/2.0-b13.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.0-b3.php b/core/Updates/2.0-b3.php index ae30df7702..b4dcdf25db 100644 --- a/core/Updates/2.0-b3.php +++ b/core/Updates/2.0-b3.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.0-b9.php b/core/Updates/2.0-b9.php index 612c79d1e2..59819890ca 100644 --- a/core/Updates/2.0-b9.php +++ b/core/Updates/2.0-b9.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.0-rc1.php b/core/Updates/2.0-rc1.php index beda1cda8d..64baac6e6d 100644 --- a/core/Updates/2.0-rc1.php +++ b/core/Updates/2.0-rc1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.0.3-b7.php b/core/Updates/2.0.3-b7.php index 868f9d4e04..f3fa6a34aa 100644 --- a/core/Updates/2.0.3-b7.php +++ b/core/Updates/2.0.3-b7.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.0.4-b5.php b/core/Updates/2.0.4-b5.php index a146275a49..24c0e0d589 100644 --- a/core/Updates/2.0.4-b5.php +++ b/core/Updates/2.0.4-b5.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.0.4-b7.php b/core/Updates/2.0.4-b7.php index 50030c2e84..512180fec9 100644 --- a/core/Updates/2.0.4-b7.php +++ b/core/Updates/2.0.4-b7.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.0.4-b8.php b/core/Updates/2.0.4-b8.php index 5dbfd95d06..0e8b56c412 100644 --- a/core/Updates/2.0.4-b8.php +++ b/core/Updates/2.0.4-b8.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.1.1-b11.php b/core/Updates/2.1.1-b11.php index 18908cc30e..45b781a1cf 100644 --- a/core/Updates/2.1.1-b11.php +++ b/core/Updates/2.1.1-b11.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.2.0-b15.php b/core/Updates/2.2.0-b15.php index 82ef7395d8..d35e6a1ff8 100644 --- a/core/Updates/2.2.0-b15.php +++ b/core/Updates/2.2.0-b15.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.2.3-b6.php b/core/Updates/2.2.3-b6.php index 5449a4a938..0b9d15e4f1 100644 --- a/core/Updates/2.2.3-b6.php +++ b/core/Updates/2.2.3-b6.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.3.0-rc2.php b/core/Updates/2.3.0-rc2.php index 0365238ef2..55219b4f92 100644 --- a/core/Updates/2.3.0-rc2.php +++ b/core/Updates/2.3.0-rc2.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.4.0-b1.php b/core/Updates/2.4.0-b1.php index 4845f18824..a0f6d64f65 100644 --- a/core/Updates/2.4.0-b1.php +++ b/core/Updates/2.4.0-b1.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.4.0-b2.php b/core/Updates/2.4.0-b2.php index a5f0adedb0..42a2798b09 100644 --- a/core/Updates/2.4.0-b2.php +++ b/core/Updates/2.4.0-b2.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.4.0-b3.php b/core/Updates/2.4.0-b3.php index 1eab41cf47..693cfd7ca0 100644 --- a/core/Updates/2.4.0-b3.php +++ b/core/Updates/2.4.0-b3.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.4.0-b4.php b/core/Updates/2.4.0-b4.php index 89f4b55ace..ad54fe8343 100644 --- a/core/Updates/2.4.0-b4.php +++ b/core/Updates/2.4.0-b4.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Updates/2.4.0-b6.php b/core/Updates/2.4.0-b6.php new file mode 100644 index 0000000000..62ab76c46e --- /dev/null +++ b/core/Updates/2.4.0-b6.php @@ -0,0 +1,24 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Updates; + +use Piwik\Updates; + +class Updates_2_4_0_b6 extends Updates +{ + public static function update() + { + $pluginManager = \Piwik\Plugin\Manager::getInstance(); + + try { + $pluginManager->activatePlugin('DevicesDetection'); + } catch(\Exception $e) { + } + } +} diff --git a/core/Url.php b/core/Url.php index d9fa0bf55f..5ad0aa5acf 100644 --- a/core/Url.php +++ b/core/Url.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/UrlHelper.php b/core/UrlHelper.php index b99f457f40..b2bbd229bb 100644 --- a/core/UrlHelper.php +++ b/core/UrlHelper.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Version.php b/core/Version.php index 2317a8404e..358d0ee45c 100644 --- a/core/Version.php +++ b/core/Version.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -21,5 +21,5 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '2.4.0-b5'; + const VERSION = '2.4.0-b6'; } diff --git a/core/View.php b/core/View.php index 6f140d4b91..a941e9739a 100644 --- a/core/View.php +++ b/core/View.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/View/OneClickDone.php b/core/View/OneClickDone.php index afb4b05f40..e07c2c3bdd 100644 --- a/core/View/OneClickDone.php +++ b/core/View/OneClickDone.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/View/RenderTokenParser.php b/core/View/RenderTokenParser.php index 6acd3a8fe0..60547d4d99 100644 --- a/core/View/RenderTokenParser.php +++ b/core/View/RenderTokenParser.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/View/ReportsByDimension.php b/core/View/ReportsByDimension.php index f75e240a92..e520f382f9 100644 --- a/core/View/ReportsByDimension.php +++ b/core/View/ReportsByDimension.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/View/UIControl.php b/core/View/UIControl.php index d0032ade07..98310413f9 100644 --- a/core/View/UIControl.php +++ b/core/View/UIControl.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/View/ViewInterface.php b/core/View/ViewInterface.php index b1e6133903..9c8d01ee0c 100644 --- a/core/View/ViewInterface.php +++ b/core/View/ViewInterface.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ViewDataTable/Config.php b/core/ViewDataTable/Config.php index ec1c2e229d..383ae043c0 100644 --- a/core/ViewDataTable/Config.php +++ b/core/ViewDataTable/Config.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ViewDataTable/Factory.php b/core/ViewDataTable/Factory.php index 8c03a54a29..aa42c9de68 100644 --- a/core/ViewDataTable/Factory.php +++ b/core/ViewDataTable/Factory.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ViewDataTable/Manager.php b/core/ViewDataTable/Manager.php index 16e8379d10..ce0308316b 100644 --- a/core/ViewDataTable/Manager.php +++ b/core/ViewDataTable/Manager.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ViewDataTable/Request.php b/core/ViewDataTable/Request.php index 920927b6f0..324803aa91 100644 --- a/core/ViewDataTable/Request.php +++ b/core/ViewDataTable/Request.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/ViewDataTable/RequestConfig.php b/core/ViewDataTable/RequestConfig.php index 42d55ec3cc..d4856bebe4 100644 --- a/core/ViewDataTable/RequestConfig.php +++ b/core/ViewDataTable/RequestConfig.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/Visualization/Sparkline.php b/core/Visualization/Sparkline.php index 098124e56f..8a7b406342 100644 --- a/core/Visualization/Sparkline.php +++ b/core/Visualization/Sparkline.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/WidgetsList.php b/core/WidgetsList.php index 4051d8948a..9d1f13abfa 100644 --- a/core/WidgetsList.php +++ b/core/WidgetsList.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/dispatch.php b/core/dispatch.php index 6d6b55a208..f18b73f0bd 100644 --- a/core/dispatch.php +++ b/core/dispatch.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php index e49b6919ee..206ebd08c0 100644 --- a/core/testMinimumPhpVersion.php +++ b/core/testMinimumPhpVersion.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -62,7 +62,7 @@ if ($minimumPhpInvalid) { " This will initialize composer for Piwik 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/>Note: if for some reasons you cannot install composer, instead install the latest Piwik release from ". - "<a href='http://builds.piwik.org/latest.zip'>builds.piwik.org</a>.</p>"; + "<a href='http://builds.piwik.org/piwik-latest.zip'>builds.piwik.org</a>.</p>"; } } @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/js/index.php b/js/index.php index 5cf84667ac..4eece69c7b 100644 --- a/js/index.php +++ b/js/index.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/js/piwik.js b/js/piwik.js index 09f00bf561..4f0152698a 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -5,9 +5,9 @@ * * @link http://piwik.org * @source https://github.com/piwik/piwik/blob/master/js/piwik.js - * @license http://piwik.org/free-software/bsd/ Simplified BSD (also in js/LICENSE.txt) + * @license http://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt) + * @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause */ - // Refer to README.md for build instructions when minifying this file for distribution. /* @@ -3296,3 +3296,6 @@ if (typeof piwik_log !== 'function') { } }; } + +/*! @license-end */ + diff --git a/lang/en.json b/lang/en.json index 0412611fff..55b3e6872b 100644 --- a/lang/en.json +++ b/lang/en.json @@ -219,8 +219,8 @@ "PluginDescription": "Web Analytics Reports Structure.", "ReportGeneratedOn": "Report generated on %s", "ReportGeneratedXAgo": "Report generated %s ago", - "SharePiwikLong": "Hi! I just found a great piece of open source software: Piwik!\n\nPiwik will let you track visitors to your website for free. You should definitely check it out!", - "SharePiwikShort": "Piwik! Free and open source web analytics. Own your data.", + "SharePiwikLong": "Hi! I just found a great piece of free software: Piwik!\n\nPiwik will let you track visitors to your website for free. You should definitely check it out!", + "SharePiwikShort": "Piwik! Free/libre web analytics. Own your data.", "ShareThis": "Share this", "ShortDateFormat": "%shortDay% %day% %shortMonth%", "ShortDateFormatWithYear": "%day% %shortMonth% %shortYear%", @@ -743,7 +743,7 @@ "OnlyEnterIfRequired": "Only enter a username if your SMTP server requires it.", "OnlyEnterIfRequiredPassword": "Only enter a password if your SMTP server requires it.", "OnlyUsedIfUserPwdIsSet": "Only used if a username\/password is set, ask your provider if you are unsure which method to use.", - "OpenSourceWebAnalytics": "Open Source Web Analytics", + "OpenSourceWebAnalytics": "free/libre analytics platform", "OperationAtLeast": "At least", "OperationAtMost": "At most", "OperationContains": "Contains", @@ -1166,7 +1166,7 @@ "Timezone": "website time zone", "WeHopeYouWillEnjoyPiwik": "We hope you will enjoy using Piwik as much as we enjoy making it.", "Welcome": "Welcome!", - "WelcomeHelp": "<p>Piwik is an open source web analytics software that makes it easy to get the information you want from your visitors.<\/p><p>This process is split up into %s easy steps and will take around 5 minutes.<\/p>", + "WelcomeHelp": "<p>Piwik is a free/libre web analytics software that makes it easy to get the information you want from your visitors.<\/p><p>This process is split up into %s easy steps and will take around 5 minutes.<\/p>", "WelcomeToCommunity": "Welcome to the Piwik community!" }, "LanguagesManager": { diff --git a/libs/PiwikTracker/PiwikTracker.php b/libs/PiwikTracker/PiwikTracker.php index f6bfe1da1f..3afc2db93a 100644 --- a/libs/PiwikTracker/PiwikTracker.php +++ b/libs/PiwikTracker/PiwikTracker.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * Client to record visits, page views, Goals, Ecommerce activity (product views, add to carts, Ecommerce orders) in a Piwik server. * This is a PHP Version of the piwik.js standard Tracking API. diff --git a/misc/cron/archive.php b/misc/cron/archive.php index e2b1c49696..1c6a49cd19 100644 --- a/misc/cron/archive.php +++ b/misc/cron/archive.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/misc/cron/updatetoken.php b/misc/cron/updatetoken.php index 9e6713235b..3936f04f9d 100644 --- a/misc/cron/updatetoken.php +++ b/misc/cron/updatetoken.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index 39514b37ac..a007ab1d85 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -2,7 +2,7 @@ # vim: et sw=4 ts=4: # -*- coding: utf-8 -*- # -# Piwik - Open source web analytics +# Piwik - free/libre analytics platform # # @link http://piwik.org # @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -622,8 +622,7 @@ class Configuration(object): success = len(config_file.read(self.options.config_file)) > 0 if not success: fatal_error( - "couldn't open the configuration file, " - "required to get the authentication token" + "the configuration file" + self.options.config_file + " could not be read. Please check permission. This file must be readable to get the authentication token" ) updatetokenfile = os.path.abspath( @@ -1365,15 +1364,15 @@ class Recorder(object): else: dates = [date.strftime('%Y-%m-%d') for date in stats.dates_recorded] if dates: - print 'Purging Piwik archives for dates: ' + ' '.join(dates) + print '\nPurging Piwik archives for dates: ' + ' '.join(dates) result = piwik.call_api( 'CoreAdminHome.invalidateArchivedReports', dates=','.join(dates), idSites=','.join(str(site_id) for site_id in stats.piwik_sites), ) - print('To re-process these reports with your new update data, execute the following command: \n ' - '`piwik/console core:archive --url=http://example/piwik/`\n' - 'Reference: http://piwik.org/docs/setup-auto-archiving/ ') + print('\nTo re-process these reports with your newly imported data, execute the following command: \n' + '$ /path/to/piwik/console core:archive --url=http://example/piwik/\n' + '\nReference: http://piwik.org/docs/setup-auto-archiving/ ') class Hit(object): diff --git a/misc/others/cli-script-bootstrap.php b/misc/others/cli-script-bootstrap.php index da0d3fbf72..a5c200f30c 100644 --- a/misc/others/cli-script-bootstrap.php +++ b/misc/others/cli-script-bootstrap.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/misc/package/ASUStor/CONTROL/icon-disable.png b/misc/package/ASUStor/CONTROL/icon-disable.png Binary files differdeleted file mode 100644 index e0ce2c1a68..0000000000 --- a/misc/package/ASUStor/CONTROL/icon-disable.png +++ /dev/null diff --git a/misc/package/ASUStor/CONTROL/icon-enable.png b/misc/package/ASUStor/CONTROL/icon-enable.png Binary files differdeleted file mode 100644 index 4c06045b1d..0000000000 --- a/misc/package/ASUStor/CONTROL/icon-enable.png +++ /dev/null diff --git a/misc/package/ASUStor/apkg_build b/misc/package/ASUStor/apkg_build deleted file mode 100644 index 091e936100..0000000000 --- a/misc/package/ASUStor/apkg_build +++ /dev/null @@ -1,441 +0,0 @@ -#!/bin/sh - -# pkg-build -- construct a debian file format .apk from a directory -# Walker Lee <walkerlee@asustor.com> -# based on a script by Steve Redler IV, steve@sr-tech.com 5-21-2001 - -set -e - -TMP_DIR="/tmp" -THIS_DIR=`pwd` -SCRIPT_PATH=`readlink -f $0` -SCRIPT_DIR=`dirname ${SCRIPT_PATH}` - -JSON_GREP="python $SCRIPT_DIR/jsongrep.py" - -PKG_BUILD_PROGRAM=`basename $0` -#PKG_BUILD_PROGRAM="apkg-build" -PKG_BUILD_VER="1.0" -PKG_BUILD_FORMAT="zip" # ar, tar, zip - -PKG_CONTROL_DIR="CONTROL" -PKG_WEBMAN_DIR="webman" -PKG_WEB_DIR="www" - -PKG_WEB_USER="admin" -PKG_WEB_GROUP="administrators" - -PKG_WEB_USER_ID=999 -PKG_WEB_GROUP_ID=999 - -PKG_WEB_PERM=770 - -PKG_DIR_PERM=755 -PKG_FILE_PERM=644 - -PKG_VERSION_FILE="apkg-version" -PKG_DATA_FILE="data.tar.gz" -PKG_CONTROL_FILE="control.tar.gz" - -PKG_CONFIG_FILE="config.json" -PKG_ICON_ENABLE_FILE="icon-enable.png" -PKG_ICON_DISABLE_FILE="icon-disable.png" - -PKG_PRE_INSTALL_SCRIPT="pre-install.sh" -PKG_PRE_UNINSTALL_SCRIPT="pre-uninstall.sh" - -PKG_POST_INSTALL_SCRIPT="post-install.sh" -PKG_POST_UNINSTALL_SCRIPT="post-uninstall.sh" - -PKG_START_STOP_SCRIPT="start-stop.sh" - -PKG_SCRIPT_LIST="$PKG_PRE_INSTALL_SCRIPT $PKG_PRE_UNINSTALL_SCRIPT \ - $PKG_POST_INSTALL_SCRIPT $PKG_POST_UNINSTALL_SCRIPT \ - $PKG_START_STOP_SCRIPT" - -PKG_SRC_DIR=$1 -PKG_DEST_DIR=$2 -PKG_TMP_DIR=$TMP_DIR/APKG_BUILD.$$ - -PKG_SUFFIX="apk" - - -pkg_struct_check() { - local owd=`pwd` - local error=0 - - # check pkg base dir - if [ ! -d $PKG_SRC_DIR ]; then - echo " *** Error: Directory $PKG_SRC_DIR does not exist" >&2 - return 1 - fi - - cd $PKG_SRC_DIR - - # check pkg control dir - if [ ! -d "$PKG_CONTROL_DIR" ]; then - echo " *** Error: Directory $PKG_SRC_DIR has no $PKG_CONTROL_DIR subdirectory." >&2 - error=1 - fi - - # check pkg config file - if [ ! -f "$PKG_CONTROL_DIR/$PKG_CONFIG_FILE" ]; then - echo " *** Error: Package config file $PKG_SRC_DIR/$PKG_CONTROL_DIR/$PKG_CONFIG_FILE not found." >&2 - error=1 - fi - - # TODO: check pkg config file is utf8 format - - # check enable pkg icon file - if [ ! -f "$PKG_CONTROL_DIR/$PKG_ICON_ENABLE_FILE" ]; then - echo " *** Error: Package enable icon file $PKG_SRC_DIR/$PKG_CONTROL_DIR/$PKG_ICON_ENABLE_FILE not found." >&2 - error=1 - fi - - # check disable pkg icon file - if [ ! -f "$PKG_CONTROL_DIR/$PKG_ICON_DISABLE_FILE" ]; then - echo " *** Error: Package disable icon file $PKG_SRC_DIR/$PKG_CONTROL_DIR/$PKG_ICON_DISABLE_FILE not found." >&2 - error=1 - fi - - cd $owd - - return $error -} - -required_field() { - field=$1 - - raw_value=`$JSON_GREP app $field < $PKG_CONTROL_DIR/$PKG_CONFIG_FILE` - value=`expr "$raw_value" : '..\(.*\).'` - if [ -z "$value" ]; then - echo " *** Error: $PKG_CONTROL_DIR/$PKG_CONFIG_FILE is missing field $field" >&2 - return 1 - fi - echo $value - return 0 -} - -pkg_config_check() { - local owd=`pwd` - local error=0 - - cd $PKG_SRC_DIR - - PKG_FIELD_PACKAGE=`required_field package` - [ "$?" -ne 0 ] && error=1 - - PKG_FIELD_NAME=`required_field name` - [ "$?" -ne 0 ] && error=1 - - PKG_FIELD_VERSION=`required_field version` - [ "$?" -ne 0 ] && error=1 - - PKG_FIELD_SECTION=`required_field section` -# [ "$?" -ne 0 ] && error=1 - - PKG_FIELD_VISIBILITY=`required_field visibility` - [ "$?" -ne 0 ] && error=1 - - PKG_FIELD_PRIORITY=`required_field priority` - [ "$?" -ne 0 ] && error=1 - - PKG_FIELD_MAINTAINER=`required_field maintainer` - [ "$?" -ne 0 ] && error=1 - - PKG_FIELD_EMAIL=`required_field email` -# [ "$?" -ne 0 ] && error=1 - - PKG_FIELD_WEBSITE=`required_field website` -# [ "$?" -ne 0 ] && error=1 - - PKG_FIELD_ARCHITECTURE=`required_field architecture` - [ "$?" -ne 0 ] && error=1 - - PKG_FIELD_FIRMWARE=`required_field firmware` - [ "$?" -ne 0 ] && error=1 - - PKG_FIELD_DESCRIPTION=`required_field description` - [ "$?" -ne 0 ] && error=1 - - PKG_FIELD_CHANGES=`required_field changes` -# [ "$?" -ne 0 ] && error=1 - -# PKG_FIELD_TAGS=`required_field tags` -# [ "$?" -ne 0 ] && error=1 - - if echo $PKG_FIELD_PACKAGE | grep '[^a-z0-9.+-]' > /dev/null 2>&1; then - if [ $error -eq 1 ]; then - echo >&2 - fi - echo " *** Error: Package name $PKG_FIELD_PACKAGE contains illegal characters, (other than [a-z0-9.+-])" >&2 - error=1 - fi - -# if [ -z "$PKG_FIELD_SECTION" ]; then -# if [ $error -eq 1 ]; then -# echo >&2 -# fi -# echo " The Section field should have one of the following values:" >&2 -# echo " admin, base, comm, editors, extras, games, graphics, kernel, libs, misc, net, text, web, x11" >&2 -# fi - - if [ -z "$PKG_FIELD_PRIORITY" ]; then - if [ $error -eq 1 ]; then - echo >&2 - fi - echo " The Priority field should have one of the following values:" >&2 - echo " required, important, standard, optional, extra" >&2 - echo " If you don't know which priority value you should be using, then use \`optional'" >&2 - - fi - - cd $owd - - return $error -} - -pkg_script_check() { - local owd=`pwd` - local error=0 - - cd $PKG_SRC_DIR - - for script_file in $PKG_SCRIPT_LIST; do - if [ -f $PKG_CONTROL_DIR/$script_file -a ! -x $PKG_CONTROL_DIR/$script_file ]; then - echo " *** Error: package script $PKG_CONTROL_DIR/$script_file is not executable" >&2 - error=1 - fi - done - - cd $owd - - return $error -} - -pkg_misc_check() { - local owd=`pwd` - local error=0 - - cd $PKG_SRC_DIR - - tilde_files=`find . -name '*~'` - if [ -n "$tilde_files" ]; then - echo "*** Warning: The following files have names ending in '~'. -You probably want to remove them: " >&2 - ls -ld $tilde_files - echo >&2 - fi - - swap_files=`find . -name '*.swp'` - if [ -n "$swap_files" ]; then - echo "*** Warning: The following files have names ending in '.swp'. -You probably want to remove them: " >&2 - ls -ld $swap_files - echo >&2 - fi - - svn_files=`find . -name '.svn'` - if [ -n "$svn_files" ]; then - echo "*** Warning: The following files have names ending in '.svn'. -You probably want to remove them: " >&2 - ls -ld $svn_files - echo >&2 - fi - - git_files=`find . -name '*.git'` - if [ -n "$git_files" ]; then - echo "*** Warning: The following files have names ending in '.git'. -You probably want to remove them: " >&2 - ls -ld $git_files - echo >&2 - fi - - cvs_files=`find . -name '*.cvs'` - if [ -n "$cvs_files" ]; then - echo "*** Warning: The following files have names ending in '.cvs'. -You probably want to remove them: " >&2 - ls -ld $cvs_files - echo >&2 - fi - -# maybe check SUID & GUID file - -# large_uid_files=`find . -uid +99` -# if [ -n "$large_uid_files" ]; then -# echo "*** Warning: The following files have a UID greater than 99. -#You probably want to chown these to a system user: " >&2 -# ls -ld $large_uid_files -# echo >&2 -# fi - - cd $owd - - return $error -} - -### -# apkg-build "main" -### - -# set pkg dest dir -case $# in -1) - PKG_SRC_DIR=`readlink -f $PKG_SRC_DIR` - PKG_DEST_DIR=$THIS_DIR - ;; -2) - PKG_SRC_DIR=`readlink -f $PKG_SRC_DIR` - PKG_DEST_DIR=`readlink -f $PKG_DEST_DIR` - ;; -*) - echo "Usage: $PKG_BUILD_PROGRAM <pkg_directory> [<destination_directory>]" >&2 - exit 1 - ;; -esac - -if [ $PKG_SRC_DIR = $PKG_DEST_DIR ]; then - echo "*** Error: Can't not build pkg in the same directory" >&2 - echo " pkg_directory: $PKG_SRC_DIR" >&2 - echo " destination_directory: $PKG_DEST_DIR" >&2 - exit 1 -fi - -# check pkg package folder structure -echo "Check package folder structure..." -if ! pkg_struct_check; then - echo >&2 - echo "$PKG_BUILD_PROGRAM: Please fix the above errors and try again." >&2 - exit 1 -fi -echo "Done" - -echo - -# check pkg config -echo "Check package config information..." -if ! pkg_config_check; then - echo >&2 - echo "$PKG_BUILD_PROGRAM: Please fix the above errors and try again." >&2 - exit 1 -fi -echo "Done" - -echo - -# check pkg script -echo "Check package script file..." -if ! pkg_script_check; then - echo >&2 - echo "$PKG_BUILD_PROGRAM: Please fix the above errors and try again." >&2 - exit 1 -fi -echo "Done" - -echo - -# check pkg misc -echo "Check package misc..." -if ! pkg_misc_check; then - echo >&2 - echo "$PKG_BUILD_PROGRAM: Please fix the above errors and try again." >&2 - exit 1 -fi -echo "Done" - -echo - -# archive pkg control script -mkdir -p $PKG_TMP_DIR - -# force chown user:group to web folder -if [ -d $PKG_SRC_DIR/$PKG_WEB_DIR ]; then - echo -n "Force change $PKG_SRC_DIR/$PKG_WEB_DIR/* owner and group to $PKG_WEB_USER:$PKG_WEB_GROUP ... " - if [ `ls -la $PKG_SRC_DIR/$PKG_WEB_DIR | wc -l` -gt 3 ]; then - # change owner - sudo chown $PKG_WEB_USER_ID:$PKG_WEB_GROUP_ID $PKG_SRC_DIR/$PKG_WEB_DIR -R - # TODO change file permission - # chmod $PKG_WEB_PERM $PKG_SRC_DIR/$PKG_WEB_DIR -R - fi - echo "Done" - - echo -fi - -echo -n "Archive package data..." -tar -C $PKG_SRC_DIR -czf $PKG_TMP_DIR/$PKG_DATA_FILE . --exclude=$PKG_CONTROL_DIR -echo "Done" - -echo - -# archive pkg data -echo -n "Archive package control script..." -tar -C $PKG_SRC_DIR/$PKG_CONTROL_DIR -czf $PKG_TMP_DIR/$PKG_CONTROL_FILE . -echo "Done" - -echo - -# generate pkg version -echo -n "Generate $PKG_VERSION_FILE..." -echo $PKG_BUILD_VER > $PKG_TMP_DIR/$PKG_VERSION_FILE -echo "Done" - -echo - -# prepare pkg filename -PKG_ARCHIVE_FILE=${PKG_FIELD_PACKAGE}_${PKG_FIELD_VERSION}_${PKG_FIELD_ARCHITECTURE}.$PKG_SUFFIX - -# use which type archive -echo "Use $PKG_BUILD_FORMAT format to archive $PKG_ARCHIVE_FILE..." -cd $PKG_TMP_DIR - -PKG_ARCHIVE_LIST="./$PKG_VERSION_FILE ./$PKG_DATA_FILE ./$PKG_CONTROL_FILE" - -rm -rf $TMP_DIR/$PKG_ARCHIVE_FILE - -if [ "$PKG_BUILD_FORMAT" = "ar" ] ; then - ar -crvf $TMP_DIR/$PKG_ARCHIVE_FILE $PKG_ARCHIVE_LIST -elif [ "$PKG_BUILD_FORMAT" = "tar" ] ; then - tar -zcvf $TMP_DIR/$PKG_ARCHIVE_FILE $PKG_ARCHIVE_LIST -elif [ "$PKG_BUILD_FORMAT" = "zip" ] ; then - zip -r $TMP_DIR/$PKG_ARCHIVE_FILE $PKG_ARCHIVE_LIST -fi -echo "Done" - -PKG_SIZE=`ls -l $TMP_DIR/$PKG_ARCHIVE_FILE | awk '{print $5}'` -PKG_MD5=`md5sum $TMP_DIR/$PKG_ARCHIVE_FILE | cut -d' ' -f1` -PKG_SHA1=`sha1sum $TMP_DIR/$PKG_ARCHIVE_FILE | cut -d' ' -f1` - -# move pkg to dest dir -[ "$PKG_DEST_DIR" != "$TMP_DIR" ] && mkdir -p $PKG_DEST_DIR && mv $TMP_DIR/$PKG_ARCHIVE_FILE $PKG_DEST_DIR - -echo - -# clean up -echo -n "Clean building data..." -rm -f $PKG_TMP_DIR/$PKG_VERSION_FILE $PKG_TMP_DIR/$PKG_DATA_FILE $PKG_TMP_DIR/$PKG_CONTROL_FILE -rmdir $PKG_TMP_DIR -echo "Done" - -echo - -echo "Package Summary" -echo " Source: $PKG_SRC_DIR" -echo " Destination: $PKG_DEST_DIR" -echo " Package: $PKG_FIELD_PACKAGE" -echo " Name: $PKG_FIELD_NAME" -echo " Version: $PKG_FIELD_VERSION" -echo " Section: $PKG_FIELD_SECTION" -echo " Visibility: $PKG_FIELD_VISIBILITY" -echo " Priority: $PKG_FIELD_PRIORITY" -echo " Maintainer: $PKG_FIELD_MAINTAINER" -echo " Email: $PKG_FIELD_EMAIL" -echo " WebSite: $PKG_FIELD_WEBSITE" -echo " Architecture: $PKG_FIELD_ARCHITECTURE" -echo " Firmware: $PKG_FIELD_FIRMWARE" -echo " Description: $PKG_FIELD_DESCRIPTION" -echo " Changes: $PKG_FIELD_CHANGES" -echo " File: $PKG_ARCHIVE_FILE" -echo " Size: $PKG_SIZE" -echo " MD5sum: $PKG_MD5" -echo " SHA1sum: $PKG_SHA1" diff --git a/misc/package/ASUStor/build.sh b/misc/package/ASUStor/build.sh deleted file mode 100644 index 06d6d9e74f..0000000000 --- a/misc/package/ASUStor/build.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -LATEST=`curl -s http://api.piwik.org/1.0/getLatestVersion/` -curl -s http://builds.piwik.org/piwik-$LATEST.tar.gz | gunzip | tar xf - - -mkdir -p Piwik/CONTROL -mv piwik Piwik/www - -sed "s/{{VERSION}}/$LATEST/" <config.json.tpl >Piwik/CONTROL/config.json -cp ../../gpl-3.0.txt Piwik/CONTROL/license.txt -cp CONTROL/*.png Piwik/CONTROL/ - -sh apkg_build Piwik diff --git a/misc/package/ASUStor/config.json.tpl b/misc/package/ASUStor/config.json.tpl deleted file mode 100644 index 9062331e3d..0000000000 --- a/misc/package/ASUStor/config.json.tpl +++ /dev/null @@ -1,37 +0,0 @@ -{ - "app":{ - "package":"piwik", - "name":"Piwik", - "version":"{{VERSION}}", - "section":"Web Hosting", - "visibility":true, - "priority":"optional", - "depends":[], - "conflicts":[], - "suggests":[], - "maintainer":"Piwik", - "email":"hello@piwik.org", - "website":"http://piwik.org/", - "architecture":"any", - "firmware":"any", - "description":"Open source, self-hosted web analytics.", - "changes":"http://piwik.org/changelog/", - "tags":["analytics", "visits", "visitors", "hits"] - }, - "desktop":{ - "icon":{ - "type":"webserver", - "title":"Piwik" - }, - "privilege":{ - "accessible":"users", - "customizable":true - } - }, - "install":{ - "dep-service":{ - "start":["httpd", "mysql"], - "restart":[] - } - } -} diff --git a/misc/package/ASUStor/jsongrep.py b/misc/package/ASUStor/jsongrep.py deleted file mode 100644 index 7b1b4713a0..0000000000 --- a/misc/package/ASUStor/jsongrep.py +++ /dev/null @@ -1,37 +0,0 @@ -#Original author: Terry Jones (http://blogs.fluidinfo.com/terry/about/) -#Source: http://blogs.fluidinfo.com/terry/2010/11/25/jsongrep-py-python-for-extracting-pieces-of-json-objects/ - -#!/usr/bin/env python - -import sys -import re -import json -from pprint import pprint - -def jsongrep(d, patterns): - try: - pattern = patterns.pop(0) - except IndexError: - pprint(d) - else: - if isinstance(d, dict): - keys = filter(pattern.match, d.keys()) - elif isinstance(d, list): - keys = map(int, - filter(pattern.match, - ['%d' % i for i in range(len(d))])) - else: - if pattern.match(str(d)): - pprint(d) - return - for item in (d[key] for key in keys): - jsongrep(item, patterns[:]) - -if __name__ == '__main__': - try: - j = json.loads(sys.stdin.read()) - except ValueError, e: - print >>sys.stderr, 'Could not load JSON object from stdin.' - sys.exit(1) - - jsongrep(j, map(re.compile, sys.argv[1:])) diff --git a/misc/package/QNAP/build.sh b/misc/package/QNAP/build.sh deleted file mode 100644 index 0ef74e21c7..0000000000 --- a/misc/package/QNAP/build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -LATEST=`curl -s http://api.piwik.org/1.0/getLatestVersion/` -curl -s http://builds.piwik.org/piwik-$LATEST.tar.gz | gunzip | tar xf - - -cp icons/qpkg_icon_80.gif piwik/.qpkg_icon_80.gif -cp icons/qpkg_icon.gif piwik/.qpkg_icon.gif -cp icons/qpkg_icon_gray.gif piwik/.qpkg_icon_gray.gif - -tar cf - piwik | gzip >Piwik.tgz - -sed "s/{{VERSION}}/$LATEST/" <qpkg.cfg.tpl >qpkg.cfg - -cp header.qpkg Piwik_$LATEST.qpkg -tar zcf - qinstall.sh Piwik.tgz qpkg.cfg >>Piwik_$LATEST.qpkg - -zip Piwik_$LATEST.zip Piwik_$LATEST.qpkg diff --git a/misc/package/QNAP/header.qpkg b/misc/package/QNAP/header.qpkg deleted file mode 100644 index 7a143ecd19..0000000000 --- a/misc/package/QNAP/header.qpkg +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -/bin/echo "Install QNAP package on TS-NAS ..." -/bin/grep "/mnt/HDA_ROOT" /proc/mounts 1>>/dev/null 2>>/dev/null -[ $? = 0 ] || return 1 -[ -d /mnt/HDA_ROOT/update_pkg/tmp ] || /bin/mkdir -p /mnt/HDA_ROOT/update_pkg/tmp -/bin/dd if=${0} bs=487 skip=1 | /bin/tar zxv -C /mnt/HDA_ROOT/update_pkg/tmp -[ $? = 0 ] || return 1 -cd /mnt/HDA_ROOT/update_pkg/tmp && ( /bin/sh qinstall.sh || echo "Installation Abort." ) && cd .. && /bin/rm -rf /mnt/HDA_ROOT/update_pkg/tmp && exit 10 -exit 1 diff --git a/misc/package/QNAP/icons/qpkg_icon.gif b/misc/package/QNAP/icons/qpkg_icon.gif Binary files differdeleted file mode 100755 index eec1713ce2..0000000000 --- a/misc/package/QNAP/icons/qpkg_icon.gif +++ /dev/null diff --git a/misc/package/QNAP/icons/qpkg_icon_80.gif b/misc/package/QNAP/icons/qpkg_icon_80.gif Binary files differdeleted file mode 100755 index 43fefcb95f..0000000000 --- a/misc/package/QNAP/icons/qpkg_icon_80.gif +++ /dev/null diff --git a/misc/package/QNAP/icons/qpkg_icon_gray.gif b/misc/package/QNAP/icons/qpkg_icon_gray.gif Binary files differdeleted file mode 100755 index 7efe51ce9d..0000000000 --- a/misc/package/QNAP/icons/qpkg_icon_gray.gif +++ /dev/null diff --git a/misc/package/QNAP/qinstall.sh b/misc/package/QNAP/qinstall.sh deleted file mode 100755 index 3f834fe1d5..0000000000 --- a/misc/package/QNAP/qinstall.sh +++ /dev/null @@ -1,246 +0,0 @@ -#!/bin/sh -#================================================================ -# Copyright (C) 2010 QNAP Systems, Inc. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -#---------------------------------------------------------------- -# -# qinstall.sh -# -# Abstract: -# A QPKG installation script for -# Piwik v1.0 -# -# HISTORY: -# 2008/03/26 - Created - KenChen -# 2010/11/05 - Modified - AndyChuo (zeonism at gmail dot com) -# 2012/07/28 - Modified - Anthon Pang (anthon at piwik dot org) -# -#================================================================ - -##### Util ##### -CMD_APACHE="/usr/local/apache/bin/apachectl" -CMD_CP="/bin/cp" -CMD_CUT="/bin/cut" -CMD_CHMOD="/bin/chmod" -CMD_ECHO="/bin/echo" -CMD_GETCFG="/sbin/getcfg" -CMD_GREP="/bin/grep" -CMD_LN="/bin/ln" -CMD_MKTEMP="/bin/mktemp" -CMD_MKDIR="/bin/mkdir" -CMD_PIDOF="/bin/pidof" -CMD_READLINK="/usr/bin/readlink" -CMD_RM="/bin/rm" -CMD_SETCFG="/sbin/setcfg" -CMD_SYNC="/bin/sync" -CMD_SETCFG="/sbin/setcfg" -CMD_SLEEP="/bin/sleep" -CMD_TAR="/bin/tar" -CMD_TOUCH="/bin/touch" -CMD_WLOG="/sbin/write_log" - -##### System ##### -UPDATE_PROCESS="/tmp/update_process" -UPDATE_PB=0 -UPDATE_P1=1 -UPDATE_P2=2 -UPDATE_PE=3 - -SYS_HOSTNAME=`/bin/hostname` -SYS_IP=`$CMD_GREP "${SYS_HOSTNAME}" /etc/hosts | $CMD_CUT -f 1` -SYS_CONFIG_DIR="/etc/config" #put the configuration files here -SYS_INIT_DIR="/etc/init.d" -SYS_rcS_DIR="/etc/rcS.d/" -SYS_rcK_DIR="/etc/rcK.d/" -SYS_QPKG_CONFIG_FILE="/etc/config/qpkg.conf" #qpkg infomation file -SYS_QPKG_CONF_FIELD_NAME="Name" -SYS_QPKG_CONF_FIELD_VERSION="Version" -SYS_QPKG_CONF_FIELD_QPKGFILE="QPKG_File" -SYS_QPKG_CONF_FIELD_ENABLE="Enable" -SYS_QPKG_CONF_FIELD_DATE="Date" -SYS_QPKG_CONF_FIELD_SHELL="Shell" -SYS_QPKG_CONF_FIELD_INSTALL_PATH="Install_Path" -SYS_QPKG_CONF_FIELD_CONFIG_PATH="Config_Path" -SYS_QPKG_CONF_FIELD_WEBUI="WebUI" -SYS_QPKG_CONF_FIELD_WEBPORT="Web_Port" -SYS_QPKG_CONF_FIELD_SERVICEPORT="Service_Port" -SYS_QPKG_CONF_FIELD_AUTHOR="Author" -SYS_WEB_STATUS=`${CMD_GETCFG} QWEB enable` -PUBLIC_SHARE=`/sbin/getcfg SHARE_DEF defPublic -d Public -f /etc/config/def_share.info` -WEB_SHARE=`/sbin/getcfg SHARE_DEF defWeb -d Qweb -f /etc/config/def_share.info` - -##### QPKG ##### -# -. qpkg.cfg -##### Func ###### -# -find_base(){ - # Determine BASE installation location according to smb.conf - - publicdir=`/sbin/getcfg Public path -f /etc/config/smb.conf` - if [ ! -z $publicdir ] && [ -d $publicdir ];then - publicdirp1=`/bin/echo $publicdir | /bin/cut -d "/" -f 2` - publicdirp2=`/bin/echo $publicdir | /bin/cut -d "/" -f 3` - publicdirp3=`/bin/echo $publicdir | /bin/cut -d "/" -f 4` - if [ ! -z $publicdirp1 ] && [ ! -z $publicdirp2 ] && [ ! -z $publicdirp3 ]; then - [ -d "/${publicdirp1}/${publicdirp2}/${PUBLIC_SHARE}" ] && QPKG_BASE="/${publicdirp1}/${publicdirp2}" - fi - fi - - # Determine BASE installation location by checking where the Public folder is. - if [ -z $QPKG_BASE ]; then - for datadirtest in /share/HDA_DATA /share/HDB_DATA /share/HDC_DATA /share/HDD_DATA /share/MD0_DATA /share/MD1_DATA; do - [ -d $datadirtest/$PUBLIC_SHARE ] && QPKG_BASE="/${publicdirp1}/${publicdirp2}" - done - fi - if [ -z $QPKG_BASE ] ; then - echo "The ${PUBLIC_SHARE} share not found." - _exit 1 - fi - -} - -_exit(){ - local ret=0 - - case $1 in - 0)#normal exit - ret=0 - if [ "x$QPKG_INSTALL_MSG" != "x" ]; then - $CMD_WLOG "${QPKG_INSTALL_MSG}" 4 - else - $CMD_WLOG "${QPKG_NAME} ${QPKG_VER} installation succeeded." 4 - fi - $CMD_ECHO "$UPDATE_PE" > ${UPDATE_PROCESS} - ;; - *) - ret=1 - if [ "x$QPKG_INSTALL_MSG" != "x" ];then - $CMD_WLOG "${QPKG_INSTALL_MSG}" 1 - else - $CMD_WLOG "${QPKG_NAME} ${QPKG_VER} installation failed" 1 - fi - $CMD_ECHO -1 > ${UPDATE_PROCESS} - ;; - esac - - exit $ret -} - -pre_update() -{ - TMP_DIR=/tmp - $CMD_CP -af $QPKG_CONFIG_PATH $TMP_DIR -} - -post_update() -{ - $CMD_CP -af "${TMP_DIR}/config.ini.php" ${QPKG_CONFIG_PATH} -} - -install() -{ - TMP=`$CMD_READLINK $QPKG_INSTALL_PATH` - UPDATE_FLAG=0 - if [ -f "${QPKG_SOURCE_DIR}/${QPKG_SOURCE_FILE}" ]; then - if [ -d ${QPKG_DIR} ]; then - CURRENT_QPKG_VER="`/sbin/getcfg ${QPKG_NAME} Version -f /etc/config/qpkg.conf`" - QPKG_INSTALL_MSG="${QPKG_NAME} ${QPKG_VER} is already installed. Setup will now perform package upgrading." - $CMD_ECHO "$QPKG_INSTALL_MSG" - UPDATE_FLAG=1 - fi - - $CMD_ECHO "$UPDATE_P1" > ${UPDATE_PROCESS} - if [ $UPDATE_FLAG -eq 0 ]; then - $CMD_ECHO "Install ${QPKG_NAME} ..." - [ ! -d $QPKG_DIR ] || $CMD_RM -rf $QPKG_DIR - else - pre_update - fi - - #install QPKG files - $CMD_TAR xzf "${QPKG_SOURCE_DIR}/${QPKG_SOURCE_FILE}" -C $QPKG_INSTALL_PATH - if [ $? = 0 ]; then - # restore backups - if [ ${UPDATE_FLAG} -eq 1 ]; then - post_update - else - $CMD_CHMOD 0777 "${QPKG_DIR}" - $CMD_CHMOD 0777 -R "${QPKG_DIR}/config" - $CMD_CHMOD 0777 -R "${QPKG_DIR}/tmp" - - $CMD_MKDIR -p ${QPKG_DIR}/tmp/{sessions, templates_c, cache, assets, latest, tcpdf} - $CMD_CHMOD 0777 -R "${QPKG_DIR}/tmp/" - fi - - chown httpdusr.everyone ${QPKG_DIR} -R - - $CMD_ECHO "$UPDATE_P2" > ${UPDATE_PROCESS} - else - ${CMD_RM} -rf ${QPKG_DIR} - QPKG_INSTALL_MSG="${QPKG_NAME} ${QPKG_VER} installation failed. ${QPKG_SOURCE_DIR}/${QPKG_SOURCE_FILE} file error." - $CMD_ECHO "$QPKG_INSTALL_MSG" - _exit 1 - fi - - # set QPKG information to $SYS_QPKG_CONFIG_FILE - $CMD_ECHO "Set QPKG information to $SYS_QPKG_CONFIG_FILE" - [ -f ${SYS_QPKG_CONFIG_FILE} ] || $CMD_TOUCH ${SYS_QPKG_CONFIG_FILE} - $CMD_SETCFG ${QPKG_NAME} ${SYS_QPKG_CONF_FIELD_NAME} "${QPKG_NAME}" -f ${SYS_QPKG_CONFIG_FILE} - $CMD_SETCFG ${QPKG_NAME} ${SYS_QPKG_CONF_FIELD_VERSION} "${QPKG_VER}" -f ${SYS_QPKG_CONFIG_FILE} - - #default value to activate(or not) your QPKG if it was a service/daemon - $CMD_SETCFG ${QPKG_NAME} ${SYS_QPKG_CONF_FIELD_ENABLE} "UNKNOWN" -f ${SYS_QPKG_CONFIG_FILE} - - #set the qpkg file name - [ "x${SYS_QPKG_CONF_FIELD_QPKGFILE}" = "x" ] || $CMD_SETCFG ${QPKG_NAME} ${SYS_QPKG_CONF_FIELD_QPKGFILE} "${QPKG_QPKG_FILE}" -f ${SYS_QPKG_CONFIG_FILE} - - #set the date of installation - $CMD_SETCFG ${QPKG_NAME} ${SYS_QPKG_CONF_FIELD_DATE} `date +%F` -f ${SYS_QPKG_CONFIG_FILE} - - #set the path of start/stop shell script - [ "x${QPKG_SERVICE_PROGRAM}" = "x" ] || $CMD_SETCFG ${QPKG_NAME} ${SYS_QPKG_CONF_FIELD_SHELL} "${QPKG_DIR}/${QPKG_SERVICE_PROGRAM}" -f ${SYS_QPKG_CONFIG_FILE} - - #set path where the QPKG installed - $CMD_SETCFG ${QPKG_NAME} ${SYS_QPKG_CONF_FIELD_INSTALL_PATH} "${QPKG_DIR}" -f ${SYS_QPKG_CONFIG_FILE} - - #set path where the QPKG configure directory/file is - [ "x${QPKG_CONFIG_PATH}" = "x" ] || $CMD_SETCFG ${QPKG_NAME} ${SYS_QPKG_CONF_FIELD_CONFIG_PATH} "${QPKG_CONFIG_PATH}" -f ${SYS_QPKG_CONFIG_FILE} - - #set the port number if your QPKG was a service/daemon and needed a port to run. - [ "x${QPKG_SERVICE_PORT}" = "x" ] || $CMD_SETCFG ${QPKG_NAME} ${SYS_QPKG_CONF_FIELD_SERVICEPORT} "${QPKG_SERVICE_PORT}" -f ${SYS_QPKG_CONFIG_FILE} - - #set the port number if your QPKG was a service/daemon and needed a port to run. - [ "x${QPKG_WEB_PORT}" = "x" ] || $CMD_SETCFG ${QPKG_NAME} ${SYS_QPKG_CONF_FIELD_WEBPORT} "${QPKG_WEB_PORT}" -f ${SYS_QPKG_CONFIG_FILE} - - #set the URL of your QPKG Web UI if existed. - [ "x${QPKG_WEBUI}" = "x" ] || $CMD_SETCFG ${QPKG_NAME} ${SYS_QPKG_CONF_FIELD_WEBUI} "${QPKG_WEBUI}" -f ${SYS_QPKG_CONFIG_FILE} - - #Sign up - [ "x${QPKG_AUTHOR}" = "x" ] && $CMD_ECHO "Warning: ${SYS_QPKG_CONF_FIELD_AUTHOR} is not specified!!" - [ "x${QPKG_AUTHOR}" = "x" ] || $CMD_SETCFG ${QPKG_NAME} ${SYS_QPKG_CONF_FIELD_AUTHOR} "${QPKG_AUTHOR}" -f ${SYS_QPKG_CONFIG_FILE} - - $CMD_SYNC - QPKG_INSTALL_MSG="$QPKG_NAME ${QPKG_VER} has been installed in $QPKG_DIR." - $CMD_ECHO "$QPKG_INSTALL_MSG" - _exit 0 - else - QPKG_INSTALL_MSG="${QPKG_NAME} ${QPKG_VER} installation failed. ${QPKG_SOURCE_DIR}/${QPKG_SOURCE_FILE} file not found." - $CMD_ECHO "$QPKG_INSTALL_MSG" - _exit 1 - fi -} - -##### Main ##### - -$CMD_ECHO "$UPDATE_PB" > ${UPDATE_PROCESS} -install diff --git a/misc/package/QNAP/qpkg.cfg.tpl b/misc/package/QNAP/qpkg.cfg.tpl deleted file mode 100644 index a97631cbb1..0000000000 --- a/misc/package/QNAP/qpkg.cfg.tpl +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -#================================================================ -# Copyright (C) 2010 QNAP Systems, Inc. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -#---------------------------------------------------------------- -# -# qpkg_all.cfg -# -# Abstract: -# A QPKG configuration file for -# Piwik v1.0 -# -# HISTORY: -# 2010/11/05 - Created - AndyChuo (zeonism at gmail dot com) -# 2012/07/28 - Modified - Anthon Pang (anthon at piwik dot org) -# -#================================================================ -QPKG_AUTHOR="QNAP Systems, Inc." -QPKG_SOURCE_DIR="." -QPKG_QPKG_FILE="Piwik.qpkg" -QPKG_SOURCE_FILE="Piwik.tgz" -QPKG_NAME="Piwik" -QPKG_VER="{{VERSION}}" -QPKG_MAJOR_VER="1" -QPKG_MINOR_VER="0" -QPKG_TYPE="Web Applications" -QPKG_LOG_PATH="" -QPKG_INSTALL_PATH="/share/${WEB_SHARE}" -QPKG_CONFIG_PATH="$QPKG_INSTALL_PATH/piwik/config/config.ini.php" -QPKG_DIR="$QPKG_INSTALL_PATH/piwik" -QPKG_WEBUI="/piwik/" #URL relative path of your QPKG web interface led by "/" -QPKG_INSTALL_MSG="" -QPKG_WEB_PORT="" -QPKG_SERVICE_PORT="" diff --git a/misc/package/build.sh b/misc/package/build.sh index 1bba6e54ea..bf1b22d86f 100755 --- a/misc/package/build.sh +++ b/misc/package/build.sh @@ -211,7 +211,7 @@ If you have any question, feel free to ask. \n\n\ Thank you,\n\n\ Piwik team" | mail -s"New Piwik Version $VERSION" "appgal@microsoft.com,hello@piwik.org" - echo "build finished! http://builds.piwik.org/latest.zip" + echo "build finished! http://builds.piwik.org/piwik-latest.zip" fi diff --git a/misc/proxy-hide-piwik-url/piwik.php b/misc/proxy-hide-piwik-url/piwik.php index fa0d4f682f..7ec88affd6 100644 --- a/misc/proxy-hide-piwik-url/piwik.php +++ b/misc/proxy-hide-piwik-url/piwik.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * Piwik Proxy Hide URL * * @link http://piwik.org/faq/how-to/#faq_132 @@ -5,7 +5,8 @@ * * @link http://piwik.org * @source https://github.com/piwik/piwik/blob/master/js/piwik.js - * @license http://piwik.org/free-software/bsd/ Simplified BSD (also in js/LICENSE.txt) + * @license http://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt) + * @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause */ if(typeof JSON2!=="object"){JSON2={}}(function(){function d(f){return f<10?"0"+f:f}function l(n,m){var f=Object.prototype.toString.apply(n);if(f==="[object Date]"){return isFinite(n.valueOf())?n.getUTCFullYear()+"-"+d(n.getUTCMonth()+1)+"-"+d(n.getUTCDate())+"T"+d(n.getUTCHours())+":"+d(n.getUTCMinutes())+":"+d(n.getUTCSeconds())+"Z":null}if(f==="[object String]"||f==="[object Number]"||f==="[object Boolean]"){return n.valueOf()}if(f!=="[object Array]"&&typeof n.toJSON==="function"){return n.toJSON(m)}return n}var c=new RegExp("[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]","g"),e='\\\\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]',i=new RegExp("["+e,"g"),j,b,k={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},h; function a(f){i.lastIndex=0;return i.test(f)?'"'+f.replace(i,function(m){var n=k[m];return typeof n==="string"?n:"\\u"+("0000"+m.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+f+'"'}function g(s,p){var n,m,t,f,q=j,o,r=p[s];if(r&&typeof r==="object"){r=l(r,s)}if(typeof h==="function"){r=h.call(p,s,r)}switch(typeof r){case"string":return a(r);case"number":return isFinite(r)?String(r):"null";case"boolean":case"null":return String(r);case"object":if(!r){return"null"}j+=b;o=[];if(Object.prototype.toString.apply(r)==="[object Array]"){f=r.length;for(n=0;n<f;n+=1){o[n]=g(n,r)||"null"}t=o.length===0?"[]":j?"[\n"+j+o.join(",\n"+j)+"\n"+q+"]":"["+o.join(",")+"]";j=q;return t}if(h&&typeof h==="object"){f=h.length;for(n=0;n<f;n+=1){if(typeof h[n]==="string"){m=h[n];t=g(m,r);if(t){o.push(a(m)+(j?": ":":")+t)}}}}else{for(m in r){if(Object.prototype.hasOwnProperty.call(r,m)){t=g(m,r);if(t){o.push(a(m)+(j?": ":":")+t)}}}}t=o.length===0?"{}":j?"{\n"+j+o.join(",\n"+j)+"\n"+q+"}":"{"+o.join(",")+"}";j=q; @@ -29,4 +30,6 @@ bs=Y[bt]}}}if(!u(bs)||(bs&&bs[0]==="")){return false}return bs},deleteCustomVari },setSessionCookieTimeout:function(bs){am=bs*1000},setReferralCookieTimeout:function(bs){aH=bs*1000},setConversionAttributionFirstReferrer:function(bs){aF=bs},disableCookies:function(){ae=true;bf.cookie="0"},deleteCookies:function(){R()},setDoNotTrack:function(bt){var bs=e.doNotTrack||e.msDoNotTrack;bh=bt&&(bs==="yes"||bs==="1");if(bh){this.disableCookies()}},addListener:function(bt,bs){a0(bt,bs)},enableLinkTracking:function(bs){if(n){aI(bs)}else{A.push(function(){aI(bs)})}},enableJSErrorTracking:function(){if(bp){return}bp=true;var bs=C.onerror;C.onerror=function(bx,bv,bu,bw,bt){at(function(){var by="JavaScript Errors";var bz=bv+":"+bu;if(bw){bz+=":"+bw}ac(by,bz,bx)});if(bs){return bs(bx,bv,bu,bw,bt)}return false}},disablePerformanceTracking:function(){aD=false},setGenerationTimeMs:function(bs){ar=parseInt(bs,10)},setHeartBeatTimer:function(bu,bt){var bs=new Date();aa=bs.getTime()+bu*1000;ap=bt*1000},killFrame:function(){if(C.location!==C.top.location){C.top.location=C.location}},redirectFile:function(bs){if(C.location.protocol==="file:"){C.location=bs }},setCountPreRendered:function(bs){aC=bs},trackGoal:function(bs,bu,bt){at(function(){aO(bs,bu,bt)})},trackLink:function(bt,bs,bu){at(function(){bb(bt,bs,bu)})},trackPageView:function(bs,bt){if(x(be)){at(function(){H(U,al,be)})}else{at(function(){aJ(bs,bt)})}},trackEvent:function(bt,bv,bs,bu){at(function(){ac(bt,bv,bs,bu)})},trackSiteSearch:function(bs,bu,bt){at(function(){au(bs,bu,bt)})},setEcommerceView:function(bv,bs,bu,bt){if(!u(bu)||!bu.length){bu=""}else{if(bu instanceof Array){bu=JSON2.stringify(bu)}}aL[5]=["_pkc",bu];if(u(bt)&&String(bt).length){aL[2]=["_pkp",bt]}if((!u(bv)||!bv.length)&&(!u(bs)||!bs.length)){return}if(u(bv)&&bv.length){aL[3]=["_pks",bv]}if(!u(bs)||!bs.length){bs=""}aL[4]=["_pkn",bs]},addEcommerceItem:function(bw,bs,bu,bt,bv){if(bw.length){a2[bw]=[bw,bs,bu,bt,bv]}},trackEcommerceOrder:function(bs,bw,bv,bu,bt,bx){a6(bs,bw,bv,bu,bt,bx)},trackEcommerceCartUpdate:function(bs){bl(bs)}}}function t(){return{push:L}}O(C,"beforeunload",M,false);m();Date.prototype.getTimeAlias=Date.prototype.getTime; G=new z();var p={setTrackerUrl:1,setAPIUrl:1,setSiteId:1};var d;for(r=0;r<_paq.length;r++){d=_paq[r][0];if(p[d]){L(_paq[r]);delete _paq[r];if(p[d]>1){if(console!==undefined&&console&&console.error){console.error("The method "+d+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: http://developer.piwik.org/api-reference/tracking-javascript#multiple-piwik-trackers')}}p[d]++}}for(r=0;r<_paq.length;r++){if(_paq[r]){L(_paq[r])}}_paq=new t();c={addPlugin:function(Q,R){a[Q]=R},getTracker:function(Q,R){return new z(Q,R)},getAsyncTracker:function(){return G}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return c})}return c}())}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{return eval("piwik_"+h) -}catch(i){}return}var c,e=Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}};
\ No newline at end of file +}catch(i){}return}var c,e=Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}; +/*! @license-end */ +};
\ No newline at end of file @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/API/API.php b/plugins/API/API.php index 212ef57d90..b0a9147b47 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php index 349cdacbfb..670bf25b7f 100644 --- a/plugins/API/Controller.php +++ b/plugins/API/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/API/Menu.php b/plugins/API/Menu.php index f383dbb9f5..d9048617ed 100644 --- a/plugins/API/Menu.php +++ b/plugins/API/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php index b8c73d8d94..7a9d12ae70 100644 --- a/plugins/API/ProcessedReport.php +++ b/plugins/API/ProcessedReport.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php index 4f203ebf58..705bdb2a6e 100644 --- a/plugins/API/RowEvolution.php +++ b/plugins/API/RowEvolution.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php index 0c253c85bc..c915060885 100644 --- a/plugins/Actions/API.php +++ b/plugins/Actions/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index 934b911319..91042fce4f 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Actions/Actions/ActionClickUrl.php b/plugins/Actions/Actions/ActionClickUrl.php index 67ae28805f..471a91a84a 100644 --- a/plugins/Actions/Actions/ActionClickUrl.php +++ b/plugins/Actions/Actions/ActionClickUrl.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Actions/Actions/ActionSiteSearch.php b/plugins/Actions/Actions/ActionSiteSearch.php index 61646aa883..eb12d9d732 100644 --- a/plugins/Actions/Actions/ActionSiteSearch.php +++ b/plugins/Actions/Actions/ActionSiteSearch.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php index cd977fd576..758e3acb85 100644 --- a/plugins/Actions/Archiver.php +++ b/plugins/Actions/Archiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php index 52d5d0c6a0..908375d032 100644 --- a/plugins/Actions/ArchivingHelper.php +++ b/plugins/Actions/ArchivingHelper.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php index ecc0af605f..0ebb8f91e8 100644 --- a/plugins/Actions/Controller.php +++ b/plugins/Actions/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Actions/Menu.php b/plugins/Actions/Menu.php index 6d3bec1a5d..85465a8836 100644 --- a/plugins/Actions/Menu.php +++ b/plugins/Actions/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Annotations/API.php b/plugins/Annotations/API.php index 418d9be0ec..5c74534db6 100755 --- a/plugins/Annotations/API.php +++ b/plugins/Annotations/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Annotations/AnnotationList.php b/plugins/Annotations/AnnotationList.php index ea75efa025..89a5b9131f 100755 --- a/plugins/Annotations/AnnotationList.php +++ b/plugins/Annotations/AnnotationList.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Annotations/Annotations.php b/plugins/Annotations/Annotations.php index 56d142ed6d..3cdaefd10c 100755 --- a/plugins/Annotations/Annotations.php +++ b/plugins/Annotations/Annotations.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php index 9ea46d5680..eec7ab3b9e 100755 --- a/plugins/Annotations/Controller.php +++ b/plugins/Annotations/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php index 210b7bf11d..afd4b1b81e 100644 --- a/plugins/CoreAdminHome/API.php +++ b/plugins/CoreAdminHome/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index 98f7e8c55e..85486b52ed 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php index f6a64fe946..86b5f26ec7 100644 --- a/plugins/CoreAdminHome/CoreAdminHome.php +++ b/plugins/CoreAdminHome/CoreAdminHome.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreAdminHome/CustomLogo.php b/plugins/CoreAdminHome/CustomLogo.php index 892cb758f0..413141136b 100644 --- a/plugins/CoreAdminHome/CustomLogo.php +++ b/plugins/CoreAdminHome/CustomLogo.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreAdminHome/Menu.php b/plugins/CoreAdminHome/Menu.php index 5fd4e624f5..0d9560569d 100644 --- a/plugins/CoreAdminHome/Menu.php +++ b/plugins/CoreAdminHome/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreAdminHome/Tasks.php b/plugins/CoreAdminHome/Tasks.php index a15f83dc82..f32cbe5a32 100644 --- a/plugins/CoreAdminHome/Tasks.php +++ b/plugins/CoreAdminHome/Tasks.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/CodeCoverage.php b/plugins/CoreConsole/Commands/CodeCoverage.php index 1054b73fa7..348d7d3980 100644 --- a/plugins/CoreConsole/Commands/CodeCoverage.php +++ b/plugins/CoreConsole/Commands/CodeCoverage.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/CoreArchiver.php b/plugins/CoreConsole/Commands/CoreArchiver.php index 5846d99f44..71c5d0cfb4 100644 --- a/plugins/CoreConsole/Commands/CoreArchiver.php +++ b/plugins/CoreConsole/Commands/CoreArchiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/GenerateApi.php b/plugins/CoreConsole/Commands/GenerateApi.php index 06397aad9b..cd7d536ea1 100644 --- a/plugins/CoreConsole/Commands/GenerateApi.php +++ b/plugins/CoreConsole/Commands/GenerateApi.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/GenerateCommand.php b/plugins/CoreConsole/Commands/GenerateCommand.php index e52dc3324d..d3199ef2c4 100644 --- a/plugins/CoreConsole/Commands/GenerateCommand.php +++ b/plugins/CoreConsole/Commands/GenerateCommand.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/GenerateController.php b/plugins/CoreConsole/Commands/GenerateController.php index b395392ea4..2f2d4a4e15 100644 --- a/plugins/CoreConsole/Commands/GenerateController.php +++ b/plugins/CoreConsole/Commands/GenerateController.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/GenerateMenu.php b/plugins/CoreConsole/Commands/GenerateMenu.php index 18f2b4dd0e..c5d0fe62ba 100644 --- a/plugins/CoreConsole/Commands/GenerateMenu.php +++ b/plugins/CoreConsole/Commands/GenerateMenu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/GeneratePlugin.php b/plugins/CoreConsole/Commands/GeneratePlugin.php index 8f56ca1243..db8bd3aedd 100644 --- a/plugins/CoreConsole/Commands/GeneratePlugin.php +++ b/plugins/CoreConsole/Commands/GeneratePlugin.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/GeneratePluginBase.php b/plugins/CoreConsole/Commands/GeneratePluginBase.php index 402b8310a1..8c17304aaa 100644 --- a/plugins/CoreConsole/Commands/GeneratePluginBase.php +++ b/plugins/CoreConsole/Commands/GeneratePluginBase.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/GenerateScheduledTask.php b/plugins/CoreConsole/Commands/GenerateScheduledTask.php index 541e93239d..ee95f80069 100644 --- a/plugins/CoreConsole/Commands/GenerateScheduledTask.php +++ b/plugins/CoreConsole/Commands/GenerateScheduledTask.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/GenerateSettings.php b/plugins/CoreConsole/Commands/GenerateSettings.php index 2726e70c54..394882c66b 100644 --- a/plugins/CoreConsole/Commands/GenerateSettings.php +++ b/plugins/CoreConsole/Commands/GenerateSettings.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/GenerateTest.php b/plugins/CoreConsole/Commands/GenerateTest.php index 598676e7b3..d08ba28f7c 100644 --- a/plugins/CoreConsole/Commands/GenerateTest.php +++ b/plugins/CoreConsole/Commands/GenerateTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/GenerateVisualizationPlugin.php b/plugins/CoreConsole/Commands/GenerateVisualizationPlugin.php index ab811a036b..abb9d29cb5 100644 --- a/plugins/CoreConsole/Commands/GenerateVisualizationPlugin.php +++ b/plugins/CoreConsole/Commands/GenerateVisualizationPlugin.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/GitCommit.php b/plugins/CoreConsole/Commands/GitCommit.php index ba28b599e1..74ed211b17 100644 --- a/plugins/CoreConsole/Commands/GitCommit.php +++ b/plugins/CoreConsole/Commands/GitCommit.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/GitPull.php b/plugins/CoreConsole/Commands/GitPull.php index 8b1c07fa66..cecd8a19ff 100644 --- a/plugins/CoreConsole/Commands/GitPull.php +++ b/plugins/CoreConsole/Commands/GitPull.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/GitPush.php b/plugins/CoreConsole/Commands/GitPush.php index 051f631899..04663901e2 100644 --- a/plugins/CoreConsole/Commands/GitPush.php +++ b/plugins/CoreConsole/Commands/GitPush.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/ManagePlugin.php b/plugins/CoreConsole/Commands/ManagePlugin.php index 949deb75eb..0ceacbef3b 100644 --- a/plugins/CoreConsole/Commands/ManagePlugin.php +++ b/plugins/CoreConsole/Commands/ManagePlugin.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/ManageTestFiles.php b/plugins/CoreConsole/Commands/ManageTestFiles.php index 5f5ad9a553..af75e32a2c 100644 --- a/plugins/CoreConsole/Commands/ManageTestFiles.php +++ b/plugins/CoreConsole/Commands/ManageTestFiles.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/RunTests.php b/plugins/CoreConsole/Commands/RunTests.php index 97eb293b5d..7dc7d43d66 100644 --- a/plugins/CoreConsole/Commands/RunTests.php +++ b/plugins/CoreConsole/Commands/RunTests.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/RunUITests.php b/plugins/CoreConsole/Commands/RunUITests.php index 890dada03f..c2b210ff3e 100644 --- a/plugins/CoreConsole/Commands/RunUITests.php +++ b/plugins/CoreConsole/Commands/RunUITests.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreConsole/Commands/SetupFixture.php b/plugins/CoreConsole/Commands/SetupFixture.php index 7847faf5d0..91f79d0d1b 100644 --- a/plugins/CoreConsole/Commands/SetupFixture.php +++ b/plugins/CoreConsole/Commands/SetupFixture.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -160,6 +160,7 @@ class SetupFixture extends ConsoleCommand require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixture.php'; + require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php'; $fixturesToLoad = array( '/tests/PHPUnit/Fixtures/*.php', diff --git a/plugins/CoreConsole/Commands/SyncUITestScreenshots.php b/plugins/CoreConsole/Commands/SyncUITestScreenshots.php index 6317581c26..872b550843 100644 --- a/plugins/CoreConsole/Commands/SyncUITestScreenshots.php +++ b/plugins/CoreConsole/Commands/SyncUITestScreenshots.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -73,7 +73,7 @@ class SyncUITestScreenshots extends ConsoleCommand $downloadTo = "plugins/$testPlugin/tests/UI/expected-ui-screenshots/$file"; } - $output->write("<info>Downloading $file to .$downloadTo...</info>\n"); + $output->write("<info>Downloading $file to $downloadTo...</info>\n"); Http::sendHttpRequest("$urlBase/processed-ui-screenshots/$file", $timeout = 60, $userAgent = null, PIWIK_DOCUMENT_ROOT . "/" . $downloadTo); } diff --git a/plugins/CoreConsole/Commands/WatchLog.php b/plugins/CoreConsole/Commands/WatchLog.php index fc06dae46a..f6dd3bba5f 100644 --- a/plugins/CoreConsole/Commands/WatchLog.php +++ b/plugins/CoreConsole/Commands/WatchLog.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php index ef25ac1d1a..3c90049ca2 100644 --- a/plugins/CoreHome/Controller.php +++ b/plugins/CoreHome/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index 0fafe37320..cd4741f83e 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php index 4ce804e865..732c1267d5 100644 --- a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php index 28fe057cd3..2fb65b40b4 100644 --- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index e55bf8881b..01c2837857 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CorePluginsAdmin/CorePluginsAdmin.php b/plugins/CorePluginsAdmin/CorePluginsAdmin.php index 2ff38a1b21..f08ed3e572 100644 --- a/plugins/CorePluginsAdmin/CorePluginsAdmin.php +++ b/plugins/CorePluginsAdmin/CorePluginsAdmin.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CorePluginsAdmin/Marketplace.php b/plugins/CorePluginsAdmin/Marketplace.php index e50cdbbb39..d0e5ec6c0a 100644 --- a/plugins/CorePluginsAdmin/Marketplace.php +++ b/plugins/CorePluginsAdmin/Marketplace.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CorePluginsAdmin/MarketplaceApiClient.php b/plugins/CorePluginsAdmin/MarketplaceApiClient.php index 034a501bbe..346b15770f 100644 --- a/plugins/CorePluginsAdmin/MarketplaceApiClient.php +++ b/plugins/CorePluginsAdmin/MarketplaceApiClient.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CorePluginsAdmin/MarketplaceApiException.php b/plugins/CorePluginsAdmin/MarketplaceApiException.php index 9da7582b86..616a9b89b1 100644 --- a/plugins/CorePluginsAdmin/MarketplaceApiException.php +++ b/plugins/CorePluginsAdmin/MarketplaceApiException.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CorePluginsAdmin/Menu.php b/plugins/CorePluginsAdmin/Menu.php index 8c7a570408..326596989b 100644 --- a/plugins/CorePluginsAdmin/Menu.php +++ b/plugins/CorePluginsAdmin/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php index a3ecdecff2..83ee44a862 100644 --- a/plugins/CorePluginsAdmin/PluginInstaller.php +++ b/plugins/CorePluginsAdmin/PluginInstaller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CorePluginsAdmin/PluginInstallerException.php b/plugins/CorePluginsAdmin/PluginInstallerException.php index 2dbfc74b1e..5ed8309c31 100644 --- a/plugins/CorePluginsAdmin/PluginInstallerException.php +++ b/plugins/CorePluginsAdmin/PluginInstallerException.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CorePluginsAdmin/Tasks.php b/plugins/CorePluginsAdmin/Tasks.php index 0863a485e6..a168f441e1 100644 --- a/plugins/CorePluginsAdmin/Tasks.php +++ b/plugins/CorePluginsAdmin/Tasks.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CorePluginsAdmin/UpdateCommunication.php b/plugins/CorePluginsAdmin/UpdateCommunication.php index c340d842fc..ad6c570e7e 100644 --- a/plugins/CorePluginsAdmin/UpdateCommunication.php +++ b/plugins/CorePluginsAdmin/UpdateCommunication.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreUpdater/Commands/Update.php b/plugins/CoreUpdater/Commands/Update.php index 0417140767..fe9b8cbc6d 100644 --- a/plugins/CoreUpdater/Commands/Update.php +++ b/plugins/CoreUpdater/Commands/Update.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index 126701f540..413f9aa3c3 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php index 1097fe04ca..cbd563e8b0 100644 --- a/plugins/CoreUpdater/CoreUpdater.php +++ b/plugins/CoreUpdater/CoreUpdater.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreUpdater/NoUpdatesFoundException.php b/plugins/CoreUpdater/NoUpdatesFoundException.php index 1fd3ef1160..52fb6b69a0 100644 --- a/plugins/CoreUpdater/NoUpdatesFoundException.php +++ b/plugins/CoreUpdater/NoUpdatesFoundException.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreUpdater/Tasks.php b/plugins/CoreUpdater/Tasks.php index f8c652781c..06c2e70452 100644 --- a/plugins/CoreUpdater/Tasks.php +++ b/plugins/CoreUpdater/Tasks.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreUpdater/UpdateCommunication.php b/plugins/CoreUpdater/UpdateCommunication.php index b94984045c..5a113f74d5 100644 --- a/plugins/CoreUpdater/UpdateCommunication.php +++ b/plugins/CoreUpdater/UpdateCommunication.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/CoreVisualizations.php b/plugins/CoreVisualizations/CoreVisualizations.php index f5a83c0f51..ae86d51896 100644 --- a/plugins/CoreVisualizations/CoreVisualizations.php +++ b/plugins/CoreVisualizations/CoreVisualizations.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/JqplotDataGenerator.php b/plugins/CoreVisualizations/JqplotDataGenerator.php index af9140fb97..53771355b5 100644 --- a/plugins/CoreVisualizations/JqplotDataGenerator.php +++ b/plugins/CoreVisualizations/JqplotDataGenerator.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php b/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php index 9ea703e9ed..22cd1dd374 100644 --- a/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php +++ b/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php b/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php index ebf705dee2..3de82dbc17 100644 --- a/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php +++ b/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/Cloud.php b/plugins/CoreVisualizations/Visualizations/Cloud.php index 86c95521eb..6598f97b89 100644 --- a/plugins/CoreVisualizations/Visualizations/Cloud.php +++ b/plugins/CoreVisualizations/Visualizations/Cloud.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/Cloud/Config.php b/plugins/CoreVisualizations/Visualizations/Cloud/Config.php index 4a3b3e1651..da8619a8c4 100644 --- a/plugins/CoreVisualizations/Visualizations/Cloud/Config.php +++ b/plugins/CoreVisualizations/Visualizations/Cloud/Config.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/Graph.php b/plugins/CoreVisualizations/Visualizations/Graph.php index 1e63c8f741..b3e8a5f6fa 100644 --- a/plugins/CoreVisualizations/Visualizations/Graph.php +++ b/plugins/CoreVisualizations/Visualizations/Graph.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/Graph/Config.php b/plugins/CoreVisualizations/Visualizations/Graph/Config.php index 4c09b91335..a8b4dde6d6 100644 --- a/plugins/CoreVisualizations/Visualizations/Graph/Config.php +++ b/plugins/CoreVisualizations/Visualizations/Graph/Config.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable.php b/plugins/CoreVisualizations/Visualizations/HtmlTable.php index e61c34e944..86859d5197 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php index 20db5fbf10..9f31098946 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/Config.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/Config.php index d03ecaf293..9fa8163a6f 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable/Config.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/Config.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/RequestConfig.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/RequestConfig.php index a982c55a32..c507d1857e 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable/RequestConfig.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/RequestConfig.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph.php index 93ac059572..38b9077470 100644 --- a/plugins/CoreVisualizations/Visualizations/JqplotGraph.php +++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php index d8e9716a1c..121cfdc315 100644 --- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php +++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Config.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Config.php index 2efcfa82ff..d93d5b0cd9 100644 --- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Config.php +++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Config.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php index 07cff899e2..f534119de0 100644 --- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php +++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution/Config.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution/Config.php index 0d7b61b773..d1482959a4 100644 --- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution/Config.php +++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution/Config.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php index 2e694e9228..bd2d033fae 100644 --- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php +++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CoreVisualizations/Visualizations/Sparkline.php b/plugins/CoreVisualizations/Visualizations/Sparkline.php index 886d483965..2ca75bbcfe 100644 --- a/plugins/CoreVisualizations/Visualizations/Sparkline.php +++ b/plugins/CoreVisualizations/Visualizations/Sparkline.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 495cf80c13b16ef80f9871d31d859abd955540b +Subproject defaa73836af7da37bff85c74de336ff6b1edcd diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php index 77df63861b..1f03f873fe 100644 --- a/plugins/CustomVariables/API.php +++ b/plugins/CustomVariables/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php index 1afcdef098..0d4172c0db 100644 --- a/plugins/CustomVariables/Archiver.php +++ b/plugins/CustomVariables/Archiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomVariables/Commands/Info.php b/plugins/CustomVariables/Commands/Info.php index e42e3ae8a0..1c2a73bda6 100644 --- a/plugins/CustomVariables/Commands/Info.php +++ b/plugins/CustomVariables/Commands/Info.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php b/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php index ed4ae6bb21..521d48704a 100644 --- a/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php +++ b/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomVariables/Controller.php b/plugins/CustomVariables/Controller.php index 01b48bbac7..a2b6b30dc6 100644 --- a/plugins/CustomVariables/Controller.php +++ b/plugins/CustomVariables/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php index 2514067547..35ab6eaf97 100644 --- a/plugins/CustomVariables/CustomVariables.php +++ b/plugins/CustomVariables/CustomVariables.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomVariables/Menu.php b/plugins/CustomVariables/Menu.php index 49c36cbd55..fd2658b85e 100644 --- a/plugins/CustomVariables/Menu.php +++ b/plugins/CustomVariables/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomVariables/Model.php b/plugins/CustomVariables/Model.php index 9fbb7d46c9..ce5ffe8843 100644 --- a/plugins/CustomVariables/Model.php +++ b/plugins/CustomVariables/Model.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomVariables/tests/Commands/InfoTest.php b/plugins/CustomVariables/tests/Commands/InfoTest.php index d8bc90b88e..654dc9c779 100644 --- a/plugins/CustomVariables/tests/Commands/InfoTest.php +++ b/plugins/CustomVariables/tests/Commands/InfoTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php b/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php index a883f09d1f..e73fb2c81c 100644 --- a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php +++ b/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomVariables/tests/CustomVariablesIntegrationTest.php b/plugins/CustomVariables/tests/CustomVariablesIntegrationTest.php index 7559857a56..b72ded9a0e 100644 --- a/plugins/CustomVariables/tests/CustomVariablesIntegrationTest.php +++ b/plugins/CustomVariables/tests/CustomVariablesIntegrationTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomVariables/tests/CustomVariablesTest.php b/plugins/CustomVariables/tests/CustomVariablesTest.php index 980401d608..8e95aff299 100644 --- a/plugins/CustomVariables/tests/CustomVariablesTest.php +++ b/plugins/CustomVariables/tests/CustomVariablesTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php b/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php index 932658a816..11ca605297 100644 --- a/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php +++ b/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/CustomVariables/tests/ModelTest.php b/plugins/CustomVariables/tests/ModelTest.php index 870228e7cd..3ad41525ba 100644 --- a/plugins/CustomVariables/tests/ModelTest.php +++ b/plugins/CustomVariables/tests/ModelTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DBStats/API.php b/plugins/DBStats/API.php index 6da5604096..442c78752a 100644 --- a/plugins/DBStats/API.php +++ b/plugins/DBStats/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DBStats/Controller.php b/plugins/DBStats/Controller.php index 07f38a77e5..f8ec667893 100644 --- a/plugins/DBStats/Controller.php +++ b/plugins/DBStats/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php index 03c04700a1..8ee7fc8160 100644 --- a/plugins/DBStats/DBStats.php +++ b/plugins/DBStats/DBStats.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DBStats/Menu.php b/plugins/DBStats/Menu.php index 1b49589d99..b39ff59ae5 100644 --- a/plugins/DBStats/Menu.php +++ b/plugins/DBStats/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DBStats/MySQLMetadataDataAccess.php b/plugins/DBStats/MySQLMetadataDataAccess.php index 2b0a8ec4e6..04f6a397a1 100644 --- a/plugins/DBStats/MySQLMetadataDataAccess.php +++ b/plugins/DBStats/MySQLMetadataDataAccess.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DBStats/MySQLMetadataProvider.php b/plugins/DBStats/MySQLMetadataProvider.php index 64b059ea7c..2862b6153b 100755 --- a/plugins/DBStats/MySQLMetadataProvider.php +++ b/plugins/DBStats/MySQLMetadataProvider.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DBStats/Tasks.php b/plugins/DBStats/Tasks.php index b0919220c8..149cca82bb 100644 --- a/plugins/DBStats/Tasks.php +++ b/plugins/DBStats/Tasks.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DBStats/tests/Mocks/MockDataAccess.php b/plugins/DBStats/tests/Mocks/MockDataAccess.php index 32b6c58e0b..2e52870799 100644 --- a/plugins/DBStats/tests/Mocks/MockDataAccess.php +++ b/plugins/DBStats/tests/Mocks/MockDataAccess.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Dashboard/API.php b/plugins/Dashboard/API.php index e49275e7b1..21003135c5 100644 --- a/plugins/Dashboard/API.php +++ b/plugins/Dashboard/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php index 74da476e0e..a0530b6782 100644 --- a/plugins/Dashboard/Controller.php +++ b/plugins/Dashboard/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php index 7eacb90922..60cad8257c 100644 --- a/plugins/Dashboard/Dashboard.php +++ b/plugins/Dashboard/Dashboard.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Dashboard/DashboardManagerControl.php b/plugins/Dashboard/DashboardManagerControl.php index d445d835be..ff82763b95 100644 --- a/plugins/Dashboard/DashboardManagerControl.php +++ b/plugins/Dashboard/DashboardManagerControl.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Dashboard/DashboardSettingsControlBase.php b/plugins/Dashboard/DashboardSettingsControlBase.php index d546d33b79..3f8f29e1e6 100644 --- a/plugins/Dashboard/DashboardSettingsControlBase.php +++ b/plugins/Dashboard/DashboardSettingsControlBase.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Dashboard/Menu.php b/plugins/Dashboard/Menu.php index 8256c2b74c..95d5a618d4 100644 --- a/plugins/Dashboard/Menu.php +++ b/plugins/Dashboard/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php index 3426aed72e..cb6b24a98e 100644 --- a/plugins/DevicesDetection/API.php +++ b/plugins/DevicesDetection/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DevicesDetection/Archiver.php b/plugins/DevicesDetection/Archiver.php index dfd42e062b..bdaa20e0db 100644 --- a/plugins/DevicesDetection/Archiver.php +++ b/plugins/DevicesDetection/Archiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DevicesDetection/Controller.php b/plugins/DevicesDetection/Controller.php index 12b5750dcf..e42006fa65 100644 --- a/plugins/DevicesDetection/Controller.php +++ b/plugins/DevicesDetection/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DevicesDetection/Menu.php b/plugins/DevicesDetection/Menu.php index 2b2f06ed78..c7ce8434b9 100644 --- a/plugins/DevicesDetection/Menu.php +++ b/plugins/DevicesDetection/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DevicesDetection/Updates/1.14.php b/plugins/DevicesDetection/Updates/1.14.php index 45b7efeafc..7430844a50 100644 --- a/plugins/DevicesDetection/Updates/1.14.php +++ b/plugins/DevicesDetection/Updates/1.14.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index 895b0ed33c..1cf8c87e95 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Events/API.php b/plugins/Events/API.php index 5397109b53..106d8e61b9 100644 --- a/plugins/Events/API.php +++ b/plugins/Events/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Events/Actions/ActionEvent.php b/plugins/Events/Actions/ActionEvent.php index 50b07b9350..51bbd476cd 100644 --- a/plugins/Events/Actions/ActionEvent.php +++ b/plugins/Events/Actions/ActionEvent.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Events/Archiver.php b/plugins/Events/Archiver.php index 1289424b45..337dec0a33 100644 --- a/plugins/Events/Archiver.php +++ b/plugins/Events/Archiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Events/Controller.php b/plugins/Events/Controller.php index 576d8ae49b..5521b1007e 100644 --- a/plugins/Events/Controller.php +++ b/plugins/Events/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Events/Events.php b/plugins/Events/Events.php index 60e4de3379..4992ca3452 100644 --- a/plugins/Events/Events.php +++ b/plugins/Events/Events.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Events/Menu.php b/plugins/Events/Menu.php index 78c9b0bc9b..df171dc488 100644 --- a/plugins/Events/Menu.php +++ b/plugins/Events/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExampleAPI/API.php b/plugins/ExampleAPI/API.php index 2c3fa728fc..27dc2f59aa 100644 --- a/plugins/ExampleAPI/API.php +++ b/plugins/ExampleAPI/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -87,7 +87,7 @@ class API extends \Piwik\Plugin\API */ public function getDescriptionArray() { - return array('piwik', 'open source', 'web analytics', 'free', 'Strong message: Свободный Тибет'); + return array('piwik', 'free/libre', 'web analytics', 'free', 'Strong message: Свободный Тибет'); } /** diff --git a/plugins/ExampleAPI/ExampleAPI.php b/plugins/ExampleAPI/ExampleAPI.php index 3d38b3a3f8..25676fd6c1 100644 --- a/plugins/ExampleAPI/ExampleAPI.php +++ b/plugins/ExampleAPI/ExampleAPI.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExampleCommand/Commands/HelloWorld.php b/plugins/ExampleCommand/Commands/HelloWorld.php index a87bf8f5ef..1a2072a7e3 100644 --- a/plugins/ExampleCommand/Commands/HelloWorld.php +++ b/plugins/ExampleCommand/Commands/HelloWorld.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExamplePlugin/API.php b/plugins/ExamplePlugin/API.php index ee94ee6548..ffa887761f 100644 --- a/plugins/ExamplePlugin/API.php +++ b/plugins/ExamplePlugin/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExamplePlugin/Controller.php b/plugins/ExamplePlugin/Controller.php index 4dae1804c2..4a2c3507b9 100644 --- a/plugins/ExamplePlugin/Controller.php +++ b/plugins/ExamplePlugin/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExamplePlugin/ExamplePlugin.php b/plugins/ExamplePlugin/ExamplePlugin.php index 103a3002a6..492c7e124e 100644 --- a/plugins/ExamplePlugin/ExamplePlugin.php +++ b/plugins/ExamplePlugin/ExamplePlugin.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExamplePlugin/Menu.php b/plugins/ExamplePlugin/Menu.php index de2b1ea9fb..ccebbdf4e3 100644 --- a/plugins/ExamplePlugin/Menu.php +++ b/plugins/ExamplePlugin/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExamplePlugin/Tasks.php b/plugins/ExamplePlugin/Tasks.php index 4ccb2bbd69..18ca1cf6ad 100644 --- a/plugins/ExamplePlugin/Tasks.php +++ b/plugins/ExamplePlugin/Tasks.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExamplePlugin/tests/SimpleIntegrationTest.php b/plugins/ExamplePlugin/tests/SimpleIntegrationTest.php index 0bfc490685..3debdd9829 100644 --- a/plugins/ExamplePlugin/tests/SimpleIntegrationTest.php +++ b/plugins/ExamplePlugin/tests/SimpleIntegrationTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExamplePlugin/tests/SimpleTest.php b/plugins/ExamplePlugin/tests/SimpleTest.php index 6087b56154..0fdc86062c 100644 --- a/plugins/ExamplePlugin/tests/SimpleTest.php +++ b/plugins/ExamplePlugin/tests/SimpleTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExamplePlugin/tests/fixtures/SimpleFixtureTrackFewVisits.php b/plugins/ExamplePlugin/tests/fixtures/SimpleFixtureTrackFewVisits.php index 5578a13621..40aff52ad8 100644 --- a/plugins/ExamplePlugin/tests/fixtures/SimpleFixtureTrackFewVisits.php +++ b/plugins/ExamplePlugin/tests/fixtures/SimpleFixtureTrackFewVisits.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExampleRssWidget/Controller.php b/plugins/ExampleRssWidget/Controller.php index 635ab8ec77..8255c0fd51 100644 --- a/plugins/ExampleRssWidget/Controller.php +++ b/plugins/ExampleRssWidget/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExampleRssWidget/ExampleRssWidget.php b/plugins/ExampleRssWidget/ExampleRssWidget.php index e4de452f28..ec035f36d1 100644 --- a/plugins/ExampleRssWidget/ExampleRssWidget.php +++ b/plugins/ExampleRssWidget/ExampleRssWidget.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExampleRssWidget/RssRenderer.php b/plugins/ExampleRssWidget/RssRenderer.php index 508c405856..254a30ce6f 100644 --- a/plugins/ExampleRssWidget/RssRenderer.php +++ b/plugins/ExampleRssWidget/RssRenderer.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExampleSettingsPlugin/Settings.php b/plugins/ExampleSettingsPlugin/Settings.php index 40a06aebd8..d3a9ec5d3b 100644 --- a/plugins/ExampleSettingsPlugin/Settings.php +++ b/plugins/ExampleSettingsPlugin/Settings.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExampleUI/API.php b/plugins/ExampleUI/API.php index 9d46d77269..7b6e0c508a 100644 --- a/plugins/ExampleUI/API.php +++ b/plugins/ExampleUI/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExampleUI/Controller.php b/plugins/ExampleUI/Controller.php index 5dd0e9bb52..9bfd517aa0 100644 --- a/plugins/ExampleUI/Controller.php +++ b/plugins/ExampleUI/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExampleUI/Menu.php b/plugins/ExampleUI/Menu.php index c2b61f6e2d..dade4ad9a6 100644 --- a/plugins/ExampleUI/Menu.php +++ b/plugins/ExampleUI/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExampleVisualization/ExampleVisualization.php b/plugins/ExampleVisualization/ExampleVisualization.php index dea4707012..e0f7edb085 100644 --- a/plugins/ExampleVisualization/ExampleVisualization.php +++ b/plugins/ExampleVisualization/ExampleVisualization.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ExampleVisualization/SimpleTable.php b/plugins/ExampleVisualization/SimpleTable.php index 81c58cfef5..6aca5e83ec 100644 --- a/plugins/ExampleVisualization/SimpleTable.php +++ b/plugins/ExampleVisualization/SimpleTable.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Feedback/API.php b/plugins/Feedback/API.php index 46e63ed49a..bcaeb77650 100644 --- a/plugins/Feedback/API.php +++ b/plugins/Feedback/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php index b0807b391c..917e5aa7fa 100644 --- a/plugins/Feedback/Controller.php +++ b/plugins/Feedback/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Feedback/Feedback.php b/plugins/Feedback/Feedback.php index 181f92ecda..6f56fdc2a4 100644 --- a/plugins/Feedback/Feedback.php +++ b/plugins/Feedback/Feedback.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Feedback/Menu.php b/plugins/Feedback/Menu.php index 1355636d97..aa1156bc52 100644 --- a/plugins/Feedback/Menu.php +++ b/plugins/Feedback/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index 63d5d5b100..43fff0bfdb 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Goals/Archiver.php b/plugins/Goals/Archiver.php index 4dfa18fa0c..78aa5a59a2 100644 --- a/plugins/Goals/Archiver.php +++ b/plugins/Goals/Archiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php index e6a090a9d0..47b62c2a33 100644 --- a/plugins/Goals/Controller.php +++ b/plugins/Goals/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php index 6d6ffbc7f3..86907b67b0 100644 --- a/plugins/Goals/Goals.php +++ b/plugins/Goals/Goals.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Goals/Menu.php b/plugins/Goals/Menu.php index e31952c578..0b27a38179 100644 --- a/plugins/Goals/Menu.php +++ b/plugins/Goals/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Goals/Visualizations/Goals.php b/plugins/Goals/Visualizations/Goals.php index 8bb5f6d996..512ca91633 100644 --- a/plugins/Goals/Visualizations/Goals.php +++ b/plugins/Goals/Visualizations/Goals.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php index 532c9ef57c..1aa5348b60 100644 --- a/plugins/ImageGraph/API.php +++ b/plugins/ImageGraph/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ImageGraph/Controller.php b/plugins/ImageGraph/Controller.php index dacfc8bfb8..cae8a09e8e 100644 --- a/plugins/ImageGraph/Controller.php +++ b/plugins/ImageGraph/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php index c10a1b22c3..bcc6833b89 100644 --- a/plugins/ImageGraph/ImageGraph.php +++ b/plugins/ImageGraph/ImageGraph.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php index 71d08162e2..6c6fbb2705 100644 --- a/plugins/ImageGraph/StaticGraph.php +++ b/plugins/ImageGraph/StaticGraph.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ImageGraph/StaticGraph/Evolution.php b/plugins/ImageGraph/StaticGraph/Evolution.php index 32bc5bc92b..3bbe6f8f08 100644 --- a/plugins/ImageGraph/StaticGraph/Evolution.php +++ b/plugins/ImageGraph/StaticGraph/Evolution.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ImageGraph/StaticGraph/Exception.php b/plugins/ImageGraph/StaticGraph/Exception.php index 6ba920afab..eca980e3b2 100644 --- a/plugins/ImageGraph/StaticGraph/Exception.php +++ b/plugins/ImageGraph/StaticGraph/Exception.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ImageGraph/StaticGraph/GridGraph.php b/plugins/ImageGraph/StaticGraph/GridGraph.php index 02efb8d372..b136f80ed0 100644 --- a/plugins/ImageGraph/StaticGraph/GridGraph.php +++ b/plugins/ImageGraph/StaticGraph/GridGraph.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ImageGraph/StaticGraph/HorizontalBar.php b/plugins/ImageGraph/StaticGraph/HorizontalBar.php index b3b30637f2..e87969eca0 100644 --- a/plugins/ImageGraph/StaticGraph/HorizontalBar.php +++ b/plugins/ImageGraph/StaticGraph/HorizontalBar.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ImageGraph/StaticGraph/Pie.php b/plugins/ImageGraph/StaticGraph/Pie.php index af54c638af..5c97885b45 100644 --- a/plugins/ImageGraph/StaticGraph/Pie.php +++ b/plugins/ImageGraph/StaticGraph/Pie.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ImageGraph/StaticGraph/Pie3D.php b/plugins/ImageGraph/StaticGraph/Pie3D.php index 81ec8c9320..7e1c51ea63 100644 --- a/plugins/ImageGraph/StaticGraph/Pie3D.php +++ b/plugins/ImageGraph/StaticGraph/Pie3D.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ImageGraph/StaticGraph/PieGraph.php b/plugins/ImageGraph/StaticGraph/PieGraph.php index d28ca5010e..272a8f4dd4 100644 --- a/plugins/ImageGraph/StaticGraph/PieGraph.php +++ b/plugins/ImageGraph/StaticGraph/PieGraph.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ImageGraph/StaticGraph/VerticalBar.php b/plugins/ImageGraph/StaticGraph/VerticalBar.php index c5146d7c17..06a0c6444a 100644 --- a/plugins/ImageGraph/StaticGraph/VerticalBar.php +++ b/plugins/ImageGraph/StaticGraph/VerticalBar.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/API.php b/plugins/Insights/API.php index 3d22aa5e6a..0a2a66970d 100644 --- a/plugins/Insights/API.php +++ b/plugins/Insights/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/Controller.php b/plugins/Insights/Controller.php index 649cb056d3..b5799e3105 100644 --- a/plugins/Insights/Controller.php +++ b/plugins/Insights/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/DataTable/Filter/ExcludeLowValue.php b/plugins/Insights/DataTable/Filter/ExcludeLowValue.php index 659785de04..116c33d127 100644 --- a/plugins/Insights/DataTable/Filter/ExcludeLowValue.php +++ b/plugins/Insights/DataTable/Filter/ExcludeLowValue.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/DataTable/Filter/Insight.php b/plugins/Insights/DataTable/Filter/Insight.php index 699d9a6614..3c4677a5ee 100644 --- a/plugins/Insights/DataTable/Filter/Insight.php +++ b/plugins/Insights/DataTable/Filter/Insight.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/DataTable/Filter/Limit.php b/plugins/Insights/DataTable/Filter/Limit.php index 4097721ecc..42f6440f10 100644 --- a/plugins/Insights/DataTable/Filter/Limit.php +++ b/plugins/Insights/DataTable/Filter/Limit.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/DataTable/Filter/MinGrowth.php b/plugins/Insights/DataTable/Filter/MinGrowth.php index fb1b86c15b..c69012250e 100644 --- a/plugins/Insights/DataTable/Filter/MinGrowth.php +++ b/plugins/Insights/DataTable/Filter/MinGrowth.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/DataTable/Filter/OrderBy.php b/plugins/Insights/DataTable/Filter/OrderBy.php index 6eff36ccfc..d7329d5b44 100644 --- a/plugins/Insights/DataTable/Filter/OrderBy.php +++ b/plugins/Insights/DataTable/Filter/OrderBy.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/InsightReport.php b/plugins/Insights/InsightReport.php index 5310ff1185..cd4a7c2471 100644 --- a/plugins/Insights/InsightReport.php +++ b/plugins/Insights/InsightReport.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/Insights.php b/plugins/Insights/Insights.php index 00138e4d4b..0d9d5fe1be 100644 --- a/plugins/Insights/Insights.php +++ b/plugins/Insights/Insights.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/Model.php b/plugins/Insights/Model.php index 981a7d26f0..3f9ac956b4 100644 --- a/plugins/Insights/Model.php +++ b/plugins/Insights/Model.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/Visualizations/Insight.php b/plugins/Insights/Visualizations/Insight.php index ca835679ca..7ff7c96a13 100644 --- a/plugins/Insights/Visualizations/Insight.php +++ b/plugins/Insights/Visualizations/Insight.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/Visualizations/Insight/RequestConfig.php b/plugins/Insights/Visualizations/Insight/RequestConfig.php index ab771a51de..b7d1d16eb0 100644 --- a/plugins/Insights/Visualizations/Insight/RequestConfig.php +++ b/plugins/Insights/Visualizations/Insight/RequestConfig.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/tests/ApiTest.php b/plugins/Insights/tests/ApiTest.php index 06223f1e63..3dfcf47a64 100644 --- a/plugins/Insights/tests/ApiTest.php +++ b/plugins/Insights/tests/ApiTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/tests/BaseUnitTest.php b/plugins/Insights/tests/BaseUnitTest.php index e975f730f4..97c2c78580 100644 --- a/plugins/Insights/tests/BaseUnitTest.php +++ b/plugins/Insights/tests/BaseUnitTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/tests/FilterExcludeLowValueTest.php b/plugins/Insights/tests/FilterExcludeLowValueTest.php index ef87df895a..51c0192ef6 100644 --- a/plugins/Insights/tests/FilterExcludeLowValueTest.php +++ b/plugins/Insights/tests/FilterExcludeLowValueTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/tests/FilterInsightTest.php b/plugins/Insights/tests/FilterInsightTest.php index 658a846015..67c216b192 100644 --- a/plugins/Insights/tests/FilterInsightTest.php +++ b/plugins/Insights/tests/FilterInsightTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/tests/FilterLimitTest.php b/plugins/Insights/tests/FilterLimitTest.php index 7eaa208b9c..6f6d703b0a 100644 --- a/plugins/Insights/tests/FilterLimitTest.php +++ b/plugins/Insights/tests/FilterLimitTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/tests/FilterMinGrowthTest.php b/plugins/Insights/tests/FilterMinGrowthTest.php index 499311fc11..a53245b891 100644 --- a/plugins/Insights/tests/FilterMinGrowthTest.php +++ b/plugins/Insights/tests/FilterMinGrowthTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/tests/FilterOrderByTest.php b/plugins/Insights/tests/FilterOrderByTest.php index 1185b0d583..8239204a2f 100644 --- a/plugins/Insights/tests/FilterOrderByTest.php +++ b/plugins/Insights/tests/FilterOrderByTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php b/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php index 283ead6484..a665a06d96 100644 --- a/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php +++ b/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/tests/InsightReportTest.php b/plugins/Insights/tests/InsightReportTest.php index 49041f8262..f5ab3e9306 100644 --- a/plugins/Insights/tests/InsightReportTest.php +++ b/plugins/Insights/tests/InsightReportTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Insights/tests/ModelTest.php b/plugins/Insights/tests/ModelTest.php index 19020fc99a..1dd70150ee 100644 --- a/plugins/Insights/tests/ModelTest.php +++ b/plugins/Insights/tests/ModelTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index a76136e70e..377783f604 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php index 8b847106a7..e302a25995 100644 --- a/plugins/Installation/FormDatabaseSetup.php +++ b/plugins/Installation/FormDatabaseSetup.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Installation/FormFirstWebsiteSetup.php b/plugins/Installation/FormFirstWebsiteSetup.php index 750781fe92..83c68bea34 100644 --- a/plugins/Installation/FormFirstWebsiteSetup.php +++ b/plugins/Installation/FormFirstWebsiteSetup.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Installation/FormSuperUser.php b/plugins/Installation/FormSuperUser.php index 5e886983e4..68d9dcad14 100644 --- a/plugins/Installation/FormSuperUser.php +++ b/plugins/Installation/FormSuperUser.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php index 8d704efc4c..24e1a767e1 100644 --- a/plugins/Installation/Installation.php +++ b/plugins/Installation/Installation.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Installation/Menu.php b/plugins/Installation/Menu.php index 6637a1774b..606f9da50c 100644 --- a/plugins/Installation/Menu.php +++ b/plugins/Installation/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Installation/ServerFilesGenerator.php b/plugins/Installation/ServerFilesGenerator.php index 3f0ece9114..5b38fcf1d0 100644 --- a/plugins/Installation/ServerFilesGenerator.php +++ b/plugins/Installation/ServerFilesGenerator.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Installation/SystemCheck.php b/plugins/Installation/SystemCheck.php index 489d7995e7..60585cf80a 100644 --- a/plugins/Installation/SystemCheck.php +++ b/plugins/Installation/SystemCheck.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Installation/View.php b/plugins/Installation/View.php index ea0e09116e..3ee24043f6 100644 --- a/plugins/Installation/View.php +++ b/plugins/Installation/View.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php index 33a2ce12fe..09277e7098 100644 --- a/plugins/LanguagesManager/API.php +++ b/plugins/LanguagesManager/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LanguagesManager/Commands/CompareKeys.php b/plugins/LanguagesManager/Commands/CompareKeys.php index a26f9bd7b1..9fb1478392 100644 --- a/plugins/LanguagesManager/Commands/CompareKeys.php +++ b/plugins/LanguagesManager/Commands/CompareKeys.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LanguagesManager/Commands/CreatePull.php b/plugins/LanguagesManager/Commands/CreatePull.php index 3001f345b5..4c0a95005f 100644 --- a/plugins/LanguagesManager/Commands/CreatePull.php +++ b/plugins/LanguagesManager/Commands/CreatePull.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LanguagesManager/Commands/FetchFromOTrance.php b/plugins/LanguagesManager/Commands/FetchFromOTrance.php index b313acc76d..f8e93cb12f 100644 --- a/plugins/LanguagesManager/Commands/FetchFromOTrance.php +++ b/plugins/LanguagesManager/Commands/FetchFromOTrance.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LanguagesManager/Commands/LanguageCodes.php b/plugins/LanguagesManager/Commands/LanguageCodes.php index 5cca10416d..7f584ea14d 100644 --- a/plugins/LanguagesManager/Commands/LanguageCodes.php +++ b/plugins/LanguagesManager/Commands/LanguageCodes.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LanguagesManager/Commands/LanguageNames.php b/plugins/LanguagesManager/Commands/LanguageNames.php index 6e74e3697f..cffe727b1f 100644 --- a/plugins/LanguagesManager/Commands/LanguageNames.php +++ b/plugins/LanguagesManager/Commands/LanguageNames.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LanguagesManager/Commands/PluginsWithTranslations.php b/plugins/LanguagesManager/Commands/PluginsWithTranslations.php index 51282f6235..cda72d7c55 100644 --- a/plugins/LanguagesManager/Commands/PluginsWithTranslations.php +++ b/plugins/LanguagesManager/Commands/PluginsWithTranslations.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LanguagesManager/Commands/SetTranslations.php b/plugins/LanguagesManager/Commands/SetTranslations.php index 4496e7307f..356481905e 100644 --- a/plugins/LanguagesManager/Commands/SetTranslations.php +++ b/plugins/LanguagesManager/Commands/SetTranslations.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LanguagesManager/Commands/Update.php b/plugins/LanguagesManager/Commands/Update.php index 33d7087bd6..224124396f 100644 --- a/plugins/LanguagesManager/Commands/Update.php +++ b/plugins/LanguagesManager/Commands/Update.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LanguagesManager/Controller.php b/plugins/LanguagesManager/Controller.php index 8763d51f44..549b67dfb7 100644 --- a/plugins/LanguagesManager/Controller.php +++ b/plugins/LanguagesManager/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php index f260e8df18..c192b3b4af 100644 --- a/plugins/LanguagesManager/LanguagesManager.php +++ b/plugins/LanguagesManager/LanguagesManager.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LanguagesManager/Menu.php b/plugins/LanguagesManager/Menu.php index 06b82f1e93..7b473b2d5f 100644 --- a/plugins/LanguagesManager/Menu.php +++ b/plugins/LanguagesManager/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LeftMenu/API.php b/plugins/LeftMenu/API.php index 9d6792cfe8..3d0d38b646 100644 --- a/plugins/LeftMenu/API.php +++ b/plugins/LeftMenu/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LeftMenu/LeftMenu.php b/plugins/LeftMenu/LeftMenu.php index 6783d6aa3c..67d906787c 100755 --- a/plugins/LeftMenu/LeftMenu.php +++ b/plugins/LeftMenu/LeftMenu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LeftMenu/Settings.php b/plugins/LeftMenu/Settings.php index 95811715e4..0fc096bdcb 100644 --- a/plugins/LeftMenu/Settings.php +++ b/plugins/LeftMenu/Settings.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/LeftMenu/tests/APITest.php b/plugins/LeftMenu/tests/APITest.php index 9c816e4642..ee9a70cfeb 100644 --- a/plugins/LeftMenu/tests/APITest.php +++ b/plugins/LeftMenu/tests/APITest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Live/API.php b/plugins/Live/API.php index 6fc1640aea..e5c88d6d52 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -545,6 +545,7 @@ class API extends \Piwik\Plugin\API $website = new Site($idSite); $timezone = $website->getTimezone(); + $currency = $website->getCurrency(); $currencies = APISitesManager::getInstance()->getCurrencySymbols(); // live api is not summable, prevents errors like "Unexpected ECommerce status value" @@ -556,12 +557,15 @@ class API extends \Piwik\Plugin\API $visitor = new Visitor($visitorDetailsArray); $visitorDetailsArray = $visitor->getAllVisitorDetails(); - $visitorDetailsArray['siteCurrency'] = $website->getCurrency(); + $visitorDetailsArray['siteCurrency'] = $currency; $visitorDetailsArray['siteCurrencySymbol'] = @$currencies[$visitorDetailsArray['siteCurrency']]; $visitorDetailsArray['serverTimestamp'] = $visitorDetailsArray['lastActionTimestamp']; + $dateTimeVisit = Date::factory($visitorDetailsArray['lastActionTimestamp'], $timezone); - $visitorDetailsArray['serverTimePretty'] = $dateTimeVisit->getLocalized('%time%'); - $visitorDetailsArray['serverDatePretty'] = $dateTimeVisit->getLocalized(Piwik::translate('CoreHome_ShortDateFormat')); + if($dateTimeVisit) { + $visitorDetailsArray['serverTimePretty'] = $dateTimeVisit->getLocalized('%time%'); + $visitorDetailsArray['serverDatePretty'] = $dateTimeVisit->getLocalized(Piwik::translate('CoreHome_ShortDateFormat')); + } $dateTimeVisitFirstAction = Date::factory($visitorDetailsArray['firstActionTimestamp'], $timezone); $visitorDetailsArray['serverDatePrettyFirstAction'] = $dateTimeVisitFirstAction->getLocalized(Piwik::translate('CoreHome_ShortDateFormat')); diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php index efdde7e9fd..224cf869ae 100644 --- a/plugins/Live/Controller.php +++ b/plugins/Live/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php index 1ce161b3e5..31efb4cf7a 100644 --- a/plugins/Live/Live.php +++ b/plugins/Live/Live.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Live/Menu.php b/plugins/Live/Menu.php index 7fbc3f4b78..2ef3466f69 100644 --- a/plugins/Live/Menu.php +++ b/plugins/Live/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index 48769bb362..3af5818d76 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Live/VisitorLog.php b/plugins/Live/VisitorLog.php index 95b86f3eb4..d17ad2426b 100644 --- a/plugins/Live/VisitorLog.php +++ b/plugins/Live/VisitorLog.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Live/VisitorLog/Config.php b/plugins/Live/VisitorLog/Config.php index 2bae79db13..42a09b50ca 100644 --- a/plugins/Live/VisitorLog/Config.php +++ b/plugins/Live/VisitorLog/Config.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php index 8407e26cc6..55f31757c1 100644 --- a/plugins/Login/Auth.php +++ b/plugins/Login/Auth.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -83,8 +83,20 @@ class Auth implements \Piwik\Auth if (!$authResult->wasAuthenticationSuccessful()) { $this->processFailedSession($rememberMe); } else { - $this->processSuccessfullSession($login, $authResult->getTokenAuth(), $rememberMe); + $this->processSuccessfulSession($login, $authResult->getTokenAuth(), $rememberMe); } + + /** + * Triggered after session initialize. + * This event notify about end of init session process. + * + * **Example** + * + * Piwik::addAction('Login.initSession.end', function () { + * // session has been initialized + * }); + */ + Piwik::postEvent('Login.initSession.end'); } /** @@ -131,6 +143,33 @@ class Auth implements \Piwik\Auth $this->setLogin($login); $this->setTokenAuth($tokenAuth); + + /** + * Triggered before authenticate function. + * This event propagate login and token_auth which will be using in authenticate process. + * + * This event exists to enable possibility for user authentication prevention. + * For example when user is locked or inactive. + * + * **Example** + * + * Piwik::addAction('Login.authenticate', function ($login, $tokenAuth) { + * if (!UserActivityManager::isActive ($login, $tokenAuth) { + * throw new Exception('Your account is inactive.'); + * } + * }); + * + * @param string $login User login. + * @param string $tokenAuth User token auth. + */ + Piwik::postEvent( + 'Login.authenticate', + array( + $login, + $tokenAuth + ) + ); + $authResult = $this->authenticate(); return $authResult; } @@ -166,8 +205,33 @@ class Auth implements \Piwik\Auth * @param $tokenAuth * @param $rememberMe */ - protected function processSuccessfullSession($login, $tokenAuth, $rememberMe) + protected function processSuccessfulSession($login, $tokenAuth, $rememberMe) { + /** + * Triggered after successful authenticate, but before cookie creation. + * This event propagate login and token_auth which was used in authenticate process. + * + * This event exists to enable the ability to custom action before the cookie will be created, + * but after a successful authentication. + * For example when user have to fill survey or change password. + * + * **Example** + * + * Piwik::addAction('Login.authenticate.successful', function ($login, $tokenAuth) { + * // redirect to change password action + * }); + * + * @param string $login User login. + * @param string $tokenAuth User token auth. + */ + Piwik::postEvent( + 'Login.authenticate.successful', + array( + $login, + $tokenAuth + ) + ); + $cookie = $this->getAuthCookie($rememberMe); $cookie->set('login', $login); $cookie->set('token_auth', $this->getHashTokenAuth($login, $tokenAuth)); diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index e18ea350d4..ae4d3e1e4b 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Login/FormLogin.php b/plugins/Login/FormLogin.php index 8c5e0b1e55..d7be8a900e 100644 --- a/plugins/Login/FormLogin.php +++ b/plugins/Login/FormLogin.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Login/FormResetPassword.php b/plugins/Login/FormResetPassword.php index 89f277d2fb..66723d3c35 100644 --- a/plugins/Login/FormResetPassword.php +++ b/plugins/Login/FormResetPassword.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php index b6bb429d6c..e44486a24a 100644 --- a/plugins/Login/Login.php +++ b/plugins/Login/Login.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MobileMessaging/API.php b/plugins/MobileMessaging/API.php index aba3edba22..51b14d851e 100644 --- a/plugins/MobileMessaging/API.php +++ b/plugins/MobileMessaging/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MobileMessaging/APIException.php b/plugins/MobileMessaging/APIException.php index 129bac1f74..5805b356fc 100644 --- a/plugins/MobileMessaging/APIException.php +++ b/plugins/MobileMessaging/APIException.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MobileMessaging/Controller.php b/plugins/MobileMessaging/Controller.php index 640782d8f7..e19b7684b1 100644 --- a/plugins/MobileMessaging/Controller.php +++ b/plugins/MobileMessaging/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MobileMessaging/CountryCallingCodes.php b/plugins/MobileMessaging/CountryCallingCodes.php index c7c8f6ec8a..004e8e5772 100644 --- a/plugins/MobileMessaging/CountryCallingCodes.php +++ b/plugins/MobileMessaging/CountryCallingCodes.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MobileMessaging/GSMCharset.php b/plugins/MobileMessaging/GSMCharset.php index 1fa4778d5c..54077a5c38 100644 --- a/plugins/MobileMessaging/GSMCharset.php +++ b/plugins/MobileMessaging/GSMCharset.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MobileMessaging/Menu.php b/plugins/MobileMessaging/Menu.php index fa38d0c791..6a2ca2e1ff 100644 --- a/plugins/MobileMessaging/Menu.php +++ b/plugins/MobileMessaging/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php index 591c19d732..fb53b75262 100644 --- a/plugins/MobileMessaging/MobileMessaging.php +++ b/plugins/MobileMessaging/MobileMessaging.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MobileMessaging/ReportRenderer/ReportRendererException.php b/plugins/MobileMessaging/ReportRenderer/ReportRendererException.php index 822057d11c..848f8789ac 100644 --- a/plugins/MobileMessaging/ReportRenderer/ReportRendererException.php +++ b/plugins/MobileMessaging/ReportRenderer/ReportRendererException.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -68,4 +68,17 @@ class ReportRendererException extends ReportRenderer { // nothing to do } + + /** + * Get report attachments, ex. graph images + * + * @param $report + * @param $processedReports + * @param $prettyDate + * @return array + */ + public function getAttachments($report, $processedReports, $prettyDate) + { + return array(); + } } diff --git a/plugins/MobileMessaging/ReportRenderer/Sms.php b/plugins/MobileMessaging/ReportRenderer/Sms.php index d8a2d24c43..f3c19d77b4 100644 --- a/plugins/MobileMessaging/ReportRenderer/Sms.php +++ b/plugins/MobileMessaging/ReportRenderer/Sms.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -128,4 +128,17 @@ class Sms extends ReportRenderer $this->rendering .= $view->render(); } + + /** + * Get report attachments, ex. graph images + * + * @param $report + * @param $processedReports + * @param $prettyDate + * @return array + */ + public function getAttachments($report, $processedReports, $prettyDate) + { + return array(); + } } diff --git a/plugins/MobileMessaging/SMSProvider.php b/plugins/MobileMessaging/SMSProvider.php index 15fb226315..9f470ef4d1 100644 --- a/plugins/MobileMessaging/SMSProvider.php +++ b/plugins/MobileMessaging/SMSProvider.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MobileMessaging/SMSProvider/Clockwork.php b/plugins/MobileMessaging/SMSProvider/Clockwork.php index 16c2068e82..2ae8e95da4 100644 --- a/plugins/MobileMessaging/SMSProvider/Clockwork.php +++ b/plugins/MobileMessaging/SMSProvider/Clockwork.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MobileMessaging/SMSProvider/StubbedProvider.php b/plugins/MobileMessaging/SMSProvider/StubbedProvider.php index 266c0336cc..b9527a3b8d 100644 --- a/plugins/MobileMessaging/SMSProvider/StubbedProvider.php +++ b/plugins/MobileMessaging/SMSProvider/StubbedProvider.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MobileMessaging/javascripts/MobileMessagingSettings.js b/plugins/MobileMessaging/javascripts/MobileMessagingSettings.js index caa99f436f..20e2184c89 100644 --- a/plugins/MobileMessaging/javascripts/MobileMessagingSettings.js +++ b/plugins/MobileMessaging/javascripts/MobileMessagingSettings.js @@ -1,5 +1,5 @@ /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Morpheus/templates/admin.twig b/plugins/Morpheus/templates/admin.twig index 2a8ed8370e..b07d8343ef 100644 --- a/plugins/Morpheus/templates/admin.twig +++ b/plugins/Morpheus/templates/admin.twig @@ -8,7 +8,7 @@ <meta charset="utf-8"> <meta http-equiv="x-ua-compatible" content="IE=EDGE,chrome=1" > <title>{% if not isCustomLogo %}Piwik › {% endif %}{{ 'CoreAdminHome_Administration'|translate }}</title> - <meta name="generator" content="Piwik - Open Source Web Analytics"/> + <meta name="generator" content="Piwik - free/libre analytics platform"/> <link rel="shortcut icon" href="{{ customFavicon|default('plugins/CoreHome/images/favicon.ico') }}"/> {% include "@CoreHome/_favicon.twig" %} diff --git a/plugins/Morpheus/templates/dashboard.twig b/plugins/Morpheus/templates/dashboard.twig index a2dfff69ca..8948410331 100644 --- a/plugins/Morpheus/templates/dashboard.twig +++ b/plugins/Morpheus/templates/dashboard.twig @@ -9,7 +9,7 @@ <title>{{ siteName|raw }} - {% if isCustomLogo == false %}Piwik › {% endif %} {{ 'CoreHome_WebAnalyticsReports'|translate }}</title> <meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1"/> <meta name="viewport" content="initial-scale=1.0" /> - <meta name="generator" content="Piwik - Open Source Web Analytics"/> + <meta name="generator" content="Piwik - free/libre analytics platform"/> <meta name="description" content="Web Analytics report for '{{ siteName|escape("html_attr") }}' - Piwik"/> <meta name="apple-itunes-app" content="app-id=737216887" /> {% include "@CoreHome/_favicon.twig" %} diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php index 19ec7a241c..37f3b73b0b 100755 --- a/plugins/MultiSites/API.php +++ b/plugins/MultiSites/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php index 1802d2f139..689eb42a41 100644 --- a/plugins/MultiSites/Controller.php +++ b/plugins/MultiSites/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MultiSites/Menu.php b/plugins/MultiSites/Menu.php index c20fe8ded4..0cbee0d89b 100644 --- a/plugins/MultiSites/Menu.php +++ b/plugins/MultiSites/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/MultiSites/MultiSites.php b/plugins/MultiSites/MultiSites.php index 86c83cd51d..e0b78fd027 100644 --- a/plugins/MultiSites/MultiSites.php +++ b/plugins/MultiSites/MultiSites.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Overlay/API.php b/plugins/Overlay/API.php index 0862160ac1..ecc25b0466 100644 --- a/plugins/Overlay/API.php +++ b/plugins/Overlay/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php index 50008754a7..f238b2adc2 100644 --- a/plugins/Overlay/Controller.php +++ b/plugins/Overlay/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Overlay/Overlay.php b/plugins/Overlay/Overlay.php index c4a4c0558f..13f3398b72 100644 --- a/plugins/Overlay/Overlay.php +++ b/plugins/Overlay/Overlay.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Overlay/templates/showErrorWrongDomain.twig b/plugins/Overlay/templates/showErrorWrongDomain.twig index dc21fa4684..cfb19855e4 100644 --- a/plugins/Overlay/templates/showErrorWrongDomain.twig +++ b/plugins/Overlay/templates/showErrorWrongDomain.twig @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"> <title></title> - <meta name="generator" content="Piwik - Open Source Web Analytics"/> + <meta name="generator" content="Piwik - free/libre analytics platform"/> {% include "@CoreHome/_favicon.twig" %} <link rel="stylesheet" type="text/css" href="plugins/Overlay/stylesheets/showErrorWrongDomain.css" /> </head> diff --git a/plugins/PrivacyManager/Config.php b/plugins/PrivacyManager/Config.php index 88ca3a00b3..fe7d95e7b6 100644 --- a/plugins/PrivacyManager/Config.php +++ b/plugins/PrivacyManager/Config.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php index 5a39b96d71..6fed90a94f 100644 --- a/plugins/PrivacyManager/Controller.php +++ b/plugins/PrivacyManager/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/PrivacyManager/DoNotTrackHeaderChecker.php b/plugins/PrivacyManager/DoNotTrackHeaderChecker.php index 0b20f32383..93c0e79fca 100644 --- a/plugins/PrivacyManager/DoNotTrackHeaderChecker.php +++ b/plugins/PrivacyManager/DoNotTrackHeaderChecker.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/PrivacyManager/IPAnonymizer.php b/plugins/PrivacyManager/IPAnonymizer.php index 9bff7c14d6..837cd96496 100644 --- a/plugins/PrivacyManager/IPAnonymizer.php +++ b/plugins/PrivacyManager/IPAnonymizer.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/PrivacyManager/LogDataPurger.php b/plugins/PrivacyManager/LogDataPurger.php index ce7095076b..2ec73deb81 100755 --- a/plugins/PrivacyManager/LogDataPurger.php +++ b/plugins/PrivacyManager/LogDataPurger.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/PrivacyManager/Menu.php b/plugins/PrivacyManager/Menu.php index c8c38aec0a..3750dfaa61 100644 --- a/plugins/PrivacyManager/Menu.php +++ b/plugins/PrivacyManager/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php index edf0eba970..c94edc67be 100644 --- a/plugins/PrivacyManager/PrivacyManager.php +++ b/plugins/PrivacyManager/PrivacyManager.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/PrivacyManager/ReportsPurger.php b/plugins/PrivacyManager/ReportsPurger.php index 6707d46d05..a35169e6ef 100755 --- a/plugins/PrivacyManager/ReportsPurger.php +++ b/plugins/PrivacyManager/ReportsPurger.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/PrivacyManager/Tasks.php b/plugins/PrivacyManager/Tasks.php index e7eafc2e4e..6a2b19c99b 100644 --- a/plugins/PrivacyManager/Tasks.php +++ b/plugins/PrivacyManager/Tasks.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Provider/API.php b/plugins/Provider/API.php index 482418b913..dd367fc21b 100644 --- a/plugins/Provider/API.php +++ b/plugins/Provider/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Provider/Archiver.php b/plugins/Provider/Archiver.php index 438fcf9deb..a8a22c9527 100644 --- a/plugins/Provider/Archiver.php +++ b/plugins/Provider/Archiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Provider/Controller.php b/plugins/Provider/Controller.php index f46250792f..54d9a4f322 100644 --- a/plugins/Provider/Controller.php +++ b/plugins/Provider/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Provider/Menu.php b/plugins/Provider/Menu.php index 77cbe89194..2d34f5b229 100644 --- a/plugins/Provider/Menu.php +++ b/plugins/Provider/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php index b0d70e0a16..d98d0571b0 100644 --- a/plugins/Provider/Provider.php +++ b/plugins/Provider/Provider.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Provider/functions.php b/plugins/Provider/functions.php index 7a5e62d76e..110b54a359 100644 --- a/plugins/Provider/functions.php +++ b/plugins/Provider/functions.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php index 9dff4eb2bc..1b8d054481 100644 --- a/plugins/Proxy/Controller.php +++ b/plugins/Proxy/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Proxy/Proxy.php b/plugins/Proxy/Proxy.php index ce31b70f2b..e879eddaa9 100644 --- a/plugins/Proxy/Proxy.php +++ b/plugins/Proxy/Proxy.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Referrers/API.php b/plugins/Referrers/API.php index 62cee27951..9f97da3fe7 100644 --- a/plugins/Referrers/API.php +++ b/plugins/Referrers/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Referrers/Archiver.php b/plugins/Referrers/Archiver.php index 7c39704f3e..e5024e4e7d 100644 --- a/plugins/Referrers/Archiver.php +++ b/plugins/Referrers/Archiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Referrers/Columns/Base.php b/plugins/Referrers/Columns/Base.php index 470753715e..c50f72c1a2 100644 --- a/plugins/Referrers/Columns/Base.php +++ b/plugins/Referrers/Columns/Base.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Referrers/Controller.php b/plugins/Referrers/Controller.php index 988e0019de..3875f11f09 100644 --- a/plugins/Referrers/Controller.php +++ b/plugins/Referrers/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Referrers/Menu.php b/plugins/Referrers/Menu.php index 97efa7b44a..8022f72168 100644 --- a/plugins/Referrers/Menu.php +++ b/plugins/Referrers/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Referrers/functions.php b/plugins/Referrers/functions.php index 559fd5ba9d..40391ee6d6 100644 --- a/plugins/Referrers/functions.php +++ b/plugins/Referrers/functions.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/SEO/API.php b/plugins/SEO/API.php index 6e59b11858..167f37e6ba 100644 --- a/plugins/SEO/API.php +++ b/plugins/SEO/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/SEO/Controller.php b/plugins/SEO/Controller.php index a4888499e5..d9a3f45731 100644 --- a/plugins/SEO/Controller.php +++ b/plugins/SEO/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/SEO/MajesticClient.php b/plugins/SEO/MajesticClient.php index 3fbf69a808..5031958209 100644 --- a/plugins/SEO/MajesticClient.php +++ b/plugins/SEO/MajesticClient.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/SEO/RankChecker.php b/plugins/SEO/RankChecker.php index 22976b3cd7..b98c29256c 100644 --- a/plugins/SEO/RankChecker.php +++ b/plugins/SEO/RankChecker.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/SEO/SEO.php b/plugins/SEO/SEO.php index 17ce2d5eb6..f295b1a28e 100644 --- a/plugins/SEO/SEO.php +++ b/plugins/SEO/SEO.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php index 26d5159dd3..67ed97cc8f 100644 --- a/plugins/ScheduledReports/API.php +++ b/plugins/ScheduledReports/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -885,60 +885,7 @@ class API extends \Piwik\Plugin\API private function getAttachments($reportRenderer, $report, $processedReports, $prettyDate) { - $additionalFiles = array(); - - if ($reportRenderer instanceof Html) { - - foreach ($processedReports as $processedReport) { - - if ($processedReport['displayGraph']) { - - $additionalFiles[] = $this->createAttachment($report, $processedReport, $prettyDate); - } - } - } - - return $additionalFiles; - } - - private function createAttachment($report, $processedReport, $prettyDate) - { - $additionalFile = array(); - - $segment = self::getSegment($report['idsegment']); - - $segmentName = $segment != null ? sprintf(' (%s)', $segment['name']) : ''; - - $processedReportMetadata = $processedReport['metadata']; - - $additionalFile['filename'] = - sprintf( - '%s - %s - %s %d - %s %d%s.png', - $processedReportMetadata['name'], - $prettyDate, - Piwik::translate('General_Website'), - $report['idsite'], - Piwik::translate('General_Report'), - $report['idreport'], - $segmentName - ); - - $additionalFile['cid'] = $processedReportMetadata['uniqueId']; - - $additionalFile['content'] = - ReportRenderer::getStaticGraph( - $processedReportMetadata, - Html::IMAGE_GRAPH_WIDTH, - Html::IMAGE_GRAPH_HEIGHT, - $processedReport['evolutionGraph'], - $segment - ); - - $additionalFile['mimeType'] = 'image/png'; - - $additionalFile['encoding'] = Zend_Mime::ENCODING_BASE64; - - return $additionalFile; + return $reportRenderer->getAttachments($report, $processedReports, $prettyDate); } private function checkUserHasViewPermission($login, $idSite) diff --git a/plugins/ScheduledReports/Controller.php b/plugins/ScheduledReports/Controller.php index db61741987..2bb64b8faf 100644 --- a/plugins/ScheduledReports/Controller.php +++ b/plugins/ScheduledReports/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ScheduledReports/Menu.php b/plugins/ScheduledReports/Menu.php index ceeeee14ac..afde618614 100644 --- a/plugins/ScheduledReports/Menu.php +++ b/plugins/ScheduledReports/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php index 8e1222d774..26c3ef5ecc 100644 --- a/plugins/ScheduledReports/ScheduledReports.php +++ b/plugins/ScheduledReports/ScheduledReports.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ScheduledReports/Tasks.php b/plugins/ScheduledReports/Tasks.php index 88c71aeea6..1cbca73236 100644 --- a/plugins/ScheduledReports/Tasks.php +++ b/plugins/ScheduledReports/Tasks.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ScheduledReports/config/tcpdf_config.php b/plugins/ScheduledReports/config/tcpdf_config.php index e084760949..8b8e0e98da 100644 --- a/plugins/ScheduledReports/config/tcpdf_config.php +++ b/plugins/ScheduledReports/config/tcpdf_config.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo -Subproject f4133e8266a7fff293299bb49a37b8eb4c3ce79 +Subproject bc73711df837a1cda2de8d8634b9c4e13997b1e diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php index 7325ee4132..680c1d6157 100644 --- a/plugins/SegmentEditor/API.php +++ b/plugins/SegmentEditor/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/SegmentEditor/Model.php b/plugins/SegmentEditor/Model.php index 68b3fcff53..54c0e07ddf 100644 --- a/plugins/SegmentEditor/Model.php +++ b/plugins/SegmentEditor/Model.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php index b723e0fafb..a79cc0be24 100644 --- a/plugins/SegmentEditor/SegmentEditor.php +++ b/plugins/SegmentEditor/SegmentEditor.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/SegmentEditor/SegmentSelectorControl.php b/plugins/SegmentEditor/SegmentSelectorControl.php index ea6f931bf5..9188a707db 100644 --- a/plugins/SegmentEditor/SegmentSelectorControl.php +++ b/plugins/SegmentEditor/SegmentSelectorControl.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index d77fc1fb55..d669bb781c 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php index 60e13b96f7..d17232c2db 100644 --- a/plugins/SitesManager/Controller.php +++ b/plugins/SitesManager/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/SitesManager/Menu.php b/plugins/SitesManager/Menu.php index 0a991559f4..a2573d1f3e 100644 --- a/plugins/SitesManager/Menu.php +++ b/plugins/SitesManager/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php index 6053381396..a5107cc051 100644 --- a/plugins/SitesManager/SitesManager.php +++ b/plugins/SitesManager/SitesManager.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable -Subproject a98ff9e692c3bda601cb269673897decce39a4f +Subproject 8abb4ee4c2dd3ccd6e16667a51e0d2ac26af66a diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php index 5664e1b766..0e65eff824 100644 --- a/plugins/Transitions/API.php +++ b/plugins/Transitions/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Transitions/Controller.php b/plugins/Transitions/Controller.php index f36c110a93..dbd782f08c 100644 --- a/plugins/Transitions/Controller.php +++ b/plugins/Transitions/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Transitions/Transitions.php b/plugins/Transitions/Transitions.php index 0ab191bdc1..473ab7c647 100644 --- a/plugins/Transitions/Transitions.php +++ b/plugins/Transitions/Transitions.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization -Subproject b54a6601a52071198b8560335869b57d9145243 +Subproject 2a064c773c8eef17655f5d2ddb626294c1ee029 diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php index 31967e5c60..4e17fb6767 100644 --- a/plugins/UserCountry/API.php +++ b/plugins/UserCountry/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountry/Archiver.php b/plugins/UserCountry/Archiver.php index bb99a90ee5..d2203e2479 100644 --- a/plugins/UserCountry/Archiver.php +++ b/plugins/UserCountry/Archiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php index 302866b41f..fc0975cba8 100644 --- a/plugins/UserCountry/Controller.php +++ b/plugins/UserCountry/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountry/GeoIPAutoUpdater.php b/plugins/UserCountry/GeoIPAutoUpdater.php index a26807fb20..a581e4ca3a 100755 --- a/plugins/UserCountry/GeoIPAutoUpdater.php +++ b/plugins/UserCountry/GeoIPAutoUpdater.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountry/LocationProvider.php b/plugins/UserCountry/LocationProvider.php index bd65698424..d0ffd93f51 100755 --- a/plugins/UserCountry/LocationProvider.php +++ b/plugins/UserCountry/LocationProvider.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountry/LocationProvider/Default.php b/plugins/UserCountry/LocationProvider/Default.php index b9a640fbe1..1681efb4f7 100755 --- a/plugins/UserCountry/LocationProvider/Default.php +++ b/plugins/UserCountry/LocationProvider/Default.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountry/LocationProvider/GeoIp.php b/plugins/UserCountry/LocationProvider/GeoIp.php index 777f3f25b9..b8e090ea74 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp.php +++ b/plugins/UserCountry/LocationProvider/GeoIp.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php index 32b30b6abc..3326248ecc 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Php.php b/plugins/UserCountry/LocationProvider/GeoIp/Php.php index 8e3316f89a..eaf8083a8a 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Php.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Php.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php index 234690e35e..3e9b51488b 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountry/Menu.php b/plugins/UserCountry/Menu.php index ee0bf08e61..dca2245723 100644 --- a/plugins/UserCountry/Menu.php +++ b/plugins/UserCountry/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountry/Tasks.php b/plugins/UserCountry/Tasks.php index 5bb9b15c3a..7033e9e597 100644 --- a/plugins/UserCountry/Tasks.php +++ b/plugins/UserCountry/Tasks.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php index e8d9bdf979..23d4c4c3e3 100644 --- a/plugins/UserCountry/UserCountry.php +++ b/plugins/UserCountry/UserCountry.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountry/functions.php b/plugins/UserCountry/functions.php index 36454edf67..dbecfdf275 100644 --- a/plugins/UserCountry/functions.php +++ b/plugins/UserCountry/functions.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php index 5eb0b56e4c..13eaf49150 100644 --- a/plugins/UserCountryMap/Controller.php +++ b/plugins/UserCountryMap/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountryMap/Menu.php b/plugins/UserCountryMap/Menu.php index 63dd1801c3..fe7b979135 100644 --- a/plugins/UserCountryMap/Menu.php +++ b/plugins/UserCountryMap/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php index dd1360de7f..8bc5a93ff9 100644 --- a/plugins/UserCountryMap/UserCountryMap.php +++ b/plugins/UserCountryMap/UserCountryMap.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php index 432863c1ed..5d1db6f089 100644 --- a/plugins/UserSettings/API.php +++ b/plugins/UserSettings/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php index d753a41665..302d52c74b 100644 --- a/plugins/UserSettings/Archiver.php +++ b/plugins/UserSettings/Archiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php index 0c52344c0f..c2cf619b11 100644 --- a/plugins/UserSettings/Controller.php +++ b/plugins/UserSettings/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserSettings/Menu.php b/plugins/UserSettings/Menu.php index e4b9309927..00f59f2544 100644 --- a/plugins/UserSettings/Menu.php +++ b/plugins/UserSettings/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php index 87f1ee7688..69f9b6519e 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php index 42b427dd7a..40e48c5840 100644 --- a/plugins/UserSettings/functions.php +++ b/plugins/UserSettings/functions.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php index f06d8b09ae..03dd947b33 100644 --- a/plugins/UsersManager/API.php +++ b/plugins/UsersManager/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -409,6 +409,7 @@ class API extends \Piwik\Plugin\API Piwik::checkUserHasSuperUserAccessOrIsTheUser($userLogin); $this->checkUserIsNotAnonymous($userLogin); $userInfo = $this->getUser($userLogin); + $passwordHasBeenUpdated = false; if (empty($password)) { $password = $userInfo['password']; @@ -418,6 +419,8 @@ class API extends \Piwik\Plugin\API UsersManager::checkPassword($password); $password = UsersManager::getPasswordHash($password); } + + $passwordHasBeenUpdated = true; } if (empty($alias)) { @@ -441,10 +444,12 @@ class API extends \Piwik\Plugin\API /** * Triggered after an existing user has been updated. + * Event notify about password change. * * @param string $userLogin The user's login handle. + * @param boolean $passwordHasBeenUpdated Flag containing information about password change. */ - Piwik::postEvent('UsersManager.updateUser.end', array($userLogin)); + Piwik::postEvent('UsersManager.updateUser.end', array($userLogin, $passwordHasBeenUpdated)); } /** diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php index 543abdb96a..12691a5ce0 100644 --- a/plugins/UsersManager/Controller.php +++ b/plugins/UsersManager/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -209,14 +209,17 @@ class Controller extends \Piwik\Plugin\ControllerAdmin $view->userAlias = $user['alias']; $view->userEmail = $user['email']; - $defaultReport = APIUsersManager::getInstance()->getUserPreference($userLogin, APIUsersManager::PREFERENCE_DEFAULT_REPORT); + $userPreferences = new UserPreferences(); + $defaultReport = $userPreferences->getDefaultWebsiteId(); if ($defaultReport === false) { $defaultReport = $this->getDefaultWebsiteId(); } $view->defaultReport = $defaultReport; if ($defaultReport == 'MultiSites') { - $view->defaultReportSiteName = Site::getNameFor($this->getDefaultWebsiteId()); + + $userPreferences = new UserPreferences(); + $view->defaultReportSiteName = Site::getNameFor($userPreferences->getDefaultWebsiteId()); } else { $view->defaultReportSiteName = Site::getNameFor($defaultReport); } @@ -234,6 +237,15 @@ class Controller extends \Piwik\Plugin\ControllerAdmin return $view->render(); } + protected function getDefaultWebsiteId() + { + $sitesId = \Piwik\Plugins\SitesManager\API::getInstance()->getSitesIdWithAdminAccess(); + if (!empty($sitesId)) { + return $sitesId[0]; + } + return false; + } + public function setIgnoreCookie() { Piwik::checkUserHasSomeViewAccess(); diff --git a/plugins/UsersManager/LastSeenTimeLogger.php b/plugins/UsersManager/LastSeenTimeLogger.php index 82928b39ea..61e6c8b130 100644 --- a/plugins/UsersManager/LastSeenTimeLogger.php +++ b/plugins/UsersManager/LastSeenTimeLogger.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UsersManager/Menu.php b/plugins/UsersManager/Menu.php index d663093852..32ad96f4fb 100644 --- a/plugins/UsersManager/Menu.php +++ b/plugins/UsersManager/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UsersManager/Model.php b/plugins/UsersManager/Model.php index ea0a845e7e..d5668b19ea 100644 --- a/plugins/UsersManager/Model.php +++ b/plugins/UsersManager/Model.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/UsersManager/UserPreferences.php b/plugins/UsersManager/UserPreferences.php new file mode 100644 index 0000000000..649271144d --- /dev/null +++ b/plugins/UsersManager/UserPreferences.php @@ -0,0 +1,93 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\UsersManager; + +use Piwik\Config; +use Piwik\Piwik; +use Piwik\Plugins\SitesManager\API as APISitesManager; +use Piwik\Plugins\UsersManager\API as APIUsersManager; + +class UserPreferences +{ + /** + * Returns default site ID that Piwik should load. + * + * _Note: This value is a Piwik setting set by each user._ + * + * @return bool|int + * @api + */ + public function getDefaultWebsiteId() + { + $defaultWebsiteId = false; + + // User preference: default website ID to load + $defaultReport = APIUsersManager::getInstance()->getUserPreference(Piwik::getCurrentUserLogin(), APIUsersManager::PREFERENCE_DEFAULT_REPORT); + if (is_numeric($defaultReport)) { + $defaultWebsiteId = $defaultReport; + } + + if ($defaultWebsiteId && Piwik::isUserHasViewAccess($defaultWebsiteId)) { + return $defaultWebsiteId; + } + + $sitesId = APISitesManager::getInstance()->getSitesIdWithAtLeastViewAccess(); + if (!empty($sitesId)) { + return $sitesId[0]; + } + return false; + } + + /** + * Returns default date for Piwik reports. + * + * _Note: This value is a Piwik setting set by each user._ + * + * @return string `'today'`, `'2010-01-01'`, etc. + * @api + */ + public function getDefaultDate() + { + // NOTE: a change in this function might mean a change in plugins/UsersManager/javascripts/usersSettings.js as well + $userSettingsDate = APIUsersManager::getInstance()->getUserPreference(Piwik::getCurrentUserLogin(), APIUsersManager::PREFERENCE_DEFAULT_REPORT_DATE); + if ($userSettingsDate == 'yesterday') { + return $userSettingsDate; + } + // if last7, last30, etc. + if (strpos($userSettingsDate, 'last') === 0 + || strpos($userSettingsDate, 'previous') === 0 + ) { + return $userSettingsDate; + } + return 'today'; + } + + /** + * Returns default period type for Piwik reports. + * + * @return string `'day'`, `'week'`, `'month'`, `'year'` or `'range'` + * @api + */ + public function getDefaultPeriod() + { + $userSettingsDate = APIUsersManager::getInstance()->getUserPreference(Piwik::getCurrentUserLogin(), APIUsersManager::PREFERENCE_DEFAULT_REPORT_DATE); + if ($userSettingsDate === false) { + return Config::getInstance()->General['default_period']; + } + if (in_array($userSettingsDate, array('today', 'yesterday'))) { + return 'day'; + } + if (strpos($userSettingsDate, 'last') === 0 + || strpos($userSettingsDate, 'previous') === 0 + ) { + return 'range'; + } + return $userSettingsDate; + } +}
\ No newline at end of file diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php index b860aeb186..b2c4b2e8f3 100644 --- a/plugins/UsersManager/UsersManager.php +++ b/plugins/UsersManager/UsersManager.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -111,9 +111,27 @@ class UsersManager extends \Piwik\Plugin public static function checkPassword($password) { + /** + * Triggered before core password validator check password. + * + * This event exists for enable option to create custom password validation rules. + * It can be used to validate password (length, used chars etc) and to notify about checking password. + * + * **Example** + * + * Piwik::addAction('UsersManager.checkPassword', function ($password) { + * if (strlen($password) < 10) { + * throw new Exception('Password is too short.'); + * } + * }); + * + * @param string $password Checking password in plain text. + */ + Piwik::postEvent('UsersManager.checkPassword', array($password)); + if (!self::isValidPasswordString($password)) { throw new Exception(Piwik::translate('UsersManager_ExceptionInvalidPassword', array(self::PASSWORD_MIN_LENGTH, - self::PASSWORD_MAX_LENGTH))); + self::PASSWORD_MAX_LENGTH))); } } diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php index 2997202226..60a12c273b 100644 --- a/plugins/VisitFrequency/API.php +++ b/plugins/VisitFrequency/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitFrequency/Controller.php b/plugins/VisitFrequency/Controller.php index e3ba12abb1..03541de78c 100644 --- a/plugins/VisitFrequency/Controller.php +++ b/plugins/VisitFrequency/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitFrequency/Menu.php b/plugins/VisitFrequency/Menu.php index 1c8682d5a9..ad8000bed2 100644 --- a/plugins/VisitFrequency/Menu.php +++ b/plugins/VisitFrequency/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitFrequency/VisitFrequency.php b/plugins/VisitFrequency/VisitFrequency.php index a2bb056772..1666edd0dc 100644 --- a/plugins/VisitFrequency/VisitFrequency.php +++ b/plugins/VisitFrequency/VisitFrequency.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php index c2bf4241be..f27e5f812a 100644 --- a/plugins/VisitTime/API.php +++ b/plugins/VisitTime/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitTime/Archiver.php b/plugins/VisitTime/Archiver.php index f16a9eba1d..e7fd9c7a19 100644 --- a/plugins/VisitTime/Archiver.php +++ b/plugins/VisitTime/Archiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitTime/Controller.php b/plugins/VisitTime/Controller.php index 0bd7b00f53..c823bbf425 100644 --- a/plugins/VisitTime/Controller.php +++ b/plugins/VisitTime/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitTime/Menu.php b/plugins/VisitTime/Menu.php index b0cd93248c..ab3dce5b55 100644 --- a/plugins/VisitTime/Menu.php +++ b/plugins/VisitTime/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php index bbec179268..39ac47d536 100644 --- a/plugins/VisitTime/VisitTime.php +++ b/plugins/VisitTime/VisitTime.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitTime/functions.php b/plugins/VisitTime/functions.php index 6e817bf7d9..a52b8ffba8 100644 --- a/plugins/VisitTime/functions.php +++ b/plugins/VisitTime/functions.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator -Subproject 240f1deff367ef1c19d065f259311865db7e161 +Subproject 17e3ebd3efab0bb489b0621cb45b88f693a71f6 diff --git a/plugins/VisitorInterest/API.php b/plugins/VisitorInterest/API.php index d2b026e394..44df111588 100644 --- a/plugins/VisitorInterest/API.php +++ b/plugins/VisitorInterest/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitorInterest/Archiver.php b/plugins/VisitorInterest/Archiver.php index d4b313683a..cba45c6934 100644 --- a/plugins/VisitorInterest/Archiver.php +++ b/plugins/VisitorInterest/Archiver.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitorInterest/Controller.php b/plugins/VisitorInterest/Controller.php index 1880532286..a2319d5c3e 100644 --- a/plugins/VisitorInterest/Controller.php +++ b/plugins/VisitorInterest/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitorInterest/Menu.php b/plugins/VisitorInterest/Menu.php index 13b9c66111..17de395000 100644 --- a/plugins/VisitorInterest/Menu.php +++ b/plugins/VisitorInterest/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php index f036b53f7d..3a38f40c18 100644 --- a/plugins/VisitorInterest/VisitorInterest.php +++ b/plugins/VisitorInterest/VisitorInterest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php index 6ea74647ee..e89113eed2 100644 --- a/plugins/VisitsSummary/API.php +++ b/plugins/VisitsSummary/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index fbdda4dc1f..44c1565b27 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitsSummary/Menu.php b/plugins/VisitsSummary/Menu.php index 3a9d26029b..e79a338d9c 100644 --- a/plugins/VisitsSummary/Menu.php +++ b/plugins/VisitsSummary/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php index c73e58afe1..066a8e2e35 100644 --- a/plugins/VisitsSummary/VisitsSummary.php +++ b/plugins/VisitsSummary/VisitsSummary.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php index 0061ee95f5..afdd38d42d 100644 --- a/plugins/Widgetize/Controller.php +++ b/plugins/Widgetize/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Widgetize/Menu.php b/plugins/Widgetize/Menu.php index a4ab4c5541..c4db230565 100644 --- a/plugins/Widgetize/Menu.php +++ b/plugins/Widgetize/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/Widgetize/Widgetize.php b/plugins/Widgetize/Widgetize.php index 1377a6c3fc..992155a061 100644 --- a/plugins/Widgetize/Widgetize.php +++ b/plugins/Widgetize/Widgetize.php @@ -1,7 +1,7 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/ZenMode/ZenMode.php b/plugins/ZenMode/ZenMode.php index eed7e267e2..8f9d140795 100644 --- a/plugins/ZenMode/ZenMode.php +++ b/plugins/ZenMode/ZenMode.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php index d8ca29ea44..366996b465 100755 --- a/tests/LocalTracker.php +++ b/tests/LocalTracker.php @@ -51,7 +51,6 @@ class Piwik_LocalTracker extends PiwikTracker // save some values $plugins = Config::getInstance()->Plugins['Plugins']; - $plugins[] = 'DevicesDetection'; $pluginsTracker = Config::getInstance()->Plugins_Tracker['Plugins_Tracker']; $oldTrackerConfig = Config::getInstance()->Tracker; diff --git a/tests/PHPUnit/BenchmarkTestCase.php b/tests/PHPUnit/BenchmarkTestCase.php index d3c954ffdc..6e57944af4 100755 --- a/tests/PHPUnit/BenchmarkTestCase.php +++ b/tests/PHPUnit/BenchmarkTestCase.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php b/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php index cfdea0fd34..63307ec667 100644 --- a/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php +++ b/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Benchmarks/ArchivingProcessBenchmark.php b/tests/PHPUnit/Benchmarks/ArchivingProcessBenchmark.php index 85300320f6..04175d2248 100755 --- a/tests/PHPUnit/Benchmarks/ArchivingProcessBenchmark.php +++ b/tests/PHPUnit/Benchmarks/ArchivingProcessBenchmark.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Benchmarks/Fixtures/ManyThousandSitesOneVisitEach.php b/tests/PHPUnit/Benchmarks/Fixtures/ManyThousandSitesOneVisitEach.php index 444c426188..6a89c57a90 100644 --- a/tests/PHPUnit/Benchmarks/Fixtures/ManyThousandSitesOneVisitEach.php +++ b/tests/PHPUnit/Benchmarks/Fixtures/ManyThousandSitesOneVisitEach.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Benchmarks/Fixtures/OneSiteThousandsOfDistinctUrlsOverMonth.php b/tests/PHPUnit/Benchmarks/Fixtures/OneSiteThousandsOfDistinctUrlsOverMonth.php index 7cf01a3d80..c719d7bfa3 100644 --- a/tests/PHPUnit/Benchmarks/Fixtures/OneSiteThousandsOfDistinctUrlsOverMonth.php +++ b/tests/PHPUnit/Benchmarks/Fixtures/OneSiteThousandsOfDistinctUrlsOverMonth.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Benchmarks/Fixtures/OneSiteTwelveThousandVisitsOneYear.php b/tests/PHPUnit/Benchmarks/Fixtures/OneSiteTwelveThousandVisitsOneYear.php index 6646db1d4a..afd2b81c6a 100755 --- a/tests/PHPUnit/Benchmarks/Fixtures/OneSiteTwelveThousandVisitsOneYear.php +++ b/tests/PHPUnit/Benchmarks/Fixtures/OneSiteTwelveThousandVisitsOneYear.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Benchmarks/Fixtures/ThousandSitesTwelveVisitsEachOneDay.php b/tests/PHPUnit/Benchmarks/Fixtures/ThousandSitesTwelveVisitsEachOneDay.php index cb9c069936..c1888c6c85 100755 --- a/tests/PHPUnit/Benchmarks/Fixtures/ThousandSitesTwelveVisitsEachOneDay.php +++ b/tests/PHPUnit/Benchmarks/Fixtures/ThousandSitesTwelveVisitsEachOneDay.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Benchmarks/MultiSitesBenchmark.php b/tests/PHPUnit/Benchmarks/MultiSitesBenchmark.php index f0f0266074..54dc180f53 100644 --- a/tests/PHPUnit/Benchmarks/MultiSitesBenchmark.php +++ b/tests/PHPUnit/Benchmarks/MultiSitesBenchmark.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Benchmarks/TrackerBenchmark.php b/tests/PHPUnit/Benchmarks/TrackerBenchmark.php index 4737988c53..4ed79791d5 100755 --- a/tests/PHPUnit/Benchmarks/TrackerBenchmark.php +++ b/tests/PHPUnit/Benchmarks/TrackerBenchmark.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/ConsoleCommandTestCase.php b/tests/PHPUnit/ConsoleCommandTestCase.php new file mode 100644 index 0000000000..4ff21b4caf --- /dev/null +++ b/tests/PHPUnit/ConsoleCommandTestCase.php @@ -0,0 +1,56 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ + +namespace Piwik\Tests; + +use Piwik\Config; +use Piwik\Console; +use Symfony\Component\Console\Tester\ApplicationTester; + +/** + * Base class for test cases that test Piwik console commands. Derives from IntegrationTestCase + * so the entire Piwik environment is set up. + * + * This will create an ApplicationTester instance (provided by Symfony) which should be used to + * test commands like this: + * + * public function testThisAndThat() + * { + * $result = $this->applicationTester->run(array( + * 'command' => 'my-command', + * 'arg1' => 'value1', + * 'arg2' => 'value2', + * '--option' => true, + * '--another-option' => 'value3' + * )); + * $this->assertEquals(0, $result, $this->getCommandDisplayOutputErrorMessage()); + * + * // other checks + * } + */ +class ConsoleCommandTestCase extends \IntegrationTestCase +{ + protected $applicationTester = null; + + public function setUp() + { + parent::setUp(); + + $application = new Console(); + $application->setAutoExit(false); + + $this->applicationTester = new ApplicationTester($application); + + Config::unsetInstance(); + } + + protected function getCommandDisplayOutputErrorMessage() + { + return "Command did not behave as expected. Command output: " . $this->applicationTester->getDisplay(); + } +}
\ No newline at end of file diff --git a/tests/PHPUnit/Core/API/ResponseBuilderTest.php b/tests/PHPUnit/Core/API/ResponseBuilderTest.php index 9f8b886af6..930404cf3e 100644 --- a/tests/PHPUnit/Core/API/ResponseBuilderTest.php +++ b/tests/PHPUnit/Core/API/ResponseBuilderTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/AssetManager/PluginManagerMock.php b/tests/PHPUnit/Core/AssetManager/PluginManagerMock.php index 105dfd625e..2dd91867f2 100644 --- a/tests/PHPUnit/Core/AssetManager/PluginManagerMock.php +++ b/tests/PHPUnit/Core/AssetManager/PluginManagerMock.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/AssetManager/PluginMock.php b/tests/PHPUnit/Core/AssetManager/PluginMock.php index 3253124350..6b6e8919ab 100644 --- a/tests/PHPUnit/Core/AssetManager/PluginMock.php +++ b/tests/PHPUnit/Core/AssetManager/PluginMock.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/AssetManager/ThemeMock.php b/tests/PHPUnit/Core/AssetManager/ThemeMock.php index 1d21edb60d..213a14d737 100644 --- a/tests/PHPUnit/Core/AssetManager/ThemeMock.php +++ b/tests/PHPUnit/Core/AssetManager/ThemeMock.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterMock.php b/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterMock.php index da70f789c5..c6d2205aae 100644 --- a/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterMock.php +++ b/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterMock.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterTest.php b/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterTest.php index 705000049c..85c4b613b3 100644 --- a/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterTest.php +++ b/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/AssetManager/UIAssetCatalogSorterTest.php b/tests/PHPUnit/Core/AssetManager/UIAssetCatalogSorterTest.php index 223be99b9c..820d8161bf 100644 --- a/tests/PHPUnit/Core/AssetManager/UIAssetCatalogSorterTest.php +++ b/tests/PHPUnit/Core/AssetManager/UIAssetCatalogSorterTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/AssetManager/UIAssetMinifierTest.php b/tests/PHPUnit/Core/AssetManager/UIAssetMinifierTest.php index 845055652c..df62e5c86b 100644 --- a/tests/PHPUnit/Core/AssetManager/UIAssetMinifierTest.php +++ b/tests/PHPUnit/Core/AssetManager/UIAssetMinifierTest.php @@ -1,7 +1,7 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/AssetManagerTest.php b/tests/PHPUnit/Core/AssetManagerTest.php index 787dc42709..e26443f8b3 100644 --- a/tests/PHPUnit/Core/AssetManagerTest.php +++ b/tests/PHPUnit/Core/AssetManagerTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/CliMulti/OutputTest.php b/tests/PHPUnit/Core/CliMulti/OutputTest.php index 46807aa30a..355fe2c4c7 100644 --- a/tests/PHPUnit/Core/CliMulti/OutputTest.php +++ b/tests/PHPUnit/Core/CliMulti/OutputTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/CliMulti/ProcessTest.php b/tests/PHPUnit/Core/CliMulti/ProcessTest.php index 2c4b02ee2e..12ec4c98e8 100644 --- a/tests/PHPUnit/Core/CliMulti/ProcessTest.php +++ b/tests/PHPUnit/Core/CliMulti/ProcessTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/CommonTest.php b/tests/PHPUnit/Core/CommonTest.php index 6650555e17..86d03c4bdb 100644 --- a/tests/PHPUnit/Core/CommonTest.php +++ b/tests/PHPUnit/Core/CommonTest.php @@ -3,7 +3,7 @@ use Piwik\Common; use Piwik\Filesystem; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/ConfigTest.php b/tests/PHPUnit/Core/ConfigTest.php index b52917827d..60245868d0 100644 --- a/tests/PHPUnit/Core/ConfigTest.php +++ b/tests/PHPUnit/Core/ConfigTest.php @@ -2,7 +2,7 @@ use Piwik\Config; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/CookieTest.php b/tests/PHPUnit/Core/CookieTest.php index 6424af736b..d222184fc9 100644 --- a/tests/PHPUnit/Core/CookieTest.php +++ b/tests/PHPUnit/Core/CookieTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php b/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php index 6088787be4..71b41bd429 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php b/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php index c03c173c02..757c010472 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php b/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php index e2b8c46b34..e5a4a3a7b7 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php b/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php index 0f841f718c..7ab59d8c4a 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php b/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php index 57c6178807..1f1c25bc61 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php b/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php index bb7f4ef0f8..e9140c3aed 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/Filter/SortTest.php b/tests/PHPUnit/Core/DataTable/Filter/SortTest.php index 96a642efeb..bf23dbd7dc 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/SortTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/SortTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php b/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php index 5be7e738e1..2cb53e701f 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php index fd7217f7b3..82eab7b484 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php index d78d70d35f..6a2a77670c 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php index a30b2dc523..d9ed90837b 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php index fda6fcda2e..36adfbfacd 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php index c3a0e99fff..2e42d7b268 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTable/RowTest.php b/tests/PHPUnit/Core/DataTable/RowTest.php index af32f3e9b0..2ecb2d3d53 100644 --- a/tests/PHPUnit/Core/DataTable/RowTest.php +++ b/tests/PHPUnit/Core/DataTable/RowTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DataTableTest.php b/tests/PHPUnit/Core/DataTableTest.php index cf4c0048f7..5388a8117c 100644 --- a/tests/PHPUnit/Core/DataTableTest.php +++ b/tests/PHPUnit/Core/DataTableTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DateTest.php b/tests/PHPUnit/Core/DateTest.php index a146166841..436b27ef59 100644 --- a/tests/PHPUnit/Core/DateTest.php +++ b/tests/PHPUnit/Core/DateTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DependencyTest.php b/tests/PHPUnit/Core/DependencyTest.php index f6e1ad15b3..3c7b783e95 100644 --- a/tests/PHPUnit/Core/DependencyTest.php +++ b/tests/PHPUnit/Core/DependencyTest.php @@ -4,7 +4,7 @@ use Piwik\Plugin\Manager as PluginManager; use Piwik\Version; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/DeprecatedMethodsTest.php b/tests/PHPUnit/Core/DeprecatedMethodsTest.php index c977dffc71..1e170bd814 100644 --- a/tests/PHPUnit/Core/DeprecatedMethodsTest.php +++ b/tests/PHPUnit/Core/DeprecatedMethodsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/HttpTest.php b/tests/PHPUnit/Core/HttpTest.php index 3042bfaadc..e7cc44beef 100644 --- a/tests/PHPUnit/Core/HttpTest.php +++ b/tests/PHPUnit/Core/HttpTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -64,7 +64,7 @@ class HttpTest extends PHPUnit_Framework_TestCase { $result = Http::sendHttpRequestBy( $method, - 'http://builds.piwik.org/latest.zip', + 'http://builds.piwik.org/piwik-latest.zip', 30, $userAgent = null, $destinationPath = null, diff --git a/tests/PHPUnit/Core/IPTest.php b/tests/PHPUnit/Core/IPTest.php index 7cd1df76de..c80af0c201 100644 --- a/tests/PHPUnit/Core/IPTest.php +++ b/tests/PHPUnit/Core/IPTest.php @@ -5,7 +5,7 @@ use Piwik\IP; use Piwik\SettingsServer; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/MetricsTest.php b/tests/PHPUnit/Core/MetricsTest.php index 831f2cdba2..ba98fa11de 100644 --- a/tests/PHPUnit/Core/MetricsTest.php +++ b/tests/PHPUnit/Core/MetricsTest.php @@ -3,7 +3,7 @@ use Piwik\Access; use Piwik\Metrics;
/**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
diff --git a/tests/PHPUnit/Core/NonceTest.php b/tests/PHPUnit/Core/NonceTest.php index 01a1f7ffd3..9d0d8ef37d 100644 --- a/tests/PHPUnit/Core/NonceTest.php +++ b/tests/PHPUnit/Core/NonceTest.php @@ -3,7 +3,7 @@ use Piwik\Config; use Piwik\Nonce; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/Period/DayTest.php b/tests/PHPUnit/Core/Period/DayTest.php index c0952722f0..694ecad0d5 100644 --- a/tests/PHPUnit/Core/Period/DayTest.php +++ b/tests/PHPUnit/Core/Period/DayTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/Period/MonthTest.php b/tests/PHPUnit/Core/Period/MonthTest.php index 7322da40b1..b22e209725 100644 --- a/tests/PHPUnit/Core/Period/MonthTest.php +++ b/tests/PHPUnit/Core/Period/MonthTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/Period/RangeTest.php b/tests/PHPUnit/Core/Period/RangeTest.php index 6807747563..2a70eb00d5 100644 --- a/tests/PHPUnit/Core/Period/RangeTest.php +++ b/tests/PHPUnit/Core/Period/RangeTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/Period/WeekTest.php b/tests/PHPUnit/Core/Period/WeekTest.php index 57052e2dd4..e0d1ae7dc7 100644 --- a/tests/PHPUnit/Core/Period/WeekTest.php +++ b/tests/PHPUnit/Core/Period/WeekTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/Period/YearTest.php b/tests/PHPUnit/Core/Period/YearTest.php index 0bc2a30e14..ef28d619d6 100644 --- a/tests/PHPUnit/Core/Period/YearTest.php +++ b/tests/PHPUnit/Core/Period/YearTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/PeriodTest.php b/tests/PHPUnit/Core/PeriodTest.php index 74953436f4..f3be995179 100644 --- a/tests/PHPUnit/Core/PeriodTest.php +++ b/tests/PHPUnit/Core/PeriodTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/RankingQueryTest.php b/tests/PHPUnit/Core/RankingQueryTest.php index 843bce0c1f..17d3cdd2c6 100644 --- a/tests/PHPUnit/Core/RankingQueryTest.php +++ b/tests/PHPUnit/Core/RankingQueryTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/RegistryTest.php b/tests/PHPUnit/Core/RegistryTest.php index ac7757e036..c6c2aff894 100644 --- a/tests/PHPUnit/Core/RegistryTest.php +++ b/tests/PHPUnit/Core/RegistryTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/ReleaseCheckListTest.php b/tests/PHPUnit/Core/ReleaseCheckListTest.php index 1fd91ca22c..cb53dde0dc 100644 --- a/tests/PHPUnit/Core/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Core/ReleaseCheckListTest.php @@ -4,7 +4,7 @@ use Piwik\Plugin\Manager; use Piwik\SettingsServer; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -191,7 +191,7 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase /** * @group Core */ - public function disabled_test_directoriesShouldBeChmod755() + public function test_directoriesShouldBeChmod755() { $pluginsPath = realpath(PIWIK_INCLUDE_PATH . '/plugins/'); diff --git a/tests/PHPUnit/Core/ScheduledTaskTest.php b/tests/PHPUnit/Core/ScheduledTaskTest.php index 29a67295d2..6cdbebbc35 100644 --- a/tests/PHPUnit/Core/ScheduledTaskTest.php +++ b/tests/PHPUnit/Core/ScheduledTaskTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php b/tests/PHPUnit/Core/ScheduledTime/DailyTest.php index dde7ae8e30..9d047546c9 100644 --- a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php +++ b/tests/PHPUnit/Core/ScheduledTime/DailyTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/ScheduledTime/HourlyTest.php b/tests/PHPUnit/Core/ScheduledTime/HourlyTest.php index 2b621bff2b..14f4ce3c0e 100644 --- a/tests/PHPUnit/Core/ScheduledTime/HourlyTest.php +++ b/tests/PHPUnit/Core/ScheduledTime/HourlyTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php b/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php index 2f26d083c3..1a57fd2df5 100644 --- a/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php +++ b/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php b/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php index 46bf3725cc..b1956f570b 100644 --- a/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php +++ b/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/SegmentExpressionTest.php b/tests/PHPUnit/Core/SegmentExpressionTest.php index f9bf85913a..874df9e2d1 100644 --- a/tests/PHPUnit/Core/SegmentExpressionTest.php +++ b/tests/PHPUnit/Core/SegmentExpressionTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/TaskSchedulerTest.php b/tests/PHPUnit/Core/TaskSchedulerTest.php index 9c112a4da4..f11b7e2745 100644 --- a/tests/PHPUnit/Core/TaskSchedulerTest.php +++ b/tests/PHPUnit/Core/TaskSchedulerTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/Translate/Filter/ByBaseTranslationsTest.php b/tests/PHPUnit/Core/Translate/Filter/ByBaseTranslationsTest.php index 9f540baf6c..8ca2f09319 100644 --- a/tests/PHPUnit/Core/Translate/Filter/ByBaseTranslationsTest.php +++ b/tests/PHPUnit/Core/Translate/Filter/ByBaseTranslationsTest.php @@ -2,7 +2,7 @@ use Piwik\Translate\Filter\ByBaseTranslations; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/Translate/Filter/ByParameterCountTest.php b/tests/PHPUnit/Core/Translate/Filter/ByParameterCountTest.php index d6d853d848..06c72ed24f 100644 --- a/tests/PHPUnit/Core/Translate/Filter/ByParameterCountTest.php +++ b/tests/PHPUnit/Core/Translate/Filter/ByParameterCountTest.php @@ -2,7 +2,7 @@ use Piwik\Translate\Filter\ByParameterCount; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/Translate/Filter/EmptyTranslationsTest.php b/tests/PHPUnit/Core/Translate/Filter/EmptyTranslationsTest.php index 91948abbec..a083e50a43 100644 --- a/tests/PHPUnit/Core/Translate/Filter/EmptyTranslationsTest.php +++ b/tests/PHPUnit/Core/Translate/Filter/EmptyTranslationsTest.php @@ -2,7 +2,7 @@ use Piwik\Translate\Filter\EmptyTranslations; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/Translate/Filter/EncodedEntitiesTest.php b/tests/PHPUnit/Core/Translate/Filter/EncodedEntitiesTest.php index ced6720395..cfad46387b 100644 --- a/tests/PHPUnit/Core/Translate/Filter/EncodedEntitiesTest.php +++ b/tests/PHPUnit/Core/Translate/Filter/EncodedEntitiesTest.php @@ -2,7 +2,7 @@ use Piwik\Translate\Filter\EncodedEntities; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/Translate/Filter/UnnecassaryWhitespacesTest.php b/tests/PHPUnit/Core/Translate/Filter/UnnecassaryWhitespacesTest.php index 36378439b7..3f86b97a0d 100644 --- a/tests/PHPUnit/Core/Translate/Filter/UnnecassaryWhitespacesTest.php +++ b/tests/PHPUnit/Core/Translate/Filter/UnnecassaryWhitespacesTest.php @@ -2,7 +2,7 @@ use Piwik\Translate\Filter\UnnecassaryWhitespaces; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php b/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php index 5bd1ec0b1f..63efd407ce 100644 --- a/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php +++ b/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php @@ -2,7 +2,7 @@ use Piwik\Translate\Validate\CoreTranslations; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/Translate/Validate/NoScriptsTest.php b/tests/PHPUnit/Core/Translate/Validate/NoScriptsTest.php index 67fd7c11d8..e0a8f27b80 100644 --- a/tests/PHPUnit/Core/Translate/Validate/NoScriptsTest.php +++ b/tests/PHPUnit/Core/Translate/Validate/NoScriptsTest.php @@ -2,7 +2,7 @@ use Piwik\Translate\Validate\NoScripts; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/Translate/WriterTest.php b/tests/PHPUnit/Core/Translate/WriterTest.php index d6a05c2ed7..cdf1422170 100644 --- a/tests/PHPUnit/Core/Translate/WriterTest.php +++ b/tests/PHPUnit/Core/Translate/WriterTest.php @@ -8,7 +8,7 @@ use Piwik\Translate\Validate\NoScripts; use Piwik\Translate\Writer; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/TranslateTest.php b/tests/PHPUnit/Core/TranslateTest.php index b9d6e5c780..b7a99f70ee 100644 --- a/tests/PHPUnit/Core/TranslateTest.php +++ b/tests/PHPUnit/Core/TranslateTest.php @@ -3,7 +3,7 @@ use Piwik\Translate; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/UnzipTest.php b/tests/PHPUnit/Core/UnzipTest.php index 099ee10680..b7115ec2f1 100644 --- a/tests/PHPUnit/Core/UnzipTest.php +++ b/tests/PHPUnit/Core/UnzipTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Core/UrlHelperTest.php b/tests/PHPUnit/Core/UrlHelperTest.php index 76c2756657..99c89fa42d 100644 --- a/tests/PHPUnit/Core/UrlHelperTest.php +++ b/tests/PHPUnit/Core/UrlHelperTest.php @@ -2,7 +2,7 @@ use Piwik\UrlHelper;
/**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
diff --git a/tests/PHPUnit/Core/UrlTest.php b/tests/PHPUnit/Core/UrlTest.php index 55651c4dcf..3bf4a3e41d 100644 --- a/tests/PHPUnit/Core/UrlTest.php +++ b/tests/PHPUnit/Core/UrlTest.php @@ -3,7 +3,7 @@ use Piwik\Config; use Piwik\Url; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php index 4a84a05cd5..123f01acaa 100644 --- a/tests/PHPUnit/DatabaseTestCase.php +++ b/tests/PHPUnit/DatabaseTestCase.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/FakeAccess.php b/tests/PHPUnit/FakeAccess.php index 9711dbffba..7f652f0ae5 100644 --- a/tests/PHPUnit/FakeAccess.php +++ b/tests/PHPUnit/FakeAccess.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php index b1b5ae912f..3c1651757b 100644 --- a/tests/PHPUnit/Fixture.php +++ b/tests/PHPUnit/Fixture.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php index 4136dc8de9..ab5e02a7ed 100644 --- a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php +++ b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/InvalidVisits.php b/tests/PHPUnit/Fixtures/InvalidVisits.php index 0fe5b81d74..75015a0766 100644 --- a/tests/PHPUnit/Fixtures/InvalidVisits.php +++ b/tests/PHPUnit/Fixtures/InvalidVisits.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -52,7 +52,7 @@ class Test_Piwik_Fixture_InvalidVisits extends Fixture // Trigger empty request $trackerUrl = self::getTrackerUrl(); $response = Http::fetchRemoteFile($trackerUrl); - self::assertTrue(strpos($response, 'is a free open source web') !== false, 'Piwik empty request response not correct: ' . $response); + self::assertTrue(strpos($response, 'is a free/libre web') !== false, 'Piwik empty request response not correct: ' . $response); $t = self::getTracker($idSite, $dateTime, $defaultInit = true); diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index 7650cef641..a43d12661d 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php index 070082f792..83695ef531 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php index f84bb47f5f..e938edb86c 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php index 2a87115fed..ebbaf380f3 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithSubDirReferrersAndCustomVars.php b/tests/PHPUnit/Fixtures/ManyVisitsWithSubDirReferrersAndCustomVars.php index 97557b2dca..95eddf823f 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithSubDirReferrersAndCustomVars.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithSubDirReferrersAndCustomVars.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php index 7512beaad0..a688a91f3f 100644 --- a/tests/PHPUnit/Fixtures/OmniFixture.php +++ b/tests/PHPUnit/Fixtures/OmniFixture.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php b/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php index 782813f792..ae0618d5c5 100644 --- a/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php +++ b/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php b/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php index 6e7934c650..0dcacc45a9 100644 --- a/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php +++ b/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php index b8d5756a7e..5626d5e9ed 100644 --- a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php +++ b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php b/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php index a18eec7b97..462fd2a4b2 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php index fd587ff2bc..6e295b45ba 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php index 29620dd041..01748bb907 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/SomeVisitsWithLongUrls.php b/tests/PHPUnit/Fixtures/SomeVisitsWithLongUrls.php index 80f950b586..58f90494c1 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsWithLongUrls.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsWithLongUrls.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php b/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php index 9548a2c452..7dc9d2e9cf 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/SqlDump.php b/tests/PHPUnit/Fixtures/SqlDump.php index e918c10f31..9113d5e4e7 100644 --- a/tests/PHPUnit/Fixtures/SqlDump.php +++ b/tests/PHPUnit/Fixtures/SqlDump.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php b/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php index 31962ff292..6c4e318341 100644 --- a/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php +++ b/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php b/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php index 7805b64d75..20c03a585a 100644 --- a/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php +++ b/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php b/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php index 6526e87963..9481cd9f2e 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php +++ b/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php b/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php index f94f220354..326ca69d66 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php +++ b/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php index 8f6ae42a57..e2df5f8258 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php +++ b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php b/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php index b327e9be0e..d5a6415035 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php +++ b/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php b/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php index 58d9967e96..37cb956c51 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php +++ b/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/TwoVisitsNoKeywordWithBot.php b/tests/PHPUnit/Fixtures/TwoVisitsNoKeywordWithBot.php index 076e9d3c50..de6bb9b2e0 100644 --- a/tests/PHPUnit/Fixtures/TwoVisitsNoKeywordWithBot.php +++ b/tests/PHPUnit/Fixtures/TwoVisitsNoKeywordWithBot.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php index 23c3936269..8900eaace2 100644 --- a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php +++ b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php index 676e97b89b..ccf0120d7b 100644 --- a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php +++ b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php index 5e27a08117..23fc35aac9 100644 --- a/tests/PHPUnit/Fixtures/UITestFixture.php +++ b/tests/PHPUnit/Fixtures/UITestFixture.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php b/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php index 71de988694..6492ebd1db 100644 --- a/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php +++ b/tests/PHPUnit/Fixtures/VisitOverSeveralDaysImportedLogs.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/VisitsInDifferentTimezones.php b/tests/PHPUnit/Fixtures/VisitsInDifferentTimezones.php index 8df71672fb..f47962e6d7 100644 --- a/tests/PHPUnit/Fixtures/VisitsInDifferentTimezones.php +++ b/tests/PHPUnit/Fixtures/VisitsInDifferentTimezones.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Fixtures/VisitsOverSeveralDays.php b/tests/PHPUnit/Fixtures/VisitsOverSeveralDays.php index 09ba1ea470..d0b08c957d 100644 --- a/tests/PHPUnit/Fixtures/VisitsOverSeveralDays.php +++ b/tests/PHPUnit/Fixtures/VisitsOverSeveralDays.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/AnnotationsTest.php b/tests/PHPUnit/Integration/AnnotationsTest.php index dfb85bc19b..6257bf7785 100755 --- a/tests/PHPUnit/Integration/AnnotationsTest.php +++ b/tests/PHPUnit/Integration/AnnotationsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php b/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php index 33ca5e31ff..c9face0533 100755 --- a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php +++ b/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadata_yearTest.php b/tests/PHPUnit/Integration/ApiGetReportMetadata_yearTest.php index 1a3ec47620..01a19ed2de 100755 --- a/tests/PHPUnit/Integration/ApiGetReportMetadata_yearTest.php +++ b/tests/PHPUnit/Integration/ApiGetReportMetadata_yearTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php index 71c8b259fd..63778ce34c 100644 --- a/tests/PHPUnit/Integration/ArchiveCronTest.php +++ b/tests/PHPUnit/Integration/ArchiveCronTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/ArchiveWebTest.php b/tests/PHPUnit/Integration/ArchiveWebTest.php index c9fd69d857..49c61792c7 100644 --- a/tests/PHPUnit/Integration/ArchiveWebTest.php +++ b/tests/PHPUnit/Integration/ArchiveWebTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/AutoSuggestAPITest.php b/tests/PHPUnit/Integration/AutoSuggestAPITest.php index 0eed2aebb6..654105c32b 100644 --- a/tests/PHPUnit/Integration/AutoSuggestAPITest.php +++ b/tests/PHPUnit/Integration/AutoSuggestAPITest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php index 9793f38d78..12d3ab1868 100644 --- a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/BlobReportLimitingTest.php b/tests/PHPUnit/Integration/BlobReportLimitingTest.php index 76570e8648..db5db0f154 100755 --- a/tests/PHPUnit/Integration/BlobReportLimitingTest.php +++ b/tests/PHPUnit/Integration/BlobReportLimitingTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/AccessTest.php b/tests/PHPUnit/Integration/Core/AccessTest.php index d33110c24b..68cff9688d 100644 --- a/tests/PHPUnit/Integration/Core/AccessTest.php +++ b/tests/PHPUnit/Integration/Core/AccessTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php index 4811c7756c..e970ec9769 100644 --- a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php +++ b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/CliMultiTest.php b/tests/PHPUnit/Integration/Core/CliMultiTest.php index a0dc3e817a..da462def03 100644 --- a/tests/PHPUnit/Integration/Core/CliMultiTest.php +++ b/tests/PHPUnit/Integration/Core/CliMultiTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -153,7 +153,7 @@ class Core_CliMultiTest extends IntegrationTestCase $response = $this->cliMulti->request($urls); $message = "Response was: " . substr( implode("\n\n", $response), 0, 4000); - $this->assertTrue(false !== strpos($response[0], '<meta name="generator" content="Piwik - Open Source Web Analytics"/>'), $message); + $this->assertTrue(false !== strpos($response[0], '<meta name="generator" content="Piwik - free/libre analytics platform"/>'), $message); $this->assertTrue(false !== strpos($response[0], 'Widgetize the full dashboard'). $message); } diff --git a/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php b/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php index de4c23d63b..847af0e3c8 100644 --- a/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php +++ b/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php b/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php index f2aeb52028..5183177aa9 100644 --- a/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php +++ b/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/DbTest.php b/tests/PHPUnit/Integration/Core/DbTest.php index 45b559a6c2..daa2c33ecb 100644 --- a/tests/PHPUnit/Integration/Core/DbTest.php +++ b/tests/PHPUnit/Integration/Core/DbTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/LogTest.php b/tests/PHPUnit/Integration/Core/LogTest.php index 5fada09e1a..3e9a2cf64d 100644 --- a/tests/PHPUnit/Integration/Core/LogTest.php +++ b/tests/PHPUnit/Integration/Core/LogTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/OptionTest.php b/tests/PHPUnit/Integration/Core/OptionTest.php index 2a1eeffcdb..e405bae453 100644 --- a/tests/PHPUnit/Integration/Core/OptionTest.php +++ b/tests/PHPUnit/Integration/Core/OptionTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/PiwikTest.php b/tests/PHPUnit/Integration/Core/PiwikTest.php index c92607147f..03726d3e80 100644 --- a/tests/PHPUnit/Integration/Core/PiwikTest.php +++ b/tests/PHPUnit/Integration/Core/PiwikTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php b/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php index a248b2b54f..cc7d974301 100644 --- a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php +++ b/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/SegmentTest.php b/tests/PHPUnit/Integration/Core/SegmentTest.php index f0a313326a..48bc2df5d1 100644 --- a/tests/PHPUnit/Integration/Core/SegmentTest.php +++ b/tests/PHPUnit/Integration/Core/SegmentTest.php @@ -4,7 +4,7 @@ use Piwik\Common; use Piwik\Segment; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/SqlTest.php b/tests/PHPUnit/Integration/Core/SqlTest.php index 47a3c23f18..194fcc3e22 100755 --- a/tests/PHPUnit/Integration/Core/SqlTest.php +++ b/tests/PHPUnit/Integration/Core/SqlTest.php @@ -2,7 +2,7 @@ use Piwik\Db; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php index ee58a1b655..4a9e138b1e 100644 --- a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php +++ b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php @@ -8,7 +8,7 @@ use Piwik\Tracker\Request; use Piwik\Translate; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php index c46097104f..5c50a8b071 100644 --- a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php +++ b/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/TrackerTest.php b/tests/PHPUnit/Integration/Core/TrackerTest.php index 14d83dca5d..24dbab777c 100644 --- a/tests/PHPUnit/Integration/Core/TrackerTest.php +++ b/tests/PHPUnit/Integration/Core/TrackerTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/UpdaterTest.php b/tests/PHPUnit/Integration/Core/UpdaterTest.php index 87cbe114e4..292e9217a5 100644 --- a/tests/PHPUnit/Integration/Core/UpdaterTest.php +++ b/tests/PHPUnit/Integration/Core/UpdaterTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php b/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php index 4e374fe9e1..993eab14c3 100644 --- a/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php +++ b/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Core/WidgetsListTest.php b/tests/PHPUnit/Integration/Core/WidgetsListTest.php index 9f9e680e64..4e11718d5a 100644 --- a/tests/PHPUnit/Integration/Core/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/Core/WidgetsListTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/CsvExportTest.php b/tests/PHPUnit/Integration/CsvExportTest.php index 25f72f3db9..3acf831a84 100755 --- a/tests/PHPUnit/Integration/CsvExportTest.php +++ b/tests/PHPUnit/Integration/CsvExportTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/CustomEventsTest.php b/tests/PHPUnit/Integration/CustomEventsTest.php index 181f1355ca..11ef152455 100644 --- a/tests/PHPUnit/Integration/CustomEventsTest.php +++ b/tests/PHPUnit/Integration/CustomEventsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php index e7a6ede5bc..89d4cd8e9e 100755 --- a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php +++ b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/FlattenReportsTest.php b/tests/PHPUnit/Integration/FlattenReportsTest.php index 3a27e76502..e7407f87f0 100644 --- a/tests/PHPUnit/Integration/FlattenReportsTest.php +++ b/tests/PHPUnit/Integration/FlattenReportsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/ImportLogsTest.php b/tests/PHPUnit/Integration/ImportLogsTest.php index 41f6f4bb29..489fdc95e2 100755 --- a/tests/PHPUnit/Integration/ImportLogsTest.php +++ b/tests/PHPUnit/Integration/ImportLogsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/LabelFilterTest.php b/tests/PHPUnit/Integration/LabelFilterTest.php index 2d891c92b2..5cdfe146a0 100644 --- a/tests/PHPUnit/Integration/LabelFilterTest.php +++ b/tests/PHPUnit/Integration/LabelFilterTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php index 9b1fa69578..82422186e8 100755 --- a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php +++ b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/NoVisitTest.php b/tests/PHPUnit/Integration/NoVisitTest.php index dcbd83fbc9..6315830750 100755 --- a/tests/PHPUnit/Integration/NoVisitTest.php +++ b/tests/PHPUnit/Integration/NoVisitTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/NonUnicodeTest.php b/tests/PHPUnit/Integration/NonUnicodeTest.php index 9085f12aa0..b5b8a0c30b 100755 --- a/tests/PHPUnit/Integration/NonUnicodeTest.php +++ b/tests/PHPUnit/Integration/NonUnicodeTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRangeTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRangeTest.php index 2a13d51874..a473112238 100755 --- a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRangeTest.php +++ b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRangeTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php index a32e7c145b..176c9e1792 100755 --- a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php +++ b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php index 5c427c8444..5526d6fc71 100755 --- a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php +++ b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisits_withCookieSupportTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisits_withCookieSupportTest.php index 4ccb8b0d6f..c8f87c9732 100755 --- a/tests/PHPUnit/Integration/OneVisitorTwoVisits_withCookieSupportTest.php +++ b/tests/PHPUnit/Integration/OneVisitorTwoVisits_withCookieSupportTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/OneVisitor_LongUrlsTruncatedTest.php b/tests/PHPUnit/Integration/OneVisitor_LongUrlsTruncatedTest.php index a445f7cbd1..ce1d5121a3 100644 --- a/tests/PHPUnit/Integration/OneVisitor_LongUrlsTruncatedTest.php +++ b/tests/PHPUnit/Integration/OneVisitor_LongUrlsTruncatedTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/OneVisitor_NoKeywordSpecifiedTest.php b/tests/PHPUnit/Integration/OneVisitor_NoKeywordSpecifiedTest.php index 2561beed0f..9c7c42cc2f 100755 --- a/tests/PHPUnit/Integration/OneVisitor_NoKeywordSpecifiedTest.php +++ b/tests/PHPUnit/Integration/OneVisitor_NoKeywordSpecifiedTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/OneVisitor_SeveralDays_ImportedInRandomOrderTest.php b/tests/PHPUnit/Integration/OneVisitor_SeveralDays_ImportedInRandomOrderTest.php index 6ef072d913..81af6b8123 100644 --- a/tests/PHPUnit/Integration/OneVisitor_SeveralDays_ImportedInRandomOrderTest.php +++ b/tests/PHPUnit/Integration/OneVisitor_SeveralDays_ImportedInRandomOrderTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/PeriodIsRange_DateIsLastN_MetadataAndNormalAPITest.php b/tests/PHPUnit/Integration/PeriodIsRange_DateIsLastN_MetadataAndNormalAPITest.php index b995808282..b96c54f66c 100755 --- a/tests/PHPUnit/Integration/PeriodIsRange_DateIsLastN_MetadataAndNormalAPITest.php +++ b/tests/PHPUnit/Integration/PeriodIsRange_DateIsLastN_MetadataAndNormalAPITest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php b/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php index 857714ec7b..42ec5753b4 100644 --- a/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php +++ b/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php b/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php index 9b8008de98..2ecccd2bf5 100644 --- a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php +++ b/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Plugins/LoginTest.php b/tests/PHPUnit/Integration/Plugins/LoginTest.php index 24dc8e2c58..274b2fd9fa 100644 --- a/tests/PHPUnit/Integration/Plugins/LoginTest.php +++ b/tests/PHPUnit/Integration/Plugins/LoginTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php index 4bbb959f86..7f17bea9c6 100644 --- a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php +++ b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php index f2556ccf71..449a7d748c 100644 --- a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php +++ b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php b/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php index a0d8af1635..fb2ad94a40 100644 --- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php +++ b/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php b/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php index b2a0130ddb..7b1836c850 100644 --- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php +++ b/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php index 3914ff2546..9ce8430f42 100644 --- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php +++ b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php index b540d2b845..666b042bad 100644 --- a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php +++ b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php index 119bdd4851..87c5023eca 100644 --- a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php +++ b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php index a13e616eb6..d02e79fd5b 100644 --- a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php +++ b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php @@ -6,7 +6,7 @@ use Piwik\Plugins\UsersManager\Model; use Piwik\Translate; /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/PrivacyManagerTest.php b/tests/PHPUnit/Integration/PrivacyManagerTest.php index b32373630b..04a1c65faa 100644 --- a/tests/PHPUnit/Integration/PrivacyManagerTest.php +++ b/tests/PHPUnit/Integration/PrivacyManagerTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/PurgeDataTest.php b/tests/PHPUnit/Integration/PurgeDataTest.php index a2621f0b1e..e7c099d78d 100755 --- a/tests/PHPUnit/Integration/PurgeDataTest.php +++ b/tests/PHPUnit/Integration/PurgeDataTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/RowEvolutionTest.php b/tests/PHPUnit/Integration/RowEvolutionTest.php index a3cb495692..f0c87a0656 100755 --- a/tests/PHPUnit/Integration/RowEvolutionTest.php +++ b/tests/PHPUnit/Integration/RowEvolutionTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/SiteSearchTest.php b/tests/PHPUnit/Integration/SiteSearchTest.php index 51c2b3e20b..f329833f9c 100755 --- a/tests/PHPUnit/Integration/SiteSearchTest.php +++ b/tests/PHPUnit/Integration/SiteSearchTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/TimezonesTest.php b/tests/PHPUnit/Integration/TimezonesTest.php index ceeddaeb40..26d77d6dac 100644 --- a/tests/PHPUnit/Integration/TimezonesTest.php +++ b/tests/PHPUnit/Integration/TimezonesTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristicsTest.php b/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristicsTest.php index 19da294671..3ccefa4a64 100755 --- a/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristicsTest.php +++ b/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristicsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/TrackGoals_AllowMultipleConversionsPerVisitTest.php b/tests/PHPUnit/Integration/TrackGoals_AllowMultipleConversionsPerVisitTest.php index 32ee70fadb..a1eb784ff6 100755 --- a/tests/PHPUnit/Integration/TrackGoals_AllowMultipleConversionsPerVisitTest.php +++ b/tests/PHPUnit/Integration/TrackGoals_AllowMultipleConversionsPerVisitTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php b/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php index 78e808502c..c56d7786dd 100644 --- a/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php +++ b/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/TrackingAPI_SetVisitorIdTest.php b/tests/PHPUnit/Integration/TrackingAPI_SetVisitorIdTest.php index 010c4cdaf5..3c738dcf26 100644 --- a/tests/PHPUnit/Integration/TrackingAPI_SetVisitorIdTest.php +++ b/tests/PHPUnit/Integration/TrackingAPI_SetVisitorIdTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php index 76fc320b64..e19490274b 100755 --- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php +++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php index 25fcc55f34..154acdb647 100755 --- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php +++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php index 6a09cde8f5..00972de40b 100755 --- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php +++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php index 794ac209da..b2a8ded3fc 100755 --- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php +++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentContainsTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentContainsTest.php index e706079f80..3b6f63bb26 100755 --- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentContainsTest.php +++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentContainsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchALL_NoGoalDataTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchALL_NoGoalDataTest.php index d297ddbb6a..b4e7c3d2fc 100755 --- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchALL_NoGoalDataTest.php +++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchALL_NoGoalDataTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php index 3b87220e27..9d9056709f 100755 --- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php +++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php index 8c4033ff7f..d5181804f6 100755 --- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php +++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php b/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php index 511b638ea0..6387c3bcf6 100644 --- a/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php +++ b/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php index ad8efa9c98..f51bc3e35f 100755 --- a/tests/PHPUnit/IntegrationTestCase.php +++ b/tests/PHPUnit/IntegrationTestCase.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/MockLocationProvider.php b/tests/PHPUnit/MockLocationProvider.php index d4a202ece0..9d613ae18f 100755 --- a/tests/PHPUnit/MockLocationProvider.php +++ b/tests/PHPUnit/MockLocationProvider.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/MockPiwikOption.php b/tests/PHPUnit/MockPiwikOption.php index 8c87af973e..1aaeea92fc 100644 --- a/tests/PHPUnit/MockPiwikOption.php +++ b/tests/PHPUnit/MockPiwikOption.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Plugins/ActionsTest.php b/tests/PHPUnit/Plugins/ActionsTest.php index 0c2507496f..ecd23ba5c7 100644 --- a/tests/PHPUnit/Plugins/ActionsTest.php +++ b/tests/PHPUnit/Plugins/ActionsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Plugins/AnonymizeIPTest.php b/tests/PHPUnit/Plugins/AnonymizeIPTest.php index 4e4e00de3b..449d255f1f 100644 --- a/tests/PHPUnit/Plugins/AnonymizeIPTest.php +++ b/tests/PHPUnit/Plugins/AnonymizeIPTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Plugins/LanguagesManagerTest.php b/tests/PHPUnit/Plugins/LanguagesManagerTest.php index c8b73468b6..04898443f7 100755 --- a/tests/PHPUnit/Plugins/LanguagesManagerTest.php +++ b/tests/PHPUnit/Plugins/LanguagesManagerTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Plugins/ProxyTest.php b/tests/PHPUnit/Plugins/ProxyTest.php index 590c31be44..ab5a57bcc4 100644 --- a/tests/PHPUnit/Plugins/ProxyTest.php +++ b/tests/PHPUnit/Plugins/ProxyTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Plugins/ReferrersTest.php b/tests/PHPUnit/Plugins/ReferrersTest.php index 068794fc28..f160e63d34 100644 --- a/tests/PHPUnit/Plugins/ReferrersTest.php +++ b/tests/PHPUnit/Plugins/ReferrersTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Plugins/SEOTest.php b/tests/PHPUnit/Plugins/SEOTest.php index a94a4dbc06..8cb377eeef 100644 --- a/tests/PHPUnit/Plugins/SEOTest.php +++ b/tests/PHPUnit/Plugins/SEOTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/tests/PHPUnit/Plugins/UserCountryTest.php index ca5b0e640e..7ca0709a1c 100644 --- a/tests/PHPUnit/Plugins/UserCountryTest.php +++ b/tests/PHPUnit/Plugins/UserCountryTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/Plugins/UserSettingsTest.php b/tests/PHPUnit/Plugins/UserSettingsTest.php index 201c25847f..b18362f1e5 100644 --- a/tests/PHPUnit/Plugins/UserSettingsTest.php +++ b/tests/PHPUnit/Plugins/UserSettingsTest.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php index 1dcb995b0e..429b3d17e6 100644 --- a/tests/PHPUnit/bootstrap.php +++ b/tests/PHPUnit/bootstrap.php @@ -34,6 +34,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Loader.php'; require_once PIWIK_INCLUDE_PATH . '/core/FrontController.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/DatabaseTestCase.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php'; +require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/ConsoleCommandTestCase.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/FakeAccess.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockPiwikOption.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php'; diff --git a/tests/README.screenshots.md b/tests/README.screenshots.md index 39648b1435..b8f54c0263 100644 --- a/tests/README.screenshots.md +++ b/tests/README.screenshots.md @@ -64,7 +64,20 @@ Removing this font may be useful if your generated screenshots' fonts do not mat ### Configuring screenshot testing library -The screenshot testing library's configuration resides in the tests/lib/screenshot-testing/config.js file. If your development environment's PHP executable isn't named 'php' or your dev Piwik install isn't at http://localhost/, you may need to edit the contents of this file. +The screenshot testing library's configuration resides in the tests/lib/screenshot-testing/config.js file. +If your development environment's PHP executable isn't named `php` +or your dev Piwik install isn't at `http://localhost/` you may need to edit the contents of this file. + +For example if Piwik is setup at `http://localhost/piwik` modify the config.js such as: +``` +exports.piwikUrl = "http://localhost/piwik/"; +exports.phpServer = { + HTTP_HOST: 'localhost', + REQUEST_URI: '/piwik/', + REMOTE_ADDR: '127.0.0.1' +}; + +``` ## Running Tests diff --git a/tests/lib/screenshot-testing/config.js b/tests/lib/screenshot-testing/config.js index bc43c105b7..5e93ba3b02 100644 --- a/tests/lib/screenshot-testing/config.js +++ b/tests/lib/screenshot-testing/config.js @@ -8,6 +8,26 @@ */ /** + * The root Piwik URL to test against. + */ +exports.piwikUrl = "http://localhost/"; + +/** + * Data for the $_SERVER variable in the setup/teardown PHP scripts. Should be the same as + * the values in your phpunit.xml file. + */ +exports.phpServer = { + HTTP_HOST: 'localhost', + REQUEST_URI: '/', + REMOTE_ADDR: '127.0.0.1' +}; + +/** + * The path to the PHP executable to execute when setting up & tearing down the database. + */ +exports.php = 'php'; + +/** * The folder in tests/lib that holds mocha. */ exports.mocha = 'mocha-1.17.1'; @@ -36,23 +56,3 @@ exports.processedScreenshotsDir = "./processed-ui-screenshots"; * The directory that stores screenshot diffs. Relative to the UI repo's root directory. */ exports.screenshotDiffDir = "./screenshot-diffs"; - -/** - * The root Piwik URL to test against. - */ -exports.piwikUrl = "http://localhost/"; - -/** - * The path to the PHP executable to execute when setting up & tearing down the database. - */ -exports.php = 'php'; - -/** - * Data for the $_SERVER variable in the setup/teardown PHP scripts. Should be the same as - * the values in your phpunit.xml file. - */ -exports.phpServer = { - HTTP_HOST: 'localhost', - REQUEST_URI: '/', - REMOTE_ADDR: '127.0.0.1' -};
\ No newline at end of file diff --git a/tests/lib/screenshot-testing/run-tests.js b/tests/lib/screenshot-testing/run-tests.js index 6ddde1d92f..62d7a56012 100644 --- a/tests/lib/screenshot-testing/run-tests.js +++ b/tests/lib/screenshot-testing/run-tests.js @@ -10,6 +10,11 @@ // required modules var config = require("./config"); +// assume the URI points to a folder and make sure Piwik won't cut off the last path segment +if (config.phpServer.REQUEST_URI.slice(-1) != '/') { + config.phpServer.REQUEST_URI += '/'; +} + require('./support/fs-extras'); phantom.injectJs('./support/globals.js'); diff --git a/tests/lib/screenshot-testing/support/app.js b/tests/lib/screenshot-testing/support/app.js index 655974bf9f..037bb5925a 100644 --- a/tests/lib/screenshot-testing/support/app.js +++ b/tests/lib/screenshot-testing/support/app.js @@ -96,6 +96,7 @@ Application.prototype.loadTestModules = function () { plugins.forEach(function (pluginPath) { walk(path.join(pluginPath, 'Test'), /_spec\.js$/, modulePaths); + walk(path.join(pluginPath, 'tests'), /_spec\.js$/, modulePaths); }); modulePaths.forEach(function (path) { @@ -206,7 +207,7 @@ Application.prototype.doRunTests = function () { }; Application.prototype.finish = function () { - phantom.exit(this.runner.failures); + phantom.exit(this.runner ? this.runner.failures : -1); }; exports.Application = new Application();
\ No newline at end of file diff --git a/tests/resources/TestPluginLogClass.php b/tests/resources/TestPluginLogClass.php index 090824c584..75f28928c4 100644 --- a/tests/resources/TestPluginLogClass.php +++ b/tests/resources/TestPluginLogClass.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/tests/resources/extractSearchEngineInformationFromUrlTests.yml b/tests/resources/extractSearchEngineInformationFromUrlTests.yml index f7e9c04d64..60daf9da83 100644 --- a/tests/resources/extractSearchEngineInformationFromUrlTests.yml +++ b/tests/resources/extractSearchEngineInformationFromUrlTests.yml @@ -1,5 +1,5 @@ ############### -# Piwik - Open source web analytics +# Piwik - free/libre analytics platform # # @link http://piwik.org # @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later |
