diff --git a/Theme/Backend/monitoring-dashboard.tpl.php b/Theme/Backend/monitoring-dashboard.tpl.php index c58c2c8..f1cc78b 100644 --- a/Theme/Backend/monitoring-dashboard.tpl.php +++ b/Theme/Backend/monitoring-dashboard.tpl.php @@ -23,13 +23,13 @@ echo $this->getData('nav')->render(); ?>
-
getHtml('OS'); ?> -
getHtml('Version'); ?> -
getHtml('Release'); ?> -
getHtml('RAMUsage'); ?> MB -
getHtml('MemoryLimit'); ?> -
getHtml('SystemRAM'); ?> MB -
getHtml('CPUUsage'); ?>% +
getHtml('OS'); ?>printHtml(php_uname('s')); ?> +
getHtml('Version'); ?>printHtml(php_uname('v')); ?> +
getHtml('Release'); ?>printHtml(php_uname('r')); ?> +
getHtml('RAMUsage'); ?>printHtml(memory_get_usage(true)/(1024*1024)); ?> MB +
getHtml('MemoryLimit'); ?>printHtml(ini_get('memory_limit')); ?> +
getHtml('SystemRAM'); ?>printHtml(\phpOMS\System\SystemUtils::getRAM()/(1024)); ?> MB +
getHtml('CPUUsage'); ?>printHtml(\phpOMS\System\SystemUtils::getCpuUsage()); ?>%
@@ -41,15 +41,15 @@ echo $this->getData('nav')->render(); ?>
-
getHtml('Emergencies'); ?> -
getHtml('Criticals'); ?> -
getHtml('Errors'); ?> -
getHtml('Warnings'); ?> -
getHtml('Alerts'); ?> -
getHtml('Notices'); ?> -
getHtml('Info'); ?> -
getHtml('Debug'); ?> -
getHtml('Total'); ?> +
getHtml('Emergencies'); ?>printHtml($logs['emergency'] ?? 0); ?> +
getHtml('Criticals'); ?>printHtml($logs['critical'] ?? 0); ?> +
getHtml('Errors'); ?>printHtml($logs['error'] ?? 0); ?> +
getHtml('Warnings'); ?>printHtml($logs['warning'] ?? 0); ?> +
getHtml('Alerts'); ?>printHtml($logs['alert'] ?? 0); ?> +
getHtml('Notices'); ?>printHtml($logs['notice'] ?? 0); ?> +
getHtml('Info'); ?>printHtml($logs['info'] ?? 0); ?> +
getHtml('Debug'); ?>printHtml($logs['debug'] ?? 0); ?> +
getHtml('Total'); ?>printHtml(array_sum($logs)); ?>
@@ -62,7 +62,7 @@ echo $this->getData('nav')->render(); ?> $count) : ?> -
+
printHtml($ip); ?>printHtml($count); ?>
diff --git a/Theme/Backend/monitoring-logs-single.tpl.php b/Theme/Backend/monitoring-logs-single.tpl.php index 993fce5..38bf31c 100644 --- a/Theme/Backend/monitoring-logs-single.tpl.php +++ b/Theme/Backend/monitoring-logs-single.tpl.php @@ -40,52 +40,52 @@ echo $this->getData('nav')->render(); ?> getHtml('ID', 0, 0); ?> - request->getData('id') ?? 0, ENT_COMPAT, 'utf-8'); ?> + printHtml((int) $this->request->getData('id') ?? 0); ?> getHtml('Time') ?> - + printHtml($log['datetime']); ?> getHtml('Uri') ?> - + printHtml($log['path']); ?> getHtml('Source') ?> - + printHtml($log['ip']); ?> getHtml('Level') ?> - - + + printHtml($log['level']); ?> getHtml('Message') ?> - + printHtml($log['message']); ?> getHtml('File') ?> - + printHtml($log['file']); ?> getHtml('Line') ?> - + printHtml($log['line']); ?> getHtml('Version') ?> - + printHtml($log['version']); ?> getHtml('OS') ?> - + printHtml($log['os']); ?> getHtml('Backtrace') ?> -
+
printHtml(json_encode($log['backtrace'], JSON_PRETTY_PRINT)); ?>
getHtml('Report') ?> + href="https://gitreports.com/issue/Orange-Management/Orange-Management/?name=Guest&issue_title=printHtml(urlencode($log['message'])); ?>&details=printHtml(urlencode($details)); ?>">getHtml('Report') ?> diff --git a/Theme/Backend/monitoring-logs.tpl.php b/Theme/Backend/monitoring-logs.tpl.php index 13338ad..0f0343c 100644 --- a/Theme/Backend/monitoring-logs.tpl.php +++ b/Theme/Backend/monitoring-logs.tpl.php @@ -43,10 +43,10 @@ echo $this->getData('nav')->render(); ?> $value) : $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/admin/monitoring/logs/single?{?}&id=' . $key);?> - > - > - > - > + printHtml($url); ?>> printHtml($value[0] ?? ''); ?> + printHtml($url); ?>> printHtml($value[1] ?? ''); ?> + printHtml($url); ?>> printHtml($value[2] ?? ''); ?> + printHtml($url); ?>> printHtml($value[7] ?? ''); ?>