System update

This commit is contained in:
bergware
2022-07-03 03:01:54 +02:00
parent a49651fc36
commit 242d103803
2 changed files with 31 additions and 31 deletions

View File

@@ -49,12 +49,12 @@ function this_duration($time) {
$secs = $hmss%60;
return this_plus($days,_('day'),($hour|$mins|$secs)==0).this_plus($hour,_('hr'),($mins|$secs)==0).this_plus($mins,_('min'),$secs==0).this_plus($secs,_('sec'),true);
}
$log = "/boot/config/parity-checks.log";
$head = "<table style='margin-top:10px;background-color:inherit'><tr style='font-weight:bold'><td>"._('Action')."</td><td>"._('Date')."</td><td>"._('Size')."</td><td>"._('Duration')."</td><td>"._('Speed')."</td><td>"._('Status')."</td><td>"._('Errors')."</td></tr>";
$list = [];
$inlog = "/boot/config/parity-checks.log";
$inhead = "<table style='margin-top:10px;background-color:inherit'><tr style='font-weight:bold'><td>"._('Action')."</td><td>"._('Date')."</td><td>"._('Size')."</td><td>"._('Duration')."</td><td>"._('Speed')."</td><td>"._('Status')."</td><td>"._('Errors')."</td></tr>";
$inlist = [];
if (file_exists($log)) {
$handle = fopen($log, 'r');
if (file_exists($inlog)) {
$handle = fopen($inlog, 'r');
while (($row = fgets($handle))!==false) {
[$date,$duration,$speed,$status,$error,$action,$size] = my_explode('|',$row,7);
$action = preg_split('/\s+/',$action);
@@ -70,15 +70,15 @@ if (file_exists($log)) {
// handle both old and new speed notation
$speed = $speed ? (is_numeric($speed) ? my_scale($speed,$unit,1)." $unit/s" : $speed) : _('Unavailable');
$status = $status==0 ? _('OK') : ($status==-4 ? _('Canceled') : $status);
$list[] = "<tr><td>$action</td><td>$date</td><td>$size</td><td>$duration</td><td>$speed</td><td>$status</td><td>$error</td></tr>";
$inlist[] = "<tr><td>$action</td><td>$date</td><td>$size</td><td>$duration</td><td>$speed</td><td>$status</td><td>$error</td></tr>";
}
fclose($handle);
}
if ($list) {
$list = array_reverse($list);
if ($inlist) {
$inlist = array_reverse($inlist);
} else {
$list[] = "<tr><td colspan='7' style='text-align:center;padding-top:12px'>"._('No parity check history present')."!</td></tr>";
$inlist[] = "<tr><td colspan='7' style='text-align:center;padding-top:12px'>"._('No parity check history present')."!</td></tr>";
}
write($head.implode($list)."</table>");
unset($head,$list);
write($inhead.implode($inlist)."</table>");
unset($inhead,$inlist);
?>

View File

@@ -143,22 +143,22 @@ if ($memory_installed >= 1024) {
$low = $memory_maximum < $memory_installed;
if ($low) $memory_maximum = pow(2,ceil(log($memory_installed)/log(2)));
$style = "<style>table.info{margin-top:10px;background-color:inherit} table.info td:first-child{width:20%;font-weight:bold} tr.ram,tr.port{display:none} span.link{text-decoration:underline;cursor:pointer}</style>";
$instyle = "<style>table.info{margin-top:10px;background-color:inherit} table.info td:first-child{width:20%;font-weight:bold} tr.ram,tr.port{display:none} span.link{text-decoration:underline;cursor:pointer}</style>";
$list = [];
$list[] = "<table class='info'><tr><td>"._('Model').":</td><td>$model</td></tr>";
$list[] = "<tr><td>".('M/B').":</td><td>{$board['Manufacturer']} {$board['Product Name']} "._('Version')." {$board['Version']} - "._('s/n').": {$board['Serial Number']}</td></tr>";
$list[] = "<tr><td>"._('BIOS').":</td><td>{$bios['Vendor']} Version {$bios['Version']}. Dated: {$bios['Release Date']}</td></tr>";
$list[] = "<tr><td>"._('CPU').":</td><td>$cpumodel".(strpos($cpumodel,'@')===false && !empty($cpu['Current Speed']) ? " @ {$cpu['Current Speed']}" : "")."</td></tr>";
$list[] = "<tr><td>"._('HVM').":</td><td>$hvm</td></tr>";
$list[] = "<tr><td>"._('IOMMU').":</td><td>$iommu</td></tr>";
$list[] = "<tr><td>"._('Cache').":</td><td>".implode(', ',$cache_installed)."</td></tr>";
$list[] = "<tr><td>$memory</td><td>$memory_installed $unit $memory_type $ecc("._('max. installable capacity')." $memory_maximum $unit".($low?'*':'').")</td></tr>";
$inlist = [];
$inlist[] = "<table class='info'><tr><td>"._('Model').":</td><td>$model</td></tr>";
$inlist[] = "<tr><td>".('M/B').":</td><td>{$board['Manufacturer']} {$board['Product Name']} "._('Version')." {$board['Version']} - "._('s/n').": {$board['Serial Number']}</td></tr>";
$inlist[] = "<tr><td>"._('BIOS').":</td><td>{$bios['Vendor']} Version {$bios['Version']}. Dated: {$bios['Release Date']}</td></tr>";
$inlist[] = "<tr><td>"._('CPU').":</td><td>$cpumodel".(strpos($cpumodel,'@')===false && !empty($cpu['Current Speed']) ? " @ {$cpu['Current Speed']}" : "")."</td></tr>";
$inlist[] = "<tr><td>"._('HVM').":</td><td>$hvm</td></tr>";
$inlist[] = "<tr><td>"._('IOMMU').":</td><td>$iommu</td></tr>";
$inlist[] = "<tr><td>"._('Cache').":</td><td>".implode(', ',$cache_installed)."</td></tr>";
$inlist[] = "<tr><td>$memory</td><td>$memory_installed $unit $memory_type $ecc("._('max. installable capacity')." $memory_maximum $unit".($low?'*':'').")</td></tr>";
foreach ($memory_devices as $device) {
if ($device['Type']=='Unknown') continue;
$size = preg_replace('/( .)B$/','$1iB',$device['Size']);
$list[] = "<tr class='ram'><td></td><td>{$device['Manufacturer']} {$device['Part Number']}, {$size} {$device['Type']} @ {$device['Configured Memory Speed']}</td></tr>";
$inlist[] = "<tr class='ram'><td></td><td>{$device['Manufacturer']} {$device['Part Number']}, {$size} {$device['Type']} @ {$device['Configured Memory Speed']}</td></tr>";
}
exec("ls /sys/class/net|grep -Po '^(bond|eth)\d+$'",$sPorts);
@@ -173,25 +173,25 @@ foreach ($sPorts as $port) {
if (substr($port,0,4)=='bond') {
if ($link) {
$bond_mode = str_replace('Bonding Mode: ','',file("/proc/net/bonding/$port",FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)[1]);
$list[] = "<tr class='$more'><td>$name</td><td>$port: $bond_mode, mtu $mtu</td></tr>";
$inlist[] = "<tr class='$more'><td>$name</td><td>$port: $bond_mode, mtu $mtu</td></tr>";
} else {
$list[] = "<tr class='$more'><td>$name</td><td>$port: "._("bond down")."</td></tr>";
$inlist[] = "<tr class='$more'><td>$name</td><td>$port: "._("bond down")."</td></tr>";
}
} else {
if ($link) {
$speed = file_get_contents("$int/speed");
$duplex = file_get_contents("$int/duplex");
$list[] = "<tr class='$more'><td>$name</td><td>$port: $speed Mbps, $duplex duplex, mtu $mtu</td></tr>";
$inlist[] = "<tr class='$more'><td>$name</td><td>$port: $speed Mbps, $duplex duplex, mtu $mtu</td></tr>";
} else {
$list[] = "<tr class='$more'><td>$name</td><td>$port: "._("interface down")."</td></tr>";
$inlist[] = "<tr class='$more'><td>$name</td><td>$port: "._("interface down")."</td></tr>";
}
}
}
$list[] = "<tr><td>"._('Kernel').":</td><td>$kernel</td></tr>";
$list[] = "<tr><td>"._('OpenSSL').":</td><td>$openssl</td></tr>";
$list[] = "<tr><td>"._('Uptime').":</td><td><span class='uptime'></span></td></tr></table>";
$inlist[] = "<tr><td>"._('Kernel').":</td><td>$kernel</td></tr>";
$inlist[] = "<tr><td>"._('OpenSSL').":</td><td>$openssl</td></tr>";
$inlist[] = "<tr><td>"._('Uptime').":</td><td><span class='uptime'></span></td></tr></table>";
write($style.implode($list));
unset($style,$list);
write($instyle.implode($inlist));
unset($instyle,$inlist);
?>