supernova-ws / SuperNova

includes/classes/UBE/UBEFleet.php

Spacing +63 added lines, -63 removed lines

@@ -162,20 +162,20 @@ 
       $this->owner_id,
       $this->db_id,
 
-      (float)$this->UBE_PLANET[PLANET_ID],
+      (float) $this->UBE_PLANET[PLANET_ID],
       "'" . db_escape($this->UBE_PLANET[PLANET_NAME]) . "'",
-      (int)$this->UBE_PLANET[PLANET_GALAXY],
-      (int)$this->UBE_PLANET[PLANET_SYSTEM],
-      (int)$this->UBE_PLANET[PLANET_PLANET],
-      (int)$this->UBE_PLANET[PLANET_TYPE],
-
-      (float)$this->resource_list[RES_METAL],
-      (float)$this->resource_list[RES_CRYSTAL],
-      (float)$this->resource_list[RES_DEUTERIUM],
-
-      (float)$this->fleet_bonus->calcBonus(P_ATTACK),
-      (float)$this->fleet_bonus->calcBonus(P_SHIELD),
-      (float)$this->fleet_bonus->calcBonus(P_ARMOR),
+      (int) $this->UBE_PLANET[PLANET_GALAXY],
+      (int) $this->UBE_PLANET[PLANET_SYSTEM],
+      (int) $this->UBE_PLANET[PLANET_PLANET],
+      (int) $this->UBE_PLANET[PLANET_TYPE],
+
+      (float) $this->resource_list[RES_METAL],
+      (float) $this->resource_list[RES_CRYSTAL],
+      (float) $this->resource_list[RES_DEUTERIUM],
+
+      (float) $this->fleet_bonus->calcBonus(P_ATTACK),
+      (float) $this->fleet_bonus->calcBonus(P_SHIELD),
+      (float) $this->fleet_bonus->calcBonus(P_ARMOR),
     );
   }
 
@@ -190,13 +190,13 @@ 
     $this->group_id = $objFleet->group_id;
 
     $fleet_unit_list = $objFleet->shipsGetArray();
-    foreach($fleet_unit_list as $unit_id => $unit_count) {
-      if(!$unit_count) {
+    foreach ($fleet_unit_list as $unit_id => $unit_count) {
+      if (!$unit_count) {
         continue;
       }
 
       $unit_type = get_unit_param($unit_id, P_UNIT_TYPE);
-      if($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) {
+      if ($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) {
         $this->unit_list->unitAdjustCount($unit_id, $unit_count);
       }
     }
@@ -232,13 +232,13 @@ 
 //      }
 //    }
 
-    foreach($sn_group_combat as $unit_id) {
-      if($unit_count = mrc_get_level($player_db_row, $planet_row, $unit_id)) {
+    foreach ($sn_group_combat as $unit_id) {
+      if ($unit_count = mrc_get_level($player_db_row, $planet_row, $unit_id)) {
         $this->unit_list->unitAdjustCount($unit_id, $unit_count);
       }
     }
 
-    foreach(sn_get_groups('resources_loot') as $resource_id) {
+    foreach (sn_get_groups('resources_loot') as $resource_id) {
       $this->resource_list[$resource_id] = floor(mrc_get_level($player_db_row, $planet_row, $resource_id));
     }
 
@@ -297,27 +297,27 @@ 
       $ube_report_id,
       $this->db_id,
 
-      (float)$this->resources_lost_on_units[RES_METAL],
-      (float)$this->resources_lost_on_units[RES_CRYSTAL],
-      (float)$this->resources_lost_on_units[RES_DEUTERIUM],
-      (float)$this->cargo_dropped[RES_METAL],
-      (float)$this->cargo_dropped[RES_CRYSTAL],
-      (float)$this->cargo_dropped[RES_DEUTERIUM],
-      (float)$this->resources_looted[RES_METAL],
-      (float)$this->resources_looted[RES_CRYSTAL],
-      (float)$this->resources_looted[RES_DEUTERIUM],
-      (float)$this->resources_lost_in_metal[RES_METAL],
+      (float) $this->resources_lost_on_units[RES_METAL],
+      (float) $this->resources_lost_on_units[RES_CRYSTAL],
+      (float) $this->resources_lost_on_units[RES_DEUTERIUM],
+      (float) $this->cargo_dropped[RES_METAL],
+      (float) $this->cargo_dropped[RES_CRYSTAL],
+      (float) $this->cargo_dropped[RES_DEUTERIUM],
+      (float) $this->resources_looted[RES_METAL],
+      (float) $this->resources_looted[RES_CRYSTAL],
+      (float) $this->resources_looted[RES_DEUTERIUM],
+      (float) $this->resources_lost_in_metal[RES_METAL],
     );
   }
 
   public function report_render_outcome_side_fleet() {
     $UBE_DEFENCE_RESTORE = array();
     $UBE_UNITS_LOST = array();
-    foreach($this->unit_list->_container as $UBEUnit) {
-      if($UBEUnit->units_restored) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
+      if ($UBEUnit->units_restored) {
         $UBE_DEFENCE_RESTORE[$UBEUnit->unitId] = $UBEUnit->units_restored;
       }
-      if($UBEUnit->units_lost) {
+      if ($UBEUnit->units_lost) {
         $UBE_UNITS_LOST[$UBEUnit->unitId] = $UBEUnit->units_lost;
       }
     }
@@ -344,16 +344,16 @@ 
     global $lang;
 
     $result = array();
-    if(!empty($array)) {
-      foreach($array as $unit_id => $unit_count) {
-        if($unit_count) {
+    if (!empty($array)) {
+      foreach ($array as $unit_id => $unit_count) {
+        if ($unit_count) {
           $result[] = array(
             'NAME' => $lang['tech'][$unit_id],
             'LOSS' => pretty_number($unit_count),
           );
         }
       }
-      if($lang_header_index && count($result)) {
+      if ($lang_header_index && count($result)) {
         array_unshift($result, array('NAME' => $lang[$lang_header_index]));
       }
     }
@@ -366,16 +366,16 @@ 
     $fleet_id = $this->db_id;
 
     $unit_sort_order = 0;
-    foreach($this->unit_list->_container as $UBEUnit) {
-      if($UBEUnit->units_lost || $UBEUnit->units_restored) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
+      if ($UBEUnit->units_lost || $UBEUnit->units_restored) {
         $unit_sort_order++;
         $sql_perform_report_unit[] = array(
           $ube_report_id,
           $fleet_id,
 
           $UBEUnit->unitId,
-          (float)$UBEUnit->units_restored,
-          (float)$UBEUnit->units_lost,
+          (float) $UBEUnit->units_restored,
+          (float) $UBEUnit->units_lost,
 
           $unit_sort_order,
         );
@@ -391,9 +391,9 @@ 
   function ube_combat_result_calculate_resources() {
     $resource_delta_fleet = array();
     // Если во флоте остались юниты или это планета - генерируем изменение ресурсов
-    foreach(sn_get_groups('resources_loot') as $resource_id) {
-      $resource_change = (float)$this->resources_looted[$resource_id] + (float)$this->cargo_dropped[$resource_id];
-      if($resource_change) {
+    foreach (sn_get_groups('resources_loot') as $resource_id) {
+      $resource_change = (float) $this->resources_looted[$resource_id] + (float) $this->cargo_dropped[$resource_id];
+      if ($resource_change) {
         $resource_delta_fleet[$resource_id] = -($resource_change);
       }
     }
@@ -426,12 +426,12 @@ 
     );
 
     $this->fleet_capacity = 0;
-    foreach($this->unit_list->_container as $UBEUnit) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
       $this->fleet_capacity += $UBEUnit->capacity * $UBEUnit->getCount();
 
-      if($UBEUnit->units_lost) {
-        foreach($UBEUnit->price as $resource_id => $unit_resource_price) {
-          if(!$unit_resource_price) {
+      if ($UBEUnit->units_lost) {
+        foreach ($UBEUnit->price as $resource_id => $unit_resource_price) {
+          if (!$unit_resource_price) {
             continue;
           }
 
@@ -439,7 +439,7 @@ 
           $this->resources_lost_on_units[$resource_id] += $resources_lost;
           // Если это корабль - прибавляем потери к обломкам на орбите
           // TODO - опция выбрасывания обороны в обломки
-          if($UBEUnit->getType() == UNIT_SHIPS) {
+          if ($UBEUnit->getType() == UNIT_SHIPS) {
             $this->resources_lost_on_ships[$resource_id] += $resources_lost;
           }
         }
@@ -451,11 +451,11 @@ 
 
     // Если емкость трюмов меньше количество ресурсов - часть ресов выбрасываем нахуй
     // На планете ($fleet_id = 0) ресурсы в космос не выбрасываются
-    if($this->db_id != 0 && $this->fleet_capacity < $fleet_total_resources) {
+    if ($this->db_id != 0 && $this->fleet_capacity < $fleet_total_resources) {
       $drop_share = 1 - $this->fleet_capacity / $fleet_total_resources; // Какая часть ресурсов выброшена
-      foreach($this->resource_list as $resource_id => &$resource_amount) {
+      foreach ($this->resource_list as $resource_id => &$resource_amount) {
         // Не просчитываем ресурсы, которых нет на борту кораблей флота
-        if(!$resource_amount) {
+        if (!$resource_amount) {
           continue;
         }
 
@@ -476,19 +476,19 @@ 
     $objFleet2->setDbId($this->db_id);
 
     // Если это была миссия Уничтожения И звезда смерти взорвалась И мы работаем с аттакерами - значит все аттакеры умерли
-    if($this->is_attacker == UBE_PLAYER_IS_ATTACKER && $reapers_status == UBE_MOON_REAPERS_DIED) {
+    if ($this->is_attacker == UBE_PLAYER_IS_ATTACKER && $reapers_status == UBE_MOON_REAPERS_DIED) {
       $objFleet2->dbDelete();
-    } elseif($ship_count_initial == 0) { // $ship_count_lost == $ship_count_initial ||
+    } elseif ($ship_count_initial == 0) { // $ship_count_lost == $ship_count_initial ||
       $objFleet2->dbDelete();
     } else {
-      if($ship_count_lost) {
+      if ($ship_count_lost) {
         // Просматриваем результаты изменения флотов
-        foreach($this->unit_list->_container as $UBEUnit) {
+        foreach ($this->unit_list->_container as $UBEUnit) {
           // Перебираем аутком на случай восстановления юнитов
 //          if(($units_left = $UBEUnit->getCount() - (float)$UBEUnit->units_lost) > 0) {
 //            $fleet_real_array[$UBEUnit->unitId] = $units_left;
 //          };
-          if(floatval($UBEUnit->units_lost) != 0) {
+          if (floatval($UBEUnit->units_lost) != 0) {
             $objFleet2->shipAdjustCount($UBEUnit->unitId, floatval($UBEUnit->units_lost));
           };
         }
@@ -498,7 +498,7 @@ 
       $objFleet2->resourcesAdjust($resource_delta_fleet);
 
       // Если защитник и не РМФ - отправляем флот назад
-      if($this->is_attacker == UBE_PLAYER_IS_ATTACKER || ($this->is_attacker == UBE_PLAYER_IS_DEFENDER && !$is_small_fleet_recce)) {
+      if ($this->is_attacker == UBE_PLAYER_IS_ATTACKER || ($this->is_attacker == UBE_PLAYER_IS_DEFENDER && !$is_small_fleet_recce)) {
         $objFleet2->markReturned();
       }
       $objFleet2->dbSave();
@@ -528,7 +528,7 @@ 
   public function calculate_unit_partial_data(UBEASA $side_ASA) {
     $this->fleet_share_of_side_armor = $this->total_stats[P_ARMOR] / $side_ASA->getArmor();
 
-    foreach($this->unit_list->_container as $UBEUnit) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
       $UBEUnit->share_of_side_armor = $UBEUnit->pool_armor / $side_ASA->getArmor();
     }
   }
@@ -540,9 +540,9 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function attack_fleets(UBEFleetList $fleet_list, $is_simulator) {
-    foreach($fleet_list->_container as $defending_fleet) {
+    foreach ($fleet_list->_container as $defending_fleet) {
       // Не атакуются флоты на своей стороне
-      if($this->is_attacker == $defending_fleet->is_attacker) {
+      if ($this->is_attacker == $defending_fleet->is_attacker) {
         continue;
       }
       $this->attack_fleet($defending_fleet, $is_simulator);
@@ -558,12 +558,12 @@ 
   public function attack_fleet(UBEFleet $defending_fleet, $is_simulator) {
     UBEDebug::unit_dump_header();
 
-    foreach($this->unit_list->_container as $attacking_unit_pool) {
+    foreach ($this->unit_list->_container as $attacking_unit_pool) {
       UBEDebug::unit_dump($attacking_unit_pool, 'attacker');
 
       // if($attack_unit_count <= 0) continue; // TODO: Это пока нельзя включать - вот если будут "боевые порядки юнитов..."
-      foreach($defending_fleet->unit_list->_container as $defending_unit_pool) {
-        if($defending_unit_pool->isEmpty()) {
+      foreach ($defending_fleet->unit_list->_container as $defending_unit_pool) {
+        if ($defending_unit_pool->isEmpty()) {
           continue;
         }
 

includes/functions/tpl_helpers.php

Spacing +29 added lines, -29 removed lines

@@ -2,8 +2,8 @@ 
 
 // Compare function to sort fleet in time order
 function tpl_assign_fleet_compare($a, $b) {
-  if($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) {
-    if($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) {
+  if ($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) {
+    if ($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) {
       return 0;
     }
 
@@ -19,17 +19,17 @@ 
  * @param string   $js_name
  */
 function tpl_assign_fleet(&$template, $fleets, $js_name = 'fleets') {
-  if(!$fleets) {
+  if (!$fleets) {
     return;
   }
 
   usort($fleets, 'tpl_assign_fleet_compare');
 
-  foreach($fleets as $fleet_data) {
+  foreach ($fleets as $fleet_data) {
     $template->assign_block_vars($js_name, $fleet_data['fleet']);
 
-    if($fleet_data['ships']) {
-      foreach($fleet_data['ships'] as $ship_data) {
+    if ($fleet_data['ships']) {
+      foreach ($fleet_data['ships'] as $ship_data) {
         $template->assign_block_vars("{$js_name}.ships", $ship_data);
       }
     }
@@ -50,8 +50,8 @@ 
     'DEUTERIUM' => $fleet[RES_DEUTERIUM],
   );
 
-  foreach($fleet as $ship_id => $ship_amount) {
-    if(in_array($ship_id, sn_get_groups('fleet'))) {
+  foreach ($fleet as $ship_id => $ship_amount) {
+    if (in_array($ship_id, sn_get_groups('fleet'))) {
       $single_ship_data = get_ship_data($ship_id, $user_data);
       $return['ships'][$ship_id] = array(
         'ID'          => $ship_id,
@@ -90,11 +90,11 @@ 
 
   $result = array();
 
-  if(!$user_data) {
+  if (!$user_data) {
     $user_data = $user;
   }
 
-  if(!$objFleet->isReturning() && $objFleet->mission_type == MT_AKS) {
+  if (!$objFleet->isReturning() && $objFleet->mission_type == MT_AKS) {
     $aks = db_acs_get_by_group_id($objFleet->group_id);
   }
 
@@ -135,14 +135,14 @@ 
     'STAY_LEFT' => floor($objFleet->time_mission_job_complete + 1 - SN_TIME_NOW),
   );
 
-  if(property_exists($objFleet, 'fleet_start_name')) {
+  if (property_exists($objFleet, 'fleet_start_name')) {
     $result['START_NAME'] = $objFleet->fleet_start_name;
   }
-  if(property_exists($objFleet, 'fleet_end_name')) {
+  if (property_exists($objFleet, 'fleet_end_name')) {
     $result['END_NAME'] = $objFleet->fleet_end_name;
   }
 
-  if(property_exists($objFleet, 'event_time')) {
+  if (property_exists($objFleet, 'event_time')) {
     $result['fleet'] = array_merge($result['fleet'], array(
       'OV_LABEL'        => $objFleet->ov_label,
       'EVENT_TIME_TEXT' => property_exists($objFleet, 'event_time') ? date(FMT_DATE_TIME, $objFleet->event_time + SN_CLIENT_TIME_DIFF) : '',
@@ -154,9 +154,9 @@ 
   $ship_list_fully_parsed = $objFleet->shipsGetArray();
 
   $ship_id = 0;
-  if($spy_level >= 6) {
-    foreach($ship_list_fully_parsed as $ship_sn_id => $ship_amount) {
-      if($spy_level >= 10) {
+  if ($spy_level >= 6) {
+    foreach ($ship_list_fully_parsed as $ship_sn_id => $ship_amount) {
+      if ($spy_level >= 10) {
         $single_ship_data = get_ship_data($ship_sn_id, $user_data);
         $result['ships'][$ship_sn_id] = array(
           'ID'          => $ship_sn_id,
@@ -188,8 +188,8 @@ 
 function tpl_parse_planet_que($que, $planet, $que_id) {
   $hangar_que = array();
   $que_hangar = $que['ques'][$que_id][$planet['id_owner']][$planet['id']];
-  if(!empty($que_hangar)) {
-    foreach($que_hangar as $que_item) {
+  if (!empty($que_hangar)) {
+    foreach ($que_hangar as $que_item) {
       $hangar_que['que'][] = array('id' => $que_item['que_unit_id'], 'count' => $que_item['que_unit_amount']);
       $hangar_que[$que_item['que_unit_id']] += $que_item['que_unit_amount'];
     }
@@ -252,10 +252,10 @@ 
     'PLANET_GOVERNOR_LEVEL_MAX' => get_unit_param($planet['PLANET_GOVERNOR_ID'], P_MAX_STACK),
   );
 
-  if(!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) {
+  if (!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) {
     $result['building_que'] = array();
     $building_que = &$que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']];
-    foreach($building_que as $que_element) {
+    foreach ($building_que as $que_element) {
       $result['building_que'][] = que_tpl_parse_element($que_element);
     }
   }
@@ -271,19 +271,19 @@ 
 function flt_get_fleets_to_planet_by_array_of_Fleet($array_of_Fleet) {
   global $user;
 
-  if(empty($array_of_Fleet)) {
+  if (empty($array_of_Fleet)) {
     return false;
   }
 
   $fleet_list = array();
-  foreach($array_of_Fleet as $fleet) {
-    if($fleet->playerOwnerId == $user['id']) {
-      if($fleet->mission_type == MT_MISSILE) {
+  foreach ($array_of_Fleet as $fleet) {
+    if ($fleet->playerOwnerId == $user['id']) {
+      if ($fleet->mission_type == MT_MISSILE) {
         continue;
       }
       $fleet_ownage = 'own';
     } else {
-      switch($fleet->mission_type) {
+      switch ($fleet->mission_type) {
         case MT_ATTACK:
         case MT_AKS:
         case MT_DESTROY:
@@ -300,10 +300,10 @@ 
 
     $fleet_list[$fleet_ownage]['fleets'][$fleet->dbId] = $fleet;
 
-    if($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) {
+    if ($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) {
       $fleet_sn = $fleet->shipsGetArray();
-      foreach($fleet_sn as $ship_id => $ship_amount) {
-        if(in_array($ship_id, sn_get_groups('fleet'))) {
+      foreach ($fleet_sn as $ship_id => $ship_amount) {
+        if (in_array($ship_id, sn_get_groups('fleet'))) {
           $fleet_list[$fleet_ownage]['total'][$ship_id] += $ship_amount;
         }
       }
@@ -320,7 +320,7 @@ 
   return $fleet_list;
 }
 
-function tpl_set_resource_info(template &$template, $planet_row, $fleets_to_planet = array(), $round = 0) {
+function tpl_set_resource_info(template & $template, $planet_row, $fleets_to_planet = array(), $round = 0) {
   $template->assign_vars(array(
     'RESOURCE_ROUNDING' => $round,
 

galaxy.php

Spacing +30 added lines, -30 removed lines

@@ -18,7 +18,7 @@ 
 $uni_system = sys_get_param_int('system', $planetrow['system']);
 $planet = sys_get_param_int('planet', $planetrow['planet']);
 
-if($mode == 'name') {
+if ($mode == 'name') {
   require_once('includes/includes/uni_rename.php');
 }
 
@@ -39,8 +39,8 @@ 
 
 $flying_fleet_count = FleetList::fleet_count_flying($user['id']);
 
-if($mode == 1) {
-} elseif($mode == 2 || $mode == 3) {
+if ($mode == 1) {
+} elseif ($mode == 2 || $mode == 3) {
   $planet = $planetrow['planet'];
 } else {
   $uni_galaxy = $planetrow['galaxy'];
@@ -66,8 +66,8 @@ 
 $PhalanxRange = GetPhalanxRange($HavePhalanx);
 
 $planet_precache_query = db_planet_list_in_system($uni_galaxy, $uni_system);
-if(!empty($planet_precache_query)) {
-  foreach($planet_precache_query as $planet_row) {
+if (!empty($planet_precache_query)) {
+  foreach ($planet_precache_query as $planet_row) {
     $planet_list[$planet_row['planet']][$planet_row['planet_type']] = $planet_row;
   }
 }
@@ -85,8 +85,8 @@ 
  * @var Fleet[][][] $fleet_list
  */
 $fleet_list = array();
-foreach($system_fleet_list->_container as $objFleetSystem) {
-  if(!$objFleetSystem->isReturning()) {
+foreach ($system_fleet_list->_container as $objFleetSystem) {
+  if (!$objFleetSystem->isReturning()) {
     $fleet_planet = $objFleetSystem->fleet_end_planet;
     $fleet_type = $objFleetSystem->fleet_end_type;
   } else {
@@ -101,7 +101,7 @@ 
 $recycler_info = array();
 $planet_recyclers_orbiting = 0;
 $recyclers_fleet = array();
-foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
   $recycler_info[$recycler_id] = get_ship_data($recycler_id, $user);
   $recyclers_fleet[$recycler_id] = mrc_get_level($user, $planetrow, $recycler_id);
   $planet_recyclers_orbiting += $recyclers_fleet[$recycler_id];
@@ -111,7 +111,7 @@ 
 $fleet_id = 1;
 $fleets = array();
 $config_game_max_planet = $config->game_maxPlanet + 1;
-for($Planet = 1; $Planet < $config_game_max_planet; $Planet++) {
+for ($Planet = 1; $Planet < $config_game_max_planet; $Planet++) {
   unset($uni_galaxyRowPlanet);
   unset($uni_galaxyRowMoon);
   unset($uni_galaxyRowUser);
@@ -121,27 +121,27 @@ 
   $uni_galaxyRowPlanet = $planet_list[$Planet][PT_PLANET];
 
   $planet_fleet_id = 0;
-  if($uni_galaxyRowPlanet['destruyed']) {
+  if ($uni_galaxyRowPlanet['destruyed']) {
     CheckAbandonPlanetState($uni_galaxyRowPlanet);
-  } elseif($uni_galaxyRowPlanet['id']) {
-    if($cached['users'][$uni_galaxyRowPlanet['id_owner']]) {
+  } elseif ($uni_galaxyRowPlanet['id']) {
+    if ($cached['users'][$uni_galaxyRowPlanet['id_owner']]) {
       $uni_galaxyRowUser = $cached['users'][$uni_galaxyRowPlanet['id_owner']];
     } else {
       $uni_galaxyRowUser = db_user_by_id($uni_galaxyRowPlanet['id_owner']);
       $cached['users'][$uni_galaxyRowUser['id']] = $uni_galaxyRowUser;
     }
 
-    if(!$uni_galaxyRowUser['id']) {
+    if (!$uni_galaxyRowUser['id']) {
       $debug->warning("Planet '{$uni_galaxyRowPlanet['name']}' [{$uni_galaxy}:{$uni_system}:{$Planet}] has no owner!", 'Userless planet', 503);
       $uni_galaxyRowPlanet['destruyed'] = SN_TIME_NOW + 60 * 60 * 24;
       $uni_galaxyRowPlanet['id_owner'] = 0;
       db_planet_set_by_id($uni_galaxyRowPlanet['id'], "id_owner = 0, destruyed = {$uni_galaxyRowPlanet['destruyed']}");
     }
 
-    if($uni_galaxyRowUser['id']) {
+    if ($uni_galaxyRowUser['id']) {
       $planetcount++;
-      if($uni_galaxyRowUser['ally_id']) {
-        if($cached['allies'][$uni_galaxyRowUser['ally_id']]) {
+      if ($uni_galaxyRowUser['ally_id']) {
+        if ($cached['allies'][$uni_galaxyRowUser['ally_id']]) {
           $allyquery = $cached['allies'][$uni_galaxyRowUser['ally_id']];
         } else {
           $allyquery = db_ally_get_by_id($uni_galaxyRowUser['ally_id']);
@@ -150,19 +150,19 @@ 
       }
 
       $fleets_to_planet = flt_get_fleets_to_planet_by_array_of_Fleet($fleet_list[$Planet][PT_PLANET]);
-      if(!empty($fleets_to_planet['own']['count'])) {
+      if (!empty($fleets_to_planet['own']['count'])) {
         $planet_fleet_id = $fleet_id;
         $fleets[] = tpl_parse_fleet_sn($fleets_to_planet['own']['total'], $fleet_id);
         $fleet_id++;
       }
 
       $uni_galaxyRowMoon = $planet_list[$Planet][PT_MOON];
-      if($uni_galaxyRowMoon['destruyed']) {
+      if ($uni_galaxyRowMoon['destruyed']) {
         CheckAbandonPlanetState($uni_galaxyRowMoon);
       } else {
         $moon_fleet_id = 0;
         $fleets_to_planet = flt_get_fleets_to_planet_by_array_of_Fleet($fleet_list[$Planet][PT_MOON]);
-        if(!empty($fleets_to_planet['own']['count'])) {
+        if (!empty($fleets_to_planet['own']['count'])) {
           $moon_fleet_id = $fleet_id;
           $fleets[] = tpl_parse_fleet_sn($fleets_to_planet['own']['total'], $fleet_id);
           $fleet_id++;
@@ -173,10 +173,10 @@ 
 
   $recyclers_incoming_capacity = 0;
   $uni_galaxyRowPlanet['debris'] = $uni_galaxyRowPlanet['debris_metal'] + $uni_galaxyRowPlanet['debris_crystal'];
-  if($uni_galaxyRowPlanet['debris']) {
-    if(!empty($fleet_list[$Planet][PT_DEBRIS])) {
-      foreach($fleet_list[$Planet][PT_DEBRIS] as $objFleetToDebris) {
-        if($objFleetToDebris->playerOwnerId == $user['id']) {
+  if ($uni_galaxyRowPlanet['debris']) {
+    if (!empty($fleet_list[$Planet][PT_DEBRIS])) {
+      foreach ($fleet_list[$Planet][PT_DEBRIS] as $objFleetToDebris) {
+        if ($objFleetToDebris->playerOwnerId == $user['id']) {
           $recyclers_incoming_capacity += $objFleetToDebris->shipsGetCapacityRecyclers($recycler_info);
         }
       }
@@ -253,21 +253,21 @@ 
 
 tpl_assign_fleet($template, $fleets);
 
-foreach(sn_get_groups('defense_active') as $unit_id) {
+foreach (sn_get_groups('defense_active') as $unit_id) {
   $template->assign_block_vars('defense_active', array(
     'ID'   => $unit_id,
     'NAME' => $lang['tech'][$unit_id],
   ));
 }
 
-foreach($cached['users'] as $PlanetUser) {
-  if(!$PlanetUser) {
+foreach ($cached['users'] as $PlanetUser) {
+  if (!$PlanetUser) {
     continue;
   }
 
   $user_ally = $cached['allies'][$PlanetUser['ally_id']];
-  if(isset($user_ally)) {
-    if($PlanetUser['id'] == $user_ally['ally_owner']) {
+  if (isset($user_ally)) {
+    if ($PlanetUser['id'] == $user_ally['ally_owner']) {
       $user_rank_title = $user_ally['ally_owner_range'];
     } else {
       $ally_ranks = explode(';', $user_ally['ranklist']);
@@ -290,8 +290,8 @@ 
   ));
 }
 
-foreach($cached['allies'] as $PlanetAlly) {
-  if($PlanetAlly) {
+foreach ($cached['allies'] as $PlanetAlly) {
+  if ($PlanetAlly) {
     $template->assign_block_vars('alliances', array(
       'ID'      => $PlanetAlly['id'],
       'NAME_JS' => js_safe_string($PlanetAlly['ally_name']),

includes/classes/Fleet.php

Spacing +20 added lines, -20 removed lines

@@ -283,7 +283,7 @@ 
   public function dbInsert() {
     // WARNING! MISSION TIMES MUST BE SET WITH set_times() method!
     // TODO - more checks!
-    if(empty($this->_time_launch)) {
+    if (empty($this->_time_launch)) {
       die('Fleet time not set!');
     }
 
@@ -363,7 +363,7 @@ 
     // Записываем изменения в БД
     $this->dbSave();
 
-    if($this->_group_id) {
+    if ($this->_group_id) {
       // TODO: Make here to delete only one AKS - by adding aks_fleet_count to AKS table
       db_fleet_aks_purge();
     }
@@ -434,15 +434,15 @@ 
    */
   // TODO - separate shipList and unitList
   public function unitsSetFromArray($unit_array) {
-    foreach($unit_array as $unit_id => $unit_count) {
+    foreach ($unit_array as $unit_id => $unit_count) {
       $unit_count = floatval($unit_count);
-      if(!$unit_count) {
+      if (!$unit_count) {
         continue;
       }
 
-      if($this->isShip($unit_id)) {
+      if ($this->isShip($unit_id)) {
         $this->unitList->unitSetCount($unit_id, $unit_count);
-      } elseif($this->isResource($unit_id)) {
+      } elseif ($this->isResource($unit_id)) {
         $this->resource_list[$unit_id] = $unit_count;
       } else {
         throw new Exception('Trying to pass to fleet non-resource and non-ship ' . var_export($unit_array, true), ERR_ERROR);
@@ -471,7 +471,7 @@ 
   public function parse_missile_db_row($missile_db_row) {
 //    $this->_reset();
 
-    if(empty($missile_db_row) || !is_array($missile_db_row)) {
+    if (empty($missile_db_row) || !is_array($missile_db_row)) {
       return;
     }
 
@@ -607,7 +607,7 @@ 
   public function shipsGetCapacityRecyclers(array $recycler_info) {
     $recyclers_incoming_capacity = 0;
     $fleet_data = $this->shipsGetArray();
-    foreach($recycler_info as $recycler_id => $recycler_data) {
+    foreach ($recycler_info as $recycler_id => $recycler_data) {
       $recyclers_incoming_capacity += $fleet_data[$recycler_id] * $recycler_data['capacity'];
     }
 
@@ -627,7 +627,7 @@ 
     sn_db_transaction_check(true);
 
     // Если флот уже обработан - не существует или возращается - тогда ничего не делаем
-    if($this->isEmpty()) {
+    if ($this->isEmpty()) {
       return $result;
     }
 
@@ -649,18 +649,18 @@ 
     // TODO - Проверка, что планета всё еще существует на указанных координатах, а не телепортировалась, не удалена хозяином, не уничтожена врагом
     // Флот, который возвращается на захваченную планету, пропадает
     // Ship landing is possible only to fleet owner's planet
-    if($this->getPlayerOwnerId() == $planet_arrival['id_owner']) {
+    if ($this->getPlayerOwnerId() == $planet_arrival['id_owner']) {
       $db_changeset = array();
 
       $fleet_array = $this->shipsGetArray();
-      foreach($fleet_array as $ship_id => $ship_count) {
-        if($ship_count) {
+      foreach ($fleet_array as $ship_id => $ship_count) {
+        if ($ship_count) {
           $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, $ship_count, $user, $planet_arrival['id']);
         }
       }
 
       // Adjusting ship amount on planet
-      if(!empty($db_changeset)) {
+      if (!empty($db_changeset)) {
         db_changeset_apply($db_changeset);
       }
 
@@ -708,7 +708,7 @@ 
    * @param array $resource_list
    */
   public function resourcesSet($resource_list) {
-    if(!empty($this->propertiesAdjusted['resource_list'])) {
+    if (!empty($this->propertiesAdjusted['resource_list'])) {
       throw new PropertyAccessException('Property "resource_list" already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::unitSetResourceList', ERR_ERROR);
     }
     $this->resourcesAdjust($resource_list, true);
@@ -722,13 +722,13 @@ 
   public function resourcesAdjust($resource_delta_list, $replace_value = false) {
     !is_array($resource_delta_list) ? $resource_delta_list = array() : false;
 
-    foreach($resource_delta_list as $resource_id => $unit_delta) {
-      if(!UnitResourceLoot::is_in_group($resource_id) || !($unit_delta = floor($unit_delta))) {
+    foreach ($resource_delta_list as $resource_id => $unit_delta) {
+      if (!UnitResourceLoot::is_in_group($resource_id) || !($unit_delta = floor($unit_delta))) {
         // Not a resource or no resources - continuing
         continue;
       }
 
-      if($replace_value) {
+      if ($replace_value) {
         $this->resource_list[$resource_id] = $unit_delta;
       } else {
         $this->resource_list[$resource_id] += $unit_delta;
@@ -738,7 +738,7 @@ 
       }
 
       // Check for negative unit value
-      if($this->resource_list[$resource_id] < 0) {
+      if ($this->resource_list[$resource_id] < 0) {
         // TODO
         throw new Exception('Resource ' . $resource_id . ' will become negative in ' . get_called_class() . '::unitAdjustResourceList', ERR_ERROR);
       }
@@ -790,7 +790,7 @@ 
     sn_db_transaction_check(true);
 
     // Если флот уже обработан - не существует или возращается - тогда ничего не делаем
-    if(!$this->resourcesGetTotal()) {
+    if (!$this->resourcesGetTotal()) {
       return $result;
     }
 
@@ -810,7 +810,7 @@ 
     // TODO - Проверка, что планета всё еще существует на указанных координатах, а не телепортировалась, не удалена хозяином, не уничтожена врагом
 
     // Restoring resources to planet
-    if($this->resourcesGetTotal()) {
+    if ($this->resourcesGetTotal()) {
       $fleet_resources = $this->resourcesGetList();
       db_planet_set_by_id($planet_arrival['id'],
         "`metal` = `metal` + '{$fleet_resources[RES_METAL]}', `crystal` = `crystal` + '{$fleet_resources[RES_CRYSTAL]}', `deuterium` = `deuterium` + '{$fleet_resources[RES_DEUTERIUM]}'");

includes/classes/UnitList.php

Spacing +21 added lines, -21 removed lines

@@ -88,7 +88,7 @@ 
    * @param Unit  $value
    */
   public function offsetSet($offset, $value) {
-    if(isset($this->mapUnitIdToDb[$value->unitId])) {
+    if (isset($this->mapUnitIdToDb[$value->unitId])) {
       classSupernova::$debug->error('UnitList::offsetSet: Unit with UnitId ' . $value->unitId . ' already exists');
     }
     $this->mapUnitIdToDb[$value->unitId] = $value;
@@ -96,7 +96,7 @@ 
   }
 
   public function offsetUnset($offset) {
-    if(!empty($this[$offset]->unitId)) {
+    if (!empty($this[$offset]->unitId)) {
 //      $unit_id = $this[$offset]->unitId;
 //      $this->mapUnitIdToDb[$unit_id] = null;
 //      unset($this->mapUnitIdToDb[$unit_id]);
@@ -118,20 +118,20 @@ 
   public function dbLoad($dbId) {
 //    $this->_reset();
 
-    if($dbId <= 0) {
+    if ($dbId <= 0) {
       return;
     }
 
-    if(!is_object($this->locatedAt)) {
+    if (!is_object($this->locatedAt)) {
       classSupernova::$debug->error('UnitList::dbLoad have no locatedAt field set');
     }
 
     $unit_array = classSupernova::db_get_unit_list_by_location(0, $this->getLocationType(), $this->getLocationDbId());
-    if(!is_array($unit_array)) {
+    if (!is_array($unit_array)) {
       return;
     }
 
-    foreach($unit_array as $unit_db_row) {
+    foreach ($unit_array as $unit_db_row) {
       $unit = $this->_createElement();
       $unit->setLocatedAt($this);
       $unit->dbRowParse($unit_db_row);
@@ -147,25 +147,25 @@ 
   }
 
   public function dbSave() {
-    if(!is_object($this->locatedAt)) {
+    if (!is_object($this->locatedAt)) {
       classSupernova::$debug->error('UnitList::dbSave have no locatedAt field set');
     }
 
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       $unit_db_id = $unit->dbId;
       $unit->dbSave();
 
-      if($unit->isEmpty()) {
+      if ($unit->isEmpty()) {
         // Removing unit object
         // TODO - change when there will be common bus for all objects
         // ...or should I? If COUNT is empty - it means that object does not exists in DB. So it should be deleted from PHP memory and cache too
         unset($this[$unit_db_id]);
       } else {
-        if($unit->dbId <= 0) {
+        if ($unit->dbId <= 0) {
           classSupernova::$debug->error('Error writing unit to DB');
         }
         // If unit is new then putting unit object to container
-        if(empty($this->_container[$unit->dbId])) {
+        if (empty($this->_container[$unit->dbId])) {
           $this->_container[$unit->dbId] = $unit;
         }
       }
@@ -200,7 +200,7 @@ 
   }
 
   public function unitGetCount($unit_id) {
-    if(empty($this->mapUnitIdToDb[$unit_id])) {
+    if (empty($this->mapUnitIdToDb[$unit_id])) {
       throw new Exception('Unit [' . $unit_id . '] is not exists in UnitList');
     }
     return $this->mapUnitIdToDb[$unit_id]->count;
@@ -215,14 +215,14 @@ 
    * @param bool $replace_value
    */
   public function unitAdjustCount($unit_id, $unit_count = 0, $replace_value = false) {
-    if(empty($this->mapUnitIdToDb[$unit_id])) {
+    if (empty($this->mapUnitIdToDb[$unit_id])) {
       // If unit not exists - creating one and setting all attributes
       $this->mapUnitIdToDb[$unit_id] = $this->_createElement();
       $this->mapUnitIdToDb[$unit_id]->setUnitId($unit_id);
       $this->mapUnitIdToDb[$unit_id]->setLocatedAt($this);
     }
 
-    if($replace_value) {
+    if ($replace_value) {
       $this->mapUnitIdToDb[$unit_id]->count = $unit_count;
     } else {
       $this->mapUnitIdToDb[$unit_id]->adjustCount($unit_count);
@@ -236,7 +236,7 @@ 
    */
   public function unitsGetArray() {
     $result = array();
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       $result[$unit->unitId] = $unit->count;
     }
 
@@ -244,7 +244,7 @@ 
   }
 
   public function unitsCountApplyLossMultiplier($ships_lost_multiplier) {
-    foreach($this->mapUnitIdToDb as $unit_id => $unit) {
+    foreach ($this->mapUnitIdToDb as $unit_id => $unit) {
       $unit->count = floor($unit->count * $ships_lost_multiplier);
     }
   }
@@ -270,8 +270,8 @@ 
 
   public function unitsPropertySumById($unit_id = 0, $propertyName = 'count') {
     $result = 0;
-    foreach($this->mapUnitIdToDb as $unit) {
-      if(!$unit_id || $unit->unitId == $unit_id) {
+    foreach ($this->mapUnitIdToDb as $unit) {
+      if (!$unit_id || $unit->unitId == $unit_id) {
         $result += $unit->$propertyName;
       }
     }
@@ -352,7 +352,7 @@ 
 
     print('</tr>');
 
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       print('<tr>');
 
       print('<td>');
@@ -403,14 +403,14 @@ 
 
 
   public function unitZeroDbId() {
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       $unit->zeroDbId();
     }
   }
 
 
   public function unitZeroCount() {
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       $unit->count = 0;
     }
   }

includes/db.php

Spacing +11 added lines, -11 removed lines

@@ -11,7 +11,7 @@ 
 
 function db_change_units_perform($query, $tablename, $object_id) {
   $query = implode(',', $query);
-  if($query && $object_id) {
+  if ($query && $object_id) {
     return classSupernova::db_upd_record_by_id($tablename == 'users' ? LOC_USER : LOC_PLANET, $object_id, $query);
     // return doquery("UPDATE {{{$tablename}}} SET {$query} WHERE `id` = '{$object_id}' LIMIT 1;");
   }
@@ -28,15 +28,15 @@ 
 
   $group = sn_get_groups('resources_loot');
 
-  foreach($unit_list as $unit_id => $unit_amount) {
-    if(!in_array($unit_id, $group)) {
+  foreach ($unit_list as $unit_id => $unit_amount) {
+    if (!in_array($unit_id, $group)) {
       // TODO - remove later
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: db_change_units() вызван для не-ресурсов!</h1>');
       pdump(debug_backtrace());
       die('db_change_units() вызван для не-ресурсов!');
     }
 
-    if(!$unit_amount) {
+    if (!$unit_amount) {
       continue;
     }
 
@@ -45,7 +45,7 @@ 
     $unit_location = sys_get_unit_location($user, $planet, $unit_id);
 
     // Changing value in object
-    switch($unit_location) {
+    switch ($unit_location) {
       case LOC_USER:
         $user[$unit_db_name] += $unit_amount;
         break;
@@ -67,23 +67,23 @@ 
   $field_set = '';
   $value_set = '';
 
-  switch($type) {
+  switch ($type) {
     case 'delete':
       $query = 'DELETE FROM';
       break;
 
     case 'insert':
       $query = 'INSERT INTO';
-      if(isset($options['__multi'])) {
+      if (isset($options['__multi'])) {
         // Here we generate mass-insert set
         break;
       }
     case 'update':
-      if(!$query) {
+      if (!$query) {
         $query = 'UPDATE';
       }
 
-      foreach($values as $field => &$value) {
+      foreach ($values as $field => &$value) {
         $value_type = gettype($value);
         if ($value_type == 'string') {
           $value = "'" . db_escape($value) . "'";
@@ -111,12 +111,12 @@ 
   $field_set['__IS_SAFE'] = true;
 }
 function sn_db_field_set_make_safe($field_set, $serialize = false) {
-  if(!is_array($field_set)) {
+  if (!is_array($field_set)) {
     die('$field_set is not an array!');
   }
 
   $result = array();
-  foreach($field_set as $field => $value) {
+  foreach ($field_set as $field => $value) {
     $field = db_escape(trim($field));
     switch (true) {
       case is_int($value):

includes/vars_combats.php

Spacing +22 added lines, -22 removed lines

@@ -35,7 +35,7 @@ 
     'shield' => 10,
     'armor' => 400,
     'attack' => 5,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
   ),
   SHIP_CARGO_BIG => array(
     'name' => 'big_ship_cargo',
@@ -55,7 +55,7 @@ 
     'shield' => 25,
     'armor' => 1200,
     'attack' => 5,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -83,7 +83,7 @@ 
     'shield' => 50,
     'armor' => 3000,
     'attack' => 10,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -111,7 +111,7 @@ 
     'shield' => 200,
     'armor' => 70000,
     'attack' => 50,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_HYPER,
@@ -140,7 +140,7 @@ 
     'shield' => 100,
     'armor' => 3000,
     'attack' => 50,
-    'amplify' => array(SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21, ),
+    'amplify' => array(SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -168,7 +168,7 @@ 
     'shield' => 10,
     'armor' => 1600,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 500.05, SHIP_SATTELITE_SOLAR => 1050, ),
+    'amplify' => array(SHIP_SPY => 500.05, SHIP_SATTELITE_SOLAR => 1050,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -196,7 +196,7 @@ 
     'shield' =>  0.01,
     'armor' => 100,
     'attack' =>  0.01,
-    'amplify' => array( SHIP_SPY => 1,),
+    'amplify' => array(SHIP_SPY => 1,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -220,7 +220,7 @@ 
       'factor' => 1,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_ENERGY => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 4 + 20) * $level * (0.1 * $production_factor);},
+      RES_ENERGY => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 4 + 20) * $level * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
 
@@ -229,7 +229,7 @@ 
     'shield' => 10,
     'armor' => 200,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 1, ),
+    'amplify' => array(SHIP_SPY => 1,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -261,7 +261,7 @@ 
     'shield' => 10,
     'armor' => 400,
     'attack' => 50,
-    'amplify' => array(SHIP_CARGO_SMALL => 16.4, SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21, ),
+    'amplify' => array(SHIP_CARGO_SMALL => 16.4, SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -290,7 +290,7 @@ 
     'shield' => 25,
     'armor' => 1000,
     'attack' => 150,
-    'amplify' => array(SHIP_CARGO_SMALL => 8.2, SHIP_SPY => 3.33367, SHIP_SATTELITE_SOLAR => 7, ),
+    'amplify' => array(SHIP_CARGO_SMALL => 8.2, SHIP_SPY => 3.33367, SHIP_SATTELITE_SOLAR => 7,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -349,7 +349,7 @@ 
     'shield' =>  50,
     'armor' => 2700,
     'attack' => 400,
-    'amplify' => array(SHIP_SMALL_FIGHTER_LIGHT => 6.15, SHIP_SPY => 1.25013, SHIP_SATTELITE_SOLAR => 2.625, UNIT_DEF_TURRET_MISSILE => 5.5, ),
+    'amplify' => array(SHIP_SMALL_FIGHTER_LIGHT => 6.15, SHIP_SPY => 1.25013, SHIP_SATTELITE_SOLAR => 2.625, UNIT_DEF_TURRET_MISSILE => 5.5,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -408,7 +408,7 @@ 
     'shield' =>  200,
     'armor' =>  6000,
     'attack' => 1000,
-    'amplify' => array(SHIP_SPY => 0.50005, SHIP_SATTELITE_SOLAR => 1.05, UNIT_DEF_TURRET_MISSILE => 1.76, ),
+    'amplify' => array(SHIP_SPY => 0.50005, SHIP_SATTELITE_SOLAR => 1.05, UNIT_DEF_TURRET_MISSILE => 1.76,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_HYPER,
@@ -504,7 +504,7 @@ 
     'shield' =>  500,
     'armor' => 11000,
     'attack' => 2000,
-    'amplify' => array(SHIP_SPY => 0.25003, SHIP_SATTELITE_SOLAR => 0.525, SHIP_LARGE_BATTLESHIP => 7.4, UNIT_DEF_TURRET_LASER_SMALL => 1.125, ),
+    'amplify' => array(SHIP_SPY => 0.25003, SHIP_SATTELITE_SOLAR => 0.525, SHIP_LARGE_BATTLESHIP => 7.4, UNIT_DEF_TURRET_LASER_SMALL => 1.125,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_HYPER,
@@ -608,7 +608,7 @@ 
     'shield' => 20,
     'armor' => 200,
     'attack' => 80,
-    'amplify' => array(SHIP_SPY => 7, ),
+    'amplify' => array(SHIP_SPY => 7,),
   ),
   UNIT_DEF_TURRET_LASER_SMALL => array(
     'name' => 'small_laser',
@@ -626,7 +626,7 @@ 
     'shield' => 25,
     'armor' => 200,
     'attack' => 100,
-    'amplify' => array(SHIP_SPY => 5, ),
+    'amplify' => array(SHIP_SPY => 5,),
   ),
   UNIT_DEF_TURRET_LASER_BIG => array(
     'name' => 'big_laser',
@@ -644,7 +644,7 @@ 
     'shield' => 100,
     'armor' => 800,
     'attack' => 250,
-    'amplify' => array(SHIP_SPY => 2, ),
+    'amplify' => array(SHIP_SPY => 2,),
   ),
   UNIT_DEF_TURRET_GAUSS => array(
     'name' => 'gauss_canyon',
@@ -662,7 +662,7 @@ 
     'armor' => 3500,
     'shield' => 200,
     'attack' => 1100,
-    'amplify' => array(SHIP_SPY => 0.5, ),
+    'amplify' => array(SHIP_SPY => 0.5,),
   ),
   UNIT_DEF_TURRET_ION => array(
     'name' => 'ionic_canyon',
@@ -680,7 +680,7 @@ 
     'shield' => 500,
     'armor' => 800,
     'attack' => 150,
-    'amplify' => array(SHIP_SPY => 3.3, ),
+    'amplify' => array(SHIP_SPY => 3.3,),
   ),
   UNIT_DEF_TURRET_PLASMA => array(
     'name' => 'buster_canyon',
@@ -698,7 +698,7 @@ 
     'shield' => 300,
     'armor' => 10000,
     'attack' => 3000,
-    'amplify' => array(SHIP_SPY => 0.17, ),
+    'amplify' => array(SHIP_SPY => 0.17,),
   ),
 
   UNIT_DEF_SHIELD_SMALL => array(
@@ -718,7 +718,7 @@ 
     'shield' => 2000,
     'armor' => 2000,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 500, ),
+    'amplify' => array(SHIP_SPY => 500,),
   ),
   UNIT_DEF_SHIELD_BIG => array(
     'name' => 'big_protection_shield',
@@ -737,7 +737,7 @@ 
     'shield' => 2000,
     'armor' => 10000,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 500, ),
+    'amplify' => array(SHIP_SPY => 500,),
   ),
   UNIT_DEF_SHIELD_PLANET => array(
     'name'      => 'planet_protector',

includes/includes/flt_page2.inc

Spacing +10 added lines, -11 removed lines

@@ -27,7 +27,7 @@ 
     'START_NAME'         => $planetrow['name'],
   );
 
-  if(!empty($TargetPlanet)) {
+  if (!empty($TargetPlanet)) {
     $template_route += array(
       'END_TYPE_TEXT_SH' => $lang['sys_planet_type_sh'][$TargetPlanet['planet_type']],
       'END_COORDS'       => uni_render_coordinates($TargetPlanet),
@@ -38,8 +38,8 @@ 
   $template->assign_block_vars('fleets', $template_route);
 
   $sn_groups_fleet = sn_get_groups('fleet');
-  foreach($fleetarray as $ship_id => $ship_count) {
-    if(in_array($ship_id, $sn_groups_fleet) && $ship_count) {
+  foreach ($fleetarray as $ship_id => $ship_count) {
+    if (in_array($ship_id, $sn_groups_fleet) && $ship_count) {
 //      $ship_base_data = get_ship_data($ship_id, $user);
       $template->assign_block_vars('fleets.ships', array(
         'ID'          => $ship_id,
@@ -57,11 +57,10 @@ 
     $fleet_capacity += get_unit_param($Ship, P_CAPACITY) * $Count;
   }
 
-  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) :
-    (isset($missiontype[MT_HOLD]) ? 12 : 0);
-  if($max_duration) {
+  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) : (isset($missiontype[MT_HOLD]) ? 12 : 0);
+  if ($max_duration) {
     $config_game_speed_expedition = ($target_mission == MT_EXPLORE && $config->game_speed_expedition ? $config->game_speed_expedition : 1);
-    for($i = 1; $i <= $max_duration; $i++) {
+    for ($i = 1; $i <= $max_duration; $i++) {
       $template->assign_block_vars('duration', array(
         'ID' => $i,
         'TIME' => pretty_time(ceil($i * 3600 / $config_game_speed_expedition)),
@@ -80,7 +79,7 @@ 
   // $TableTitle = uni_render_planet_full($planetrow) . '&nbsp;=&gt;&nbsp;' . uni_render_planet_full($temp);
 
   $sn_group_resources = sn_get_groups('resources');
-  for($i = 0; $i<3; $i++) {
+  for ($i = 0; $i < 3; $i++) {
     $amount = $planetrow[$sn_group_resources[$i]] - ($i == 2 ? $consumption : 0);
     $template->assign_block_vars('resources', array(
       'ID' => $i,
@@ -90,7 +89,7 @@ 
     ));
   }
 
-  if(sn_module::$sn_module['unit_captain']->manifest['active'] && ($captain = sn_module::$sn_module['unit_captain']->unit_captain_get($planetrow['id'])) && $captain['unit_location_type'] == LOC_PLANET) {
+  if (sn_module::$sn_module['unit_captain']->manifest['active'] && ($captain = sn_module::$sn_module['unit_captain']->unit_captain_get($planetrow['id'])) && $captain['unit_location_type'] == LOC_PLANET) {
     $template->assign_vars(array(
       'CAPTAIN_ID' => $captain['unit_id'],
       'CAPTAIN_LEVEL' => $captain['captain_level'],
@@ -111,9 +110,9 @@ 
     // 'TableTitle' => $TableTitle,
 
     'speedallsmin' => sys_get_param_float('speedallsmin'),
-    'speed' => sys_get_param_int('speed') ,
+    'speed' => sys_get_param_int('speed'),
 
-    'fleet_group' => sys_get_param_id('fleet_group') ,
+    'fleet_group' => sys_get_param_id('fleet_group'),
     'acs_target_mr' => sys_get_param_str('acs_target_mr'),
 
     'MAX_DURATION' => $max_duration,

includes/classes/module.php

Spacing +30 added lines, -30 removed lines

@@ -76,7 +76,7 @@ 
     require SN_ROOT_PHYSICAL . 'config.php';
 
     $module_config_array = get_class($this) . '_config';
-    if(!empty($$module_config_array) && is_array($$module_config_array)) {
+    if (!empty($$module_config_array) && is_array($$module_config_array)) {
       $this->config = $$module_config_array;
 
       return true;
@@ -94,15 +94,15 @@ 
 
     // TODO: Load configuration from DB. Manifest setting
     // Trying to load configuration from file
-    if(!$config_exists = $this->loadModuleRootConfig()) {
+    if (!$config_exists = $this->loadModuleRootConfig()) {
       // Конфигурация может лежать в config_path в манифеста или в корне модуля
-      if(isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
+      if (isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
         $config_exists = true;
-      } elseif(file_exists($config_filename = dirname($filename) . '/config.php')) {
+      } elseif (file_exists($config_filename = dirname($filename) . '/config.php')) {
         $config_exists = true;
       }
 
-      if($config_exists) {
+      if ($config_exists) {
         include($config_filename);
         $module_config_array = $class_module_name . '_config';
         $this->config = $$module_config_array;
@@ -119,7 +119,7 @@ 
 
     // Checking module status - is it installed and active
     $this->check_status();
-    if(!$this->manifest['active']) {
+    if (!$this->manifest['active']) {
       return;
     }
 
@@ -139,11 +139,11 @@ 
 
   protected function setSystemConstants() {
     // Setting constants - if any
-    if(empty($this->manifest['constants']) || !is_array($this->manifest['constants'])) {
+    if (empty($this->manifest['constants']) || !is_array($this->manifest['constants'])) {
       return;
     }
 
-    foreach($this->manifest['constants'] as $constant_name => $constant_value) {
+    foreach ($this->manifest['constants'] as $constant_name => $constant_value) {
       defined($constant_name) || define($constant_name, $constant_value);
     }
   }
@@ -155,48 +155,48 @@ 
     // New values from module variables will overwrite previous values (for root variables) and array elements with corresponding indexes (for arrays)
     // Constants as array indexes are honored - it's make valid such declarations as 'sn_data[ques][QUE_STRUCTURES]'
     $this->manifest['vars'] = $this->__assign_vars();
-    if(empty($this->manifest['vars']) || !is_array($this->manifest['vars'])) {
+    if (empty($this->manifest['vars']) || !is_array($this->manifest['vars'])) {
       return;
     }
 
     $vars_assigned = array();
-    foreach($this->manifest['vars'] as $var_name => $var_value) {
+    foreach ($this->manifest['vars'] as $var_name => $var_value) {
       $sub_vars = explode('[', str_replace(']', '', $var_name));
       $var_name = $sub_vars[0];
 
-      if(!isset($vars_assigned[$var_name])) {
+      if (!isset($vars_assigned[$var_name])) {
         $vars_assigned[$var_name] = true;
         global $$var_name;
       }
 
       $pointer = &$$var_name;
-      if(($n = count($sub_vars)) > 1) {
-        for($i = 1; $i < $n; $i++) {
-          if(defined($sub_vars[$i])) {
+      if (($n = count($sub_vars)) > 1) {
+        for ($i = 1; $i < $n; $i++) {
+          if (defined($sub_vars[$i])) {
             $sub_vars[$i] = constant($sub_vars[$i]);
           }
 
-          if(!isset($pointer[$sub_vars[$i]]) && $i != $n) {
+          if (!isset($pointer[$sub_vars[$i]]) && $i != $n) {
             $pointer[$sub_vars[$i]] = array();
           }
           $pointer = &$pointer[$sub_vars[$i]];
         }
       }
 
-      if(!isset($pointer) || !is_array($pointer)) {
+      if (!isset($pointer) || !is_array($pointer)) {
         $pointer = $var_value;
-      } elseif(is_array($$var_name)) {
+      } elseif (is_array($$var_name)) {
         $pointer = array_merge_recursive_numeric($pointer, $var_value);
       }
     }
   }
 
   protected function mergeMenu(&$sn_menu_extra, &$menu_patch) {
-    if(!is_array($menu_patch)) {
+    if (!is_array($menu_patch)) {
       return;
     }
 
-    foreach($menu_patch as $menu_item_name => $menu_item_data) {
+    foreach ($menu_patch as $menu_item_name => $menu_item_data) {
       $sn_menu_extra[$menu_item_name] = $menu_item_data;
     }
   }
@@ -205,34 +205,34 @@ 
     // Overriding function if any
     sn_sys_handler_add(classSupernova::$functions, $this->manifest['functions'], $this);
 
-    foreach(classSupernova::$sn_mvc as $handler_type => &$handler_data) {
+    foreach (classSupernova::$sn_mvc as $handler_type => &$handler_data) {
       sn_sys_handler_add($handler_data, $this->manifest['mvc'][$handler_type], $this, $handler_type);
     }
   }
 
   protected function mergeNavbarButton() {
-    if(empty($this->manifest['navbar_prefix_button']) || !is_array($this->manifest['navbar_prefix_button'])) {
+    if (empty($this->manifest['navbar_prefix_button']) || !is_array($this->manifest['navbar_prefix_button'])) {
       return;
     }
 
-    foreach($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
+    foreach ($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
       classSupernova::$sn_mvc['navbar_prefix_button'][$button_image] = $button_url_relative;
     }
   }
 
   protected function mergeI18N() {
     $arrayName = 'i18n';
-    if(empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
+    if (empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
       return;
     }
 
-    foreach($this->manifest[$arrayName] as $pageName => &$contentList) {
-      foreach($contentList as &$i18n_file_data) {
-        if(is_array($i18n_file_data) && !$i18n_file_data['path']) {
+    foreach ($this->manifest[$arrayName] as $pageName => &$contentList) {
+      foreach ($contentList as &$i18n_file_data) {
+        if (is_array($i18n_file_data) && !$i18n_file_data['path']) {
           $i18n_file_data['path'] = $this->manifest['root_relative'];
         }
       }
-      if(!isset(classSupernova::$sn_mvc[$arrayName][$pageName])) {
+      if (!isset(classSupernova::$sn_mvc[$arrayName][$pageName])) {
         classSupernova::$sn_mvc[$arrayName][$pageName] = array();
       }
       classSupernova::$sn_mvc[$arrayName][$pageName] += $contentList;
@@ -240,13 +240,13 @@ 
   }
 
   protected function mergeArraySpecial($arrayName) {
-    if(empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
+    if (empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
       return;
     }
 
-    foreach($this->manifest[$arrayName] as $pageName => &$contentList) {
+    foreach ($this->manifest[$arrayName] as $pageName => &$contentList) {
       !isset(classSupernova::$sn_mvc[$arrayName][$pageName]) ? classSupernova::$sn_mvc[$arrayName][$pageName] = array() : false;
-      foreach($contentList as $contentName => &$content) {
+      foreach ($contentList as $contentName => &$content) {
         classSupernova::$sn_mvc[$arrayName][$pageName][$contentName] = $content;
       }
     }