From 6b85faf7dad5a83eb28a06fdcf428102ae63bc28 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Fri, 4 Oct 2019 14:11:37 +0200
Subject: [ticket/16174] Add core.set_cookie

PHPBB3-16174
---
 phpBB/phpbb/session.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 31f32af7c4..057c69b666 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,22 @@ class session
 			return;
 		}
 
+		$disable_cookie = false;
+		/**
+		* Event to disable setting cookie
+		*
+		* @event core.set_cookie
+		* @var	bool		disable_cookie		Set to true to disable setting this cookie
+		* @since 3.2.9-RC1
+		*/
+		$vars = array('disable_cookie');
+		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'];
-- 
cgit v1.2.1


From 367b0bc2084d53ab6c7f2b6c7a61a0aba9cf04a2 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Mon, 7 Oct 2019 13:47:02 +0200
Subject: [ticket/16174] Add function params to the event

PHPBB3-16174
---
 phpBB/phpbb/session.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 057c69b666..237513e05f 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1090,10 +1090,20 @@ class session
 		* Event to disable setting cookie
 		*
 		* @event core.set_cookie
-		* @var	bool		disable_cookie		Set to true to disable setting this 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');
+		$vars = array(
+			'disable_cookie',
+			'name',
+			'cookiedata',
+			'cookietime',
+			'httponly',
+		);
 		extract($phpbb_dispatcher->trigger_event('core.set_cookie', compact($vars)));
 
 		if ($disable_cookie)
-- 
cgit v1.2.1


From 1aaeb2bca997282800f4cc30a6951104322ae433 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Tue, 8 Oct 2019 09:29:22 +0200
Subject: [ticket/16174] Improve event desc

PHPBB3-16174
---
 phpBB/phpbb/session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 237513e05f..cc5a1b8f8f 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1087,7 +1087,7 @@ class session
 
 		$disable_cookie = false;
 		/**
-		* Event to disable setting cookie
+		* Event to modify or disable setting cookies
 		*
 		* @event core.set_cookie
 		* @var	bool		disable_cookie	Set to true to disable setting this cookie
-- 
cgit v1.2.1