 |
- |
%20(1)%20(1).jpg) |
 |
 |
 |
+ |
.png){kind=logo} |
 |
 |
 |
 |
- |
 |
 |
.png) |
- |
+ |
 |
 |
- |
-
-
 |
 |
 |
+|||||||||
 |
 |
 |
- |
- |
+ |
+ |
 |
 |
 |
 |
-|
 |
- |
 |
- |
+ |
+|||||||
%20(2).jpg){kind=small} |
- |
 |
- |
+ |
 |
- |
- |
+ |
+ |
 |
-|
 |
+ |
+ |
 |
 |
-.jpg){kind=small} |
+ |
+|||||
|
 |
- |
+ |
+ |
 |
 |
 |
 |
 |
 |
-|
 |
 |
- |
- |
- |
- |
- |
- |
- |
- |
+||
 |
+ | + | + | + | + | + | + | + | + | + |
Composer Packages ('; echo Tracy\Helpers::escapeHtml(count($packages)) /* pos 37:24 */; - echo Tracy\Helpers::escapeHtml($devPackages ? ' + ' . count($devPackages) . ' dev' : '') /* pos 37:42 */; + echo Tracy\Helpers::escapeHtml($devPackages ? ' + ' . count($devPackages) . ' dev' : null) /* pos 37:42 */; echo ')
@@ -72,7 +72,7 @@ if ($packages || $devPackages) /* pos 35:3 */ { echo '';
echo Tracy\Helpers::escapeHtml($message) /* pos 10:14 */;
diff --git a/core/vendor/tracy/tracy/src/Tracy/BlueScreen/BlueScreen.php b/core/vendor/tracy/tracy/src/Tracy/BlueScreen/BlueScreen.php
index 1ff43695c8..a670f58f0c 100644
--- a/core/vendor/tracy/tracy/src/Tracy/BlueScreen/BlueScreen.php
+++ b/core/vendor/tracy/tracy/src/Tracy/BlueScreen/BlueScreen.php
@@ -7,7 +7,7 @@
namespace Tracy;
-use function in_array;
+use function count, in_array;
use const ARRAY_FILTER_USE_KEY, ENT_IGNORE, PHP_VERSION_ID;
@@ -468,7 +468,7 @@ public function getAgentDumper(): \Closure
public function formatMessage(\Throwable $exception): string
{
- $msg = Helpers::encodeString(trim((string) $exception->getMessage()), self::MaxMessageLength, showWhitespaces: false);
+ $msg = Helpers::encodeString(trim($exception->getMessage()), self::MaxMessageLength, showWhitespaces: false);
// highlight 'string'
$msg = preg_replace(
@@ -481,9 +481,10 @@ public function formatMessage(\Throwable $exception): string
$msg = preg_replace_callback(
'#(\w+\\\[\w\\\]+\w)(?:::(\w+))?#',
function ($m) {
- if (isset($m[2]) && method_exists($m[1], $m[2])) {
+ $classLike = class_exists($m[1], autoload: false) || interface_exists($m[1], autoload: false) || trait_exists($m[1], autoload: false);
+ if ($classLike && isset($m[2]) && method_exists($m[1], $m[2])) {
$r = new \ReflectionMethod($m[1], $m[2]);
- } elseif (class_exists($m[1], autoload: false) || interface_exists($m[1], autoload: false)) {
+ } elseif ($classLike) {
$r = new \ReflectionClass($m[1]);
}
diff --git a/core/vendor/tracy/tracy/src/Tracy/BlueScreen/CodeHighlighter.php b/core/vendor/tracy/tracy/src/Tracy/BlueScreen/CodeHighlighter.php
index 8d7003a309..0820b4a4ac 100644
--- a/core/vendor/tracy/tracy/src/Tracy/BlueScreen/CodeHighlighter.php
+++ b/core/vendor/tracy/tracy/src/Tracy/BlueScreen/CodeHighlighter.php
@@ -87,7 +87,7 @@ private static function highlightPhpCode(string $code): string
$code = str_replace("\r\n", "\n", $code);
$code = preg_replace('#(__halt_compiler\s*\(\)\s*;).*#is', '$1', $code);
$code = rtrim($code);
- $code = preg_replace('#/\*sensitive\{\*/.*?/\*\}\*/#s', Dumper\Describer::HiddenValue, $code);
+ $code = preg_replace('#/\*sensitive\{\*/.*?/\*}\*/#s', Dumper\Describer::HiddenValue, $code);
$last = $out = '';
foreach (\PhpToken::tokenize($code) as $token) {
diff --git a/core/vendor/tracy/tracy/src/Tracy/BlueScreen/assets/bluescreen.js b/core/vendor/tracy/tracy/src/Tracy/BlueScreen/assets/bluescreen.js
index c8983b2071..9e53d88bc4 100644
--- a/core/vendor/tracy/tracy/src/Tracy/BlueScreen/assets/bluescreen.js
+++ b/core/vendor/tracy/tracy/src/Tracy/BlueScreen/assets/bluescreen.js
@@ -9,7 +9,7 @@ class BlueScreen {
let blueScreen = document.getElementById('tracy-bs');
document.documentElement.classList.add('tracy-bs-visible');
- if (navigator.platform.indexOf('Mac') > -1) {
+ if (navigator.userAgent.includes('Mac')) {
blueScreen.classList.add('tracy-mac');
}
@@ -40,7 +40,7 @@ class BlueScreen {
static globalInit() {
// enables toggling via ESC
document.addEventListener('keyup', (e) => {
- if (e.keyCode === 27 && !e.shiftKey && !e.altKey && !e.ctrlKey && !e.metaKey) { // ESC
+ if (e.key === 'Escape' && !e.shiftKey && !e.altKey && !e.ctrlKey && !e.metaKey) {
Tracy.Toggle.toggle(document.getElementById('tracy-bs-toggle'));
}
});
diff --git a/core/vendor/tracy/tracy/src/Tracy/BlueScreen/dist/agent.phtml b/core/vendor/tracy/tracy/src/Tracy/BlueScreen/dist/agent.phtml
index fdaf58fb16..d0ab024516 100644
--- a/core/vendor/tracy/tracy/src/Tracy/BlueScreen/dist/agent.phtml
+++ b/core/vendor/tracy/tracy/src/Tracy/BlueScreen/dist/agent.phtml
@@ -63,7 +63,7 @@ Mapped source: ';
echo "\n";
foreach (Helpers::getExceptionChain($exception) as $i => $ex) /* pos 46:1 */ {
$title = $blueScreen->getExceptionTitle($ex) /* pos 47:2 */;
- $code = $ex->getCode() ? ' #' . $ex->getCode() : '' /* pos 48:2 */;
+ $code = $ex->getCode() ? ' #' . $ex->getCode() : null /* pos 48:2 */;
if ($i === 0) /* pos 49:2 */ {
echo '# ';
echo Tracy\Helpers::escapeMd($title) /* pos 50:5 */;
diff --git a/core/vendor/tracy/tracy/src/Tracy/BlueScreen/dist/page.phtml b/core/vendor/tracy/tracy/src/Tracy/BlueScreen/dist/page.phtml
index 587232dab1..b6e2bb73b0 100644
--- a/core/vendor/tracy/tracy/src/Tracy/BlueScreen/dist/page.phtml
+++ b/core/vendor/tracy/tracy/src/Tracy/BlueScreen/dist/page.phtml
@@ -8,7 +8,7 @@ use Tracy\Helpers;
/** @var string $js */
/** @var string $source */
$title = $blueScreen->getExceptionTitle($exception) /* pos 8:1 */;
-$code = $exception->getCode() ? ' #' . $exception->getCode() : '' /* pos 9:1 */;
+$code = $exception->getCode() ? ' #' . $exception->getCode() : null /* pos 9:1 */;
$chain = Helpers::getExceptionChain($exception) /* pos 10:1 */;
echo '
@@ -39,7 +39,7 @@ if (count($chain) > 1) /* pos 24:2 */ {
echo Tracy\Helpers::escapeHtml(get_debug_type($ex)) /* pos 26:12 */;
echo ': ';
echo Tracy\Helpers::escapeHtml($ex->getMessage()) /* pos 26:35 */;
- echo Tracy\Helpers::escapeHtml($ex->getCode() ? ' #' . $ex->getCode() : '') /* pos 26:54 */;
+ echo Tracy\Helpers::escapeHtml($ex->getCode() ? ' #' . $ex->getCode() : null) /* pos 26:54 */;
echo '
';
diff --git a/core/vendor/tracy/tracy/src/Tracy/BlueScreen/dist/section-header.phtml b/core/vendor/tracy/tracy/src/Tracy/BlueScreen/dist/section-header.phtml
index f6d912bc02..4cdd26a209 100644
--- a/core/vendor/tracy/tracy/src/Tracy/BlueScreen/dist/section-header.phtml
+++ b/core/vendor/tracy/tracy/src/Tracy/BlueScreen/dist/section-header.phtml
@@ -7,7 +7,7 @@ use Tracy\Helpers;
/** @var Tracy\BlueScreen $blueScreen */
echo "\n";
$title = $blueScreen->getExceptionTitle($ex) /* pos 7:1 */;
-$code = $ex->getCode() ? ' #' . $ex->getCode() : '' /* pos 8:1 */;
+$code = $ex->getCode() ? ' #' . $ex->getCode() : null /* pos 8:1 */;
echo '
' . Helpers::escapeHtml($s) . '' + : $s; + try { $logFile = Debugger::log($exception, Debugger::EXCEPTION); } catch (\Throwable $e) { - echo "$exception\nTracy is unable to log error: {$e->getMessage()}\n"; + echo $escape("$exception\nTracy is unable to log error: {$e->getMessage()}\n"); return; } @@ -62,11 +66,17 @@ private function renderExceptionCli(\Throwable $exception): void header("X-Tracy-Error-Log: $logFile", replace: false); } + if (Helpers::isAgent() && !Helpers::isCli() && !Helpers::isHtmlMode()) { + // non-HTML HTTP response for an agent carries the markdown report directly in the body + echo $this->blueScreen->renderAgent($exception) . ($logFile ? "\n(stored in $logFile)\n" : ''); + return; + } + if (Helpers::detectColors() && @is_file($exception->getFile())) { echo "\n\n" . CodeHighlighter::highlightPhpCli((string) file_get_contents($exception->getFile()), $exception->getLine()) . "\n"; } - echo "$exception\n" . ($logFile ? "\n(stored in $logFile)\n" : ''); + echo $escape("$exception\n" . ($logFile ? "\n(stored in $logFile)\n" : '')); if ($logFile && Debugger::$browser) { exec(Debugger::$browser . ' ' . escapeshellarg(strtr($logFile, Debugger::$editorMapping))); } diff --git a/core/vendor/tracy/tracy/src/Tracy/Dumper/Describer.php b/core/vendor/tracy/tracy/src/Tracy/Dumper/Describer.php index d71b67466c..76a938c36d 100644 --- a/core/vendor/tracy/tracy/src/Tracy/Dumper/Describer.php +++ b/core/vendor/tracy/tracy/src/Tracy/Dumper/Describer.php @@ -8,7 +8,7 @@ namespace Tracy\Dumper; use Tracy\Helpers; -use function array_map, array_slice, class_exists, count, explode, file, get_debug_type, get_resource_type, gettype, htmlspecialchars, implode, is_bool, is_file, is_int, is_resource, is_string, is_subclass_of, json_encode, method_exists, preg_match, spl_object_id, str_replace, strlen, strpos, strtolower, trim, uksort; +use function array_map, array_slice, class_exists, count, file, get_debug_type, get_resource_type, htmlspecialchars, implode, interface_exists, is_array, is_bool, is_float, is_int, is_object, is_resource, is_string, is_subclass_of, json_encode, method_exists, preg_match, spl_object_id, str_replace, strlen, strpos, strtolower, trim, uksort; /** @@ -20,7 +20,7 @@ final class Describer public const HiddenValue = '*****'; // Number.MAX_SAFE_INTEGER - private const JsSafeInteger = 1 << 53 - 1; + private const JsSafeInteger = (1 << 53) - 1; public int $maxDepth = 7; public int $maxLength = 150; @@ -53,7 +53,10 @@ final class Describer public function describe(mixed $var): \stdClass { - uksort($this->objectExposers, fn($a, $b): int => $b === '' || (class_exists($a, autoload: false) && is_subclass_of($a, $b)) ? -1 : 1); + // exposers are sorted from the most specific type to the most general; '' acts as the universal supertype + $isSubtypeOf = fn(string $type, string $parent): bool => $parent === '' + || ((class_exists($type, autoload: false) || interface_exists($type, autoload: false)) && is_subclass_of($type, $parent)); + uksort($this->objectExposers, fn($a, $b): int => $isSubtypeOf($b, $a) <=> $isSubtypeOf($a, $b)); try { return (object) [ @@ -72,12 +75,15 @@ public function describe(mixed $var): \stdClass private function describeVar(mixed $var, int $depth = 0, ?int $refId = null): mixed { - if ($var === null || is_bool($var)) { - return $var; - } - - $m = 'describe' . explode(' ', gettype($var))[0]; - return $this->$m($var, $depth, $refId); + return match (true) { + $var === null, is_bool($var) => $var, + is_int($var) => $this->describeInteger($var), + is_float($var) => $this->describeDouble($var), + is_string($var) => $this->describeString($var, $depth), + is_array($var) => $this->describeArray($var, $depth, $refId), + is_object($var) => $this->describeObject($var, $depth), + default => $this->describeResource($var, $depth), // open or closed resource + }; } @@ -193,7 +199,10 @@ private function describeObject(object $obj, int $depth = 0): Value $value->items = []; $props = $this->exposeObject($obj, $value); foreach ($props ?? [] as $k => $v) { - $this->addPropertyTo($value, (string) $k, $v, Value::PropertyVirtual, $this->getReferenceId($props ?? [], $k)); + $described = $this->isSensitive((string) $k, $v, get_debug_type($obj)) // props come from user callbacks (__debugInfo, custom exposers) + ? new Value(Value::TypeText, self::hideValue($v)) + : null; + $this->addPropertyTo($value, (string) $k, $v, Value::PropertyVirtual, $this->getReferenceId($props ?? [], $k), described: $described); } } diff --git a/core/vendor/tracy/tracy/src/Tracy/Dumper/Dumper.php b/core/vendor/tracy/tracy/src/Tracy/Dumper/Dumper.php index 5bee48b404..552967c9a4 100644 --- a/core/vendor/tracy/tracy/src/Tracy/Dumper/Dumper.php +++ b/core/vendor/tracy/tracy/src/Tracy/Dumper/Dumper.php @@ -12,6 +12,7 @@ use Tracy\Dumper\Describer; use Tracy\Dumper\Exposer; use Tracy\Dumper\Renderer; +use Uri; use function array_flip, array_map, file_get_contents, fwrite, str_replace; use const STDOUT; @@ -69,7 +70,6 @@ class Dumper public static array $resources = [ 'stream' => 'stream_get_meta_data', 'stream-context' => 'stream_context_get_options', - 'curl' => 'curl_getinfo', ]; /** @var array
- let snapshot = JSON.parse(pre.getAttribute('data-tracy-snapshot'));
- pre.removeAttribute('data-tracy-snapshot');
- pre.appendChild(build(JSON.parse(pre.getAttribute('data-tracy-dump')), snapshot, pre.classList.contains('tracy-collapsed')));
- pre.removeAttribute('data-tracy-dump');
- pre.classList.remove('tracy-collapsed');
+ try {
+ let snapshot = JSON.parse(pre.getAttribute('data-tracy-snapshot'));
+ pre.removeAttribute('data-tracy-snapshot');
+ pre.appendChild(build(JSON.parse(pre.getAttribute('data-tracy-dump')), snapshot, pre.classList.contains('tracy-collapsed')));
+ pre.removeAttribute('data-tracy-dump');
+ pre.classList.remove('tracy-collapsed');
+ } catch {
+ // a broken dump must not prevent the remaining dumps from initializing
+ }
});
// snapshots
(context || document).querySelectorAll('meta[itemprop=tracy-snapshot]').forEach((meta) => {
let snapshot = JSON.parse(meta.getAttribute('content'));
meta.parentElement.querySelectorAll('[data-tracy-dump]').forEach((pre) => { //
- if (pre.closest('[data-tracy-snapshot]')) { // ignore unrelated
- return;
+ try {
+ if (pre.closest('[data-tracy-snapshot]')) { // ignore unrelated
+ return;
+ }
+ pre.appendChild(build(JSON.parse(pre.getAttribute('data-tracy-dump')), snapshot, pre.classList.contains('tracy-collapsed')));
+ pre.removeAttribute('data-tracy-dump');
+ pre.classList.remove('tracy-collapsed');
+ } catch {
+ // a broken dump must not prevent the remaining dumps from initializing
}
- pre.appendChild(build(JSON.parse(pre.getAttribute('data-tracy-dump')), snapshot, pre.classList.contains('tracy-collapsed')));
- pre.removeAttribute('data-tracy-dump');
- pre.classList.remove('tracy-collapsed');
});
// must be left for debug bar panel content
});
diff --git a/core/vendor/tracy/tracy/src/Tracy/Helpers.php b/core/vendor/tracy/tracy/src/Tracy/Helpers.php
index e439f0787f..96258dd709 100644
--- a/core/vendor/tracy/tracy/src/Tracy/Helpers.php
+++ b/core/vendor/tracy/tracy/src/Tracy/Helpers.php
@@ -218,7 +218,7 @@ public static function getSource(): string
. (isset($_SERVER['argv']) ? ': ' . implode(' ', array_map(self::escapeArg(...), $_SERVER['argv'])) : '');
} elseif (isset($_SERVER['REQUEST_URI'])) {
- return (!empty($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off') ? 'https://' : 'http://')
+ return (self::isHttps() ? 'https://' : 'http://')
. ($_SERVER['HTTP_HOST'] ?? '')
. $_SERVER['REQUEST_URI'];
@@ -228,6 +228,13 @@ public static function getSource(): string
}
+ /** @internal */
+ public static function isHttps(): bool
+ {
+ return !empty($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off') !== 0;
+ }
+
+
/** @internal */
public static function improveException(\Throwable $e): void
{
@@ -385,7 +392,8 @@ public static function consoleLog(string $data): void
/** @internal */
public static function isAgent(): bool
{
- return ($_COOKIE['tracy-webdriver'] ?? null) === '1';
+ return ($_COOKIE['tracy-webdriver'] ?? null) === '1' // set by bar.js when navigator.webdriver
+ || isset($_SERVER['HTTP_X_TRACY_AGENT']); // non-browser agents (curl, HTTP clients)
}
diff --git a/core/vendor/tracy/tracy/src/Tracy/Logger/Logger.php b/core/vendor/tracy/tracy/src/Tracy/Logger/Logger.php
index 62415339ca..39b5d458cb 100644
--- a/core/vendor/tracy/tracy/src/Tracy/Logger/Logger.php
+++ b/core/vendor/tracy/tracy/src/Tracy/Logger/Logger.php
@@ -8,7 +8,7 @@
namespace Tracy;
use function in_array, is_string;
-use const DIRECTORY_SEPARATOR, FILE_APPEND, LOCK_EX, PHP_EOL;
+use const DIRECTORY_SEPARATOR, FILE_APPEND, LOCK_EX, LOCK_UN, PHP_EOL;
/**
@@ -28,7 +28,7 @@ class Logger implements ILogger
/** @var string|int interval for sending email is 2 days */
public $emailSnooze = '2 days';
- /** @var callable(mixed $message, string $email): void handler for sending emails */
+ /** @var ?callable(mixed $message, string $email): void handler for sending emails, null disables sending */
public $mailer;
/** @var ?BlueScreen */
@@ -164,17 +164,52 @@ protected function logException(\Throwable $exception, ?string $file = null): st
*/
protected function sendEmail($message): void
{
- $snooze = is_numeric($this->emailSnooze)
- ? $this->emailSnooze
- : strtotime($this->emailSnooze) - time();
-
- if (
- $this->email
- && $this->mailer
- && @filemtime($this->directory . '/email-sent') + $snooze < time() // @ file may not exist
- && @file_put_contents($this->directory . '/email-sent', 'sent') // @ file may not be writable
- ) {
- ($this->mailer)($message, implode(', ', (array) $this->email));
+ if (!$this->email || !$this->mailer) {
+ return;
+ }
+
+ if (is_numeric($this->emailSnooze)) {
+ $snooze = (int) $this->emailSnooze;
+ } elseif (($time = strtotime($this->emailSnooze)) !== false) {
+ $snooze = $time - time();
+ } else {
+ throw new \InvalidArgumentException("Invalid time interval '$this->emailSnooze'.");
+ }
+
+ $this->throttle(
+ $this->directory . '/email-sent',
+ $snooze,
+ fn() => ($this->mailer)($message, implode(', ', (array) $this->email)),
+ );
+ }
+
+
+ /**
+ * Executes the action at most once per given interval. The check is atomic across
+ * concurrent requests and the interval restarts only after the action succeeds.
+ * @param \Closure(): void $action
+ */
+ private function throttle(string $lockFile, int $interval, \Closure $action): void
+ {
+ $handle = @fopen($lockFile, 'c+'); // @ - file may not be writable
+ if (!$handle) {
+ return;
+ }
+
+ try {
+ if (!flock($handle, LOCK_EX)) {
+ return;
+ }
+
+ $stat = fstat($handle);
+ if ($stat['size'] === 0 || $stat['mtime'] + $interval < time()) {
+ $action();
+ ftruncate($handle, 0);
+ fwrite($handle, date('c'));
+ }
+ } finally {
+ flock($handle, LOCK_UN);
+ fclose($handle);
}
}
diff --git a/core/vendor/tracy/tracy/src/Tracy/Session/FileSession.php b/core/vendor/tracy/tracy/src/Tracy/Session/FileSession.php
index f3cc3e218b..2c13182f48 100644
--- a/core/vendor/tracy/tracy/src/Tracy/Session/FileSession.php
+++ b/core/vendor/tracy/tracy/src/Tracy/Session/FileSession.php
@@ -56,12 +56,20 @@ private function open(): void
|| !($file = @fopen($path = $this->dir . '/' . self::FilePrefix . $id, 'r+')) // intentionally @
) {
$id = Helpers::createId();
- setcookie($this->cookieName, $id, time() + self::CookieLifetime, '/', '', secure: false, httponly: true);
+ setcookie($this->cookieName, $id, [
+ 'expires' => time() + self::CookieLifetime,
+ 'path' => '/',
+ 'secure' => Helpers::isHttps(),
+ 'httponly' => true,
+ 'samesite' => 'Lax',
+ ]);
$file = @fopen($path = $this->dir . '/' . self::FilePrefix . $id, 'c+'); // intentionally @
if ($file === false) {
throw new \RuntimeException("Unable to create file '$path'. " . (error_get_last()['message'] ?? ''));
}
+
+ @chmod($path, 0o600); // @ - may not be supported by the filesystem
}
if (!@flock($file, LOCK_EX)) { // intentionally @
@@ -69,7 +77,7 @@ private function open(): void
}
$this->file = $file;
- $this->data = @unserialize(stream_get_contents($this->file)) ?: []; // @ - file may be empty
+ $this->data = @unserialize(stream_get_contents($this->file), ['allowed_classes' => false]) ?: []; // @ - file may be empty; data contain no objects
if (mt_rand() / mt_getrandmax() < $this->gcProbability) {
$this->clean();
@@ -87,8 +95,8 @@ public function clean(): void
{
$old = strtotime('-1 week');
foreach (glob($this->dir . '/' . self::FilePrefix . '*') ?: [] as $file) {
- if (filemtime($file) < $old) {
- unlink($file);
+ if (@filemtime($file) < $old) { // @ - file may be deleted by concurrent GC
+ @unlink($file); // @ - file may be deleted by concurrent GC
}
}
}
diff --git a/core/vendor/tracy/tracy/src/Tracy/assets/toggle.js b/core/vendor/tracy/tracy/src/Tracy/assets/toggle.js
index aabefb5f17..bcc82a9f56 100644
--- a/core/vendor/tracy/tracy/src/Tracy/assets/toggle.js
+++ b/core/vendor/tracy/tracy/src/Tracy/assets/toggle.js
@@ -17,7 +17,7 @@ class Toggle {
if (
!e.shiftKey && !e.ctrlKey && !e.metaKey
&& (el = e.target.closest('.tracy-toggle'))
- && Math.pow(start[0] - e.clientX, 2) + Math.pow(start[1] - e.clientY, 2) < MOVE_THRESHOLD
+ && (!start || Math.pow(start[0] - e.clientX, 2) + Math.pow(start[1] - e.clientY, 2) < MOVE_THRESHOLD) // no start = keyboard activation
) {
Toggle.toggle(el, undefined, e);
e.preventDefault();
@@ -31,7 +31,7 @@ class Toggle {
// changes element visibility
static toggle(el, expand, e) {
let collapsed = el.classList.contains('tracy-collapsed'),
- ref = el.getAttribute('data-tracy-ref') || el.getAttribute('href', 2),
+ ref = el.getAttribute('data-tracy-ref') || el.getAttribute('href'),
dest = el;
if (typeof expand === 'undefined') {
@@ -73,7 +73,12 @@ class Toggle {
}
});
- let toggles = JSON.parse(sessionStorage.getItem('tracy-toggles-' + baseEl.id));
+ let toggles;
+ try {
+ toggles = JSON.parse(sessionStorage.getItem('tracy-toggles-' + baseEl.id));
+ } catch {
+ // ignore corrupt data
+ }
if (toggles && restore !== false) {
toggles.forEach((item) => {
let el = baseEl;
diff --git a/install/stubs/migrations/2026_08_20_000000_add_cachepwd_expiry_to_users.php b/install/stubs/migrations/2026_08_20_000000_add_cachepwd_expiry_to_users.php
new file mode 100644
index 0000000000..e09191842e
--- /dev/null
+++ b/install/stubs/migrations/2026_08_20_000000_add_cachepwd_expiry_to_users.php
@@ -0,0 +1,40 @@
+dateTime('cachepwd_valid_to')->nullable()->after('cachepwd');
+ });
+
+ // From here on an empty deadline means "never expires" (pwd_repair_minutes = 0).
+ // Tokens that already exist have no deadline recorded and would silently become
+ // eternal, so they are cleared: their owners simply request a new link.
+ DB::table('users')->where('cachepwd', '<>', '')->update([
+ 'cachepwd' => '',
+ 'cachepwd_valid_to' => null,
+ ]);
+ }
+
+ public function down() {
+ if (Schema::hasTable('users') && Schema::hasColumn('users', 'cachepwd_valid_to')) {
+ Schema::table('users', function (Blueprint $table) {
+ $table->dropColumn('cachepwd_valid_to');
+ });
+ }
+ }
+}
diff --git a/manager/actions/mutate_web_user.dynamic.php b/manager/actions/mutate_web_user.dynamic.php
index 3e06534b45..d26b88672d 100755
--- a/manager/actions/mutate_web_user.dynamic.php
+++ b/manager/actions/mutate_web_user.dynamic.php
@@ -355,7 +355,7 @@ function evoRenderTvImageCheck(a) {
' : '') . + __('global.pwd_repair_minutes_message'), + 'disabled' => $disabledSettings['pwd_repair_minutes'] ?? null + ]) + + + @include('manager::form.radio', [ 'name' => 'pwd_hash_algo', 'label' => __('global.pwd_hash_algo_title'),