mirror of
https://github.com/phpbb/phpbb.git
synced 2025-03-21 08:00:46 +01:00
Merge branch '3.2.x' into 3.3.x
This commit is contained in:
commit
06c894ff7f
@ -1077,7 +1077,7 @@ class session
|
||||
*/
|
||||
function set_cookie($name, $cookiedata, $cookietime, $httponly = true)
|
||||
{
|
||||
global $config;
|
||||
global $config, $phpbb_dispatcher;
|
||||
|
||||
// If headers are already set, we just return
|
||||
if (headers_sent())
|
||||
@ -1085,6 +1085,32 @@ class session
|
||||
return;
|
||||
}
|
||||
|
||||
$disable_cookie = false;
|
||||
/**
|
||||
* Event to modify or disable setting cookies
|
||||
*
|
||||
* @event core.set_cookie
|
||||
* @var bool disable_cookie Set to true to disable setting this cookie
|
||||
* @var string name Name of the cookie
|
||||
* @var string cookiedata The data to hold within the cookie
|
||||
* @var int cookietime The expiration time as UNIX timestamp
|
||||
* @var bool httponly Use HttpOnly?
|
||||
* @since 3.2.9-RC1
|
||||
*/
|
||||
$vars = array(
|
||||
'disable_cookie',
|
||||
'name',
|
||||
'cookiedata',
|
||||
'cookietime',
|
||||
'httponly',
|
||||
);
|
||||
extract($phpbb_dispatcher->trigger_event('core.set_cookie', compact($vars)));
|
||||
|
||||
if ($disable_cookie)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
$name_data = rawurlencode($config['cookie_name'] . '_' . $name) . '=' . rawurlencode($cookiedata);
|
||||
$expire = gmdate('D, d-M-Y H:i:s \\G\\M\\T', $cookietime);
|
||||
$domain = (!$config['cookie_domain'] || $config['cookie_domain'] == '127.0.0.1' || strpos($config['cookie_domain'], '.') === false) ? '' : '; domain=' . $config['cookie_domain'];
|
||||
|
Loading…
x
Reference in New Issue
Block a user