diff options
| author | Simon Rettberg | 2023-07-18 14:57:43 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2023-07-18 14:57:43 +0200 |
| commit | 393a4e8e12f858f22146cd3d7c9d9ac5457c5959 (patch) | |
| tree | 0f43917e18300fe9e2a81c7f8ac2f615761ea270 /modules-available/eventlog/inc/filterruleprocessor.inc.php | |
| parent | [statistics] Don't duplicate user in .vmchooser-session event (diff) | |
| download | slx-admin-393a4e8e12f858f22146cd3d7c9d9ac5457c5959.tar.gz slx-admin-393a4e8e12f858f22146cd3d7c9d9ac5457c5959.tar.xz slx-admin-393a4e8e12f858f22146cd3d7c9d9ac5457c5959.zip | |
[eventlog] Add 'L' suffix to formatting, try to improve help text
Diffstat (limited to 'modules-available/eventlog/inc/filterruleprocessor.inc.php')
| -rw-r--r-- | modules-available/eventlog/inc/filterruleprocessor.inc.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/modules-available/eventlog/inc/filterruleprocessor.inc.php b/modules-available/eventlog/inc/filterruleprocessor.inc.php index 3c9b861f..17a63e38 100644 --- a/modules-available/eventlog/inc/filterruleprocessor.inc.php +++ b/modules-available/eventlog/inc/filterruleprocessor.inc.php @@ -296,7 +296,7 @@ class FilterRuleProcessor private static function fillTemplate(string $template, array $values): string { - return preg_replace_callback('/%([0-9]+)(?::([0-9]+|[a-z][a-z0-9]*))?\.?([a-z]*)%/', function($m) use ($values) { + return preg_replace_callback('/%([0-9]+)(?::([0-9]+|[a-z][a-z0-9_]*))?\.?([a-z]*)%/i', function($m) use ($values) { if (!isset($values[$m[1]])) return '<invalid row index #' . $m[1] . '>'; if (($m[2] ?? '') === '') { @@ -309,16 +309,21 @@ class FilterRuleProcessor switch ($m[3]) { case 'gb': $shift++; + // fallthrough case 'mb': $shift++; + // fallthrough case 'kb': $shift++; + // fallthrough case 'b': return Util::readableFileSize((int)$v, -1, $shift); case 'ts': return Util::prettyTime((int)$v); case 'd': return Util::formatDuration((int)$v); + case 'L': + return Location::getName((int)$v); case '': break; default: |