From bbdf5c70bb7c78f92621805c4c428420789a9b37 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 24 Apr 2025 19:10:59 +0200
Subject: [PATCH 1/5] Revert "Update diagnostics"

This reverts commit 854a02b63f07356c31f5a9aac7dfead4595a219d.
---
 emhttp/plugins/dynamix/scripts/diagnostics | 1 +
 1 file changed, 1 insertion(+)

diff --git a/emhttp/plugins/dynamix/scripts/diagnostics b/emhttp/plugins/dynamix/scripts/diagnostics
index 46deed326..594344478 100755
--- a/emhttp/plugins/dynamix/scripts/diagnostics
+++ b/emhttp/plugins/dynamix/scripts/diagnostics
@@ -48,6 +48,7 @@ function write(...$messages){
   foreach ($messages as $message) publish('diagnostics', $message);
 }
 
+// Modify run function to include error logging
 function run($cmd, &$save=null, $timeout=30) {
   // output command for display
   write($cmd);

From 77bfb0a3ef7d87111010070d14f4e31313f88859 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 24 Apr 2025 19:11:22 +0200
Subject: [PATCH 2/5] Revert "Update diagnostics"

This reverts commit 4540a2f92b2575d732e32748cd8ccd7cdb8ef206.
---
 emhttp/plugins/dynamix/scripts/diagnostics | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/scripts/diagnostics b/emhttp/plugins/dynamix/scripts/diagnostics
index 594344478..717f503d9 100755
--- a/emhttp/plugins/dynamix/scripts/diagnostics
+++ b/emhttp/plugins/dynamix/scripts/diagnostics
@@ -50,11 +50,12 @@ function write(...$messages){
 
 // Modify run function to include error logging
 function run($cmd, &$save=null, $timeout=30) {
+  global $cli,$diag;
   // output command for display
   write($cmd);
   // execute command with timeout of 30s
   exec("LC_ALL=en_US.UTF-8 timeout -s9 $timeout $cmd", $save);
-  return implode("\n", $save);
+  return implode("\n",$save);
 }
 
 function newline($file) {

From d0c13510c5ef306e112a9ae735b51c1bad3eacc1 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 24 Apr 2025 19:11:35 +0200
Subject: [PATCH 3/5] Revert "update diagnostics"

This reverts commit b4542d9d2a957c52f43f99490ad72c5f3e8f4646.
---
 emhttp/plugins/dynamix/scripts/diagnostics | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/emhttp/plugins/dynamix/scripts/diagnostics b/emhttp/plugins/dynamix/scripts/diagnostics
index 717f503d9..ffc58f2ab 100755
--- a/emhttp/plugins/dynamix/scripts/diagnostics
+++ b/emhttp/plugins/dynamix/scripts/diagnostics
@@ -26,7 +26,7 @@ $cli = empty($zip);
 
 $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Helpers.php";
-require_once "$docroot/webGui/include/publish.php";
+require_once "$docroot/webGui/include/Wrappers.php";
 
 if (is_file('/boot/syslinux/syslinux.cfg')) {
   $bootenv = '/boot/syslinux';
@@ -45,7 +45,18 @@ $pools = pools_filter($disks);
 require_once "$docroot/webGui/include/CustomMerge.php";
 
 function write(...$messages){
-  foreach ($messages as $message) publish('diagnostics', $message);
+  $com = curl_init();
+  curl_setopt_array($com,[
+    CURLOPT_URL => 'http://localhost/pub/diagnostics?buffer_length=1',
+    CURLOPT_UNIX_SOCKET_PATH => '/var/run/nginx.socket',
+    CURLOPT_POST => 1,
+    CURLOPT_RETURNTRANSFER => true
+  ]);
+  foreach ($messages as $message) {
+    curl_setopt($com, CURLOPT_POSTFIELDS, $message);
+    curl_exec($com);
+  }
+  curl_close($com);
 }
 
 // Modify run function to include error logging
@@ -54,7 +65,7 @@ function run($cmd, &$save=null, $timeout=30) {
   // output command for display
   write($cmd);
   // execute command with timeout of 30s
-  exec("LC_ALL=en_US.UTF-8 timeout -s9 $timeout $cmd", $save);
+  exec("timeout -s9 $timeout $cmd", $save);
   return implode("\n",$save);
 }
 
@@ -457,7 +468,7 @@ foreach ($ports as $port) {
   file_put_contents("/$diag/system/ethtool.txt", "--------------------------------\r\n", FILE_APPEND);
 }
 run("ip -br a|todos >".escapeshellarg("/$diag/system/ifconfig.txt"));
-maskIP("/$diag/system/ifconfig.txt");
+if (!$all) maskIP("/$diag/system/ifconfig.txt");
 
 // create system information (suppress errors)
 run("find /sys/kernel/iommu_groups/ -type l 2>/dev/null|sort -V|todos >".escapeshellarg("/$diag/system/iommu_groups.txt"));

From 1e9b5acd37bac9ba1ea8fbdc24b3a9ca5adf49bc Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 25 Apr 2025 11:52:25 +0200
Subject: [PATCH 4/5] Docker and VM: remove path do not exist warning

---
 .../plugins/dynamix.docker.manager/DockerSettings.page |  6 ++----
 emhttp/plugins/dynamix.vm.manager/VMSettings.page      | 10 ++++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
index d30e742fa..0203a7f89 100644
--- a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
@@ -146,11 +146,9 @@ _(Enable Docker)_:
   <?=mk_option(_var($dockercfg,'DOCKER_ENABLED'), 'no', _('No'))?>
   <?=mk_option(_var($dockercfg,'DOCKER_ENABLED'), 'yes', _('Yes'))?>
   </select>
-  <?if (_var($var,'fsState')!="Started"):?>
+<?if (_var($var,'fsState')!="Started"):?>
   <span id="arraystopped"><i class="fa fa-warning icon warning"></i> <?=(_var($dockercfg,'DOCKER_ENABLED')=='yes') ? '_(Docker will be available after Array is Started)_' : '_(Apply to activate Docker after Array is Started)_'?></span>
-  <?elseif (!is_dir(dirname(_var($dockercfg,'DOCKER_IMAGE_FILE'))) || !is_dir(_var($dockercfg,'DOCKER_APP_CONFIG_PATH'))):?>
-  <span class="basic"><i class="fa fa-warning icon warning"></i> _(One or more paths do not exist)_ (<a href="#" onclick="$('.advancedview').switchButton('option','checked',true); return false">_(view)_</a>)</span>
-  <?endif;?>
+<?endif;?>
 
 :docker_enable_help:
 
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 292580098..114aed13b 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -112,13 +112,11 @@ _(Enable VMs)_:
   <?= mk_option($libvirt_service, 'disable', _('No'))?>
   <?= mk_option($libvirt_service, 'enable', _('Yes'))?>
   </select>
-  <?if ($hardware):?>
-  <?if (!$started):?>
+<?if ($hardware):?>
+<?if (!$started):?>
   <span id="arraystopped"><i class="fa fa-warning icon warning"></i> <?=($libvirt_service=='enable')?'_(VMs will be available after Array is Started)_':'_(Apply to activate VMs after Array is Started)_'?></span>
-  <?elseif (!is_dir(dirname($domain_cfg['IMAGE_FILE'])) || !is_dir($domain_cfg['DOMAINDIR']) || !is_dir($domain_cfg['MEDIADIR'])):?>
-  <span class="basic" style="display:inline"><i class="fa fa-warning icon warning"></i> _(One or more paths do not exist)_ (<a href="#" onclick="$('.advancedview').switchButton('option','checked',true); return false">_(view)_</a>)</span>
-  <?endif;?>
-  <?endif;?>
+<?endif;?>
+<?endif;?>
 
 :vms_enable_help:
 

From fb417ce2eb1fe583cc549e7baccf3bd6d9503d4e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 25 Apr 2025 11:53:47 +0200
Subject: [PATCH 5/5] Update diagnostics

---
 emhttp/plugins/dynamix/scripts/diagnostics | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/scripts/diagnostics b/emhttp/plugins/dynamix/scripts/diagnostics
index ada5d715a..6193cd106 100755
--- a/emhttp/plugins/dynamix/scripts/diagnostics
+++ b/emhttp/plugins/dynamix/scripts/diagnostics
@@ -475,7 +475,7 @@ foreach ($ports as $port) {
   file_put_contents("/$diag/system/ethtool.txt", "--------------------------------\r\n", FILE_APPEND);
 }
 run("ip -br a|todos >".escapeshellarg("/$diag/system/ifconfig.txt"));
-if (!$all) maskIP("/$diag/system/ifconfig.txt");
+maskIP("/$diag/system/ifconfig.txt");
 
 // create system information (suppress errors)
 run("find /sys/kernel/iommu_groups/ -type l 2>/dev/null|sort -V|todos >".escapeshellarg("/$diag/system/iommu_groups.txt"));