Updates

PDowney · web-flow · commit e482c0cc2d06 · 2026-03-23T15:48:23.000-04:00
diff --git a/config/var/www/admin/control-panel/controllers/UptimeController.php b/config/var/www/admin/control-panel/controllers/UptimeController.php
@@ -206,12 +206,12 @@ private function calculateOverallStatus(array $monitors)
             case self::STATUS_UP:
                 $upCount++;
                 break;
-            case self::STATUS_SEEMS_DOWN: // Seems down
-            case self::STATUS_DOWN: // Down
+            case self::STATUS_SEEMS_DOWN:
+            case self::STATUS_DOWN:
                 $downCount++;
                 break;
-            case self::STATUS_PAUSED: // Paused
-            case self::STATUS_NOT_CHECKED: // Not checked yet
+            case self::STATUS_PAUSED:
+            case self::STATUS_NOT_CHECKED:
                 $paused++;
                 break;
             default:
diff --git a/scripts/functions/shared/enginescript-shared-vhost.sh b/scripts/functions/shared/enginescript-shared-vhost.sh
@@ -248,13 +248,13 @@ configure_cloudflare_settings() {
       echo "Detecting server public IP address..."
       SERVER_IP=$(curl -s --max-time 5 https://ipinfo.io/ip)
       
-      # Validate IP format
-      if ! [[ "$SERVER_IP" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+      # Validate IP format (ensure each octet is within 0-255)
+      if ! [[ "$SERVER_IP" =~ ^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ ]]; then
         echo "WARNING: Invalid IP from ipinfo.io (${SERVER_IP}), trying backup source..."
         SERVER_IP=$(curl -s --max-time 5 https://icanhazip.com)
         
-        # Validate backup IP
-        if ! [[ "$SERVER_IP" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+        # Validate backup IP (ensure each octet is within 0-255)
+        if ! [[ "$SERVER_IP" =~ ^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-5][0-9]|[01]?[0-9][0-9]?)$ ]]; then
           echo "ERROR: Could not obtain valid IP address from any source."
           echo "Received response: ${SERVER_IP}"
           echo ""
