From b7980455ccdad3626fc2d4e4624a4b594c6addf5 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 2 Jan 2024 23:34:18 +0000 Subject: [PATCH] update --- Admin/Install/db.json | 2 +- Controller/BackendController.php | 12 ++++++------ Controller/Controller.php | 2 +- Models/PermissionCategory.php | 2 +- Theme/Backend/monitoring-dashboard.tpl.php | 4 ++++ Theme/Backend/monitoring-logs-single.tpl.php | 2 +- Theme/Backend/monitoring-logs.tpl.php | 2 +- Theme/Backend/monitoring-security.tpl.php | 2 +- info.json | 1 - 9 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Admin/Install/db.json b/Admin/Install/db.json index 4ee83ee..1462c32 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -62,7 +62,7 @@ "fields": { "monitoring_request_id": { "name": "monitoring_request_id", - "type": "INT", + "type": "BIGINT", "null": false, "primary": true, "autoincrement": true diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 426d9e5..e11c940 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -33,7 +33,7 @@ use phpOMS\Views\View; final class BackendController extends Controller { /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -56,7 +56,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -143,7 +143,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -166,7 +166,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -189,7 +189,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -210,7 +210,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response diff --git a/Controller/Controller.php b/Controller/Controller.php index 81bda61..b744861 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -92,7 +92,7 @@ class Controller extends ModuleAbstract return; } - $stat = new ImpressionStat($request); + $stat = new ImpressionStat($request); $stat->end = new \DateTime('now'); // This is not run through the createModel() function on purpose diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php index f064743..6bbb6bb 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -17,7 +17,7 @@ namespace Modules\Monitoring\Models; use phpOMS\Stdlib\Base\Enum; /** - * Permision state enum. + * Permission category enum. * * @package Modules\Monitoring\Models * @license OMS License 2.0 diff --git a/Theme/Backend/monitoring-dashboard.tpl.php b/Theme/Backend/monitoring-dashboard.tpl.php index c4e36bb..a5822dd 100755 --- a/Theme/Backend/monitoring-dashboard.tpl.php +++ b/Theme/Backend/monitoring-dashboard.tpl.php @@ -67,11 +67,15 @@ echo $this->data['nav']->render(); ?> printHtml('pdftotext'); ?>printHtml((string) (SystemUtils::runProc('pdftotext', '-v')[0] ?? '')); ?> printHtml('pdftoppm'); ?>printHtml((string) (SystemUtils::runProc('pdftoppm', '-v')[0] ?? '')); ?> + printHtml('wkhtmltoimage'); ?>printHtml((string) (SystemUtils::runProc('wkhtmltoimage', '--version')[0] ?? '')); ?> + printHtml('wget'); ?>printHtml((string) (SystemUtils::runProc('wget', '--version')[0] ?? '')); ?> printHtml('tesseract'); ?>printHtml((string) (SystemUtils::runProc('tesseract', '-v')[0] ?? '')); ?> printHtml('apache2'); ?>printHtml((string) (SystemUtils::runProc('apache2', '-v')[0] ?? '')); ?> printHtml('mysql'); ?>printHtml((string) (SystemUtils::runProc('mysql', '--version')[0] ?? '')); ?> printHtml('postgresql'); ?>printHtml((string) (SystemUtils::runProc('psql', '--version')[0] ?? '')); ?> printHtml('sqlsrv'); ?>printHtml((string) (SystemUtils::runProc('sqlsrv', '--version')[0] ?? '')); ?> + printHtml('sqlite3'); ?>printHtml(\substr((string) (SystemUtils::runProc('sqlite3', '--version')[0] ?? ''), 0, 40)); ?> + printHtml('sqlite'); ?>printHtml(\substr((string) (SystemUtils::runProc('sqlite', '--version')[0] ?? ''), 0, 40)); ?> diff --git a/Theme/Backend/monitoring-logs-single.tpl.php b/Theme/Backend/monitoring-logs-single.tpl.php index 8658a50..ae91479 100755 --- a/Theme/Backend/monitoring-logs-single.tpl.php +++ b/Theme/Backend/monitoring-logs-single.tpl.php @@ -82,7 +82,7 @@ echo $this->data['nav']->render(); ?>
- +
diff --git a/Theme/Backend/monitoring-logs.tpl.php b/Theme/Backend/monitoring-logs.tpl.php index 04516ab..1e36415 100755 --- a/Theme/Backend/monitoring-logs.tpl.php +++ b/Theme/Backend/monitoring-logs.tpl.php @@ -26,7 +26,7 @@ echo $this->data['nav']->render(); ?>
getHtml('Modules'); ?>download
- +
getHtml('Timestamp'); ?> diff --git a/Theme/Backend/monitoring-security.tpl.php b/Theme/Backend/monitoring-security.tpl.php index be102fa..df238a1 100755 --- a/Theme/Backend/monitoring-security.tpl.php +++ b/Theme/Backend/monitoring-security.tpl.php @@ -67,7 +67,7 @@ echo $this->data['nav']->render(); ?>
getHtml('Inspection'); ?>download
- +
getHtml('Status'); ?> diff --git a/info.json b/info.json index 3740769..ac659fa 100755 --- a/info.json +++ b/info.json @@ -14,7 +14,6 @@ "name": "Jingga", "website": "jingga.app" }, - "description": "The administration module.", "directory": "Monitoring", "dependencies": { "Admin": "1.0.0"