From 3b278ac0da30e4c781e336172fcced57b4efb2cf Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 13 May 2022 14:26:58 +0200 Subject: [eventlog] Cast numeric values to int explicitly, in case they are '' --- inc/util.inc.php | 2 +- modules-available/eventlog/inc/filterruleprocessor.inc.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/util.inc.php b/inc/util.inc.php index d95265f4..b4340c94 100644 --- a/inc/util.inc.php +++ b/inc/util.inc.php @@ -113,7 +113,7 @@ class Util $decimals = 2 - floor(strlen((int)$bytes) - 1); } } - return sprintf("%.{$decimals}f", $bytes) . "\xe2\x80\x89" . $sz[$factor + $shift]; + return sprintf("%.{$decimals}f", $bytes) . "\xe2\x80\x89" . ($sz[$factor + $shift] ?? '#>PiB#'); } public static function sanitizeFilename(string $name) diff --git a/modules-available/eventlog/inc/filterruleprocessor.inc.php b/modules-available/eventlog/inc/filterruleprocessor.inc.php index 29ad9c92..a19180c5 100644 --- a/modules-available/eventlog/inc/filterruleprocessor.inc.php +++ b/modules-available/eventlog/inc/filterruleprocessor.inc.php @@ -303,11 +303,11 @@ class FilterRuleProcessor case 'kb': $shift++; case 'b': - return Util::readableFileSize($v, -1, $shift); + return Util::readableFileSize((int)$v, -1, $shift); case 'ts': - return Util::prettyTime($v); + return Util::prettyTime((int)$v); case 'd': - return Util::formatDuration($v); + return Util::formatDuration((int)$v); case '': break; default: -- cgit v1.2.3-55-g7522