From 6b2f3620e20a3f5d53a1ae7fc35e8524296d8aeb Mon Sep 17 00:00:00 2001
From: ljm42 <larry_meaney@iname.com>
Date: Thu, 16 Feb 2023 12:26:47 -0700
Subject: [PATCH] diagnostics: PHP 8 fixes

---
 plugins/dynamix/scripts/diagnostics | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/plugins/dynamix/scripts/diagnostics b/plugins/dynamix/scripts/diagnostics
index 9cc8b6dc5..54462767b 100755
--- a/plugins/dynamix/scripts/diagnostics
+++ b/plugins/dynamix/scripts/diagnostics
@@ -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) {