Skip to content

Commit 868062a

Browse files
committed
Fix showing date in log viewer when the format is not set in app settings; other minor adjustments
1 parent 007549b commit 868062a

File tree

6 files changed

+11
-7
lines changed

6 files changed

+11
-7
lines changed

src/Common.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,13 @@ function app_date($date, bool $includeTime = false, bool $includeTimezone = fals
4848
{
4949
$format = $includeTime
5050
? [
51-
setting('App.dateFormat'),
52-
setting('App.timeFormat'),
51+
// values not by default in the Config\App, therefore need defaults
52+
setting('App.dateFormat') ?? 'Y-m-d',
53+
setting('App.timeFormat') ?? 'H:i:s',
5354
$includeTimezone ? 'T' : '',
5455
]
5556
: [
56-
setting('App.dateFormat'),
57+
setting('App.dateFormat') ?? 'Y-m-d',
5758
$includeTimezone ? 'T' : '',
5859
];
5960

src/Tools/Controllers/LogsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class LogsController extends AdminController
2020
protected $theme = 'Admin';
2121
protected $viewPrefix = 'Bonfire\Tools\Views\\';
2222
protected $logsPath = WRITEPATH . 'logs/';
23-
protected $ext = '.log';
23+
protected $ext = '.log';
2424
protected $logsLimit;
2525
protected $logsHandler;
2626

src/Tools/Language/en/Tools.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
'empty' => 'No logs registered.',
1717
'level' => 'Level',
1818
'date' => 'Date',
19+
'time' => 'Time',
1920
'file' => 'Filename',
2021
'content' => 'Content',
2122
'deleteFile' => 'Delete log file',

src/Tools/Language/it/Tools.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
'empty' => 'Nessun registro trovato.',
1717
'level' => 'Livello',
1818
'date' => 'Data',
19+
'time' => 'Ora',
1920
'file' => 'Nome del file',
2021
'content' => 'Contenuto',
2122
'deleteFile' => 'Elimina il file di registro',

src/Tools/Language/lt/Tools.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
'empty' => 'Žurnalų failų nėra.',
1717
'level' => 'Lygmuo',
1818
'date' => 'Data',
19+
'time' => 'Laikas',
1920
'file' => 'Failo pavadinimas',
2021
'content' => 'Turinys',
2122
'deleteFile' => 'Trinti žurnalo failą',

src/Tools/Views/view_log.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
$this->section('main') ?>
66
<x-page-head>
77
<a href="<?= site_url(ADMIN_AREA . '/tools/logs') ?>" class="back">&larr; <?= lang('Tools.logsModTitle')?></a>
8-
<h2><?= lang('Tools.log') ?> : <?= $logFilePretty ?></h2>
8+
<h2><?= lang('Tools.log') ?>: <?= $logFilePretty ?></h2>
99
</x-page-head>
1010

1111
<x-admin-box>
@@ -14,7 +14,7 @@
1414
<table class="table table-hover nowrap" id="log">
1515
<tr>
1616
<th><?= lang('Tools.level'); ?></th>
17-
<th><?= lang('Tools.date'); ?></th>
17+
<th><?= lang('Tools.time'); ?></th>
1818
<th><?= lang('Tools.content'); ?></th>
1919

2020
</tr>
@@ -26,7 +26,7 @@
2626
<?php endif ?>
2727
>
2828
<td class="text-<?= $log['class']; ?>">
29-
<span class="<?= $log['icon']; ?>" aria-hidden="true"></span>&nbsp;<?= $log['level'] ?>
29+
<span class="<?= $log['icon']; ?> d-inline" aria-hidden="true"></span>&nbsp;<span class="d-inline"><?= $log['level'] ?></span>
3030
</td>
3131
<td class="date"><?= app_date($log['date'], true) ?></td>
3232
<td class="text">

0 commit comments

Comments
 (0)