From 36f9e7402ca3b5e97efd188831fce7fe4d335597 Mon Sep 17 00:00:00 2001
From: Justin Brown <21961216+jbtwo@users.noreply.github.com>
Date: Tue, 16 Jul 2024 19:32:30 -0400
Subject: [PATCH 1/2] fix UPS settings page when config contains empty values

---
 emhttp/plugins/dynamix.apcupsd/UPSdetails.page | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.apcupsd/UPSdetails.page b/emhttp/plugins/dynamix.apcupsd/UPSdetails.page
index 9eaa96693..5e36b51e0 100644
--- a/emhttp/plugins/dynamix.apcupsd/UPSdetails.page
+++ b/emhttp/plugins/dynamix.apcupsd/UPSdetails.page
@@ -17,7 +17,10 @@ Tag="battery-3"
 ?>
 <script>
 function getUPSstatus() {
-  $.post('/plugins/dynamix.apcupsd/include/UPSstatus.php',{level:<?=$cfg['BATTERYLEVEL']?>,runtime:<?=$cfg['MINUTES']?>},function(data) {
+  var batteryLevel = "<?= !empty($cfg['BATTERYLEVEL']) ? $cfg['BATTERYLEVEL'] : 0 ?>";
+  var batteryRuntime = "<?= !empty($cfg['MINUTES']) ? $cfg['MINUTES'] : 0 ?>";
+
+  $.post('/plugins/dynamix.apcupsd/include/UPSstatus.php',{level:batteryLevel,runtime:batteryRuntime},function(data) {
     data = data.split('\n');
     $('#ups_summary').html(data[0]);
     $('#ups_status').html(data[1]);

From 392cc77a20b0827b09c1e6f6575c385245e944a6 Mon Sep 17 00:00:00 2001
From: Justin Brown <21961216+jbtwo@users.noreply.github.com>
Date: Wed, 24 Jul 2024 16:57:35 -0400
Subject: [PATCH 2/2] switch to _var function for setting batteryLevel &
 batteryRuntime

---
 emhttp/plugins/dynamix.apcupsd/UPSdetails.page | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix.apcupsd/UPSdetails.page b/emhttp/plugins/dynamix.apcupsd/UPSdetails.page
index 5e36b51e0..a4e658f9b 100644
--- a/emhttp/plugins/dynamix.apcupsd/UPSdetails.page
+++ b/emhttp/plugins/dynamix.apcupsd/UPSdetails.page
@@ -14,11 +14,13 @@ Tag="battery-3"
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
  */
+$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+require_once "$docroot/webGui/include/Wrappers.php";
 ?>
 <script>
 function getUPSstatus() {
-  var batteryLevel = "<?= !empty($cfg['BATTERYLEVEL']) ? $cfg['BATTERYLEVEL'] : 0 ?>";
-  var batteryRuntime = "<?= !empty($cfg['MINUTES']) ? $cfg['MINUTES'] : 0 ?>";
+  var batteryLevel = "<?= _var($cfg,'BATTERYLEVEL',0) ?>";
+  var batteryRuntime = "<?= _var($cfg,'MINUTES',0) ?>";
 
   $.post('/plugins/dynamix.apcupsd/include/UPSstatus.php',{level:batteryLevel,runtime:batteryRuntime},function(data) {
     data = data.split('\n');