From a7b1a6c12f4a71bf7877f038889bc0a06d9a180b Mon Sep 17 00:00:00 2001
From: ljm42 <larry_meaney@iname.com>
Date: Thu, 14 Mar 2024 14:12:30 -0700
Subject: [PATCH] Fix Docker notifications

and improve consistency in related files
---
 .../dynamix.docker.manager/scripts/dockerupdate        |  9 +++++----
 .../dynamix.plugin.manager/include/UnraidCheck.php     | 10 +++++++---
 .../dynamix.plugin.manager/scripts/languagecheck       |  5 +++--
 .../plugins/dynamix.plugin.manager/scripts/plugincheck |  5 +++--
 emhttp/plugins/dynamix/scripts/statuscheck             |  8 +++++---
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/emhttp/plugins/dynamix.docker.manager/scripts/dockerupdate b/emhttp/plugins/dynamix.docker.manager/scripts/dockerupdate
index 8f5482095..592e3fc00 100755
--- a/emhttp/plugins/dynamix.docker.manager/scripts/dockerupdate
+++ b/emhttp/plugins/dynamix.docker.manager/scripts/dockerupdate
@@ -1,7 +1,7 @@
 #!/usr/bin/php -q
 <?PHP
-/* Copyright 2005-2023, Lime Technology
- * Copyright 2012-2023, Bergware International.
+/* Copyright 2005-2024, Lime Technology
+ * Copyright 2012-2024, Bergware International.
  * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
@@ -16,6 +16,7 @@
 $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+// this command will set the $notify array
 extract(parse_plugin_cfg('dynamix', true));
 
 // Multi-language support
@@ -43,7 +44,7 @@ if (!isset($check)) {
   $DockerTemplates->getAllInfo(true);
   echo " Done.";
 } else {
-  $notify = "$docroot/webGui/scripts/notify";
+  $script = "$docroot/webGui/scripts/notify";
   $var    = (array)@parse_ini_file("/var/local/emhttp/var.ini");
   $server = strtoupper(_var($var,'NAME','tower'));
   $output = _var($notify,'docker_notify');
@@ -59,7 +60,7 @@ if (!isset($check)) {
         $event = str_replace("&apos;","'",_("Docker")." - $name [$new]");
         $subject = str_replace("&apos;","'",sprintf(_("Notice [%s] - Version update %s"),$server,$new));
         $description = str_replace("&apos;","'",sprintf(_("A new version of %s is available"),$name));
-        exec("$notify -e ".escapeshellarg($event)." -s ".escapeshellarg($subject)." -d ".escapeshellarg($description)." -i ".escapeshellarg("normal $output")." -l '/Docker' -x");
+        exec("$script -e ".escapeshellarg($event)." -s ".escapeshellarg($subject)." -d ".escapeshellarg($description)." -i ".escapeshellarg("normal $output")." -l '/Docker' -x");
       }
     }
   }
diff --git a/emhttp/plugins/dynamix.plugin.manager/include/UnraidCheck.php b/emhttp/plugins/dynamix.plugin.manager/include/UnraidCheck.php
index 30104a466..2f2b091d6 100644
--- a/emhttp/plugins/dynamix.plugin.manager/include/UnraidCheck.php
+++ b/emhttp/plugins/dynamix.plugin.manager/include/UnraidCheck.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright 2005-2023, Lime Technology
- * Copyright 2012-2023, Bergware International.
+/* Copyright 2005-2024, Lime Technology
+ * Copyright 2012-2024, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -108,6 +108,7 @@ class UnraidOsCheck
             function _($text) {return $text;}
         }
 
+        // this command will set the $notify array
         extract(parse_plugin_cfg('dynamix', true));
 
         $var = (array)@parse_ini_file('/var/local/emhttp/var.ini');
@@ -166,7 +167,10 @@ class UnraidOsCheck
             $server  = strtoupper(_var($var,'NAME','server'));
             $newver = (array_key_exists('version',$responseMutated) && $responseMutated['version']) ? $responseMutated['version'] : 'unknown';
             $script  = '/usr/local/emhttp/webGui/scripts/notify';
-            exec("$script -e ".escapeshellarg("System - Unraid [$newver]")." -s ".escapeshellarg("Notice [$server] - Version update $newver")." -d ".escapeshellarg("A new version of Unraid is available")." -i ".escapeshellarg("normal $output")." -l '/Tools/Update' -x");
+            $event = "System - Unraid [$newver]";
+            $subject = "Notice [$server] - Version update $newver";
+            $description = "A new version of Unraid is available";
+            exec("$script -e ".escapeshellarg($event)." -s ".escapeshellarg($subject)." -d ".escapeshellarg($description)." -i ".escapeshellarg("normal $output")." -l '/Tools/Update' -x");
         }
 
         exit(0);
diff --git a/emhttp/plugins/dynamix.plugin.manager/scripts/languagecheck b/emhttp/plugins/dynamix.plugin.manager/scripts/languagecheck
index 93e8265fe..2f28d25e4 100755
--- a/emhttp/plugins/dynamix.plugin.manager/scripts/languagecheck
+++ b/emhttp/plugins/dynamix.plugin.manager/scripts/languagecheck
@@ -1,7 +1,7 @@
 #!/usr/bin/php -q
 <?PHP
-/* Copyright 2005-2023, Lime Technology
- * Copyright 2012-2023, Bergware International.
+/* Copyright 2005-2024, Lime Technology
+ * Copyright 2012-2024, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -15,6 +15,7 @@
 $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
+// this command will set the $notify array
 extract(parse_plugin_cfg('dynamix', true));
 
 // Multi-language support
diff --git a/emhttp/plugins/dynamix.plugin.manager/scripts/plugincheck b/emhttp/plugins/dynamix.plugin.manager/scripts/plugincheck
index 6eb1acec0..301537304 100755
--- a/emhttp/plugins/dynamix.plugin.manager/scripts/plugincheck
+++ b/emhttp/plugins/dynamix.plugin.manager/scripts/plugincheck
@@ -1,7 +1,7 @@
 #!/usr/bin/php -q
 <?PHP
-/* Copyright 2005-2023, Lime Technology
- * Copyright 2012-2023, Bergware International.
+/* Copyright 2005-2024, Lime Technology
+ * Copyright 2012-2024, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -15,6 +15,7 @@
 $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
+// this command will set the $notify array
 extract(parse_plugin_cfg('dynamix',true));
 
 // Multi-language support
diff --git a/emhttp/plugins/dynamix/scripts/statuscheck b/emhttp/plugins/dynamix/scripts/statuscheck
index 4dcd91f9a..5c122cf6e 100755
--- a/emhttp/plugins/dynamix/scripts/statuscheck
+++ b/emhttp/plugins/dynamix/scripts/statuscheck
@@ -1,7 +1,7 @@
 #!/usr/bin/php -q
 <?PHP
-/* Copyright 2005-2023, Lime Technology
- * Copyright 2012-2023, Bergware International.
+/* Copyright 2005-2024, Lime Technology
+ * Copyright 2012-2024, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -21,6 +21,7 @@ $disks = (array)@parse_ini_file("/var/local/emhttp/disks.ini",true);
 require_once "$docroot/webGui/include/CustomMerge.php";
 
 $script = "$docroot/webGui/scripts/notify";
+// this command will set the $notify array
 extract(parse_plugin_cfg("dynamix",true));
 $output = _var($notify,'report');
 $server = strtoupper(_var($var,'NAME','tower'));
@@ -178,7 +179,8 @@ $warn = ($error0 || $error3) ? "alert" : (($error1 || $error2) ? "warning" : "no
 $stat = $warn=="normal" ? "[PASS]" : "[FAIL]";
 $info = "Array has $size disk".($size==1 ? "" : "s").($parity ? " ({$word}parity".($pools ? " & pools)" : ")") : ($pools ? " ({$word}pools)" : ""));
 $message = implode('\n', $data);
-exec("$script -s ".escapeshellarg("Notice [$server] - array health report $stat")." -d ".escapeshellarg("$info")." -m ".escapeshellarg("$message")." -i ".escapeshellarg("$warn $output")." -l '/Main'");
+$subject = "Notice [$server] - array health report $stat";
+exec("$script -s ".escapeshellarg($subject)." -d ".escapeshellarg("$info")." -m ".escapeshellarg("$message")." -i ".escapeshellarg("$warn $output")." -l '/Main'");
 
 exit(0);
 ?>