From 4700b44125131d1121a346d6135e451cbf438be7 Mon Sep 17 00:00:00 2001 From: MasterShredder Date: Sun, 7 Dec 2014 05:52:24 +0400 Subject: [ticket/13422] Add new event core.ucp_save_custom_cookies PHPBB3-13422 --- phpBB/ucp.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 182bc2e285..d8b8e92119 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -164,6 +164,22 @@ switch ($mode) $cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name); + /** + * Event to save custom cookies from deletion + * + * @event core.ucp_save_custom_cookies + * @var string cookie_name Cookie name to checking + * @var bool continue Do we save our cookie or not + * @since 3.1.3-RC1 + */ + $continue = false; + $vars = array('cookie_name', 'continue'); + extract($phpbb_dispatcher->trigger_event('core.ucp_save_custom_cookies', compact($vars))); + if ($continue) + { + continue; + } + // Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_ if (strpos($cookie_name, 'poll_') !== 0) { -- cgit v1.2.1 From 50ed202aacb79703892eb822a6ac7e05079c0e85 Mon Sep 17 00:00:00 2001 From: MasterShredder Date: Sat, 27 Dec 2014 17:43:30 +0400 Subject: [ticket/13422] Renamed "continue" variable to "retain_cookie" for the event core.ucp_save_custom_cookies PHPBB3-13422 --- phpBB/ucp.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index d8b8e92119..e20bc15f49 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -169,13 +169,13 @@ switch ($mode) * * @event core.ucp_save_custom_cookies * @var string cookie_name Cookie name to checking - * @var bool continue Do we save our cookie or not + * @var bool retain_cookie Do we retain our cookie or not, true if retain * @since 3.1.3-RC1 */ - $continue = false; - $vars = array('cookie_name', 'continue'); + $retain_cookie = false; + $vars = array('cookie_name', 'retain_cookie'); extract($phpbb_dispatcher->trigger_event('core.ucp_save_custom_cookies', compact($vars))); - if ($continue) + if ($retain_cookie) { continue; } -- cgit v1.2.1 From 0a1f8388d006d83ce0eba648200f62861cebfd1d Mon Sep 17 00:00:00 2001 From: MasterShredder Date: Sun, 28 Dec 2014 03:44:07 +0400 Subject: [ticket/13422] Changed some spaces to tabs PHPBB3-13422 --- phpBB/ucp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index e20bc15f49..654fd59345 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -168,8 +168,8 @@ switch ($mode) * Event to save custom cookies from deletion * * @event core.ucp_save_custom_cookies - * @var string cookie_name Cookie name to checking - * @var bool retain_cookie Do we retain our cookie or not, true if retain + * @var string cookie_name Cookie name to checking + * @var bool retain_cookie Do we retain our cookie or not, true if retain * @since 3.1.3-RC1 */ $retain_cookie = false; -- cgit v1.2.1 From 655d95002c3ea0289eb27a89ef33ddccefa247c3 Mon Sep 17 00:00:00 2001 From: MasterShredder Date: Sun, 28 Dec 2014 13:20:04 +0400 Subject: [ticket/13422] Renamed event PHPBB3-13422 --- phpBB/ucp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 654fd59345..8c74ca1f3c 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -167,14 +167,14 @@ switch ($mode) /** * Event to save custom cookies from deletion * - * @event core.ucp_save_custom_cookies + * @event core.ucp_delete_cookies * @var string cookie_name Cookie name to checking * @var bool retain_cookie Do we retain our cookie or not, true if retain * @since 3.1.3-RC1 */ $retain_cookie = false; $vars = array('cookie_name', 'retain_cookie'); - extract($phpbb_dispatcher->trigger_event('core.ucp_save_custom_cookies', compact($vars))); + extract($phpbb_dispatcher->trigger_event('core.ucp_delete_cookies', compact($vars))); if ($retain_cookie) { continue; -- cgit v1.2.1