From ff285493990a1dac4b9e91a3f7bfd28eff353cb9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Thu, 26 Nov 2020 12:35:21 +0100 Subject: [PATCH] Improve variable naming in update_com.woltlab.wcf_5.4_session_1_cookies.php --- .../update_com.woltlab.wcf_5.4_session_1_cookies.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_1_cookies.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_1_cookies.php index 7bd8faf70e..db926ee461 100644 --- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_1_cookies.php +++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_session_1_cookies.php @@ -18,25 +18,25 @@ use wcf\util\CryptoUtil; use wcf\util\HeaderUtil; // 1) Check whether the cookies are already in place. -$sessionIdOkay = false; +$hasValidSessionCookie = false; if (!empty($_COOKIE[COOKIE_PREFIX."acp_session"])) { $cookieValue = CryptoUtil::getValueFromSignedString($_COOKIE[COOKIE_PREFIX."acp_session"]); if ($cookieValue) { $sessionID = \bin2hex($cookieValue); if ($sessionID === WCF::getSession()->sessionID) { - $sessionIdOkay = true; + $hasValidSessionCookie = true; } } } -$xsrfTokenOkay = false; +$hasValidXsrfToken = false; if (!empty($_COOKIE['XSRF-TOKEN'])) { if (CryptoUtil::validateSignedString($_COOKIE['XSRF-TOKEN'])) { - $xsrfTokenOkay = true; + $hasValidXsrfToken = true; } } -if ($sessionIdOkay && $xsrfTokenOkay) { +if ($hasValidSessionCookie && $hasValidXsrfToken) { // The process may continue; return; } -- 2.20.1