mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-22 09:29:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1266 from ljm42/fix-diagnostics

Browse Source 
diagnostics: PHP 8 fixes
This commit is contained in:
tom mortensen
2023-02-16 16:48:49 -08:00
committed by GitHub
parent 39a4ab3be8 6b2f3620e2
commit c2b334d3a9
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/dynamix/scripts/diagnostics
View File

@@ -335,14 +335,16 @@ foreach (glob("$get/*.ini") as $file) {
// Create loads.txt
$cpuload = run("uptime")." Cores: ".run("nproc")."\r\n".(string)@file_get_contents("$get/cpuload.ini")."\r\n";
$diskload = (array)@file("$get/diskload.ini");
$loadTxt = [];
foreach ($diskload as $loadLine) {
$load = explode('=',$loadLine);
foreach ($disks as $disk) {
if ($load[0]==$disk['device']) {
$loadTxt[] = "{$disk['device']} ({$disk['name']})=".trim($load[1]);
break;
if (file_exists("$get/diskload.ini")){
$diskload = (array)@file("$get/diskload.ini");
foreach ($diskload as $loadLine) {
$load = explode('=',$loadLine);
foreach ($disks as $disk) {
if ($load[0]==$disk['device']) {
$loadTxt[] = "{$disk['device']} ({$disk['name']})=".trim($load[1]);
break;
}
}
}
}
@@ -558,7 +560,7 @@ foreach (glob("/var/log/syslog*") as $file) {
run("todos <".escapeshellarg($file)." >".escapeshellarg("$log.txt"));
if (!$all) {
unset($titles,$rows);
run("grep -Po 'file: \K[^\"]+' ".escapeshellarg("$log.txt")." 2>/dev/null|sort|uniq", $titles);
run("grep -Po 'file: \K[^\"\\x27]+' ".escapeshellarg("$log.txt")." 2>/dev/null|sort|uniq", $titles);
run("sed -ri 's|\b\S+@\S+\.\S+\b|email@removed.com|;s|\b(username\|password)([=:])\S+\b|\\1\\2xxx|;s|(GUID: \S)\S+(\S) |\\1..\\2 |;s|(moving \"\S\|\"/mnt/user/\S).*(\S)\"|\\1..\\2\"|' ".escapeshellarg("$log.txt"));
run("sed -ri 's|(server: ).+(\.(my)?unraid\.net(:[0-9]+)?,)|\\1hash\\2|;s|(host: \").+(\.(my)?unraid\.net(:[0-9]+)?\")|\\1hash\\2|;s|(referrer: \"https?://).+(\.(my)?unraid\.net)|\\1hash\\2|' ".escapeshellarg("$log.txt"));
foreach ($titles as $mover) {