mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
ENHANCEMENT Session::set_cookie_path() and Session::set_cookie_domain() are now possible. This is useful for sharing cookies across all subdomains, for example. (from r109101)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112779 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
bf935d5a5e
commit
215cbb6b36
@ -83,16 +83,63 @@ class Session {
|
||||
/**
|
||||
* @var $timeout Set session timeout
|
||||
*/
|
||||
static protected $timeout = 0;
|
||||
protected static $timeout = 0;
|
||||
|
||||
static protected $session_ips = array();
|
||||
protected static $session_ips = array();
|
||||
|
||||
protected static $cookie_domain;
|
||||
|
||||
protected static $cookie_path;
|
||||
|
||||
/**
|
||||
* Session data
|
||||
*/
|
||||
protected $data = array();
|
||||
|
||||
protected $changedData = array();
|
||||
|
||||
/**
|
||||
* Cookie domain, for example 'www.php.net'.
|
||||
*
|
||||
* To make cookies visible on all subdomains then the domain
|
||||
* must be prefixed with a dot like '.php.net'.
|
||||
*
|
||||
* @param string $domain The domain to set
|
||||
*/
|
||||
public static function set_cookie_domain($domain) {
|
||||
self::$cookie_domain = $domain;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the cookie domain.
|
||||
* @return string
|
||||
*/
|
||||
public static function get_cookie_domain() {
|
||||
return self::$cookie_domain;
|
||||
}
|
||||
|
||||
/**
|
||||
* Path to set on the domain where the session cookie will work.
|
||||
* Use a single slash ('/') for all paths on the domain.
|
||||
*
|
||||
* @param string $path The path to set
|
||||
*/
|
||||
public static function set_cookie_path($path) {
|
||||
self::$cookie_path = $path;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the path on the domain where the session cookie will work.
|
||||
* @return string
|
||||
*/
|
||||
public static function get_cookie_path() {
|
||||
if(self::$cookie_path) {
|
||||
return self::$cookie_path;
|
||||
} else {
|
||||
return Director::baseURL();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new session object, with the given starting data
|
||||
*
|
||||
@ -348,9 +395,16 @@ class Session {
|
||||
*/
|
||||
public static function start($sid = null) {
|
||||
self::load_config();
|
||||
$path = self::get_cookie_path();
|
||||
$domain = self::get_cookie_domain();
|
||||
|
||||
if(!session_id() && !headers_sent()) {
|
||||
session_set_cookie_params(self::$timeout, Director::baseURL());
|
||||
if($domain) {
|
||||
session_set_cookie_params(self::$timeout, $path, $domain);
|
||||
} else {
|
||||
session_set_cookie_params(self::$timeout, $path);
|
||||
}
|
||||
|
||||
// @ is to supress win32 warnings/notices when session wasn't cleaned up properly
|
||||
// There's nothing we can do about this, because it's an operating system function!
|
||||
if($sid) session_id($sid);
|
||||
|
Loading…
Reference in New Issue
Block a user