Adds proper log levels to log plugin

doc/database/main.sql

@@ -174,22 +174,6 @@ INSERT INTO `security_ip_whitelist` (`id`, `ip_address`, `is_network`, `descript
 (4, '172.16.0.0/12', 1, 'Private network (Class B)', '2025-01-03 16:40:15', 'system'),
 (5, '192.168.0.0/16', 1, 'Private network (Class C)', '2025-01-03 16:40:15', 'system');
 
---
--- Logs
---
-
--- --------------------------------------------------------
-CREATE TABLE `log` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `user_id` int(11) NOT NULL,
-  `time` datetime NOT NULL DEFAULT current_timestamp(),
-  `scope` set('user','system') NOT NULL,
-  `message` varchar(255) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `user_id` (`user_id`),
-  CONSTRAINT `log_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci;
-
 --
 -- Jilo
 --

plugins/logs/controllers/logs.php

@@ -91,6 +91,7 @@ if (!empty($search)) {
             $log_record = array(
                 // assign title to the field in the array record
                 'time'          => $item['time'],
+                'log level'     => $item['level'],
                 'log message'   => $item['message']
             );
         } else {
@@ -99,6 +100,7 @@ if (!empty($search)) {
                 'userID'        => $item['user_id'],
                 'username'      => $item['username'],
                 'time'          => $item['time'],
+                'log level'     => $item['level'],
                 'log message'   => $item['message']
             );
         }

plugins/logs/migrations/create_log_table.sql

@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `log` (
   `id` INT(11) NOT NULL AUTO_INCREMENT,
   `user_id` INT(11) NOT NULL,
   `time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `level` VARCHAR(10) NOT NULL DEFAULT 'info',
+  `level` set('emergency','alert','critical','error','warning','notice','info','debug') NOT NULL DEFAULT 'info',
   `scope` set('user','system') NOT NULL,
   `message` VARCHAR(255) NOT NULL,
   PRIMARY KEY (`id`),

plugins/logs/models/Log.php

@@ -102,14 +102,15 @@ class Log {
         $scope  = $context['scope']    ?? 'system';
         try {
             $sql = 'INSERT INTO log
-                        (user_id, scope, message)
+                        (user_id, level, scope, message)
                     VALUES
-                        (:user_id, :scope, :message)';
+                        (:user_id, :level, :scope, :message)';
             $query = $this->db->prepare($sql);
             $query->execute([
                 ':user_id' => $userId,
+                ':level'   => $level,
                 ':scope'   => $scope,
-                ':message' => "[$level] " . $message,
+                ':message' => $message,
             ]);
         } catch (Exception $e) {
             // swallowing exceptions or here we could log to error log for testing

plugins/logs/views/logs.php

@@ -75,13 +75,14 @@
             <div class="mb-5">
 <?php if (!empty($logs['records'])) { ?>
                 <div class="table-responsive">
-                    <table class="table table-hover align-middle mb-0">
+                    <table class="table table-hover align-middle mb-0" style="width: 100%;">
                         <thead class="table-light">
                             <tr>
 <?php if ($scope === 'system') { ?>
                                 <th>Username&nbsp;(id)</th>
 <?php } ?>
-                                <th>Time</th>
+                                <th style="white-space: nowrap;">Time</th>
+                                <th style="white-space: nowrap;">Log level</th>
                                 <th>Log message</th>
                             </tr>
                         </thead>
@@ -89,10 +90,11 @@
 <?php     foreach ($logs['records'] as $row) { ?>
                             <tr>
 <?php         if ($scope === 'system') { ?>
-                                <td><?= $row['userID'] ? '<strong>' . htmlspecialchars($row['username'] . " ({$row['userID']})") . '</strong>' : '<span class="text-muted font-weight-normal small">SYSTEM</span>' ?></td>
+                                <td style="white-space: nowrap;"><?= $row['userID'] ? '<strong>' . htmlspecialchars($row['username'] . " ({$row['userID']})") . '</strong>' : '<span class="text-muted font-weight-normal small">SYSTEM</span>' ?></td>
 <?php         } ?>
-                                <td><span class="text-muted"><?= date('d M Y H:i', strtotime($row['time'])) ?></span></td>
+                                <td style="white-space: nowrap;"><span class="text-muted"><?= date('d M Y H:i', strtotime($row['time'])) ?></span></td>
-                                <td><?= htmlspecialchars($row['log message']) ?></td>
+                                <td style="white-space: nowrap;"><?= htmlspecialchars($row['log level']) ?></td>
+                                <td style="width: 100%; word-break: break-word;"><?= htmlspecialchars($row['log message']) ?></td>
                             </tr>
 <?php     } ?>
                         </tbody>