From a259d16f6994a03acfccf06259a619fc75b09a05 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 31 May 2023 09:48:55 +0200
Subject: [PATCH 1/2] Fixed disk utilization and temp thresholds

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

diff --git a/plugins/dynamix/include/Helpers.php b/plugins/dynamix/include/Helpers.php
index f3bedae64..778132a22 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 = (isset($disk['critical']) && strlen($disk['critical'])) ? $disk['critical'] : ((isset($display['critical']) && strlen($display['critical'])) ? $display['critical'] : 0);
-  $warning = (isset($disk['warning']) && strlen($disk['warning'])) ? $disk['warning'] : ((isset($display['warning']) && strlen($display['warning'])) ? $display['warning'] : 0);
+  $critical = _var($disk,'critical') ? $disk['critical'] : (_var($display,'critical') ? $display['critical'] : 0);
+  $warning = _var($disk,'warning') ? $disk['warning'] : (_var($display,'warning') ? $display['warning'] : 0);
   if (!$free) {
     if ($critical>0 && $limit>=$critical) return 'redbar';
     if ($warning>0 && $limit>=$warning) return 'orangebar';
diff --git a/plugins/dynamix/nchan/update_2 b/plugins/dynamix/nchan/update_2
index 51508db86..075989996 100755
--- a/plugins/dynamix/nchan/update_2
+++ b/plugins/dynamix/nchan/update_2
@@ -208,8 +208,8 @@ function device_usage(&$disk, &$full, &$high) {
   if ($used) {
     if ($text==2 || $text==21) {
       $load = substr($used,0,-1);
-      $critical = ($disk['critical'] ?? $display['critical'] ?? 0) ?: 0;
-      $warning = ($disk['warning'] ?? $display['warning'] ?? 0) ?: 0;
+      $critical = _var($disk,'critical') ? $disk['critical'] : (_var($display,'critical') ? $display['critical'] : 0);
+      $warning = _var($disk,'warning') ? $disk['warning'] : (_var($display,'warning') ? $display['warning'] : 0);
       if ($critical>0 && $load>=$critical) {$class = 'redbar'; $full++;}
       elseif ($warning>0 && $load>=$warning) {$class = 'orangebar'; $high++;}
       else $class = 'greenbar';
diff --git a/plugins/dynamix/scripts/monitor b/plugins/dynamix/scripts/monitor
index f2e810d56..023255110 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  = (isset($disk['maxTemp']) && strlen($disk['maxTemp'])) ? $disk['maxTemp'] : ((isset($display['max']) && strlen($display['max'])) ? $display['max'] : 0);
-  $hot  = (isset($disk['hotTemp']) && strlen($disk['hotTemp'])) ? $disk['hotTemp'] : ((isset($display['hot']) && strlen($display['hot'])) ? $display['hot'] : 0);
+  $max  = _var($disk,'maxTemp') ? $disk['maxTemp'] : (_var($display,'max') ? $display['max'] : 0);
+  $hot  = _var($disk,'hotTemp') ? $disk['hotTemp'] : (_var($display,'hot') ? $display['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 = (isset($disk['critical']) && strlen($disk['critical'])) ? $disk['critical'] : ((isset($display['critical']) && strlen($display['critical'])) ? $display['critical'] : 0);
-  $warning = (isset($disk['warning']) && strlen($disk['warning'])) ? $disk['warning'] : ((isset($display['warning']) && strlen($display['warning'])) ? $display['warning'] : 0);
+  $critical = _var($disk,'critical') ? $disk['critical'] : (_var($display,'critical') ? $display['critical'] : 0);
+  $warning = _var($disk,'warning') ? $disk['warning'] : (_var($display,'warning') ? $display['warning'] : 0);
   $warn = exceed($used,$critical) ? 'alert' : (exceed($used,$warning) ? 'warning' : false);
   $item = 'used';
   $last = $saved[$item][$name] ?? 0;

From e473a4c52e919ca6f30cef34bb760a7375548eb7 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 31 May 2023 11:13:42 +0200
Subject: [PATCH 2/2] Fixed disk utilization and temp thresholds

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

diff --git a/plugins/dynamix/nchan/update_2 b/plugins/dynamix/nchan/update_2
index 075989996..429a5b0b0 100755
--- a/plugins/dynamix/nchan/update_2
+++ b/plugins/dynamix/nchan/update_2
@@ -159,8 +159,8 @@ function device_temp(&$disk, &$red, &$orange) {
   global $display;
   $spin = strpos(_var($disk,'color'),'blink')===false;
   $temp = _var($disk,'temp','*');
-  $max = ($disk['maxTemp'] ?? $display['max'] ?? 0) ?: 0;
-  $hot = ($disk['hotTemp'] ?? $display['hot'] ?? 0) ?: 0;
+  $max  = _var($disk,'maxTemp') ? $disk['maxTemp'] : (_var($display,'max') ? $display['max'] : 0);
+  $hot  = _var($disk,'hotTemp') ? $disk['hotTemp'] : (_var($display,'hot') ? $display['hot'] : 0);
   $top = $display['top'] ?? 120;
   $heat = false; $color = 'green';
   if (exceed($temp,$max,$top)) {