From d2d51285f50b0d46185bcc296c924ed10505b66d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 28 May 2023 12:35:16 +0200
Subject: [PATCH 1/6] Fixed disk critical / warning coloring

---
 plugins/dynamix/include/Helpers.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix/include/Helpers.php b/plugins/dynamix/include/Helpers.php
index babee2484..6e48dc6bf 100644
--- a/plugins/dynamix/include/Helpers.php
+++ b/plugins/dynamix/include/Helpers.php
@@ -117,8 +117,8 @@ function my_usage() {
 function usage_color(&$disk, $limit, $free) {
   global $display;
   if (_var($display,'text',0)==1 || intval(_var($display,'text',0)/10)==1) return '';
-  $critical = ($disk['critical'] ?? $display['critical'] ?? 0) ?: 0;
-  $warning = ($disk['warning'] ?? $display['warning'] ?? 0) ?: 0;
+  if (!empty($disk['critical'])) $critical = $disk['critical']; elseif (!empty($display['critical'])) $critical = $display['critical']; else $critical = 0;
+  if (!empty($disk['warning'])) $warning = $disk['warning']; elseif (!empty($display['warning'])) $warning = $display['warning']; else $warning = 0;
   if (!$free) {
     if ($critical>0 && $limit>=$critical) return 'redbar';
     if ($warning>0 && $limit>=$warning) return 'orangebar';

From 4213484c603fbbe07105ae59c334dde8385d7152 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 28 May 2023 12:48:41 +0200
Subject: [PATCH 2/6] Fixed: temp / disk threshold monitoring

---
 plugins/dynamix/scripts/monitor | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/dynamix/scripts/monitor b/plugins/dynamix/scripts/monitor
index fef765cd0..9cb66c583 100755
--- a/plugins/dynamix/scripts/monitor
+++ b/plugins/dynamix/scripts/monitor
@@ -46,8 +46,8 @@ function check_temp(&$disk,$text,$info) {
   global $notify,$saved,$server,$display,$top;
   $name = _var($disk,'name');
   $temp = _var($disk,'temp','*');
-  $max  = ($disk['maxTemp'] ?? $display['max'] ?? 0) ?: 0;
-  $hot  = ($disk['hotTemp'] ?? $display['hot'] ?? 0) ?: 0;
+  if (!empty($disk['maxTemp'])) $max = $disk['maxTemp']; elseif (!empty($display['maxTemp'])) $max = $display['maxTemp']; else $max = 0;
+  if (!empty($disk['hotTemp'])) $hot = $disk['hotTemp']; elseif (!empty($display['hotTemp'])) $hot = $display['hotTemp']; else $hot = 0;
   $warn = exceed($temp,$max,$top) ? 'alert' : (exceed($temp,$hot,$top) ? 'warning' : false);
   $item = 'temp';
   $last = $saved[$item][$name] ?? 0;
@@ -123,8 +123,8 @@ function check_usage(&$disk,$used,$text,$info) {
   global $notify,$saved,$server,$display;
   if ($used == -1) return;
   $name = _var($disk,'name');
-  $critical = ($disk['critical'] ?? $display['critical'] ?? 0) ?: 0;
-  $warning = ($disk['warning'] ?? $display['warning'] ?? 0) ?: 0;
+  if (!empty($disk['critical'])) $critical = $disk['critical']; elseif (!empty($display['critical'])) $critical = $display['critical']; else $critical = 0;
+  if (!empty($disk['warning'])) $warning = $disk['warning']; elseif (!empty($display['warning'])) $warning = $display['warning']; else $warning = 0;
   $warn = exceed($used,$critical) ? 'alert' : (exceed($used,$warning) ? 'warning' : false);
   $item = 'used';
   $last = $saved[$item][$name] ?? 0;

From fcd3dce728fbe803893275f48abd02f2e33cb9c5 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 28 May 2023 12:57:44 +0200
Subject: [PATCH 3/6] Update monitor

---
 plugins/dynamix/scripts/monitor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix/scripts/monitor b/plugins/dynamix/scripts/monitor
index 9cb66c583..2a80d4267 100755
--- a/plugins/dynamix/scripts/monitor
+++ b/plugins/dynamix/scripts/monitor
@@ -46,8 +46,8 @@ function check_temp(&$disk,$text,$info) {
   global $notify,$saved,$server,$display,$top;
   $name = _var($disk,'name');
   $temp = _var($disk,'temp','*');
-  if (!empty($disk['maxTemp'])) $max = $disk['maxTemp']; elseif (!empty($display['maxTemp'])) $max = $display['maxTemp']; else $max = 0;
-  if (!empty($disk['hotTemp'])) $hot = $disk['hotTemp']; elseif (!empty($display['hotTemp'])) $hot = $display['hotTemp']; else $hot = 0;
+  if (!empty($disk['maxTemp'])) $max = $disk['maxTemp']; elseif (!empty($display['max'])) $max = $display['max']; else $max = 0;
+  if (!empty($disk['hotTemp'])) $hot = $disk['hotTemp']; elseif (!empty($display['hot'])) $hot = $display['hot']; else $hot = 0;
   $warn = exceed($temp,$max,$top) ? 'alert' : (exceed($temp,$hot,$top) ? 'warning' : false);
   $item = 'temp';
   $last = $saved[$item][$name] ?? 0;

From 8e817b666af4c3cf92d5eb8423d6076d9a3e607a Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 28 May 2023 13:05:58 +0200
Subject: [PATCH 4/6] Fixed thresholds

---
 plugins/dynamix/include/Helpers.php | 4 ++--
 plugins/dynamix/scripts/monitor     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/dynamix/include/Helpers.php b/plugins/dynamix/include/Helpers.php
index 6e48dc6bf..d703e5bc0 100644
--- a/plugins/dynamix/include/Helpers.php
+++ b/plugins/dynamix/include/Helpers.php
@@ -117,8 +117,8 @@ function my_usage() {
 function usage_color(&$disk, $limit, $free) {
   global $display;
   if (_var($display,'text',0)==1 || intval(_var($display,'text',0)/10)==1) return '';
-  if (!empty($disk['critical'])) $critical = $disk['critical']; elseif (!empty($display['critical'])) $critical = $display['critical']; else $critical = 0;
-  if (!empty($disk['warning'])) $warning = $disk['warning']; elseif (!empty($display['warning'])) $warning = $display['warning']; else $warning = 0;
+  if (isset($disk['critical'])) $critical = $disk['critical']; elseif (isset($display['critical'])) $critical = $display['critical']; else $critical = 0;
+  if (isset($disk['warning'])) $warning = $disk['warning']; elseif (isset($display['warning'])) $warning = $display['warning']; else $warning = 0;
   if (!$free) {
     if ($critical>0 && $limit>=$critical) return 'redbar';
     if ($warning>0 && $limit>=$warning) return 'orangebar';
diff --git a/plugins/dynamix/scripts/monitor b/plugins/dynamix/scripts/monitor
index 2a80d4267..90062b955 100755
--- a/plugins/dynamix/scripts/monitor
+++ b/plugins/dynamix/scripts/monitor
@@ -46,8 +46,8 @@ function check_temp(&$disk,$text,$info) {
   global $notify,$saved,$server,$display,$top;
   $name = _var($disk,'name');
   $temp = _var($disk,'temp','*');
-  if (!empty($disk['maxTemp'])) $max = $disk['maxTemp']; elseif (!empty($display['max'])) $max = $display['max']; else $max = 0;
-  if (!empty($disk['hotTemp'])) $hot = $disk['hotTemp']; elseif (!empty($display['hot'])) $hot = $display['hot']; else $hot = 0;
+  if (isset($disk['maxTemp'])) $max = $disk['maxTemp']; elseif (isset($display['max'])) $max = $display['max']; else $max = 0;
+  if (isset($disk['hotTemp'])) $hot = $disk['hotTemp']; elseif (isset($display['hot'])) $hot = $display['hot']; else $hot = 0;
   $warn = exceed($temp,$max,$top) ? 'alert' : (exceed($temp,$hot,$top) ? 'warning' : false);
   $item = 'temp';
   $last = $saved[$item][$name] ?? 0;
@@ -123,8 +123,8 @@ function check_usage(&$disk,$used,$text,$info) {
   global $notify,$saved,$server,$display;
   if ($used == -1) return;
   $name = _var($disk,'name');
-  if (!empty($disk['critical'])) $critical = $disk['critical']; elseif (!empty($display['critical'])) $critical = $display['critical']; else $critical = 0;
-  if (!empty($disk['warning'])) $warning = $disk['warning']; elseif (!empty($display['warning'])) $warning = $display['warning']; else $warning = 0;
+  if (isset($disk['critical'])) $critical = $disk['critical']; elseif (isset($display['critical'])) $critical = $display['critical']; else $critical = 0;
+  if (isset($disk['warning'])) $warning = $disk['warning']; elseif (isset($display['warning'])) $warning = $display['warning']; else $warning = 0;
   $warn = exceed($used,$critical) ? 'alert' : (exceed($used,$warning) ? 'warning' : false);
   $item = 'used';
   $last = $saved[$item][$name] ?? 0;

From 3ccc68c13bb8732b3cfd7b886a26f6726ae30186 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 29 May 2023 17:35:23 +0200
Subject: [PATCH 5/6] Revert "Fixed thresholds"

This reverts commit 8e817b666af4c3cf92d5eb8423d6076d9a3e607a.
---
 plugins/dynamix/include/Helpers.php | 4 ++--
 plugins/dynamix/scripts/monitor     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/dynamix/include/Helpers.php b/plugins/dynamix/include/Helpers.php
index d703e5bc0..6e48dc6bf 100644
--- a/plugins/dynamix/include/Helpers.php
+++ b/plugins/dynamix/include/Helpers.php
@@ -117,8 +117,8 @@ function my_usage() {
 function usage_color(&$disk, $limit, $free) {
   global $display;
   if (_var($display,'text',0)==1 || intval(_var($display,'text',0)/10)==1) return '';
-  if (isset($disk['critical'])) $critical = $disk['critical']; elseif (isset($display['critical'])) $critical = $display['critical']; else $critical = 0;
-  if (isset($disk['warning'])) $warning = $disk['warning']; elseif (isset($display['warning'])) $warning = $display['warning']; else $warning = 0;
+  if (!empty($disk['critical'])) $critical = $disk['critical']; elseif (!empty($display['critical'])) $critical = $display['critical']; else $critical = 0;
+  if (!empty($disk['warning'])) $warning = $disk['warning']; elseif (!empty($display['warning'])) $warning = $display['warning']; else $warning = 0;
   if (!$free) {
     if ($critical>0 && $limit>=$critical) return 'redbar';
     if ($warning>0 && $limit>=$warning) return 'orangebar';
diff --git a/plugins/dynamix/scripts/monitor b/plugins/dynamix/scripts/monitor
index 90062b955..2a80d4267 100755
--- a/plugins/dynamix/scripts/monitor
+++ b/plugins/dynamix/scripts/monitor
@@ -46,8 +46,8 @@ function check_temp(&$disk,$text,$info) {
   global $notify,$saved,$server,$display,$top;
   $name = _var($disk,'name');
   $temp = _var($disk,'temp','*');
-  if (isset($disk['maxTemp'])) $max = $disk['maxTemp']; elseif (isset($display['max'])) $max = $display['max']; else $max = 0;
-  if (isset($disk['hotTemp'])) $hot = $disk['hotTemp']; elseif (isset($display['hot'])) $hot = $display['hot']; else $hot = 0;
+  if (!empty($disk['maxTemp'])) $max = $disk['maxTemp']; elseif (!empty($display['max'])) $max = $display['max']; else $max = 0;
+  if (!empty($disk['hotTemp'])) $hot = $disk['hotTemp']; elseif (!empty($display['hot'])) $hot = $display['hot']; else $hot = 0;
   $warn = exceed($temp,$max,$top) ? 'alert' : (exceed($temp,$hot,$top) ? 'warning' : false);
   $item = 'temp';
   $last = $saved[$item][$name] ?? 0;
@@ -123,8 +123,8 @@ function check_usage(&$disk,$used,$text,$info) {
   global $notify,$saved,$server,$display;
   if ($used == -1) return;
   $name = _var($disk,'name');
-  if (isset($disk['critical'])) $critical = $disk['critical']; elseif (isset($display['critical'])) $critical = $display['critical']; else $critical = 0;
-  if (isset($disk['warning'])) $warning = $disk['warning']; elseif (isset($display['warning'])) $warning = $display['warning']; else $warning = 0;
+  if (!empty($disk['critical'])) $critical = $disk['critical']; elseif (!empty($display['critical'])) $critical = $display['critical']; else $critical = 0;
+  if (!empty($disk['warning'])) $warning = $disk['warning']; elseif (!empty($display['warning'])) $warning = $display['warning']; else $warning = 0;
   $warn = exceed($used,$critical) ? 'alert' : (exceed($used,$warning) ? 'warning' : false);
   $item = 'used';
   $last = $saved[$item][$name] ?? 0;

From fd4dad2daebf8b5c0f2ef98c425c202dace45418 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 29 May 2023 17:39:14 +0200
Subject: [PATCH 6/6] Fixed thresholds

---
 plugins/dynamix/include/Helpers.php | 4 ++--
 plugins/dynamix/scripts/monitor     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/dynamix/include/Helpers.php b/plugins/dynamix/include/Helpers.php
index 6e48dc6bf..ac74ec136 100644
--- a/plugins/dynamix/include/Helpers.php
+++ b/plugins/dynamix/include/Helpers.php
@@ -117,8 +117,8 @@ function my_usage() {
 function usage_color(&$disk, $limit, $free) {
   global $display;
   if (_var($display,'text',0)==1 || intval(_var($display,'text',0)/10)==1) return '';
-  if (!empty($disk['critical'])) $critical = $disk['critical']; elseif (!empty($display['critical'])) $critical = $display['critical']; else $critical = 0;
-  if (!empty($disk['warning'])) $warning = $disk['warning']; elseif (!empty($display['warning'])) $warning = $display['warning']; else $warning = 0;
+  if (strlen($disk['critical'])) $critical = $disk['critical']; elseif (strlen($display['critical'])) $critical = $display['critical']; else $critical = 0;
+  if (strlen($disk['warning'])) $warning = $disk['warning']; elseif (strlen($display['warning'])) $warning = $display['warning']; else $warning = 0;
   if (!$free) {
     if ($critical>0 && $limit>=$critical) return 'redbar';
     if ($warning>0 && $limit>=$warning) return 'orangebar';
diff --git a/plugins/dynamix/scripts/monitor b/plugins/dynamix/scripts/monitor
index 2a80d4267..43c5901fa 100755
--- a/plugins/dynamix/scripts/monitor
+++ b/plugins/dynamix/scripts/monitor
@@ -46,8 +46,8 @@ function check_temp(&$disk,$text,$info) {
   global $notify,$saved,$server,$display,$top;
   $name = _var($disk,'name');
   $temp = _var($disk,'temp','*');
-  if (!empty($disk['maxTemp'])) $max = $disk['maxTemp']; elseif (!empty($display['max'])) $max = $display['max']; else $max = 0;
-  if (!empty($disk['hotTemp'])) $hot = $disk['hotTemp']; elseif (!empty($display['hot'])) $hot = $display['hot']; else $hot = 0;
+  if (strlen($disk['maxTemp'])) $max = $disk['maxTemp']; elseif (strlen($display['max'])) $max = $display['max']; else $max = 0;
+  if (strlen($disk['hotTemp'])) $hot = $disk['hotTemp']; elseif (strlen($display['hot'])) $hot = $display['hot']; else $hot = 0;
   $warn = exceed($temp,$max,$top) ? 'alert' : (exceed($temp,$hot,$top) ? 'warning' : false);
   $item = 'temp';
   $last = $saved[$item][$name] ?? 0;
@@ -123,8 +123,8 @@ function check_usage(&$disk,$used,$text,$info) {
   global $notify,$saved,$server,$display;
   if ($used == -1) return;
   $name = _var($disk,'name');
-  if (!empty($disk['critical'])) $critical = $disk['critical']; elseif (!empty($display['critical'])) $critical = $display['critical']; else $critical = 0;
-  if (!empty($disk['warning'])) $warning = $disk['warning']; elseif (!empty($display['warning'])) $warning = $display['warning']; else $warning = 0;
+  if (strlen($disk['critical'])) $critical = $disk['critical']; elseif (strlen($display['critical'])) $critical = $display['critical']; else $critical = 0;
+  if (strlen($disk['warning'])) $warning = $disk['warning']; elseif (strlen($display['warning'])) $warning = $display['warning']; else $warning = 0;
   $warn = exceed($used,$critical) ? 'alert' : (exceed($used,$warning) ? 'warning' : false);
   $item = 'used';
   $last = $saved[$item][$name] ?? 0;