Merge branch 'master' of https://github.com/piwik/piwik into fix/archive_message

Conflicts:
	misc/cron/archive.php

.gitignore

@@ -12,6 +12,7 @@ misc/*.dat
 misc/user/logo-header.png
 misc/user/logo.png
 misc/user/logo.svg
+misc/user/favicon.png
 php_errors.log
 piwik-min.js
 plugins/*.zip
@@ -53,4 +54,4 @@ tests/PHPUnit/proxy/libs
 tests/PHPUnit/proxy/piwik.js
 tests/PHPUnit/proxy/plugins
 tests/PHPUnit/proxy/tests
-config/*.config.ini.php
\ No newline at end of file
+config/*.config.ini.php

.travis.yml

@@ -5,6 +5,7 @@ php:
   - 5.5
   - 5.4
   - 5.3
+#  - 5.6
 #  - hhvm
 
 # Separate different test suites
@@ -28,12 +29,15 @@ env:
 matrix:
   allow_failures:
     - php: hhvm
+    - php: 5.6
   exclude:
     # Javascript tests need to run only on one PHP version
     - php: 5.4
       env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
     - php: 5.5
       env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
+    - php: 5.6
+      env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
     - php: hhvm
       env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
     # AngularJS tests need to run only on one PHP version
@@ -41,6 +45,8 @@ matrix:
       env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL
     - php: 5.5
       env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL
+    - php: 5.6
+      env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL
     - php: hhvm
       env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL
     # Only run Mysqli tests on PHP 5.5
@@ -56,6 +62,12 @@ matrix:
       env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
     - php: 5.5
       env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+    - php: 5.6
+      env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
+    - php: 5.6
+      env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
+    - php: 5.6
+      env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
     - php: hhvm
       env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
     - php: hhvm
@@ -66,13 +78,28 @@ matrix:
 script: ./travis.sh
 
 before_script:
+  - mysql --version
+  - mysql -e "SELECT VERSION();"
+  - mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION'" # Travis default
+  # Uncomment to enable sql_mode STRICT_TRANS_TABLES (new default in Mysql 5.6)
+  #- mysql -e "SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES'"
+  - mysql -e "SELECT @@sql_mode;"
+  - mysql -e "SHOW GLOBAL VARIABLES;"
+  # Setup Piwik stack
   - ./tests/travis/initiate_ui_tests.sh
-  - composer self-update
-  - composer install
+  - travis_retry composer self-update
+  - travis_retry composer install
   - uname -a
   - date
   - php -r "var_dump(gd_info());"
   - mysql -e 'create database piwik_tests;'
+  # Make sure we use Python 2.6
+  - travis_retry sudo add-apt-repository ppa:fkrull/deadsnakes -y
+  - travis_retry sudo apt-get update
+  - travis_retry sudo apt-get install python2.6 python2.6-dev
+  # Log Analytics works with Python 2.6 or 2.7 but we want to test on 2.6
+  - python2.6 --version
+  - python --version
   - ./tests/travis/prepare.sh
   - ./tests/travis/setup_webserver.sh
   - cd tests/PHPUnit
@@ -85,10 +112,16 @@ after_script:
   - cat /var/log/nginx/error.log
   - cat $TRAVIS_BUILD_DIR/tmp/php-fpm.log
   - cat $TRAVIS_BUILD_DIR/tmp/logs/piwik.log
+  - cat $TRAVIS_BUILD_DIR/config/config.ini.php
   - cd $TRAVIS_BUILD_DIR
   - ./tests/travis/upload_artifacts.sh
 
 notifications:
+  slack:
+    rooms:
+      - piwik:3HWhNh21qPfDACQXTrJOb0mW
+      - piwikpro:7OABSbDrywSTo2nv9lD2svXG
+
   irc:
     skip_join: true
     on_success: change

LEGALNOTICE

 COPYRIGHT
 
-	Piwik - Open Source Web Analytics
+	Piwik - free/libre analytics platform
 
 	The software package is:
 
-		Copyright (C) 2013  Matthieu Aubry
+		Copyright (C) 2014  Matthieu Aubry
 
 	Individual contributions, components, and libraries are copyright
 	of their respective authors.
@@ -40,7 +40,7 @@ CREDITS
 
 	For detailed contribution history, refer to the source, tickets,
 	patches, and Git revision history, available at
-	http://dev.piwik.org/trac/
+	https://github.com/piwik/piwik/issues
 	https://github.com/piwik/piwik
 
 
@@ -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,15 +206,23 @@ 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 (Expat)
+
+	Name: Mousetrap
+	Link: https://github.com/ccampbell/mousetrap
+	License: Apache 2.0
 
 
 THIRD-PARTY CONTENT
@@ -259,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

README.md

 # Piwik - piwik.org   
 
+## 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 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/)
+
+We are grateful if you can share the Job Description with your friends and colleagues. We can help the right candidate relocate to beautiful New Zealand.
+
 ## 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
 

composer.json

 {
     "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+",
@@ -14,7 +14,7 @@
     ],
     "support": {
         "forum": "http://forum.piwik.org/",
-        "issues": "http://dev.piwik.org/trac/roadmap",
+        "issues": "https://github.com/piwik/piwik/issues",
         "wiki": "http://dev.piwik.org/",
         "source": "https://github.com/piwik/piwik"
     },
@@ -25,6 +25,9 @@
         "symfony/console": ">=v2.3.5",
         "tedivm/jshrink": "v0.5.1",
         "mustangostang/spyc": "0.5.*",
-        "piwik/device-detector": "*"
+        "piwik/device-detector": "2.*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.1"
     }
 }

config/global.ini.php

@@ -18,7 +18,7 @@ password =
 dbname =
 tables_prefix =
 port = 3306
-adapter = PDO_MYSQL
+adapter = PDO\MYSQL
 type = InnoDB
 schema = Mysql
 
@@ -34,7 +34,7 @@ password =
 dbname = piwik_tests
 tables_prefix = piwiktests_
 port = 3306
-adapter = PDO_MYSQL
+adapter = PDO\MYSQL
 type = InnoDB
 schema = Mysql
 
@@ -47,7 +47,7 @@ log_writers[] = screen
 ; NONE, ERROR, WARN, INFO, DEBUG, VERBOSE
 log_level = WARN
 
-; if set to 1, only requests done in CLI mode (eg. the archive.php cron run) will be logged
+; if set to 1, only requests done in CLI mode (eg. the ./console core:archive cron run) will be logged
 ; NOTE: log_only_when_debug_parameter will also be checked for
 log_only_when_cli = 0
 
@@ -72,13 +72,10 @@ always_archive_data_range = 0;
 ; NOTE: you must also set [log] log_writers[] = "screen" to enable the profiler to print on screen
 enable_sql_profiler = 0
 
-; if set to 1, a Piwik tracking code will be included in the Piwik UI footer and will track visits, pages, etc. to idsite = 1
+; if set to > 0, a Piwik tracking code will be included in the Piwik UI footer and will track visits, pages, etc.
+; data will be stored for idSite = enable_measure_piwik_usage_in_idsite
 ; this is useful for Piwik developers as an easy way to create data in their local Piwik
-track_visits_inside_piwik_ui = 0
-
-; if set to 1, javascript files will be included individually and neither merged nor minified.
-; this option must be set to 1 when adding, removing or modifying javascript files
-disable_merged_assets = 0
+enable_measure_piwik_usage_in_idsite = 0
 
 ; If set to 1, all requests to piwik.php will be forced to be 'new visitors'
 tracker_always_new_visitor = 0
@@ -87,11 +84,24 @@ tracker_always_new_visitor = 0
 allow_upgrades_to_beta = 0
 
 [DebugTests]
-; Set to 1 by default. If you set to 0, the standalone plugins (with their own git repositories)
-; will not be loaded when executing tests.
-enable_load_standalone_plugins_during_tests = 1
+; When set to 1, standalone plugins (those with their own git repositories)
+; will be loaded when executing tests.
+enable_load_standalone_plugins_during_tests = 0
+
+[Development]
+
+; Enables the development mode where we avoid most caching to make sure code changes will be directly applied as
+; some caches are only invalidated after an update otherwise. When enabled it'll also performs some validation checks.
+; For instance if you register a method in a widget we will verify whether the method actually exists and is public.
+; If not, we will show you a helpful warning to make it easy to find simple typos etc.
+enabled = 0
+
+; if set to 1, javascript files will be included individually and neither merged nor minified.
+; this option must be set to 1 when adding, removing or modifying javascript files
+disable_merged_assets = 0
 
 [General]
+
 ; the following settings control whether Unique Visitors will be processed for different period types.
 ; year and range periods are disabled by default, to ensure optimal performance for high traffic Piwik instances
 ; if you set it to 1 and want the Unique Visitors to be re-processed for reports in the past, drop all piwik_archive_* tables
@@ -102,6 +112,12 @@ enable_processing_unique_visitors_month = 1
 enable_processing_unique_visitors_year = 0
 enable_processing_unique_visitors_range = 0
 
+; The list of periods that are available in the Piwik calendar
+; Example use case: custom date range requests are processed in real time,
+; so they may take a few minutes on very high traffic website: you may remove "range" below to disable this period
+enabled_periods_UI = "day,week,month,year,range"
+enabled_periods_API = "day,week,month,year,range"
+
 ; when set to 1, all requests to Piwik will return a maintenance message without connecting to the DB
 ; this is useful when upgrading using the shell command, to prevent other users from accessing the UI while Upgrade is in progress
 maintenance_mode = 0
@@ -147,6 +163,16 @@ browser_archiving_disabled_enforce = 0
 ;       this will only affect custom segments added or modified after this setting is changed.
 enable_create_realtime_segments = 1
 
+; Whether to enable the "Suggest values for segment" in the Segment Editor panel.
+; Set this to 0 in case your Piwik database is very big, and suggested values may not appear in time
+enable_segment_suggested_values = 1
+
+; By default, any user with a "view" access for a website can create segment assigned to this website.
+; Set this to "admin" or "superuser" to require that users should have at least this access to create new segments.
+; Note: anonymous user (even if it has view access) is not allowed to create or edit segment.
+; Possible values are "view", "admin", "superuser"
+adding_segment_requires_access = "view"
+
 ; this action name is used when the URL ends with a slash /
 ; it is useful to have an actual string to write in the UI
 action_default_name = index
@@ -158,6 +184,10 @@ default_language = en
 ; default number of elements in the datatable
 datatable_default_limit = 10
 
+; Each datatable report has a Row Limit selector at the bottom right.
+; By default you can select from 5 to 500 rows. You may customise the values below:
+datatable_row_limits = "5,10,25,50,100,250,500"
+
 ; default number of rows returned in API responses
 ; this value is overwritten by the '# Rows to display' selector.
 ; if set to -1, a click on 'Export as' will export all rows independently of the current '# Rows to display'.
@@ -200,7 +230,7 @@ minimum_pgsql_version = 8.3
 ; Minimum adviced memory limit in php.ini file (see memory_limit value)
 minimum_memory_limit = 128
 
-; Minimum memory limit enforced when archived via misc/cron/archive.php
+; Minimum memory limit enforced when archived via ./console core:archive
 minimum_memory_limit_when_archiving = 768
 
 ; Piwik will check that usernames and password have a minimum length, and will check that characters are "allowed"
@@ -237,6 +267,12 @@ login_password_recovery_email_address = "password-recovery@{DOMAIN}"
 ; name that appears as a Sender in the password recovery email
 login_password_recovery_email_name = Piwik
 
+; email address that appears as a Repy-to in the password recovery email
+; if specified, {DOMAIN} will be replaced by the current Piwik domain
+login_password_recovery_replyto_email_address = "no-reply@{DOMAIN}"
+; name that appears as a Reply-to in the password recovery email
+login_password_recovery_replyto_email_name = "No-reply"
+
 ; By default when user logs out he is redirected to Piwik "homepage" usually the Login form.
 ; Uncomment the next line to set a URL to redirect the user to after he logs out of Piwik.
 ; login_logout_url = http://...
@@ -259,6 +295,9 @@ noreply_email_address = "noreply@{DOMAIN}"
 ; when testing, use your own email address or "nobody"
 feedback_email_address = "feedback@piwik.org"
 
+; using to set reply_to in reports e-mail to login of report creator
+scheduled_reports_replyto_is_user_email_and_alias = 0
+
 ; during archiving, Piwik will limit the number of results recorded, for performance reasons
 ; maximum number of rows for any of the Referrers tables (keywords, search engines, campaigns, etc.)
 datatable_archiving_maximum_rows_referrers = 1000
@@ -347,9 +386,14 @@ enable_trusted_host_check = 1
 ;trusted_hosts[] = example.com
 ;trusted_hosts[] = stats.example.com
 
+; If you use this Piwik instance over multiple hostnames, Piwik will need to know
+; a unique instance_id for this instance, so that Piwik can serve the right custom logo and tmp/* assets,
+; independantly of the hostname Piwik is currently running under.
+; instance_id = stats.example.com
+
 ; 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.zip
 
 ; The API server is an essential part of the Piwik infrastructure/ecosystem to
 ; provide services to Piwik installations, e.g., getLatestVersion and
@@ -411,6 +455,7 @@ enable_auto_update = 1
 ; If set to 0 it also disables the "sent plugin update emails" feature in general and the related setting in the UI.
 enable_update_communication = 1
 
+
 [Tracker]
 ; Piwik uses first party cookies by default. If set to 1,
 ; the visit ID cookie will be set on the Piwik server domain as well
@@ -466,7 +511,7 @@ default_time_one_page_visit = 0
 ; The mapping is defined in core/DataFiles/LanguageToCountry.php,
 enable_language_to_country_guess = 1
 
-; When the misc/cron/archive.php cron hasn't been setup, we still need to regularly run some maintenance tasks.
+; When the `./console core:archive` cron hasn't been setup, we still need to regularly run some maintenance tasks.
 ; Visits to the Tracker will try to trigger Scheduled Tasks (eg. scheduled PDF/HTML reports by email).
 ; Scheduled tasks will only run if 'Enable Piwik Archiving from Browser' is enabled in the General Settings.
 ; Tasks run once every hour maximum, they might not run every hour if traffic is low.
@@ -494,6 +539,18 @@ page_maximum_length = 1024;
 ; TTL: Time to live for cache files, in seconds. Default to 5 minutes.
 tracker_cache_file_ttl = 300
 
+; Whether Bulk tracking requests to the Tracking API requires the token_auth to be set.
+bulk_requests_require_authentication = 0
+
+; Whether Bulk tracking requests will be wrapped within a DB Transaction.
+; This greatly increases performance of Log Analytics and in general any Bulk Tracking API requests.
+bulk_requests_use_transaction = 1
+
+; Comma separated list of known Referrer Spammers, ie. bot visits that set a fake Referrer field.
+; All Visits with a Referrer URL host set to one of these will be excluded.
+; If you find new spam entries in Referrers>Websites, please report them here: https://github.com/piwik/piwik/issues/5099
+referrer_urls_spam = "semalt.com"
+
 ; DO NOT USE THIS SETTING ON PUBLICLY AVAILABLE PIWIK SERVER
 ; !!! Security risk: if set to 0, it would allow anyone to push data to Piwik with custom dates in the past/future and even with fake IPs!
 ; When using the Tracking API, to override either the datetime and/or the visitor IP, 
@@ -501,6 +558,7 @@ tracker_cache_file_ttl = 300
 ; DO NOT USE THIS SETTING ON PUBLIC PIWIK SERVERS
 tracking_requests_require_authentication = 1
 
+
 [Segments]
 ; Reports with segmentation in API requests are processed in real time.
 ; On high traffic websites it is recommended to pre-process the data
@@ -569,6 +627,7 @@ Plugins[] = Dashboard
 Plugins[] = MultiSites
 Plugins[] = Referrers
 Plugins[] = UserSettings
+Plugins[] = DevicesDetection
 Plugins[] = Goals
 Plugins[] = SEO
 Plugins[] = Events
@@ -599,7 +658,8 @@ Plugins[] = MobileMessaging
 Plugins[] = Overlay
 Plugins[] = SegmentEditor
 Plugins[] = Insights
-
+Plugins[] = ZenMode
+Plugins[] = LeftMenu
 Plugins[] = Morpheus
 
 [PluginsInstalled]

console

@@ -11,6 +11,9 @@ if (!defined('PIWIK_USER_PATH')) {
 }
 
 require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
+
+@date_default_timezone_set('UTC');
+
 require_once file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')
     ? PIWIK_INCLUDE_PATH . '/vendor/autoload.php' // Piwik is the main project
     : PIWIK_INCLUDE_PATH . '/../../autoload.php'; // Piwik is installed as a dependency

core/API/DataTableGenericFilter.php

 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -10,12 +10,17 @@ namespace Piwik\API;
 
 use Exception;
 use Piwik\Common;
-use Piwik\DataTable;
 use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal;
+use Piwik\DataTable;
 
 class DataTableGenericFilter
 {
-    private static $genericFiltersInfo = null;
+    /**
+     * List of filter names not to run.
+     *
+     * @var string[]
+     */
+    private $disabledFilters = array();
 
     /**
      * Constructor
@@ -37,6 +42,16 @@ class DataTableGenericFilter
         $this->applyGenericFilters($table);
     }
 
+    /**
+     * Makes sure a set of filters are not run.
+     *
+     * @param string[] $filterNames The name of each filter to disable.
+     */
+    public function disableFilters($filterNames)
+    {
+        $this->disabledFilters = array_unique(array_merge($this->disabledFilters, $filterNames));
+    }
+
     /**
      * Returns an array containing the information of the generic Filter
      * to be applied automatically to the data resulting from the API calls.
@@ -51,43 +66,47 @@ class DataTableGenericFilter
      */
     public static function getGenericFiltersInformation()
     {
-        if (is_null(self::$genericFiltersInfo)) {
-            self::$genericFiltersInfo = array(
-                'Pattern'                        => array(
-                    'filter_column'  => array('string', 'label'),
-                    'filter_pattern' => array('string'),
-                ),
-                'PatternRecursive'               => array(
-                    'filter_column_recursive'  => array('string', 'label'),
-                    'filter_pattern_recursive' => array('string'),
-                ),
-                'ExcludeLowPopulation'           => array(
-                    'filter_excludelowpop'       => array('string'),
-                    'filter_excludelowpop_value' => array('float', '0'),
-                ),
-                'AddColumnsProcessedMetrics'     => array(
-                    'filter_add_columns_when_show_all_columns' => array('integer')
-                ),
-                'AddColumnsProcessedMetricsGoal' => array(
-                    'filter_update_columns_when_show_all_goals' => array('integer'),
-                    'idGoal'                                    => array('string', AddColumnsProcessedMetricsGoal::GOALS_OVERVIEW),
-                ),
-                'Sort'                           => array(
-                    'filter_sort_column' => array('string'),
-                    'filter_sort_order'  => array('string', 'desc'),
-                ),
-                'Truncate'                       => array(
-                    'filter_truncate' => array('integer'),
-                ),
-                'Limit'                          => array(
-                    'filter_offset'    => array('integer', '0'),
-                    'filter_limit'     => array('integer'),
-                    'keep_summary_row' => array('integer', '0'),
-                ),
-            );
-        }
-
-        return self::$genericFiltersInfo;
+        return array(
+            array('Pattern',
+                  array(
+                      'filter_column'  => array('string', 'label'),
+                      'filter_pattern' => array('string')
+                  )),
+            array('PatternRecursive',
+                  array(
+                      'filter_column_recursive'  => array('string', 'label'),
+                      'filter_pattern_recursive' => array('string'),
+                  )),
+            array('ExcludeLowPopulation',
+                  array(
+                      'filter_excludelowpop'       => array('string'),
+                      'filter_excludelowpop_value' => array('float', '0'),
+                  )),
+            array('AddColumnsProcessedMetrics',
+                  array(
+                      'filter_add_columns_when_show_all_columns' => array('integer')
+                  )),
+            array('AddColumnsProcessedMetricsGoal',
+                  array(
+                      'filter_update_columns_when_show_all_goals' => array('integer'),
+                      'idGoal'                                    => array('string', AddColumnsProcessedMetricsGoal::GOALS_OVERVIEW),
+                  )),
+            array('Sort',
+                  array(
+                      'filter_sort_column' => array('string'),
+                      'filter_sort_order'  => array('string', 'desc'),
+                  )),
+            array('Truncate',
+                  array(
+                      'filter_truncate' => array('integer'),
+                  )),
+            array('Limit',
+                  array(
+                      'filter_offset'    => array('integer', '0'),
+                      'filter_limit'     => array('integer'),
+                      'keep_summary_row' => array('integer', '0'),
+                  )),
+        );
     }
 
     /**
@@ -110,10 +129,17 @@ class DataTableGenericFilter
         $genericFilters = self::getGenericFiltersInformation();
 
         $filterApplied = false;
-        foreach ($genericFilters as $filterName => $parameters) {
+        foreach ($genericFilters as $filterMeta) {
+            $filterName = $filterMeta[0];
+            $filterParams = $filterMeta[1];
             $filterParameters = array();
             $exceptionRaised = false;
-            foreach ($parameters as $name => $info) {
+
+            if (in_array($filterName, $this->disabledFilters)) {
+                continue;
+            }
+
+            foreach ($filterParams as $name => $info) {
                 // parameter type to cast to
                 $type = $info[0];
 

core/API/DataTableManipulator.php

 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

core/API/DataTableManipulator/Flattener.php

 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

core/API/DataTableManipulator/LabelFilter.php

 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -24,6 +24,7 @@ use Piwik\DataTable\Row;
 class LabelFilter extends DataTableManipulator
 {
     const SEPARATOR_RECURSIVE_LABEL = '>';
+    const TERMINAL_OPERATOR = '@';
 
     private $labels;
     private $addLabelIndex;
@@ -111,16 +112,22 @@ class LabelFilter extends DataTableManipulator
      * Note: The HTML Encoded version must be tried first, since in ResponseBuilder the $label is unsanitized
      * via Common::unsanitizeLabelParameter.
      *
-     * @param string $label
+     * @param string $originalLabel
      * @return array
      */
-    private function getLabelVariations($label)
+    private function getLabelVariations($originalLabel)
     {
         static $pageTitleReports = array('getPageTitles', 'getEntryPageTitles', 'getExitPageTitles');
 
+        $originalLabel = trim($originalLabel);
+
+        $isTerminal = substr($originalLabel, 0, 1) == self::TERMINAL_OPERATOR;
+        if ($isTerminal) {
+            $originalLabel = substr($originalLabel, 1);
+        }
+
         $variations = array();
-        $label = urldecode($label);
-        $label = trim($label);
+        $label = trim(urldecode($originalLabel));
 
         $sanitizedLabel = Common::sanitizeInputValue($label);
         $variations[] = $sanitizedLabel;
@@ -128,10 +135,15 @@ class LabelFilter extends DataTableManipulator
         if ($this->apiModule == 'Actions'
             && in_array($this->apiMethod, $pageTitleReports)
         ) {
-            // special case: the Actions.getPageTitles report prefixes some labels with a blank.
-            // the blank might be passed by the user but is removed in Request::getRequestArrayFromString.
-            $variations[] = ' ' . $sanitizedLabel;
-            $variations[] = ' ' . $label;
+            if ($isTerminal) {
+                array_unshift($variations, ' ' . $sanitizedLabel);
+                array_unshift($variations, ' ' . $label);
+            } else {
+                // special case: the Actions.getPageTitles report prefixes some labels with a blank.
+                // the blank might be passed by the user but is removed in Request::getRequestArrayFromString.
+                $variations[] = ' ' . $sanitizedLabel;
+                $variations[] = ' ' . $label;
+            }
         }
         $variations[] = $label;
 

core/API/DataTableManipulator/ReportTotalsCalculator.php

 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -11,11 +11,8 @@ namespace Piwik\API\DataTableManipulator;
 use Piwik\API\DataTableManipulator;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\DataTable\BaseFilter;
-use Piwik\Period\Range;
-use Piwik\Period;
-use Piwik\Piwik;
 use Piwik\Metrics;
+use Piwik\Period;
 use Piwik\Plugins\API\API;
 
 /**

core/API/DocumentationGenerator.php

 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -136,6 +136,7 @@ class DocumentationGenerator
             'ip'             => '194.57.91.215',
             'idSites'             => '1,2',
             'idAlert'             => '1',
+            'seconds'        => '3600',
 //            'segmentName'    => 'browserCode',
         );
 
@@ -185,6 +186,7 @@ class DocumentationGenerator
         $aParameters['include_aggregate_rows'] = false;
         $aParameters['filter_limit'] = false; //@review without adding this, I can not set filter_limit in $otherRequestParameters integration tests
         $aParameters['filter_sort_column'] = false; //@review without adding this, I can not set filter_sort_column in $otherRequestParameters integration tests
+        $aParameters['filter_sort_order'] = false; //@review without adding this, I can not set filter_sort_order in $otherRequestParameters integration tests
         $aParameters['filter_truncate'] = false;
         $aParameters['hideColumns'] = false;
         $aParameters['showColumns'] = false;

core/API/Proxy.php

 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

core/API/Request.php

 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -343,7 +343,7 @@ class Request
         // unless the filter param was in $queryParams
         $genericFiltersInfo = DataTableGenericFilter::getGenericFiltersInformation();
         foreach ($genericFiltersInfo as $filter) {
-            foreach ($filter as $queryParamName => $queryParamInfo) {
+            foreach ($filter[1] as $queryParamName => $queryParamInfo) {
                 if (!isset($params[$queryParamName])) {
                     $params[$queryParamName] = null;
                 }

core/API/ResponseBuilder.php

 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -295,6 +295,9 @@ class ResponseBuilder
      */
     protected function handleDataTable($datatable)
     {
+        // process request
+        $label = $this->getLabelFromRequest($this->request);
+
         // if requested, flatten nested tables
         if (Common::getRequestVar('flat', '0', 'string', $this->request) == '1') {
             $flattener = new Flattener($this->apiModule, $this->apiMethod, $this->request);
@@ -312,6 +315,10 @@ class ResponseBuilder
         // if the flag disable_generic_filters is defined we skip the generic filters
         if (0 == Common::getRequestVar('disable_generic_filters', '0', 'string', $this->request)) {
             $genericFilter = new DataTableGenericFilter($this->request);
+            if (!empty($label)) {
+                $genericFilter->disableFilters(array('Limit', 'Truncate'));
+            }
+
             $genericFilter->filter($datatable);
         }
 
@@ -332,7 +339,6 @@ class ResponseBuilder
         }
 
         // apply label filter: only return rows matching the label parameter (more than one if more than one label)
-        $label = $this->getLabelFromRequest($this->request);
         if (!empty($label)) {
             $addLabelIndex = Common::getRequestVar('labelFilterAddLabelIndex', 0, 'int', $this->request) == 1;
 

core/Access.php

 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -9,7 +9,6 @@
 namespace Piwik;
 
 use Piwik\Db;
-use Piwik\Plugins\UsersManager\API as APIUsersManager;
 
 /**
  * Singleton that manages user access to Piwik resources.

core/Archive.php

 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -9,10 +9,9 @@
 namespace Piwik;
 
 use Piwik\Archive\Parameters;
-
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\DataAccess\ArchiveSelector;
-use Piwik\Period\Range;
+use Piwik\Period\Factory;
 
 /**
  * The **Archive** class is used to query cached analytics statistics
@@ -101,8 +100,7 @@ use Piwik\Period\Range;
  * 
  * <a name="footnote-1"></a>
  * [1]: The archiving process will not be launched if browser archiving is disabled
- *      and the current request came from a browser (and not the **archive.php** cron
- *      script).
+ *      and the current request came from a browser.
  *
  *
  * @api
@@ -199,12 +197,13 @@ class Archive
     {
         $websiteIds = Site::getIdSitesFromIdSitesString($idSites, $_restrictSitesToLogin);
 
+        $timezone = count($websiteIds) == 1 ? Site::getTimezoneFor($websiteIds[0]) : false;
+
         if (Period::isMultiplePeriod($strDate, $period)) {
-            $oPeriod = new Range($period, $strDate);
+            $oPeriod = Factory::build($period, $strDate, $timezone);
             $allPeriods = $oPeriod->getSubperiods();
         } else {
-            $timezone = count($websiteIds) == 1 ? Site::getTimezoneFor($websiteIds[0]) : false;
-            $oPeriod = Period::makePeriodFromQueryParams($timezone, $period, $strDate);
+            $oPeriod = Factory::makePeriodFromQueryParams($timezone, $period, $strDate);
             $allPeriods = array($oPeriod);
         }
         $segment = new Segment($segment, $websiteIds);

core/Archive/DataCollection.php

 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later