supernova-ws / SuperNova

classes/classConfig.php

Spacing +16 added lines, -16 removed lines

@@ -190,9 +190,9 @@ 
     'advGoogleLeftMenuCode'        => '(Place here code for banner)',
 
     // Alliance bonus calculations
-    'ali_bonus_algorithm'          => 0,  // Bonus calculation algorithm
+    'ali_bonus_algorithm'          => 0, // Bonus calculation algorithm
     'ali_bonus_brackets'           => 10, // Brackets count for ALI_BONUS_BY_RANK
-    'ali_bonus_brackets_divisor'   => 10,// Bonus divisor for ALI_BONUS_BY_RANK
+    'ali_bonus_brackets_divisor'   => 10, // Bonus divisor for ALI_BONUS_BY_RANK
     'ali_bonus_divisor'            => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS
     'ali_bonus_members'            => 10, // Minumum alliace size to start using bonus
 
@@ -223,25 +223,25 @@ 
     'deuterium_basic_income'       => 0,
     'eco_scale_storage'            => 1,
     'eco_stockman_fleet'           => '', // Black Market - Starting amount of s/h ship merchant to sell
-    'eco_stockman_fleet_populate'  => 1,  // Populate empty Stockman fleet with ships or not
+    'eco_stockman_fleet_populate'  => 1, // Populate empty Stockman fleet with ships or not
     'empire_mercenary_base_period' => PERIOD_MONTH, // Base
     'empire_mercenary_temporary'   => 0, // Temporary empire-wide mercenaries
     'energy_basic_income'          => 0,
 
     // Bashing protection settings
-    'fleet_bashing_attacks'        => 3,      // Max amount of attack per wave - 3 by default
-    'fleet_bashing_interval'       => 1800,   // Maximum interval between attacks when they still count as one wave - 30m by default
-    'fleet_bashing_scope'          => 86400,  // Interval on which bashing waves counts - 24h by default
-    'fleet_bashing_war_delay'      => 43200,  // Delay before start bashing after declaring war to alliance - 12h by default
-    'fleet_bashing_waves'          => 3,      // Max amount of waves per day - 3 by default
+    'fleet_bashing_attacks'        => 3, // Max amount of attack per wave - 3 by default
+    'fleet_bashing_interval'       => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default
+    'fleet_bashing_scope'          => 86400, // Interval on which bashing waves counts - 24h by default
+    'fleet_bashing_war_delay'      => 43200, // Delay before start bashing after declaring war to alliance - 12h by default
+    'fleet_bashing_waves'          => 3, // Max amount of waves per day - 3 by default
 
     'Fleet_Cdr'   => 30,
     'fleet_speed' => 1,
 
     'fleet_update_interval' => 4,
 
-    'game_adminEmail'       => 'root@localhost',    // Admin's email to show to users
-    'game_counter'          => 0,  // Does built-in page hit counter is on?
+    'game_adminEmail'       => 'root@localhost', // Admin's email to show to users
+    'game_counter'          => 0, // Does built-in page hit counter is on?
     // Defaults
     'game_default_language' => 'ru',
     'game_default_skin'     => 'skins/EpicBlue/',
@@ -255,13 +255,13 @@ 
     'game_maxSystem'      => 199,
     'game_maxPlanet'      => 15,
     // Game global settings
-    'game_mode'           => 0,           // 0 - SuperNova, 1 - oGame
+    'game_mode'           => 0, // 0 - SuperNova, 1 - oGame
     'game_name'           => 'SuperNova', // Server name (would be on banners and on top of left menu)
 
     'game_news_actual'   => 259200, // How long announcement would be marked as "New". In seconds. Default - 3 days
-    'game_news_overview' => 3,    // How much last news to show in Overview page
+    'game_news_overview' => 3, // How much last news to show in Overview page
     // Noob protection
-    'game_noob_factor'   => 5,    // Multiplier to divide "stronger" and "weaker" users
+    'game_noob_factor'   => 5, // Multiplier to divide "stronger" and "weaker" users
     'game_noob_points'   => 5000, // Below this point user threated as noob. 0 to disable
 
     'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccounts)
@@ -311,8 +311,8 @@ 
     'payment_currency_exchange_wmu' => 30,
     'payment_currency_exchange_wmz' => 1,
 
-    'payment_lot_price' => 1,     // Lot price in default currency
-    'payment_lot_size'  => 2500,  // Lot size. Also service as minimum amount of DM that could be bought with one transaction
+    'payment_lot_price' => 1, // Lot price in default currency
+    'payment_lot_size'  => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction
 
     'planet_teleport_cost'    => 50000, //
     'planet_teleport_timeout' => 86400, //
@@ -330,7 +330,7 @@ 
     'resource_multiplier'     => 1,
 
     //Roleplay system
-    'rpg_bonus_divisor'       => 10,    // Amount of DM referral shoud get for partner have 1 DM bonus
+    'rpg_bonus_divisor'       => 10, // Amount of DM referral shoud get for partner have 1 DM bonus
     'rpg_bonus_minimum'       => 10000, // Minimum DM ammount for starting paying bonuses to affiliate
 
     // Black Market - General

classes/Common/ObjectCollection.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
    * @since 5.0.0
    */
   public function offsetUnset($offset) {
-    if($this->offsetExists($offset)) {
+    if ($this->offsetExists($offset)) {
       parent::offsetUnset($this->offsetGet($offset));
     }
   }

classes/Common/Invoker.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
   }
 
   public static function build($callable) {
-    if(is_array($callable) && count($callable) == 2 && is_object($callable[0])) {
+    if (is_array($callable) && count($callable) == 2 && is_object($callable[0])) {
       return new static($callable);
     } else {
       return false;

includes/includes/flt_mission_transport.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
   $source_planet = &$mission_data->src_planet;
   $destination_planet = &$mission_data->dst_planet;
 
-  if(empty($destination_planet['id_owner'])) {
+  if (empty($destination_planet['id_owner'])) {
     $objFleet->markReturnedAndSave();
 
     return $result;
@@ -33,7 +33,7 @@ 
     $fleet_resources[RES_DEUTERIUM], classLocale::$lang['Deuterium']);
   DBStaticMessages::msg_send_simple_message($objFleet->target_owner_id, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT, classLocale::$lang['sys_mess_tower'], classLocale::$lang['sys_mess_transport'], $Message);
 
-  if($objFleet->target_owner_id <> $objFleet->playerOwnerId) {
+  if ($objFleet->target_owner_id <> $objFleet->playerOwnerId) {
     DBStaticMessages::msg_send_simple_message($objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT, classLocale::$lang['sys_mess_tower'], classLocale::$lang['sys_mess_transport'], $Message);
   }
 

classes/V2Fleet/V2FleetModel.php

Spacing +13 added lines, -13 removed lines

@@ -93,28 +93,28 @@ 
   public function __construct(\Common\GlobalContainer $gc) {
     parent::__construct($gc);
 
-    $this->accessors->set(P_CONTAINER_SET, 'dbId', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'dbId', function(V2FleetContainer $that, $value) {
       $that->setDirect('dbId', $value);
       $that->location->setLocationId($value);
     });
 
-    $this->accessors->set(P_CONTAINER_SET, 'ownerId', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'ownerId', function(V2FleetContainer $that, $value) {
       $that->setDirect('ownerId', $value);
       $that->location->setLocationPlayerId($value);
     });
 
-    $this->accessors->set(P_CONTAINER_SET, 'owner', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'owner', function(V2FleetContainer $that, $value) {
       $that->owner = $value;
-      if(isset($value['id'])) {
+      if (isset($value['id'])) {
         $that->ownerId = $value['id'];
       } else {
         $that->ownerId = 0;
       }
     });
 
-    $this->accessors->set(P_CONTAINER_SET, 'departure', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'departure', function(V2FleetContainer $that, $value) {
       $that->departure = $value;
-      if(isset($value['id'])) {
+      if (isset($value['id'])) {
         $that->departurePlanetId = $value['id'];
         $that->vectorDeparture = $value;
       } else {
@@ -122,20 +122,20 @@ 
       }
     });
 
-    $this->accessors->set(P_CONTAINER_GET, 'vectorDeparture', function (V2FleetContainer $that) {
+    $this->accessors->set(P_CONTAINER_GET, 'vectorDeparture', function(V2FleetContainer $that) {
       $vector = new Vector();
       $that->setDirect('vectorDeparture', $vector);
 
       return $vector;
     }, ACCESSOR_SHARED);
-    $this->accessors->set(P_CONTAINER_SET, 'vectorDeparture', function (V2FleetContainer $that, $value) {
+    $this->accessors->set(P_CONTAINER_SET, 'vectorDeparture', function(V2FleetContainer $that, $value) {
       $vector = $that->vectorDeparture;
 
-      if(is_array($value)) {
+      if (is_array($value)) {
         $value = Vector::convertToVector($value);
       }
 
-      if($value instanceof Vector) {
+      if ($value instanceof Vector) {
         $vector->readFromVector($value);
       } else {
         throw new \Exception('V2Fleet::vectorDeparture setter - value is not a Vector or array!', ERR_ERROR);
@@ -148,7 +148,7 @@ 
     $this->accessors->set(P_CONTAINER_EXPORT, 'vectorArrive', array($this, 'exportVector'));
 
 
-    $this->accessors->set(P_CONTAINER_GET, 'location', function (V2FleetContainer $that) {
+    $this->accessors->set(P_CONTAINER_GET, 'location', function(V2FleetContainer $that) {
 //      if (is_null($location = $that->getDirect('location'))) {}
       $location = new V2Location(LOC_FLEET);
       $that->setDirect('location', $location);
@@ -156,7 +156,7 @@ 
       return $location;
     }, ACCESSOR_SHARED);
 
-    $this->accessors->set(P_CONTAINER_GET, 'units', function (V2FleetContainer $that) {
+    $this->accessors->set(P_CONTAINER_GET, 'units', function(V2FleetContainer $that) {
 //      if (is_null($units = $that->getDirect('units'))) {}
       $units = \classSupernova::$gc->unitList;
       $that->setDirect('units', $units);
@@ -164,7 +164,7 @@ 
       return $units;
     }, ACCESSOR_SHARED);
 
-    $this->accessors->set(P_CONTAINER_GET, 'isReturning', function (V2FleetContainer $that) {
+    $this->accessors->set(P_CONTAINER_GET, 'isReturning', function(V2FleetContainer $that) {
       return $that->status == FLEET_FLAG_RETURNING;
     });
 

includes/includes/flt_mission_recycle.php

Spacing +9 added lines, -9 removed lines

@@ -16,10 +16,10 @@ 
   $RecyclerCapacity = 0;
   $OtherFleetCapacity = 0;
 
-  foreach($objFleet->shipsIterator() as $unit_id => $unit) {
-    if(in_array($unit_id, classSupernova::$gc->groupFleet)) {
+  foreach ($objFleet->shipsIterator() as $unit_id => $unit) {
+    if (in_array($unit_id, classSupernova::$gc->groupFleet)) {
       $capacity = get_unit_param($unit_id, P_CAPACITY) * $unit->count;
-      if(in_array($unit_id, classSupernova::$gc->groupRecyclers)) {
+      if (in_array($unit_id, classSupernova::$gc->groupRecyclers)) {
         $RecyclerCapacity += $capacity;
       } else {
         $OtherFleetCapacity += $capacity;
@@ -28,33 +28,33 @@ 
   }
 
   $fleet_resources_amount = $objFleet->resourcesGetTotal();
-  if($fleet_resources_amount > $OtherFleetCapacity) {
+  if ($fleet_resources_amount > $OtherFleetCapacity) {
     // Если во флоте есть другие корабли И количество ресурсов больше, чем их ёмкость трюмов - значит часть этих ресурсов лежит в трюмах переработчиков
     // Уменьшаем ёмкость переработчиков на указанную величину
     $RecyclerCapacity -= ($fleet_resources_amount - $OtherFleetCapacity);
   }
 
   $resources_recycled = array();
-  if(($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity) {
+  if (($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity) {
     $resources_recycled[RES_METAL] = $destination_planet["debris_metal"];
     $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"];
   } else {
-    if(($destination_planet["debris_metal"] > $RecyclerCapacity / 2) &&
+    if (($destination_planet["debris_metal"] > $RecyclerCapacity / 2) &&
       ($destination_planet["debris_crystal"] > $RecyclerCapacity / 2)
     ) {
       $resources_recycled[RES_METAL] = $RecyclerCapacity / 2;
       $resources_recycled[RES_CRYSTAL] = $RecyclerCapacity / 2;
     } else {
-      if($destination_planet["debris_metal"] > $destination_planet["debris_crystal"]) {
+      if ($destination_planet["debris_metal"] > $destination_planet["debris_crystal"]) {
         $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"];
-        if($destination_planet["debris_metal"] > ($RecyclerCapacity - $resources_recycled[RES_CRYSTAL])) {
+        if ($destination_planet["debris_metal"] > ($RecyclerCapacity - $resources_recycled[RES_CRYSTAL])) {
           $resources_recycled[RES_METAL] = $RecyclerCapacity - $resources_recycled[RES_CRYSTAL];
         } else {
           $resources_recycled[RES_METAL] = $destination_planet["debris_metal"];
         }
       } else {
         $resources_recycled[RES_METAL] = $destination_planet["debris_metal"];
-        if($destination_planet["debris_crystal"] > ($RecyclerCapacity - $resources_recycled[RES_METAL])) {
+        if ($destination_planet["debris_crystal"] > ($RecyclerCapacity - $resources_recycled[RES_METAL])) {
           $resources_recycled[RES_CRYSTAL] = $RecyclerCapacity - $resources_recycled[RES_METAL];
         } else {
           $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"];

includes/includes/flt_functions.php

Spacing +78 added lines, -78 removed lines

@@ -8,14 +8,14 @@ 
 use Vector\Vector;
 
 function flt_fleet_speed($user, $fleet) {
-  if(!is_array($fleet)) {
+  if (!is_array($fleet)) {
     $fleet = array($fleet => 1);
   }
 
   $speeds = array();
-  if(!empty($fleet)) {
-    foreach($fleet as $ship_id => $amount) {
-      if($amount && in_array($ship_id, classSupernova::$gc->groupFleetAndMissiles)) {
+  if (!empty($fleet)) {
+    foreach ($fleet as $ship_id => $amount) {
+      if ($amount && in_array($ship_id, classSupernova::$gc->groupFleetAndMissiles)) {
         $single_ship_data = get_ship_data($ship_id, $user);
         $speeds[] = $single_ship_data['speed'];
       }
@@ -47,14 +47,14 @@ 
 
   $game_fleet_speed = flt_server_flight_speed_multiplier();
   $fleet_speed = flt_fleet_speed($user_row, $fleet_array);
-  if(!empty($fleet_array) && $fleet_speed && $game_fleet_speed) {
+  if (!empty($fleet_array) && $fleet_speed && $game_fleet_speed) {
     $speed_percent = $speed_percent ? max(min($speed_percent, 10), 1) : 10;
     $real_speed = $speed_percent * sqrt($fleet_speed);
 
     $duration = max(1, round((35000 / $speed_percent * sqrt($distance * 10 / $fleet_speed) + 10) / $game_fleet_speed));
 
-    foreach($fleet_array as $ship_id => $ship_count) {
-      if(!$ship_id || !$ship_count) {
+    foreach ($fleet_array as $ship_id => $ship_count) {
+      if (!$ship_id || !$ship_count) {
         continue;
       }
 
@@ -82,19 +82,19 @@ 
 function flt_bashing_check($user, $enemy, $planet_dst, $mission, $flight_duration, $fleet_group = 0) {
   $config_bashing_attacks = classSupernova::$config->fleet_bashing_attacks;
   $config_bashing_interval = classSupernova::$config->fleet_bashing_interval;
-  if(!$config_bashing_attacks) {
+  if (!$config_bashing_attacks) {
     // Bashing allowed - protection disabled
     return FLIGHT_ALLOWED;
   }
 
   $bashing_result = FLIGHT_MISSION_ATTACK_BASHING;
-  if($user['ally_id'] && $enemy['ally_id']) {
+  if ($user['ally_id'] && $enemy['ally_id']) {
     $relations = ali_relations($user['ally_id'], $enemy['ally_id']);
-    if(!empty($relations)) {
+    if (!empty($relations)) {
       $relations = $relations[$enemy['ally_id']];
-      switch($relations['alliance_diplomacy_relation']) {
+      switch ($relations['alliance_diplomacy_relation']) {
         case ALLY_DIPLOMACY_WAR:
-          if(SN_TIME_NOW - $relations['alliance_diplomacy_time'] <= classSupernova::$config->fleet_bashing_war_delay) {
+          if (SN_TIME_NOW - $relations['alliance_diplomacy_time'] <= classSupernova::$config->fleet_bashing_war_delay) {
             $bashing_result = FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY;
           } else {
             return FLIGHT_ALLOWED;
@@ -116,9 +116,9 @@ 
 
   // Retrieving flying fleets
   $objFleetsBashing = FleetList::dbGetFleetListBashing($user['id'], $planet_dst);
-  foreach($objFleetsBashing->_container as $fleetBashing) {
+  foreach ($objFleetsBashing->_container as $fleetBashing) {
     // Checking for ACS - each ACS count only once
-    if($fleetBashing->group_id) {
+    if ($fleetBashing->group_id) {
       $bashing_list["{$user['id']}_{$fleetBashing->group_id}"] = $fleetBashing->time_arrive_to_target;
     } else {
       $bashing_list[] = $fleetBashing->time_arrive_to_target;
@@ -126,12 +126,12 @@ 
   }
 
   // Check for joining to ACS - if there are already fleets in ACS no checks should be done
-  if($mission == MT_ACS && $bashing_list["{$user['id']}_{$fleet_group}"]) {
+  if ($mission == MT_ACS && $bashing_list["{$user['id']}_{$fleet_group}"]) {
     return FLIGHT_ALLOWED;
   }
 
   $query = DBStaticFleetBashing::db_bashing_list_get($user, $planet_dst, $time_limit);
-  while($bashing_row = db_fetch($query)) {
+  while ($bashing_row = db_fetch($query)) {
     $bashing_list[] = $bashing_row['bashing_time'];
   }
 
@@ -140,9 +140,9 @@ 
   $last_attack = 0;
   $wave = 0;
   $attack = 1;
-  foreach($bashing_list as &$bash_time) {
+  foreach ($bashing_list as &$bash_time) {
     $attack++;
-    if($bash_time - $last_attack > $config_bashing_interval || $attack > $config_bashing_attacks) {
+    if ($bash_time - $last_attack > $config_bashing_interval || $attack > $config_bashing_attacks) {
       $attack = 1;
       $wave++;
     }
@@ -159,16 +159,16 @@ 
   //TODO: try..catch
   global $user;
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     return $result = FLIGHT_PLAYER_VACATION_OWN;
   }
 
-  if(empty($fleet) || !is_array($fleet)) {
+  if (empty($fleet) || !is_array($fleet)) {
     return $result = FLIGHT_SHIPS_NO_SHIPS;
   }
 
   $sn_groups_mission = sn_get_groups('missions');
-  if(!isset($sn_groups_mission[$mission])) {
+  if (!isset($sn_groups_mission[$mission])) {
     return $result = FLIGHT_MISSION_UNKNOWN;
   }
   $sn_data_mission = $sn_groups_mission[$mission];
@@ -187,32 +187,32 @@ 
   $resources = 0;
   $ship_ids = classSupernova::$gc->groupFleet;
   $resource_ids = sn_get_groups('resources_loot');
-  foreach($fleet as $ship_id => $ship_count) {
+  foreach ($fleet as $ship_id => $ship_count) {
     $is_ship = in_array($ship_id, $ship_ids);
     $is_resource = in_array($ship_id, $resource_ids);
-    if(!$is_ship && !$is_resource) {
+    if (!$is_ship && !$is_resource) {
       // TODO Спецобработчик для Капитана и модулей
 //      return FLIGHT_SHIPS_UNIT_WRONG;
     }
 
-    if($ship_count < 0) {
+    if ($ship_count < 0) {
       return $result = $is_ship ? FLIGHT_SHIPS_NEGATIVE : FLIGHT_RESOURCES_NEGATIVE;
     }
 
-    if($ship_count > mrc_get_level($user, $planet_src, $ship_id)) {
+    if ($ship_count > mrc_get_level($user, $planet_src, $ship_id)) {
       // TODO FLIGHT_MISSION_MISSILE_NO_MISSILES
       return $result = $is_ship ? FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES : FLIGHT_RESOURCES_NOT_ENOUGH;
     }
 
-    if($is_ship) {
+    if ($is_ship) {
       $single_ship_data = get_ship_data($ship_id, $user);
-      if($single_ship_data[P_SPEED] <= 0) {
+      if ($single_ship_data[P_SPEED] <= 0) {
         return $result = FLIGHT_SHIPS_UNMOVABLE;
       }
       $ships += $ship_count;
       $recyclers += in_array($ship_id, classSupernova::$gc->groupRecyclers) ? $ship_count : 0;
       $spies += $ship_id == SHIP_SPY ? $ship_count : 0;
-    } elseif($is_resource) {
+    } elseif ($is_resource) {
       $resources += $ship_count;
     }
   }
@@ -223,7 +223,7 @@ 
     }
   */
 
-  if(isset($options['resources']) && $options['resources'] > 0 && !(isset($sn_data_mission['transport']) && $sn_data_mission['transport'])) {
+  if (isset($options['resources']) && $options['resources'] > 0 && !(isset($sn_data_mission['transport']) && $sn_data_mission['transport'])) {
     return $result = FLIGHT_RESOURCES_FORBIDDEN;
   }
 
@@ -235,78 +235,78 @@ 
   */
 
   $speed = $options['fleet_speed_percent'];
-  if($speed && ($speed != intval($speed) || $speed < 1 || $speed > 10)) {
+  if ($speed && ($speed != intval($speed) || $speed < 1 || $speed > 10)) {
     return $result = FLIGHT_FLEET_SPEED_WRONG;
   }
 
   $travel_data = flt_travel_data($user, $planet_src, $planet_dst, $fleet, $options['fleet_speed_percent']);
 
 
-  if(mrc_get_level($user, $planet_src, RES_DEUTERIUM) < $fleet[RES_DEUTERIUM] + $travel_data['consumption']) {
+  if (mrc_get_level($user, $planet_src, RES_DEUTERIUM) < $fleet[RES_DEUTERIUM] + $travel_data['consumption']) {
     return $result = FLIGHT_RESOURCES_FUEL_NOT_ENOUGH;
   }
 
-  if($travel_data['consumption'] > $travel_data['capacity']) {
+  if ($travel_data['consumption'] > $travel_data['capacity']) {
     return $result = FLIGHT_FLEET_TOO_FAR;
   }
 
-  if($travel_data['hold'] < $resources) {
+  if ($travel_data['hold'] < $resources) {
     return $result = FLIGHT_FLEET_OVERLOAD;
   }
 
   $fleet_start_time = SN_TIME_NOW + $travel_data['duration'];
 
   $fleet_group = $options['fleet_group'];
-  if($fleet_group) {
-    if($mission != MT_ACS) {
+  if ($fleet_group) {
+    if ($mission != MT_ACS) {
       return $result = FLIGHT_MISSION_IMPOSSIBLE;
     };
 
     $acs = DBStaticFleetACS::db_acs_get_by_group_id($fleet_group);
-    if(!$acs['id']) {
+    if (!$acs['id']) {
       return $result = FLIGHT_MISSION_ACS_NOT_EXISTS;
     }
 
-    if($planet_dst['galaxy'] != $acs['galaxy'] || $planet_dst['system'] != $acs['system'] || $planet_dst['planet'] != $acs['planet'] || $planet_dst['planet_type'] != $acs['planet_type']) {
+    if ($planet_dst['galaxy'] != $acs['galaxy'] || $planet_dst['system'] != $acs['system'] || $planet_dst['planet'] != $acs['planet'] || $planet_dst['planet_type'] != $acs['planet_type']) {
       return $result = FLIGHT_MISSION_ACS_WRONG_TARGET;
     }
 
-    if($fleet_start_time > $acs['ankunft']) {
+    if ($fleet_start_time > $acs['ankunft']) {
       return $result = FLIGHT_MISSION_ACS_TOO_LATE;
     }
   }
 
   $flying_fleets = $options['flying_fleets'];
-  if(!$flying_fleets) {
+  if (!$flying_fleets) {
     $flying_fleets = FleetList::fleet_count_flying($user['id']);
   }
-  if(GetMaxFleets($user) <= $flying_fleets && $mission != MT_MISSILE) {
+  if (GetMaxFleets($user) <= $flying_fleets && $mission != MT_MISSILE) {
     return $result = FLIGHT_FLEET_NO_SLOTS;
   }
 
   // В одиночку шпионские зонды могут летать только в миссии Шпионаж, Передислокация и Транспорт
-  if($ships && $spies && $spies == $ships && !($mission == MT_SPY || $mission == MT_RELOCATE || $mission == MT_TRANSPORT)) {
+  if ($ships && $spies && $spies == $ships && !($mission == MT_SPY || $mission == MT_RELOCATE || $mission == MT_TRANSPORT)) {
     return $result = FLIGHT_SHIPS_NOT_ONLY_SPIES;
   }
 
   // Checking for no planet
-  if(!$planet_dst['id_owner']) {
-    if($mission == MT_COLONIZE && !$fleet[SHIP_COLONIZER]) {
+  if (!$planet_dst['id_owner']) {
+    if ($mission == MT_COLONIZE && !$fleet[SHIP_COLONIZER]) {
       return $result = FLIGHT_SHIPS_NO_COLONIZER;
     }
 
-    if($mission == MT_EXPLORE || $mission == MT_COLONIZE) {
+    if ($mission == MT_EXPLORE || $mission == MT_COLONIZE) {
       return $result = FLIGHT_ALLOWED;
     }
 
     return $result = FLIGHT_VECTOR_NO_TARGET;
   }
 
-  if($mission == MT_RECYCLE) {
-    if($planet_dst['debris_metal'] + $planet_dst['debris_crystal'] <= 0) {
+  if ($mission == MT_RECYCLE) {
+    if ($planet_dst['debris_metal'] + $planet_dst['debris_crystal'] <= 0) {
       return $result = FLIGHT_MISSION_RECYCLE_NO_DEBRIS;
     }
-    if($recyclers <= 0) {
+    if ($recyclers <= 0) {
       return $result = FLIGHT_SHIPS_NO_RECYCLERS;
     }
 
@@ -314,8 +314,8 @@ 
   }
 
   // Got planet. Checking if it is ours
-  if($planet_dst['id_owner'] == $user['id']) {
-    if($mission == MT_TRANSPORT || $mission == MT_RELOCATE) {
+  if ($planet_dst['id_owner'] == $user['id']) {
+    if ($mission == MT_TRANSPORT || $mission == MT_RELOCATE) {
       return $result = FLIGHT_ALLOWED;
     }
 
@@ -323,19 +323,19 @@ 
   }
 
   // No, planet not ours. Cutting mission that can't be send to not-ours planet
-  if($mission == MT_RELOCATE || $mission == MT_COLONIZE || $mission == MT_EXPLORE) {
+  if ($mission == MT_RELOCATE || $mission == MT_COLONIZE || $mission == MT_EXPLORE) {
     return $result = FLIGHT_MISSION_IMPOSSIBLE;
   }
 
   $enemy = DBStaticUser::db_user_by_id($planet_dst['id_owner']);
   // We cannot attack or send resource to users in VACATION mode
-  if($enemy['vacation'] && $mission != MT_RECYCLE) {
+  if ($enemy['vacation'] && $mission != MT_RECYCLE) {
     return $result = FLIGHT_PLAYER_VACATION;
   }
 
   // Multi IP protection
   // TODO: Here we need a procedure to check proxies
-  if(sys_is_multiaccount($user, $enemy)) {
+  if (sys_is_multiaccount($user, $enemy)) {
     return $result = FLIGHT_PLAYER_SAME_IP;
   }
 
@@ -343,8 +343,8 @@ 
   $enemy_points = $enemy['total_points'];
 
   // Is it transport? If yes - checking for buffing to prevent mega-alliance destroyer
-  if($mission == MT_TRANSPORT) {
-    if($user_points >= $enemy_points || classSupernova::$config->allow_buffing) {
+  if ($mission == MT_TRANSPORT) {
+    if ($user_points >= $enemy_points || classSupernova::$config->allow_buffing) {
       return $result = FLIGHT_ALLOWED;
     } else {
       return $result = FLIGHT_PLAYER_BUFFING;
@@ -354,66 +354,66 @@ 
   // Only aggresive missions passed to this point. HOLD counts as passive but aggresive
 
   // Is it admin with planet protection?
-  if($planet_dst['id_level'] > $user['authlevel']) {
+  if ($planet_dst['id_level'] > $user['authlevel']) {
     return $result = FLIGHT_PLAYER_ADMIN;
   }
 
   // Okay. Now skipping protection checks for inactive longer then 1 week
-  if(!$enemy['onlinetime'] || $enemy['onlinetime'] >= (SN_TIME_NOW - 60 * 60 * 24 * 7)) {
-    if(
+  if (!$enemy['onlinetime'] || $enemy['onlinetime'] >= (SN_TIME_NOW - 60 * 60 * 24 * 7)) {
+    if (
       ($enemy_points <= classSupernova::$config->game_noob_points && $user_points > classSupernova::$config->game_noob_points)
       ||
       (classSupernova::$config->game_noob_factor && $user_points > $enemy_points * classSupernova::$config->game_noob_factor)
     ) {
-      if($mission != MT_HOLD) {
+      if ($mission != MT_HOLD) {
         return $result = FLIGHT_PLAYER_NOOB;
       }
-      if($mission == MT_HOLD && !($user['ally_id'] && $user['ally_id'] == $enemy['ally_id'] && classSupernova::$config->ally_help_weak)) {
+      if ($mission == MT_HOLD && !($user['ally_id'] && $user['ally_id'] == $enemy['ally_id'] && classSupernova::$config->ally_help_weak)) {
         return $result = FLIGHT_PLAYER_NOOB;
       }
     }
   }
 
   // Is it HOLD mission? If yes - there should be ally deposit
-  if($mission == MT_HOLD) {
-    if(mrc_get_level($user, $planet_dst, STRUC_ALLY_DEPOSIT)) {
+  if ($mission == MT_HOLD) {
+    if (mrc_get_level($user, $planet_dst, STRUC_ALLY_DEPOSIT)) {
       return $result = FLIGHT_ALLOWED;
     }
 
     return $result = FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT;
   }
 
-  if($mission == MT_SPY) {
+  if ($mission == MT_SPY) {
     return $result = $spies >= 1 ? FLIGHT_ALLOWED : FLIGHT_MISSION_SPY_NO_SPIES;
   }
 
   // Is it MISSILE mission?
-  if($mission == MT_MISSILE) {
+  if ($mission == MT_MISSILE) {
     $sn_data_mip = get_unit_param(UNIT_DEF_MISSILE_INTERPLANET);
-    if(mrc_get_level($user, $planet_src, STRUC_SILO) < $sn_data_mip[P_REQUIRE][STRUC_SILO]) {
+    if (mrc_get_level($user, $planet_src, STRUC_SILO) < $sn_data_mip[P_REQUIRE][STRUC_SILO]) {
       return $result = FLIGHT_MISSION_MISSILE_NO_SILO;
     }
 
-    if(!$fleet[UNIT_DEF_MISSILE_INTERPLANET]) {
+    if (!$fleet[UNIT_DEF_MISSILE_INTERPLANET]) {
       return $result = FLIGHT_MISSION_MISSILE_NO_MISSILES;
     }
 
     $distance = abs($planet_dst['system'] - $planet_src['system']);
     $mip_range = flt_get_missile_range($user);
-    if($distance > $mip_range || $planet_dst['galaxy'] != $planet_src['galaxy']) {
+    if ($distance > $mip_range || $planet_dst['galaxy'] != $planet_src['galaxy']) {
       return $result = FLIGHT_MISSION_MISSILE_TOO_FAR;
     }
 
-    if(isset($options['target_structure']) && $options['target_structure'] && !in_array($options['target_structure'], sn_get_groups('defense_active'))) {
+    if (isset($options['target_structure']) && $options['target_structure'] && !in_array($options['target_structure'], sn_get_groups('defense_active'))) {
       return $result = FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE;
     }
   }
 
-  if($mission == MT_DESTROY && $planet_dst['planet_type'] != PT_MOON) {
+  if ($mission == MT_DESTROY && $planet_dst['planet_type'] != PT_MOON) {
     return $result = FLIGHT_MISSION_IMPOSSIBLE;
   }
 
-  if($mission == MT_ATTACK || $mission == MT_ACS || $mission == MT_DESTROY) {
+  if ($mission == MT_ATTACK || $mission == MT_ACS || $mission == MT_DESTROY) {
     return $result = flt_bashing_check($user, $enemy, $planet_dst, $mission, $travel_data['duration'], $fleet_group);
   }
 
@@ -440,7 +440,7 @@ 
   $from = $from['planet'];
 
   $can_attack = flt_can_attack($from, $to, $fleet_REAL_array, $mission, $options);
-  if($can_attack != FLIGHT_ALLOWED) {
+  if ($can_attack != FLIGHT_ALLOWED) {
     $internal_transaction ? sn_db_transaction_rollback() : false;
 
     return $can_attack;
@@ -451,7 +451,7 @@ 
   $travel_data = flt_travel_data($user, $from, $to, $fleet_REAL_array, $options['fleet_speed_percent']);
 
   $time_on_mission = 0;
-  if($mission == MT_EXPLORE || $mission == MT_HOLD) {
+  if ($mission == MT_EXPLORE || $mission == MT_HOLD) {
     // TODO - include some checks about maximum and minumum stay_duration
     $time_on_mission = $options['stay_time'] * 3600;
   }
@@ -473,14 +473,14 @@ 
   $sn_group_fleet = classSupernova::$gc->groupFleet;
   $sn_group_resources_loot = sn_get_groups('resources_loot');
   $planetRowFieldChanges = array();
-  foreach($fleet_REAL_array as $unit_id => $amount) {
-    if(!$amount || !$unit_id) {
+  foreach ($fleet_REAL_array as $unit_id => $amount) {
+    if (!$amount || !$unit_id) {
       continue;
     }
 
-    if(in_array($unit_id, $sn_group_fleet)) {
+    if (in_array($unit_id, $sn_group_fleet)) {
       DBStaticUnit::dbUpdateOrInsertUnit($unit_id, -$amount, $user, $from['id']);
-    } elseif(in_array($unit_id, $sn_group_resources_loot)) {
+    } elseif (in_array($unit_id, $sn_group_resources_loot)) {
       $planetRowFieldChanges[$unit_id] -= $amount;
     }
   }
@@ -512,16 +512,16 @@ 
 
   $ship_data = array();
   $fleet_array = array();
-  foreach($ship_list as $transport_id => $cork) {
+  foreach ($ship_list as $transport_id => $cork) {
     $ship_data[$transport_id] = flt_travel_data($user, $from, $to, array($transport_id => 1), 10);
   }
   uasort($ship_data, 'flt_calculate_ship_to_transport_sort');
 
   $fleet_capacity = 0;
   $fuel_total = $fuel_left = mrc_get_level($user, $from, RES_DEUTERIUM);
-  foreach($ship_data as $transport_id => &$ship_info) {
+  foreach ($ship_data as $transport_id => &$ship_info) {
     $ship_loaded = min($ship_list[$transport_id], ceil($resource_amount / $ship_info['hold']), floor($fuel_left / $ship_info['consumption']));
-    if($ship_loaded) {
+    if ($ship_loaded) {
       $fleet_array[$transport_id] = $ship_loaded;
       $resource_amount -= min($resource_amount, $ship_info['hold'] * $ship_loaded);
       $fuel_left -= $ship_info['consumption'] * $ship_loaded;

classes/Common/GlobalContainer.php

Spacing +19 added lines, -19 removed lines

@@ -52,82 +52,82 @@
     $gc = $this;
 
     // Default db
-    $gc->db = function ($c) {
+    $gc->db = function($c) {
       classSupernova::$db = $db = new \db_mysql($c);
 
       return $db;
     };
 
-    $gc->debug = function ($c) {
+    $gc->debug = function($c) {
       return new \debug();
     };
 
-    $gc->types = function ($c) {
+    $gc->types = function($c) {
       return new \Common\Types();
     };
 
-    $gc->cache = function ($c) {
+    $gc->cache = function($c) {
       return new \classCache(classSupernova::$cache_prefix);
     };
 
-    $gc->config = function ($c) {
+    $gc->config = function($c) {
       return new \classConfig(classSupernova::$cache_prefix);
     };
 
-    $gc->localePlayer = function (GlobalContainer $c) {
+    $gc->localePlayer = function(GlobalContainer $c) {
       return new \classLocale($c->config->server_locale_log_usage);
     };
 
-    $gc->dbGlobalRowOperator = function (GlobalContainer $c) {
+    $gc->dbGlobalRowOperator = function(GlobalContainer $c) {
       return new \DbRowDirectOperator($c->db);
     };
 
-    $gc->query = $gc->factory(function (GlobalContainer $c) {
+    $gc->query = $gc->factory(function(GlobalContainer $c) {
       return new \DbQueryConstructor($c->db);
     });
 
-    $gc->cacheOperator = function (GlobalContainer $gc) {
+    $gc->cacheOperator = function(GlobalContainer $gc) {
       return new \SnDbCachedOperator($gc);
     };
 
     $gc->snCacheClass = 'SnCache';
-    $gc->snCache = function (GlobalContainer $gc) {
+    $gc->snCache = function(GlobalContainer $gc) {
       return $gc->db->snCache;
     };
 
     $gc->buddyClass = 'Buddy\BuddyModel';
-    $gc->buddyModel = function (GlobalContainer $c) {
+    $gc->buddyModel = function(GlobalContainer $c) {
       return new $c->buddyClass($c);
     };
 
-    $gc->unitModel = function (GlobalContainer $c) {
+    $gc->unitModel = function(GlobalContainer $c) {
       return new \V2Unit\V2UnitModel($c);
     };
-    $gc->unitList = $this->factory(function (GlobalContainer $c) {
+    $gc->unitList = $this->factory(function(GlobalContainer $c) {
       return new \V2Unit\V2UnitList($c);
     });
 
-    $gc->fleetModel = function (GlobalContainer $c) {
+    $gc->fleetModel = function(GlobalContainer $c) {
       return new V2FleetModel($c);
     };
 
-    $gc->planetRenderer = function (GlobalContainer $c) {
+    $gc->planetRenderer = function(GlobalContainer $c) {
       return new PlanetRenderer($c);
     };
 
-    $gc->fleetRenderer = function (GlobalContainer $c) {
+    $gc->fleetRenderer = function(GlobalContainer $c) {
       return new \FleetRenderer($c);
     };
 
-    $gc->groupFleet = function (GlobalContainer $c) {
+    $gc->groupFleet = function(GlobalContainer $c) {
       return sn_get_groups('fleet');
     };
 
-    $gc->groupFleetAndMissiles = function (GlobalContainer $c) {
+    $gc->groupFleetAndMissiles = function(GlobalContainer $c) {
       return sn_get_groups(array('fleet', GROUP_STR_MISSILES));
     };
 
-    $gc->groupRecyclers = function (GlobalContainer $c) {
+    $gc->groupRecyclers = function(GlobalContainer $c) {
       return sn_get_groups('flt_recyclers');
     };
 

classes/Entity/KeyedModel.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
   /**
    * @param KeyedContainer $cEntity
    */
-  protected function onSaveUnchanged($cEntity){
+  protected function onSaveUnchanged($cEntity) {
     // TODO - or just save nothing ?????
     // throw new \Exception('EntityModel isNotEmpty, have dbId and not CHANGED! It can\'t be!');
     // Do nothing