diff options
| -rw-r--r-- | PRIVACY.md | 2 | ||||
| -rwxr-xr-x | config/global.ini.php | 4 | ||||
| -rw-r--r-- | core/Session.php | 2 | ||||
| -rw-r--r-- | core/Session/SessionFingerprint.php | 2 | ||||
| -rw-r--r-- | core/Updates/4.0.0-b2.php | 2 | ||||
| -rw-r--r-- | plugins/Login/tests/Integration/SessionInitializerTest.php | 4 |
6 files changed, 9 insertions, 7 deletions
diff --git a/PRIVACY.md b/PRIVACY.md index 79e6a327c0..ebf59b7861 100644 --- a/PRIVACY.md +++ b/PRIVACY.md @@ -18,7 +18,7 @@ purge old data. You can configure Matomo to automatically delete log data older ### Include a tracking Opt-Out feature on your site In your website, we recommended providing an easy way for your visitors to “opt-out” of being tracked by Matomo. -You can use the Opt-Out feature to display a link your website that sets a special browser cookie (`piwik_ignore`) when +You can use the Opt-Out feature to display a link your website that sets a special browser cookie (`matomo_ignore`) when clicked. Visitors that click that link will be ignored by Matomo in the future: [How to include a tracking opt-out iframe.](https://matomo.org/docs/privacy/#step-3-include-a-web-analytics-opt-out-feature-on-your-site-using-an-iframe) diff --git a/config/global.ini.php b/config/global.ini.php index 3fec1ac4e2..c3c628bbd3 100755 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -395,7 +395,7 @@ hash_algorithm = whirlpool force_ssl = 0 ; (DEPRECATED) has no effect -login_cookie_name = piwik_auth +login_cookie_name = matomo_auth ; By default, the auth cookie is set only for the duration of session. ; if "Remember me" is checked, the auth cookie will be valid for 14 days by default @@ -825,7 +825,7 @@ enable_language_to_country_guess = 1 scheduled_tasks_min_interval = 3600 ; name of the cookie to ignore visits -ignore_visits_cookie_name = piwik_ignore +ignore_visits_cookie_name = matomo_ignore ; Comma separated list of variable names that will be read to define a Campaign name, for example CPC campaign ; Example: If a visitor first visits 'index.php?matomo_campaign=Adwords-CPC' then it will be counted as a campaign referrer named 'Adwords-CPC' diff --git a/core/Session.php b/core/Session.php index 0104bb4f6c..3a20c10c72 100644 --- a/core/Session.php +++ b/core/Session.php @@ -71,7 +71,7 @@ class Session extends Zend_Session // incorrectly invalidate the session @ini_set('session.referer_check', ''); - // to preserve previous behavior piwik_auth provided when it contained a token_auth, we ensure + // to preserve previous behavior matomo_auth provided when it contained a token_auth, we ensure // the session data won't be deleted until the cookie expires. @ini_set('session.gc_maxlifetime', $config->General['login_cookie_expire']); diff --git a/core/Session/SessionFingerprint.php b/core/Session/SessionFingerprint.php index 7e28b1af03..231ba17ea6 100644 --- a/core/Session/SessionFingerprint.php +++ b/core/Session/SessionFingerprint.php @@ -30,7 +30,7 @@ use Piwik\Date; * against what is stored in the session. If it doesn't then this is a * session hijacking attempt. * - * We also check that a hash in the piwik_auth cookie matches the hash + * We also check that a hash in the matomo_auth cookie matches the hash * of the time the user last changed their password + the session secret. * If they don't match, the password has been changed since this session * started, and is no longer valid. diff --git a/core/Updates/4.0.0-b2.php b/core/Updates/4.0.0-b2.php index a4d778115d..a872fa1e6b 100644 --- a/core/Updates/4.0.0-b2.php +++ b/core/Updates/4.0.0-b2.php @@ -48,6 +48,8 @@ class Updates_4_0_0_b2 extends PiwikUpdates ], ['idinvalidation']); $migrations[] = $this->migration->db->addIndex('archive_invalidations', ['idsite', 'date1', 'period'], 'index_idsite_dates_period_name'); + // keep piwik_ignore for existing installs + $migrations[] = $this->migration->config->set('Tracker', 'ignore_visits_cookie_name', 'piwik_ignore'); return $migrations; } diff --git a/plugins/Login/tests/Integration/SessionInitializerTest.php b/plugins/Login/tests/Integration/SessionInitializerTest.php index 64f06ffe11..d38be17af8 100644 --- a/plugins/Login/tests/Integration/SessionInitializerTest.php +++ b/plugins/Login/tests/Integration/SessionInitializerTest.php @@ -65,7 +65,7 @@ class SessionInitializerTest extends IntegrationTestCase private function assertAuthCookieIsAbsent() { - $this->assertArrayNotHasKey('piwik_auth', $_COOKIE); + $this->assertArrayNotHasKey('matomo_auth', $_COOKIE); } private function assertAuthCookieIsCreated(Cookie $cookie) @@ -75,7 +75,7 @@ class SessionInitializerTest extends IntegrationTestCase private function createAuthCookie() { - $_COOKIE['piwik_auth'] = 'login=czo5OiJ0ZXN0bG9naW4iOw==:token_auth=czozMjoiOWU5MDYxZjk2MDI0YTY3NWFmOGFkNWZmNmNiZGY2ZGMiOw=='; + $_COOKIE['matomo_auth'] = 'login=czo5OiJ0ZXN0bG9naW4iOw==:token_auth=czozMjoiOWU5MDYxZjk2MDI0YTY3NWFmOGFkNWZmNmNiZGY2ZGMiOw=='; } private function assertAuthCookieIsDeleted(Cookie $cookie) |