From e648d83d0823e4d80d7c1a0e4f30cabb482eb462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= Date: Fri, 12 Dec 2025 20:19:29 +0900 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- util.php | 64 +++++++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/util.php b/util.php index 50c4409..9fa3ab4 100644 --- a/util.php +++ b/util.php @@ -178,47 +178,45 @@ function assert_unless_success(Result $assertion, Throwable|string|null $descrip return false; } -if (AUTH_ENABLED) { - function getcookie(string $name): string|null { - return $_COOKIE[$name] ?? null; - } +function getcookie(string $name): string|null { + return $_COOKIE[$name] ?? null; +} - function namecolor(\stdClass $userData): string { - $ban = "#888888"; - $male = "#97ACEF"; - $female = "#F185C9"; - $ungender = "#7C60B0"; +function namecolor(\stdClass $userData): string { + $ban = "#888888"; + $male = "#97ACEF"; + $female = "#F185C9"; + $ungender = "#7C60B0"; - $gender = 'color: '.($userData->gender === 0 ? $male : ($userData->gender === 1 ? $female : $ungender)).';'; - $style = $userData->namecolor ?: ($userData->role >= 0 ? $gender : $ban); + $gender = 'color: '.($userData->gender === 0 ? $male : ($userData->gender === 1 ? $female : $ungender)).';'; + $style = $userData->namecolor ?: ($userData->role >= 0 ? $gender : $ban); - $showname = $userData->displayname ?: $userData->username; + $showname = $userData->displayname ?: $userData->username; - $color = "{$showname}"; - if ($userData->role === 1) $color .= ""; + $color = "{$showname}"; + if ($userData->role === 1) $color .= ""; - $suffix = $userData->gender === 0 ? 'くん' : ($userData->gender === 1 ? 'ちゃん' : 'さん'); + $suffix = $userData->gender === 0 ? 'くん' : ($userData->gender === 1 ? 'ちゃん' : 'さん'); - return $color.$suffix; - } + return $color.$suffix; +} - function make_csrf_token(?bool $force = false): string { - if (null !== getcookie('csrf_token') && !$force) return getcookie('csrf_token'); - $token = bin2hex(random_bytes(32)); - setcookie('csrf_token', $token, [ - 'expires' => time() + 300, // 5分 - 'path' => '/', - 'domain' => $_SERVER['SERVER_NAME'], - 'secure' => (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off'), - 'httponly' => true, - 'samesite' => 'Strict' - ]); - return $token; - } +function make_csrf_token(?bool $force = false): string { + if (null !== getcookie('csrf_token') && !$force) return getcookie('csrf_token'); + $token = bin2hex(random_bytes(32)); + setcookie('csrf_token', $token, [ + 'expires' => time() + 300, // 5分 + 'path' => '/', + 'domain' => $_SERVER['SERVER_NAME'], + 'secure' => (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off'), + 'httponly' => true, + 'samesite' => 'Strict' + ]); + return $token; +} - function verify_csrf_token(string $token): bool { - return null !== getcookie('csrf_token') && hash_equals(getcookie('csrf_token'), $token); - } +function verify_csrf_token(string $token): bool { + return null !== getcookie('csrf_token') && hash_equals(getcookie('csrf_token'), $token); } function count_special_chars(string $str): int {