不要
諏訪子 <suwako@076.moe>、2025-12-12 20:19
コミット e648d83d0823e4d80d7c1a0e4f30cabb482eb462
・親 47cf4f9
・ファイルを見る
1個のファイル、+31 -33
変更
util.php
| @@ -178,47 +178,45 @@ | ||
| 178 | 178 | return false; |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | -if (AUTH_ENABLED) { | |
| 182 | - function getcookie(string $name): string|null { | |
| 183 | - return $_COOKIE[$name] ?? null; | |
| 184 | - } | |
| 181 | +function getcookie(string $name): string|null { | |
| 182 | + return $_COOKIE[$name] ?? null; | |
| 183 | +} | |
| 185 | 184 | |
| 186 | - function namecolor(\stdClass $userData): string { | |
| 187 | - $ban = "#888888"; | |
| 188 | - $male = "#97ACEF"; | |
| 189 | - $female = "#F185C9"; | |
| 190 | - $ungender = "#7C60B0"; | |
| 185 | +function namecolor(\stdClass $userData): string { | |
| 186 | + $ban = "#888888"; | |
| 187 | + $male = "#97ACEF"; | |
| 188 | + $female = "#F185C9"; | |
| 189 | + $ungender = "#7C60B0"; | |
| 191 | 190 | |
| 192 | - $gender = 'color: '.($userData->gender === 0 ? $male : ($userData->gender === 1 ? $female : $ungender)).';'; | |
| 193 | - $style = $userData->namecolor ?: ($userData->role >= 0 ? $gender : $ban); | |
| 191 | + $gender = 'color: '.($userData->gender === 0 ? $male : ($userData->gender === 1 ? $female : $ungender)).';'; | |
| 192 | + $style = $userData->namecolor ?: ($userData->role >= 0 ? $gender : $ban); | |
| 194 | 193 | |
| 195 | - $showname = $userData->displayname ?: $userData->username; | |
| 194 | + $showname = $userData->displayname ?: $userData->username; | |
| 196 | 195 | |
| 197 | - $color = "<span style=\"{$style}\">{$showname}</span>"; | |
| 198 | - if ($userData->role === 1) $color .= "<span style=\"font-size: x-small; background: #10c074; border: 1px solid #fcfcfc; border-radius: 10px; padding: 0 0.5em;\">✓</span>"; | |
| 196 | + $color = "<span style=\"{$style}\">{$showname}</span>"; | |
| 197 | + if ($userData->role === 1) $color .= "<span style=\"font-size: x-small; background: #10c074; border: 1px solid #fcfcfc; border-radius: 10px; padding: 0 0.5em;\">✓</span>"; | |
| 199 | 198 | |
| 200 | - $suffix = $userData->gender === 0 ? 'くん' : ($userData->gender === 1 ? 'ちゃん' : 'さん'); | |
| 199 | + $suffix = $userData->gender === 0 ? 'くん' : ($userData->gender === 1 ? 'ちゃん' : 'さん'); | |
| 201 | 200 | |
| 202 | - return $color.$suffix; | |
| 203 | - } | |
| 201 | + return $color.$suffix; | |
| 202 | +} | |
| 204 | 203 | |
| 205 | - function make_csrf_token(?bool $force = false): string { | |
| 206 | - if (null !== getcookie('csrf_token') && !$force) return getcookie('csrf_token'); | |
| 207 | - $token = bin2hex(random_bytes(32)); | |
| 208 | - setcookie('csrf_token', $token, [ | |
| 209 | - 'expires' => time() + 300, // 5分 | |
| 210 | - 'path' => '/', | |
| 211 | - 'domain' => $_SERVER['SERVER_NAME'], | |
| 212 | - 'secure' => (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off'), | |
| 213 | - 'httponly' => true, | |
| 214 | - 'samesite' => 'Strict' | |
| 215 | - ]); | |
| 216 | - return $token; | |
| 217 | - } | |
| 204 | +function make_csrf_token(?bool $force = false): string { | |
| 205 | + if (null !== getcookie('csrf_token') && !$force) return getcookie('csrf_token'); | |
| 206 | + $token = bin2hex(random_bytes(32)); | |
| 207 | + setcookie('csrf_token', $token, [ | |
| 208 | + 'expires' => time() + 300, // 5分 | |
| 209 | + 'path' => '/', | |
| 210 | + 'domain' => $_SERVER['SERVER_NAME'], | |
| 211 | + 'secure' => (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off'), | |
| 212 | + 'httponly' => true, | |
| 213 | + 'samesite' => 'Strict' | |
| 214 | + ]); | |
| 215 | + return $token; | |
| 216 | +} | |
| 218 | 217 | |
| 219 | - function verify_csrf_token(string $token): bool { | |
| 220 | - return null !== getcookie('csrf_token') && hash_equals(getcookie('csrf_token'), $token); | |
| 221 | - } | |
| 218 | +function verify_csrf_token(string $token): bool { | |
| 219 | + return null !== getcookie('csrf_token') && hash_equals(getcookie('csrf_token'), $token); | |
| 222 | 220 | } |
| 223 | 221 | |
| 224 | 222 | function count_special_chars(string $str): int { |