diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-10-20 21:01:44 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-10-20 21:01:44 +0200 |
| commit | 06c894ff7f77e53773aa1e7d205b494cc6480b5c (patch) | |
| tree | c981e031fc47cdb6ddb84a55554685b5c6721db3 /phpBB/phpbb/session.php | |
| parent | e75071fbd224f555309a91897efa10f2c4a9e90a (diff) | |
| parent | f0bf54f9eb01379ae3c18b351da75bbd8b071c64 (diff) | |
| download | forums-06c894ff7f77e53773aa1e7d205b494cc6480b5c.tar forums-06c894ff7f77e53773aa1e7d205b494cc6480b5c.tar.gz forums-06c894ff7f77e53773aa1e7d205b494cc6480b5c.tar.bz2 forums-06c894ff7f77e53773aa1e7d205b494cc6480b5c.tar.xz forums-06c894ff7f77e53773aa1e7d205b494cc6480b5c.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 38e40ba29e..7624a67b05 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -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']; |