Fixes

PDowney · web-flow · commit 1aaa30aa095a · 2025-12-06T18:56:54.000-05:00
diff --git a/config/var/www/admin/control-panel/controllers/UptimeController.php b/config/var/www/admin/control-panel/controllers/UptimeController.php
@@ -191,7 +191,7 @@ private function calculateOverallStatus(array $monitors)
             $status = isset($monitor['status']) ? (int) $monitor['status'] : 0;
             switch ($status) {
                 case 2: // Up
-                    $up++;
+                    $upCount++;
                     break;
                 case 8: // Seems down
                 case 9: // Down
@@ -211,9 +211,9 @@ private function calculateOverallStatus(array $monitors)
         if ($total > 0) {
             if ($down > 0) {
                 $overall_status = 'critical';
-            } elseif ($up === $total) {
+            } elseif ($upCount === $total) {
                 $overall_status = 'healthy';
-            } elseif ($up > 0) {
+            } elseif ($upCount > 0) {
                 $overall_status = 'partial';
             }
         }
@@ -222,7 +222,7 @@ private function calculateOverallStatus(array $monitors)
             'enabled' => true,
             'overall_status' => $overall_status,
             'total_monitors' => $total,
-            'up' => $up,
+            'up' => $upCount,
             'down' => $down,
             'paused' => $paused
         ];
diff --git a/scripts/update/phpmyadmin-update.sh b/scripts/update/phpmyadmin-update.sh
@@ -21,7 +21,7 @@ source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.
 # phpMyAdmin
 
 # Store existing config file
-rm -rf /usr/src/config.inc.php
+rm -rf /usr/src/config.inc.php 2>/dev/null || true
 mv /var/www/admin/enginescript/phpmyadmin/config.inc.php /usr/src/config.inc.php
 rm -rf /var/www/admin/enginescript/phpmyadmin
 
diff --git a/scripts/update/software-update.sh b/scripts/update/software-update.sh
@@ -42,7 +42,7 @@ fi
 if [[ "${INSTALL_PHPMYADMIN}" == "1" ]];
   then
     echo "Updating phpMyAdmin"
-    /usr/local/bin/enginescript/scripts/install/tools/security/phpmyadmin-update.sh
+    /usr/local/bin/enginescript/scripts/update/phpmyadmin-update.sh
   else
     echo "Skipping phpMyAdmin update"
 fi
