From f37467ad92ba208738dfce5289a8746e1ceed216 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 16 Sep 2022 20:01:06 +0200
Subject: [PATCH] UPS display enhancements

Minor code optimizations
---
 plugins/dynamix.apcupsd/include/UPSstatus.php | 2 +-
 plugins/dynamix/nchan/ups_status              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/dynamix.apcupsd/include/UPSstatus.php b/plugins/dynamix.apcupsd/include/UPSstatus.php
index e58b3d0fa..8eda7cf22 100644
--- a/plugins/dynamix.apcupsd/include/UPSstatus.php
+++ b/plugins/dynamix.apcupsd/include/UPSstatus.php
@@ -56,7 +56,7 @@ if (file_exists("/var/run/apcupsd.pid")) {
       break;
     case 'NOMPOWER':
       $power = strtok($val,' ');
-      $status[3] = $power==0 ? "<td $red>$val</td>" : "<td $green>$val</td>";
+      $status[3] = $power>0 ? "<td $green>$val</td>" : "<td $red>$val</td>";
       break;
     case 'LOADPCT':
       $load = strtok($val,' ');
diff --git a/plugins/dynamix/nchan/ups_status b/plugins/dynamix/nchan/ups_status
index cb9bb5534..86735b217 100755
--- a/plugins/dynamix/nchan/ups_status
+++ b/plugins/dynamix/nchan/ups_status
@@ -84,7 +84,7 @@ while (true) {
       case 'BCHARGE':
         [$val,$unit] = explode(' ', $val, 2);
         $val = intval($val);
-        $status[1] = strtok($val,' ')>$level ? "<span $green>$val $unit</span>" : "<span $red>$val $unit</span>";
+        $status[1] = $val>$level ? "<span $green>$val $unit</span>" : "<span $red>$val $unit</span>";
         break;
       case 'TIMELEFT':
         [$val,$unit] = explode(' ', $val, 2);
@@ -93,7 +93,7 @@ while (true) {
         break;
       case 'NOMPOWER':
         $power = strtok($val,' ');
-        $status[3] = $power==0 ? "<span $red>$val</span>" : "<span $green>$val</span>";
+        $status[3] = $power>0 ? "<span $green>$val</span>" : "<span $red>$val</span>";
         break;
       case 'LOADPCT':
         $load = strtok($val,' ');