GH-139 Reuse validateFleetArray in fleet3

mdziekon · Dec 7, 2020 · 57f10f7 · 57f10f7
1 parent dc6f66b
commit 57f10f7
Showing 1 changed file with 47 additions and 43 deletions.
diff --git a/fleet3.php b/fleet3.php
@@ -6,6 +6,9 @@
 
 include($_EnginePath.'common.php');
 
+include($_EnginePath . 'modules/flightControl/_includes.php');
+
+use UniEngine\Engine\Modules\FlightControl;
 use UniEngine\Engine\Modules\Flights;
 
 loggedCheck();
@@ -411,55 +414,56 @@ function messageRed($Text, $Title)
     !empty($Fleet['array']) &&
     is_array($Fleet['array'])
 ) {
+    $fleetArrayValidationResult = FlightControl\Utils\Validators\validateFleetArray([
+        'fleet' => $Fleet['array'],
+        'planet' => &$_Planet,
+        'isFromDirectUserInput' => false,
+    ]);
+
+    if (!$fleetArrayValidationResult['isValid']) {
+        $firstValidationError = $fleetArrayValidationResult['errors'][0];
+
+        $errorMessage = null;
+        switch ($firstValidationError['errorCode']) {
+            case 'INVALID_SHIP_ID':
+                $errorMessage = $_Lang['fl1_BadShipGiven'];
+                break;
+            case 'SHIP_WITH_NO_ENGINE':
+                $errorMessage = $_Lang['fl1_CantSendUnflyable'];
+                break;
+            case 'INVALID_SHIP_COUNT':
+                $errorMessage = $_Lang['fleet_generic_errors_invalidshipcount'];
+                break;
+            case 'SHIP_COUNT_EXCEEDS_AVAILABLE':
+                $errorMessage = $_Lang['fl1_NoEnoughShips'];
+                break;
+            default:
+                $errorMessage = $_Lang['fleet_generic_errors_unknown'];
+                break;
+        }
+
+        messageRed($errorMessage, $ErrorTitle);
+    }
+
     foreach ($Fleet['array'] as $ShipID => $ShipCount) {
         $ShipID = intval($ShipID);
-        if(in_array($ShipID, $_Vars_ElementCategories['fleet']))
-        {
-            if(!empty($_Vars_Prices[$ShipID]['engine']))
-            {
-                $ShipCount = floor($ShipCount);
-                if($ShipCount > 0)
-                {
-                    if($_Planet[$_Vars_GameElements[$ShipID]] >= $ShipCount)
-                    {
-                        $FleetArray[$ShipID] = $ShipCount;
-                        $Fleet['count'] += $ShipCount;
-                        $ThisStorage = $_Vars_Prices[$ShipID]['capacity'] * $ShipCount;
-                        if($ShipID != 210)
-                        {
-                            $Fleet['storage'] += $ThisStorage;
-                        }
-                        else
-                        {
-                            $Fleet['FuelStorage'] += $ThisStorage;
-                        }
-                        $FleetRemover[] = "`{$_Vars_GameElements[$ShipID]}` = `{$_Vars_GameElements[$ShipID]}` - {$ShipCount}";
-                    }
-                    else
-                    {
-                        messageRed($_Lang['fl1_NoEnoughShips'], $ErrorTitle);
-                    }
-                }
-                else
-                {
-                    messageRed($_Lang['fleet_generic_errors_invalidshipcount'], $ErrorTitle);
-                }
-            }
-            else
-            {
-                messageRed($_Lang['fl1_CantSendUnflyable'], $ErrorTitle);
-            }
-        }
-        else
-        {
-            messageRed($_Lang['fl1_BadShipGiven'], $ErrorTitle);
+        $ShipCount = floor($ShipCount);
+        $FleetArray[$ShipID] = $ShipCount;
+        $Fleet['count'] += $ShipCount;
+        $ThisStorage = $_Vars_Prices[$ShipID]['capacity'] * $ShipCount;
+
+        if ($ShipID != 210) {
+            $Fleet['storage'] += $ThisStorage;
+        } else {
+            $Fleet['FuelStorage'] += $ThisStorage;
         }
+
+        $FleetRemover[] = "`{$_Vars_GameElements[$ShipID]}` = `{$_Vars_GameElements[$ShipID]}` - {$ShipCount}";
     }
-}
-else
-{
+} else {
     messageRed($_Lang['fl2_FleetArrayPostEmpty'], $ErrorTitle);
 }
+
 if($Fleet['count'] <= 0)
 {
     messageRed($_Lang['fl2_ZeroShips'], $ErrorTitle);