From 37c5c0749bba33f3452d16fd41bdea6bd4c0c0cc Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Tue, 16 Mar 2010 11:12:09 +0000
Subject: [PATCH] Fixes #1155 Cookie path can now be defined in config file
git-svn-id: http://dev.piwik.org/svn/trunk@1927 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
config/global.ini.php | 8 ++++++++
core/Cookie.php | 8 +++++---
core/Tracker/Visit.php | 12 +++++++++++-
plugins/Login/Controller.php | 3 ++-
plugins/Login/Login.php | 3 ++-
5 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/config/global.ini.php b/config/global.ini.php
index 1e9b3bc31e..780bfe5fe3 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -122,6 +122,10 @@ login_cookie_name = piwik_auth
; login cookie expiration (30 days)
login_cookie_expire = 2592000
+; The path on the server in which the cookie will be available on.
+; Defaults to empty. See spec in http://curl.haxx.se/rfc/cookie_spec.html
+login_cookie_path =
+
; email address that appears as a Sender in the password recovery email
; if specified, {DOMAIN} will be replaced by the current Piwik domain
login_password_recovery_email_address = "password-recovery@{DOMAIN}"
@@ -191,6 +195,10 @@ cookie_name = piwik_visitor
; by default, the Piwik tracking cookie expires in 2 years
cookie_expire = 63072000
+; The path on the server in which the cookie will be available on.
+; Defaults to empty. See spec in http://curl.haxx.se/rfc/cookie_spec.html
+cookie_path =
+
; variable name to track any campaign, for example CPC campaign
; Example: If a visitor first visits 'index.php?piwik_campaign=Adwords-CPC' then it will be counted as a campaign referer named 'Adwords-CPC'
campaign_var_name = piwik_campaign
diff --git a/core/Cookie.php b/core/Cookie.php
index c688cf09eb..26eee20f34 100644
--- a/core/Cookie.php
+++ b/core/Cookie.php
@@ -46,11 +46,12 @@ class Piwik_Cookie
*
* @param string cookie Name
* @param int The timestamp after which the cookie will expire, eg time() + 86400
+ * @param string The path on the server in which the cookie will be available on.
*/
- public function __construct( $cookieName, $expire = null)
+ public function __construct( $cookieName, $expire = null, $path = null)
{
$this->name = $cookieName;
-
+ $this->path = $path;
$this->expire = $expire;
if(is_null($expire)
|| !is_numeric($expire)
@@ -59,6 +60,7 @@ class Piwik_Cookie
$this->expire = $this->getDefaultExpire();
}
+
if($this->isCookieFound())
{
$this->loadContentFromCookie();
@@ -139,7 +141,7 @@ class Piwik_Cookie
public function save()
{
$this->setP3PHeader();
- $this->setCookie( $this->name, $this->generateContentString(), $this->expire);
+ $this->setCookie( $this->name, $this->generateContentString(), $this->expire, $this->path);
}
/**
diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index 7b73acc0a4..c118be2088 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -476,6 +476,16 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
{
return time() + Piwik_Tracker_Config::getInstance()->Tracker['cookie_expire'];
}
+
+ /**
+ * Returns cookie path
+ *
+ * @return string
+ */
+ protected function getCookiePath()
+ {
+ return Piwik_Tracker_Config::getInstance()->Tracker['cookie_path'];
+ }
/**
* This methods tries to see if the visitor has visited the website before.
@@ -509,7 +519,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
protected function recognizeTheVisitor()
{
$this->visitorKnown = false;
- $this->setCookie( new Piwik_Cookie( $this->getCookieName(), $this->getCookieExpire() ) );
+ $this->setCookie( new Piwik_Cookie( $this->getCookieName(), $this->getCookieExpire(), $this->getCookiePath() ) );
/*
* Case the visitor has the piwik cookie.
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 23e6cceceb..870dd5db8e 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -138,7 +138,8 @@ class Piwik_Login_Controller extends Piwik_Controller
$authCookieName = Zend_Registry::get('config')->General->login_cookie_name;
$authCookieExpiry = time() + Zend_Registry::get('config')->General->login_cookie_expire;
- $cookie = new Piwik_Cookie($authCookieName, $authCookieExpiry);
+ $authCookiePath = Zend_Registry::get('config')->General->login_cookie_path;
+ $cookie = new Piwik_Cookie($authCookieName, $authCookieExpiry, $authCookiePath);
$cookie->set('login', $login);
$cookie->set('token_auth', $authResult->getTokenAuth());
$cookie->save();
diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php
index 0ca90e69b6..0e10113237 100644
--- a/plugins/Login/Login.php
+++ b/plugins/Login/Login.php
@@ -68,7 +68,8 @@ class Piwik_Login extends Piwik_Plugin
$authCookieName = Zend_Registry::get('config')->General->login_cookie_name;
$authCookieExpiry = time() + Zend_Registry::get('config')->General->login_cookie_expire;
- $authCookie = new Piwik_Cookie($authCookieName, $authCookieExpiry);
+ $authCookiePath = Zend_Registry::get('config')->General->login_cookie_path;
+ $authCookie = new Piwik_Cookie($authCookieName, $authCookieExpiry, $authCookiePath);
$defaultLogin = 'anonymous';
$defaultTokenAuth = 'anonymous';
if($authCookie->isCookieFound())
--
GitLab