GH-139 Simplify fleet array unpacking in fleet2

mdziekon · Dec 7, 2020 · d60fcce · d60fcce
1 parent ad44398
commit d60fcce
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/fleet2.php b/fleet2.php
@@ -227,19 +227,21 @@
 $Fleet['storage'] = 0;
 $Fleet['FuelStorage'] = 0;
 
-$Fleet['array'] = explode(';', $_POST['FleetArray']);
+$Fleet['array'] = String2Array($_POST['FleetArray']);
 $FleetArray = array();
-if(!empty($Fleet['array']) AND (array)$Fleet['array'] === $Fleet['array'])
-{
-    foreach($Fleet['array'] as $ShipData)
+
+if (
+    !empty($Fleet['array']) &&
+    is_array($Fleet['array'])
+) {
+    foreach($Fleet['array'] as $ShipID => $ShipCount)
     {
-        $ShipData = explode(',', $ShipData);
-        $ShipID = intval($ShipData[0]);
+        $ShipID = intval($ShipID);
         if(in_array($ShipID, $_Vars_ElementCategories['fleet']))
         {
             if(!empty($_Vars_Prices[$ShipID]['engine']))
             {
-                $ShipCount = floor($ShipData[1]);
+                $ShipCount = floor($ShipCount);
                 if($ShipCount > 0)
                 {
                     if($_Planet[$_Vars_GameElements[$ShipID]] >= $ShipCount)