smecontribs/smeserver-mailstats
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enhance display of summary log line

Browse Source
This commit is contained in:
Brian Read 2024-06-30 12:05:54 +01:00
parent ebff1f3d78
commit 61f9872e66
1 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
root/opt/mailstats/html/showSummaryLogs.php
View File

@ -38,13 +38,45 @@ function generateLogDataTable($logData) {
return "Invalid JSON data"; return "Invalid JSON data";
} }
$keys = array_keys($data); //// Remove entries with the key "logterse"
$values = array_values($data); //if (isset($data['logterse'])) {
//unset($data['logterse']);
//}
// Remove entries with the key "logterse" and remove entries with empty values
foreach ($data as $key => $value) {
if ($key === 'logterse' || empty($value)) {
unset($data[$key]);
}
}
// Handle adjacent duplicates by merging keys
$mergedData = [];
$previousValue = null;
foreach ($data as $key => $value) {
if ($value === $previousValue) {
// Merge the current key with the previous key
end($mergedData);
$lastKey = key($mergedData);
$newKey = "$lastKey/$key";
$mergedData[$newKey] = $value;
// Remove the old entry
unset($mergedData[$lastKey]);
} else {
// Otherwise, add a new entry
$mergedData[$key] = $value;
}
$previousValue = $value;
}
$keys = array_keys($mergedData);
$values = array_values($mergedData);
$output = '<table border="1" style="border-collapse: collapse; width: 41%;overflow-x:auto;font-size:1cqw"><tbody>'; $output = '<table class="stripes" style="border-collapse: collapse; width:80%;overflow-x:auto; margin:2%"><tbody>';
// Divide keys and values into sets of 6 // Divide keys and values into sets of 6
$chunks = array_chunk($keys, 7); $chunks = array_chunk($keys, 6);
foreach ($chunks as $chunkIndex => $chunk) { foreach ($chunks as $chunkIndex => $chunk) {
if ($chunkIndex > 0) { if ($chunkIndex > 0) {
// Add spacing between different sets // Add spacing between different sets
@ -57,7 +89,7 @@ function generateLogDataTable($logData) {
} }
$output .= '</tr><tr>'; $output .= '</tr><tr>';
foreach ($chunk as $i => $key) { foreach ($chunk as $i => $key) {
$output .= '<td>' . htmlspecialchars($values[$chunkIndex * 7 + $i]) . '</td>'; $output .= '<td>' . htmlspecialchars($values[$chunkIndex * 6+ $i]) . '</td>';
} }
$output .= '</tr>'; $output .= '</tr>';
} }
@ -72,24 +104,27 @@ function generateLogDataTable($logData) {
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel='stylesheet' type='text/css' href='css/mailstats.css' />
<title>Summary Logs</title> <title>Summary Logs</title>
<style> <!-- <style>
table { table {
width: 100%; xxwidth: 100%;
border-collapse: collapse; xxborder-collapse: collapse;
} }
table, th, td { table, th, td {
border: 1px solid black; xxborder: 1px solid black;
} }
th, td { th, td {
padding: 8px; xxpadding: 8px;
text-align: left; xxtext-align: left;
} }
</style> </style>
-->
</head> </head>
<body> <body>
<div style="width:100%;overflow-x:auto;font-size:1cqw">"
<h1>Summary Logs for Date: <?= htmlspecialchars($date) ?> <?= $hour == 99 ? 'for All Hours' : 'and Hour: ' . htmlspecialchars($hour) ?></h1> <h1>Summary Logs for Date: <?= htmlspecialchars($date) ?> <?= $hour == 99 ? 'for All Hours' : 'and Hour: ' . htmlspecialchars($hour) ?></h1>
<table> <table style="border-collapse:collapse;width:98%">
<thead> <thead>
<tr> <tr>
<th>Id</th> <th>Id</th>
@ -113,6 +148,7 @@ function generateLogDataTable($logData) {
<?php endif; ?> <?php endif; ?>
</tbody> </tbody>
</table> </table>
</div>
<?php <?php
// Close the connection // Close the connection
$stmt->close(); $stmt->close();