From 68959e336d60a2bb5e91bda6521a32bfc903fa50 Mon Sep 17 00:00:00 2001 From: djarrancotleanu Date: Fri, 22 Nov 2024 15:36:27 +1000 Subject: [PATCH] Fix #350: Do not setcookie during unit tests --- classes/local/outagelib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/local/outagelib.php b/classes/local/outagelib.php index 94638fb..5386859 100644 --- a/classes/local/outagelib.php +++ b/classes/local/outagelib.php @@ -311,8 +311,9 @@ if ((time() >= {{STARTTIME}}) && (time() < {{STOPTIME}})) { } // Put access key as a cookie if given. This stops the need to put it as a url param on every request. $urlaccesskey = optional_param('accesskey', null, PARAM_TEXT); + $isphpunit = defined('PHPUNIT_TEST'); - if (!empty($urlaccesskey)) { + if (!empty($urlaccesskey) && !$isphpunit) { setcookie('auth_outage_accesskey', $urlaccesskey, time() + 86400, '/', '', {{COOKIESECURE}}, {{COOKIEHTTPONLY}}); } @@ -322,7 +323,6 @@ if ((time() >= {{STARTTIME}}) && (time() < {{STOPTIME}})) { $ipblocked = !remoteip_in_list('{{ALLOWEDIPS}}'); $accesskeyblocked = $useraccesskey != '{{ACCESSKEY}}'; $allowed = ({{USEACCESSKEY}} && !$accesskeyblocked) || ({{USEALLOWEDIPS}} && !$ipblocked); - $isphpunit = defined('PHPUNIT_TEST'); if (!$allowed) { if (!$isphpunit) {