add a limit filter for log view see #224

Author: vincent-peugnet

app/class/Controlleradmin.php

@@ -112,38 +112,42 @@ public function log(): void
             'warn' => $_GET['warn'] ?? true,
             'error' => $_GET['error'] ?? true,
             'info' => $_GET['info'] ?? true,
+            'limit' => $_GET['limit'] ?? 100,
         ];
 
         $loglines = file(Model::ERROR_LOG);
+        $filelines = count($loglines);
 
         $stats = stat(Model::ERROR_LOG);
         if ($stats === false) {
             throw new LogicException();
         }
 
-
         $logs = [];
-        $i = 1;
         $t = 0;
-        foreach ($loglines as $line) {
+        $max = max(0, $filelines - $filters['limit']);
+        for ($l = $filelines - 1; $l >= 0; $l--) {
+            if ($t >= $filters['limit']) {
+                break;
+            }
+            $line = $loglines[$l];
             if (!str_starts_with($line, '#')) {
                 try {
                     $log = new Logline($line);
-                    $t++;
                     if ($filters[$log->level]) {
-                        $logs[$i] = $log;
+                        $logs[$l + 1] = $log;
+                        $t++;
                     }
                 } catch (RuntimeException $e) {
                     // Skip the line if parsing failed
                 }
             }
-            $i++;
         }
         $this->showtemplate('adminlog', array_merge([
-            'logs' => $logs,
+            'logs' => array_reverse($logs, true),
             'total' => $t,
             'filesize' => $stats['size'] / 8,
-            'filelines' => count($loglines),
+            'filelines' => $filelines,
         ], $filters));
     }
 }

app/view/templates/adminlog.php

@@ -12,18 +12,21 @@
             </span>
         </h2>
         <div id="options">
-            <form class="level" action="<?= $this->url('adminlog') ?>#bottom" method="get">
+            <form action="<?= $this->url('adminlog') ?>#bottom" method="get">
                 <input type="hidden" name="warn" value="0">
                 <input type="checkbox" name="warn" id="warn" value="1" <?= $warn ? 'checked' : '' ?>>
-                <label for="warn" class="warn">warn</label>
+                <label for="warn" class="level warn">warn</label>
 
                 <input type="hidden" name="error" value="0">
                 <input type="checkbox" name="error" id="error" value="1" <?= $error ? 'checked' : '' ?>>
-                <label for="error" class="error">error</label>
+                <label for="error" class="level error">error</label>
 
                 <input type="hidden" name="info" value="0">
                 <input type="checkbox" name="info" id="info" value="1" <?= $info ? 'checked' : '' ?>>
-                <label for="info" class="info">info</label>
+                <label for="info" class="level info">info</label>
+
+                <input type="number" name="limit" id="limit" value="<?= $limit ?>" min="0">
+                <label for="limit">last lines</label>
 
                 <input type="submit" value="filter">
             </form>
@@ -73,7 +76,7 @@
     </section>
 </main>
 <footer>
-    w_error.log | displayed lines: <?= $total ?> | file lines: <?= $filelines ?> | file size: <?= $this->readablesize($filesize) ?>o
+    w_error.log | parsed lines: <?= $total ?> | file lines: <?= $filelines ?> | file size: <?= $this->readablesize($filesize) ?>o
 </footer>
 
 <?php $this->stop('page') ?>

assets/css/adminlog.css

@@ -6,16 +6,16 @@
     border-radius: var(--radius);
 }
 
-.level .warn {
+.level .warn, .level.warn {
     background-color: rgb(221, 144, 0);
 }
 
-.level .error {
+.level .error, .level.error {
     background-color: red;
 
 }
 
-.level .info {
+.level .info, .level.info {
     background-color: green;
 
 }
@@ -45,5 +45,12 @@ tbody {
     border-radius: var(--radius);
     padding: var(--half-padding) var(--padding);
     font-size: var(--size-small);
+}
+
+#options #limit {
+    width: 80px;
+}
+
+label.level {
     color: white;
 }