supernova-ws / SuperNova

includes/classes/DBRow.php

Doc Comments +1 added lines, -1 removed lines

@@ -411,7 +411,7 @@
   /**
    * @param array $field_set
    *
-   * @return int|string
+   * @return integer
    */
   protected function db_field_set_create(array $field_set) {
     !sn_db_field_set_is_safe($field_set) ? $field_set = sn_db_field_set_make_safe($field_set) : false;

includes/includes/flt_flying_fleet_handler2.php

Spacing +22 added lines, -26 removed lines

@@ -38,15 +38,11 @@ 
 // ------------------------------------------------------------------
 function flt_flyingFleetsSort($a, $b) {
   // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
-  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
-    // Если время - одинаковое, сравниваем события флотов
+  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 : // Если время - одинаковое, сравниваем события флотов
     // Если события - одинаковые, то флоты равны
-    ($a['fleet_event'] == $b['fleet_event'] ? 0 :
-      // Если события разные - первыми считаем прибывающие флоты
-      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 :
-        // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
-        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 :
-          // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
+    ($a['fleet_event'] == $b['fleet_event'] ? 0 : // Если события разные - первыми считаем прибывающие флоты
+      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
+        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
           // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
           (
           0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -60,7 +56,7 @@ 
 function log_file($msg) {
   static $handler;
 
-  if(!$handler) {
+  if (!$handler) {
     $handler = fopen('event.log', 'a+');
   }
 
@@ -100,12 +96,12 @@ 
   */
   global $config, $debug;
 
-  if($config->game_disable != GAME_DISABLE_NONE || $skip_fleet_update) {
+  if ($config->game_disable != GAME_DISABLE_NONE || $skip_fleet_update) {
     return;
   }
 
   sn_db_transaction_start();
-  if($config->db_loadItem('game_disable') != GAME_DISABLE_NONE || SN_TIME_NOW - strtotime($config->db_loadItem('fleet_update_last')) <= $config->fleet_update_interval) {
+  if ($config->db_loadItem('game_disable') != GAME_DISABLE_NONE || SN_TIME_NOW - strtotime($config->db_loadItem('fleet_update_last')) <= $config->fleet_update_interval) {
     sn_db_transaction_rollback();
 
     return;
@@ -113,14 +109,14 @@ 
 
 
   // Watchdog timer
-  if($config->db_loadItem('fleet_update_lock')) {
-    if(defined('DEBUG_FLYING_FLEETS')) {
+  if ($config->db_loadItem('fleet_update_lock')) {
+    if (defined('DEBUG_FLYING_FLEETS')) {
       $random = 0;
     } else {
       $random = mt_rand(240, 300);
     }
 
-    if(SN_TIME_NOW - strtotime($config->fleet_update_lock) <= $random) {
+    if (SN_TIME_NOW - strtotime($config->fleet_update_lock) <= $random) {
       sn_db_transaction_rollback();
 
       return;
@@ -144,11 +140,11 @@ 
   $missions_used = array();
 
   $objFleetList = FleetList::dbGetFleetListCurrentTick();
-  foreach($objFleetList->_container as $objFleet) {
+  foreach ($objFleetList->_container as $objFleet) {
     set_time_limit(15);
     // TODO - Унифицировать код с темплейтным разбором эвентов на планете!
     $missions_used[$objFleet->mission_type] = 1;
-    if($objFleet->time_arrive_to_target <= SN_TIME_NOW && !$objFleet->isReturning()) {
+    if ($objFleet->time_arrive_to_target <= SN_TIME_NOW && !$objFleet->isReturning()) {
       $fleet_event_list[] = array(
         'object'      => $objFleet,
         'fleet_time'  => $objFleet->time_arrive_to_target,
@@ -156,7 +152,7 @@ 
       );
     }
 
-    if($objFleet->time_mission_job_complete > 0 && $objFleet->time_mission_job_complete <= SN_TIME_NOW && !$objFleet->isReturning()) {
+    if ($objFleet->time_mission_job_complete > 0 && $objFleet->time_mission_job_complete <= SN_TIME_NOW && !$objFleet->isReturning()) {
       $fleet_event_list[] = array(
         'object'      => $objFleet,
         'fleet_time'  => $objFleet->time_mission_job_complete,
@@ -164,7 +160,7 @@ 
       );
     }
 
-    if($objFleet->time_return_to_source <= SN_TIME_NOW) {
+    if ($objFleet->time_return_to_source <= SN_TIME_NOW) {
       $fleet_event_list[] = array(
         'object'      => $objFleet,
         'fleet_time'  => $objFleet->time_return_to_source,
@@ -190,17 +186,17 @@ 
 //    MT_MISSILE => 'flt_mission_missile.php',
     MT_EXPLORE   => 'flt_mission_explore',
   );
-  foreach($missions_used as $mission_id => $cork) {
+  foreach ($missions_used as $mission_id => $cork) {
     require_once(SN_ROOT_PHYSICAL . "includes/includes/{$mission_files[$mission_id]}" . DOT_PHP_EX);
   }
 
 //log_file('Обработка миссий');
   $sn_groups_mission = sn_get_groups('missions');
-  foreach($fleet_event_list as $fleet_event) {
+  foreach ($fleet_event_list as $fleet_event) {
     // TODO: Указатель тут потом сделать
     // TODO: СЕЙЧАС НАДО ПРОВЕРЯТЬ ПО БАЗЕ - А ЖИВОЙ ЛИ ФЛОТ?!
     $fleet_row = $fleet_event['fleet_row'];
-    if(empty($fleet_event['object'])) {
+    if (empty($fleet_event['object'])) {
       // Fleet was destroyed in course of previous actions
       continue;
     }
@@ -224,20 +220,20 @@ 
 
     $objFleet->dbLoad($objFleet->dbId);
 
-    if(!$objFleet->dbId) {
+    if (!$objFleet->dbId) {
       // Fleet was destroyed in course of previous actions
       sn_db_transaction_commit();
       continue;
     }
 
-    if($fleet_event['fleet_event'] == EVENT_FLT_RETURN) {
+    if ($fleet_event['fleet_event'] == EVENT_FLT_RETURN) {
       // Fleet returns to planet
       $objFleet->RestoreFleetToPlanet(true, false);
       sn_db_transaction_commit();
       continue;
     }
 
-    if($fleet_event['fleet_event'] == EVENT_FLT_ARRIVE && $objFleet->isReturning()) {
+    if ($fleet_event['fleet_event'] == EVENT_FLT_ARRIVE && $objFleet->isReturning()) {
       // При событии EVENT_FLT_ARRIVE флот всегда должен иметь fleet_mess == 0
       // В противном случае это означает, что флот уже был обработан ранее - например, при САБе
       sn_db_transaction_commit();
@@ -257,13 +253,13 @@ 
     $objMission->dst_planet = $mission_data['dst_planet'] ? db_planet_by_vector($objFleet->target_coordinates_typed(), '', true, '`id`, `id_owner`, `name`') : null;
     $objMission->fleet_event = $fleet_event['fleet_event'];
 
-    if($objMission->dst_planet && $objMission->dst_planet['id_owner']) {
+    if ($objMission->dst_planet && $objMission->dst_planet['id_owner']) {
       $update_result = sys_o_get_updated($objMission->dst_planet['id_owner'], $objMission->dst_planet['id'], $objFleet->time_arrive_to_target);
       $objMission->dst_user = !empty($objMission->dst_user) ? $update_result['user'] : null;
       $objMission->dst_planet = $update_result['planet'];
     }
 
-    switch($objFleet->mission_type) {
+    switch ($objFleet->mission_type) {
       // Для боевых атак нужно обновлять по САБу и по холду - таки надо возвращать данные из обработчика миссий!
       case MT_AKS:
       case MT_ATTACK:

includes/includes/flt_mission_colonize.php

Spacing +4 added lines, -4 removed lines

@@ -20,14 +20,14 @@ 
   $TargetAddress = sprintf($lang['sys_adress_planet'], $fleet_end_coordinates['galaxy'], $fleet_end_coordinates['system'], $fleet_end_coordinates['planet']);
 
   $TheMessage = $lang['sys_colo_no_colonizer'];
-  if($objFleet->shipsGetTotalById(SHIP_COLONIZER) >= 1) {
+  if ($objFleet->shipsGetTotalById(SHIP_COLONIZER) >= 1) {
     $TheMessage = $lang['sys_colo_notfree'];
-    if(empty($mission_data->dst_planet)) {
+    if (empty($mission_data->dst_planet)) {
       $iPlanetCount = get_player_current_colonies($src_user_row);
 
       // Can we colonize more planets?
       $TheMessage = $lang['sys_colo_maxcolo'];
-      if($iPlanetCount < get_player_max_colonies($src_user_row)) {
+      if ($iPlanetCount < get_player_max_colonies($src_user_row)) {
         // Yes, we can colonize
         $TheMessage = $lang['sys_colo_badpos'];
 
@@ -35,7 +35,7 @@ 
           $fleet_end_coordinates['galaxy'], $fleet_end_coordinates['system'], $fleet_end_coordinates['planet'],
           $objFleet->playerOwnerId, "{$lang['sys_colo_defaultname']} {$iPlanetCount}", false,
           array('user_row' => $src_user_row));
-        if($NewOwnerPlanet) {
+        if ($NewOwnerPlanet) {
           $TheMessage = $lang['sys_colo_arrival'] . $TargetAddress . $lang['sys_colo_allisok'];
           msg_send_simple_message($objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_SPY, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
 

includes/includes/flt_mission_attack.php

Spacing +2 added lines, -2 removed lines

@@ -17,14 +17,14 @@
 function flt_mission_attack($objMission) {
   $objFleet = $objMission->fleet;
 
-  if($objFleet->shipsGetTotal() <= 0) {
+  if ($objFleet->shipsGetTotal() <= 0) {
     return null;
   }
 
   $destination_user = $objMission->dst_user;
   $destination_planet = $objMission->dst_planet;
 
-  if(
+  if (
     // Нет данных о планете назначения или её владельце
     empty($destination_user) || empty($destination_planet) || !is_array($destination_user) || !is_array($destination_planet)
     ||

includes/includes/flt_mission_explore.php

Spacing +29 added lines, -30 removed lines

@@ -21,7 +21,7 @@ 
   global $lang, $config;
   static $ship_data, $rates;
 
-  if(empty($mission_data->fleet_event) || $mission_data->fleet_event != EVENT_FLT_ACOMPLISH) {
+  if (empty($mission_data->fleet_event) || $mission_data->fleet_event != EVENT_FLT_ACOMPLISH) {
     return CACHE_NONE;
   }
 
@@ -46,10 +46,10 @@ 
   $outcome_value = &$result['$outcome_value'];
   $outcome_list = &$result['$outcome_list'];
 
-  if(!$ship_data) {
-    foreach(sn_get_groups('fleet') as $unit_id) {
+  if (!$ship_data) {
+    foreach (sn_get_groups('fleet') as $unit_id) {
       $unit_info = get_unit_param($unit_id);
-      if($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
+      if ($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
         continue;
       }
       $ship_data[$unit_id][P_COST_METAL] = get_unit_cost_in($unit_info[P_COST]);
@@ -59,7 +59,7 @@ 
 
   $max_metal_cost = 0;
   $fleet_real_array = $objFleet->shipsGetArray();
-  foreach($fleet_real_array as $ship_id => $ship_amount) {
+  foreach ($fleet_real_array as $ship_id => $ship_amount) {
     $ship_cost_in_metal = $ship_amount * $ship_data[$ship_id][P_COST_METAL];
     $result['$fleet_metal_points'] += $ship_amount * $ship_data[$ship_id][P_COST_METAL];
     // Рассчитываем стоимость самого дорого корабля в металле
@@ -73,8 +73,8 @@ 
   $outcome_list[FLT_EXPEDITION_OUTCOME_NONE]['chance'] = ceil(200 / pow($flt_stay_hours, 1 / 1.7));
 
   $chance_max = 0;
-  foreach($outcome_list as $key => &$value) {
-    if(!$value['chance']) {
+  foreach ($outcome_list as $key => &$value) {
+    if (!$value['chance']) {
       unset($outcome_list[$key]);
       continue;
     }
@@ -82,13 +82,13 @@ 
   }
   $outcome_value = mt_rand(0, $chance_max);
   $outcome_description = &$outcome_list[$mission_outcome = FLT_EXPEDITION_OUTCOME_NONE];
-  foreach($outcome_list as $key => &$value) {
-    if(!$value['chance']) {
+  foreach ($outcome_list as $key => &$value) {
+    if (!$value['chance']) {
       continue;
     }
     $mission_outcome = $key;
     $outcome_description = $value;
-    if($outcome_value <= $outcome_description['value']) {
+    if ($outcome_value <= $outcome_description['value']) {
       break;
     }
   }
@@ -105,7 +105,7 @@ 
 //  $outcome_mission_sub = -1;
 
   $fleet_found = array();
-  switch($mission_outcome) {
+  switch ($mission_outcome) {
     case FLT_EXPEDITION_OUTCOME_LOST_FLEET:
       $objFleet->shipsCountApplyLossMultiplier(mt_rand(1, 3) * mt_rand(200000, 300000) / 1000000);
     break;
@@ -126,8 +126,8 @@ 
 
       // Ограничиваем корабли только теми, чья стоимость в металле меньше или равно стоимости самого дорогого корабля
       $can_be_found = array();
-      foreach($ship_data as $ship_id => $ship_info) {
-        if($ship_info['metal_cost'] < $max_metal_cost) {
+      foreach ($ship_data as $ship_id => $ship_info) {
+        if ($ship_info['metal_cost'] < $max_metal_cost) {
           $can_be_found[$ship_id] = $ship_info['metal_cost'];
         }
       }
@@ -135,13 +135,13 @@ 
       unset($can_be_found[SHIP_COLONIZER]);
       unset($can_be_found[SHIP_SPY]);
 
-      while(count($can_be_found) && $found_in_metal >= max($can_be_found)) {
+      while (count($can_be_found) && $found_in_metal >= max($can_be_found)) {
         $found_index = mt_rand(1, count($can_be_found)) - 1;
         $found_ship = array_slice($can_be_found, $found_index, 1, true);
         $found_ship_cost = reset($found_ship);
         $found_ship_id = key($found_ship);
 
-        if($found_ship_cost > $found_in_metal) {
+        if ($found_ship_cost > $found_in_metal) {
           unset($can_be_found[$found_ship_id]);
         } else {
           $found_ship_count = mt_rand(1, floor($found_in_metal / $found_ship_cost));
@@ -150,10 +150,10 @@ 
         }
       }
 
-      if(empty($fleet_found)) {
+      if (empty($fleet_found)) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       } else {
-        foreach($fleet_found as $unit_id => $unit_amount) {
+        foreach ($fleet_found as $unit_id => $unit_amount) {
           $objFleet->shipAdjustCount($unit_id, $unit_amount);
         }
       }
@@ -177,7 +177,7 @@ 
 
       $objFleet->resourcesAdjust($resources_found);
 
-      if(array_sum($resources_found) == 0) {
+      if (array_sum($resources_found) == 0) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       }
     break;
@@ -188,7 +188,7 @@ 
       // Рассчитываем количество найденной ТМ
       $found_dark_matter = floor(min($outcome_percent * $result['$fleet_metal_points'] / $rates[RES_DARK_MATTER], 10000) * mt_rand(750000, 1000000) / 1000000);
 
-      if(!$found_dark_matter) {
+      if (!$found_dark_matter) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       }
     break;
@@ -202,40 +202,39 @@ 
 
   mission_expedition_result_adjust($result, $objFleet);
 
-  if($found_dark_matter) {
+  if ($found_dark_matter) {
     rpg_points_change($objFleet->playerOwnerId, RPG_EXPEDITION, $found_dark_matter, 'Expedition Bonus');
     $msg_text_addon = sprintf($lang['flt_mission_expedition']['found_dark_matter'], $found_dark_matter);
   }
 
-  if(!empty($fleet_lost)) {
+  if (!empty($fleet_lost)) {
     $msg_text_addon = $lang['flt_mission_expedition']['lost_fleet'];
-    foreach($fleet_lost as $ship_id => $ship_amount) {
+    foreach ($fleet_lost as $ship_id => $ship_amount) {
       $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
     }
   }
 
-  if(!empty($fleet_found)) {
+  if (!empty($fleet_found)) {
     $msg_text_addon = $lang['flt_mission_expedition']['found_fleet'];
-    foreach($fleet_found as $ship_id => $ship_amount) {
+    foreach ($fleet_found as $ship_id => $ship_amount) {
       $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
     }
   }
 
-  if(!empty($resources_found) && array_sum($resources_found) > 0) {
+  if (!empty($resources_found) && array_sum($resources_found) > 0) {
     $msg_text_addon = $lang['flt_mission_expedition']['found_resources'];
-    foreach($resources_found as $resource_id => $resource_amount) {
+    foreach ($resources_found as $resource_id => $resource_amount) {
       $msg_text_addon .= $lang['tech'][$resource_id] . ' - ' . $resource_amount . "\r\n";
     }
   }
 
-  if(!$msg_text) {
+  if (!$msg_text) {
     $messages = &$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['messages'];
-    if($outcome_mission_sub >= 0 && is_array($messages)) {
+    if ($outcome_mission_sub >= 0 && is_array($messages)) {
       $messages = &$messages[$outcome_mission_sub];
     }
 
-    $msg_text = is_string($messages) ? $messages :
-      (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
+    $msg_text = is_string($messages) ? $messages : (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
   }
 
   $fleet_row_end_coordinates_without_type = $objFleet->target_coordinates_without_type();

includes/template.php

Spacing +70 added lines, -70 removed lines

@@ -10,7 +10,7 @@ 
 function gettemplatename($u_dpath) {
   static $template_names = array();
 
-  if(!isset($template_names[$u_dpath])) {
+  if (!isset($template_names[$u_dpath])) {
     $template_names[$u_dpath] = file_exists(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') ? sys_file_read(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') : TEMPLATE_NAME;
   }
 
@@ -52,12 +52,12 @@ 
  * @param $sn_menu_extra
  */
 function tpl_menu_merge_extra(&$sn_menu, &$sn_menu_extra) {
-  if(empty($sn_menu) || empty($sn_menu_extra)) {
+  if (empty($sn_menu) || empty($sn_menu_extra)) {
     return;
   }
 
-  foreach($sn_menu_extra as $menu_item_id => $menu_item) {
-    if(empty($menu_item['LOCATION'])) {
+  foreach ($sn_menu_extra as $menu_item_id => $menu_item) {
+    if (empty($menu_item['LOCATION'])) {
       $sn_menu[$menu_item_id] = $menu_item;
       continue;
     }
@@ -66,16 +66,16 @@ 
     unset($menu_item['LOCATION']);
 
     $is_positioned = $item_location[0];
-    if($is_positioned == '+' || $is_positioned == '-') {
+    if ($is_positioned == '+' || $is_positioned == '-') {
       $item_location = substr($item_location, 1);
     } else {
       $is_positioned = '';
     }
 
-    if($item_location) {
+    if ($item_location) {
       $menu_keys = array_keys($sn_menu);
       $insert_position = array_search($item_location, $menu_keys);
-      if($insert_position === false) {
+      if ($insert_position === false) {
         $insert_position = count($sn_menu) - 1;
         $is_positioned = '+';
         $item_location = '';
@@ -88,7 +88,7 @@ 
     $spliced = array_splice($sn_menu, $insert_position, count($sn_menu) - $insert_position);
     $sn_menu[$menu_item_id] = $menu_item;
 
-    if(!$is_positioned && $item_location) {
+    if (!$is_positioned && $item_location) {
       unset($spliced[$item_location]);
     }
     $sn_menu = array_merge($sn_menu, $spliced);
@@ -104,24 +104,24 @@ 
 function tpl_menu_assign_to_template(&$sn_menu, &$template) {
   global $lang;
 
-  if(empty($sn_menu) || !is_array($sn_menu)) {
+  if (empty($sn_menu) || !is_array($sn_menu)) {
     return;
   }
 
-  foreach($sn_menu as $menu_item_id => $menu_item) {
-    if(!$menu_item) {
+  foreach ($sn_menu as $menu_item_id => $menu_item) {
+    if (!$menu_item) {
       continue;
     }
 
-    if(is_string($menu_item_id)) {
+    if (is_string($menu_item_id)) {
       $menu_item['ID'] = $menu_item_id;
     }
 
-    if($menu_item['TYPE'] == 'lang') {
+    if ($menu_item['TYPE'] == 'lang') {
       $lang_string = &$lang;
-      if(preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) {
-        for($i = 1; $i < count($matches); $i++) {
-          if(defined($matches[$i])) {
+      if (preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) {
+        for ($i = 1; $i < count($matches); $i++) {
+          if (defined($matches[$i])) {
             $matches[$i] = constant($matches[$i]);
           }
           $lang_string = &$lang_string[$matches[$i]];
@@ -133,8 +133,8 @@ 
     $menu_item['ALT'] = htmlentities($menu_item['ALT']);
     $menu_item['TITLE'] = htmlentities($menu_item['TITLE']);
 
-    if(!empty($menu_item['ICON'])) {
-      if(is_string($menu_item['ICON'])) {
+    if (!empty($menu_item['ICON'])) {
+      if (is_string($menu_item['ICON'])) {
         $menu_item['ICON_PATH'] = $menu_item['ICON'];
       } else {
         $menu_item['ICON'] = $menu_item_id;
@@ -164,7 +164,7 @@ 
     'MENU_START_HIDE'     => !empty($_COOKIE[SN_COOKIE . '_menu_hidden']) || defined('SN_GOOGLE'),
   ));
 
-  if(isset($template_result['MENU_CUSTOMIZE'])) {
+  if (isset($template_result['MENU_CUSTOMIZE'])) {
     $template->assign_vars(array(
       'PLAYER_OPTION_MENU_SHOW_ON_BUTTON'   => classSupernova::$user_options[PLAYER_OPTION_MENU_SHOW_ON_BUTTON],
       'PLAYER_OPTION_MENU_HIDE_ON_BUTTON'   => classSupernova::$user_options[PLAYER_OPTION_MENU_HIDE_ON_BUTTON],
@@ -178,7 +178,7 @@ 
     ));
   }
 
-  if(defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) {
+  if (defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) {
     tpl_menu_merge_extra($sn_menu_admin, $sn_menu_admin_extra);
     tpl_menu_assign_to_template($sn_menu_admin, $template);
   } else {
@@ -218,7 +218,7 @@ 
   $in_admin = defined('IN_ADMIN') && IN_ADMIN === true;
   $is_login = defined('LOGIN_LOGOUT') && LOGIN_LOGOUT === true;
 
-  if(is_object($page)) {
+  if (is_object($page)) {
     isset($page->_rootref['MENU']) ? $isDisplayMenu = $page->_rootref['MENU'] : false;
     isset($page->_rootref['NAVBAR']) ? $isDisplayTopNav = $page->_rootref['NAVBAR'] : false;
 
@@ -226,7 +226,7 @@ 
     !isset($page->_rootref['PAGE_HEADER']) && $title ? $page->assign_var('PAGE_HEADER', $title) : false;
   }
 
-  if(empty($user['id']) || !is_numeric($user['id'])) {
+  if (empty($user['id']) || !is_numeric($user['id'])) {
     $isDisplayMenu = false;
     $isDisplayTopNav = false;
   }
@@ -238,10 +238,10 @@ 
   $user_time_measured_unix = intval(isset($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) ? strtotime($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) : 0);
 
   $font_size = !empty($_COOKIE[SN_COOKIE_F]) ? $_COOKIE[SN_COOKIE_F] : classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE];
-  if(strpos($font_size, '%') !== false) {
+  if (strpos($font_size, '%') !== false) {
     // Размер шрифта в процентах
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
-  } elseif(strpos($font_size, 'px') !== false) {
+  } elseif (strpos($font_size, 'px') !== false) {
     // Размер шрифта в пикселях
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
   } else {
@@ -253,10 +253,10 @@ 
 
   $template = gettemplate('_global_header', true);
 
-  if(!empty($sn_mvc['javascript'])) {
-    foreach($sn_mvc['javascript'] as $page_name => $script_list) {
-      if(empty($page_name) || $page_name == $sn_page_name) {
-        foreach($script_list as $filename => $content) {
+  if (!empty($sn_mvc['javascript'])) {
+    foreach ($sn_mvc['javascript'] as $page_name => $script_list) {
+      if (empty($page_name) || $page_name == $sn_page_name) {
+        foreach ($script_list as $filename => $content) {
           $template_result['.']['javascript'][] = array(
             'FILE'    => $filename,
             'CONTENT' => $content,
@@ -290,9 +290,9 @@ 
   $sn_mvc['css'][''] = array_merge($standard_css, $sn_mvc['css']['']);
 
 
-  foreach($sn_mvc['css'] as $page_name => $script_list) {
-    if(empty($page_name) || $page_name == $sn_page_name) {
-      foreach($script_list as $filename => $content) {
+  foreach ($sn_mvc['css'] as $page_name => $script_list) {
+    if (empty($page_name) || $page_name == $sn_page_name) {
+      foreach ($script_list as $filename => $content) {
         $template_result['.']['css'][] = array(
           'FILE'    => $filename,
           'CONTENT' => $content,
@@ -339,12 +339,12 @@ 
   $template->assign_recursive($template_result);
   displayP(parsetemplate($template));
 
-  if(($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) {
+  if (($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) {
     // $AdminPage = $AdminPage ? $user['authlevel'] : 0;
     displayP(parsetemplate(tpl_render_menu()));
   }
 
-  if($isDisplayTopNav && !$in_admin) {
+  if ($isDisplayTopNav && !$in_admin) {
     displayP(parsetemplate(tpl_render_topnav($user, $planetrow)));
   }
 
@@ -352,8 +352,8 @@ 
 
   !is_array($page) ? $page = array($page) : false;
   $result_added = false;
-  foreach($page as $page_item) {
-    if(!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) {
+  foreach ($page as $page_item) {
+    if (!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) {
       $page_item = gettemplate('_result_message', $page_item);
       $temp = $page_item->files['_result_message'];
       unset($page_item->files['_result_message']);
@@ -376,7 +376,7 @@ 
   ));
   displayP(parsetemplate($template));
 
-  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false;;
+  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false; ;
 
   sn_db_disconnect();
 
@@ -414,7 +414,7 @@ 
  * @param string         $type
  */
 function tpl_topnav_event_build(&$template, $FleetList, $type = 'fleet') {
-  if(empty($FleetList)) {
+  if (empty($FleetList)) {
     return;
   }
 
@@ -423,19 +423,19 @@ 
   $fleet_event_count = 0;
   $fleet_flying_sorter = array();
   $fleet_flying_events = array();
-  foreach($FleetList->_container as $objFleet) {
+  foreach ($FleetList->_container as $objFleet) {
     $will_return = true;
-    if(!$objFleet->isReturning()) {
+    if (!$objFleet->isReturning()) {
       // cut fleets on Hold and Expedition
-      if($objFleet->time_arrive_to_target >= SN_TIME_NOW) {
+      if ($objFleet->time_arrive_to_target >= SN_TIME_NOW) {
         $objFleet->mission_type == MT_RELOCATE ? $will_return = false : false;
         tpl_topnav_event_build_helper($objFleet->time_arrive_to_target, EVENT_FLEET_ARRIVE, $lang['sys_event_arrive'], $objFleet->target_coordinates_typed(), !$will_return, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
       }
-      if($objFleet->time_mission_job_complete) {
+      if ($objFleet->time_mission_job_complete) {
         tpl_topnav_event_build_helper($objFleet->time_mission_job_complete, EVENT_FLEET_STAY, $lang['sys_event_stay'], $objFleet->target_coordinates_typed(), false, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
       }
     }
-    if($will_return) {
+    if ($will_return) {
       tpl_topnav_event_build_helper($objFleet->time_return_to_source, EVENT_FLEET_RETURN, $lang['sys_event_return'], $objFleet->launch_coordinates_typed(), true, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
     }
   }
@@ -443,7 +443,7 @@ 
   asort($fleet_flying_sorter);
 
   $fleet_flying_count = $FleetList->count();
-  foreach($fleet_flying_sorter as $fleet_event_id => $fleet_time) {
+  foreach ($fleet_flying_sorter as $fleet_event_id => $fleet_time) {
     $fleet_event = &$fleet_flying_events[$fleet_event_id];
     $template->assign_block_vars("flying_{$type}s", array(
       'TIME' => max(0, $fleet_time - SN_TIME_NOW),
@@ -471,7 +471,7 @@ 
 function sn_tpl_render_topnav(&$user, $planetrow) {
   global $lang, $config, $sn_module_list, $template_result, $sn_mvc;
 
-  if(!is_array($user)) {
+  if (!is_array($user)) {
     return '';
   }
 
@@ -492,8 +492,8 @@ 
 
   $ThisUsersPlanets = db_planet_list_sorted($user);
   // while ($CurPlanet = db_fetch($ThisUsersPlanets))
-  foreach($ThisUsersPlanets as $CurPlanet) {
-    if($CurPlanet['destruyed']) {
+  foreach ($ThisUsersPlanets as $CurPlanet) {
+    if ($CurPlanet['destruyed']) {
       continue;
     }
 
@@ -517,8 +517,8 @@ 
    */
   $fleet_flying_list = array();
   $fleet_flying_list[0] = FleetList::dbGetFleetListByOwnerId($user['id']);
-  foreach($fleet_flying_list[0]->_container as $fleet_id => $objFleet) {
-    if(empty($fleet_flying_list[$objFleet->mission_type])) {
+  foreach ($fleet_flying_list[0]->_container as $fleet_id => $objFleet) {
+    if (empty($fleet_flying_list[$objFleet->mission_type])) {
       $fleet_flying_list[$objFleet->mission_type] = new FleetList();
     }
     $fleet_flying_list[$objFleet->mission_type][$fleet_id] = $objFleet;
@@ -530,8 +530,8 @@ 
   que_tpl_parse($template, QUE_RESEARCH, $user, array(), null, !classSupernova::$user_options[PLAYER_OPTION_NAVBAR_RESEARCH_WIDE]);
   que_tpl_parse($template, SUBQUE_FLEET, $user, $planetrow, null, true);
 
-  if(!empty($sn_mvc['navbar_prefix_button']) && is_array($sn_mvc['navbar_prefix_button'])) {
-    foreach($sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) {
+  if (!empty($sn_mvc['navbar_prefix_button']) && is_array($sn_mvc['navbar_prefix_button'])) {
+    foreach ($sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) {
       $template->assign_block_vars('navbar_prefix_button', array(
         'IMAGE'        => $navbar_button_image,
         'URL_RELATIVE' => $navbar_button_url,
@@ -545,13 +545,13 @@ 
   $time_now_parsed = getdate(SN_TIME_NOW);
   $time_local_parsed = getdate(defined('SN_CLIENT_TIME_LOCAL') ? SN_CLIENT_TIME_LOCAL : SN_TIME_NOW);
 
-  if($config->game_news_overview) {
+  if ($config->game_news_overview) {
     $user_last_read_safe = intval($user['news_lastread']);
     nws_render($template, "WHERE UNIX_TIMESTAMP(`tsTimeStamp`) >= {$user_last_read_safe}", $config->game_news_overview);
   }
 
   $notes_query = db_note_list_by_owner($user['id'], true);
-  while($note_row = db_fetch($notes_query)) {
+  while ($note_row = db_fetch($notes_query)) {
     note_assign($template, $note_row);
   }
 
@@ -562,7 +562,7 @@ 
     'QUE_ID'   => QUE_RESEARCH,
     'QUE_HTML' => 'topnav',
 
-    'RESEARCH_ONGOING' => (boolean)$user['que'],
+    'RESEARCH_ONGOING' => (boolean) $user['que'],
 
     'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], $lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
       $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -639,7 +639,7 @@ 
     'QUE_STRUCTURES' => QUE_STRUCTURES,
   ));
 
-  if((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) {
+  if ((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) {
     tpl_set_resource_info($template, $planetrow);
     $template->assign_vars(array(
       'SN_RENDER_NAVBAR_PLANET' => true,
@@ -654,12 +654,12 @@ 
  * @param template|string $template
  */
 function displayP($template) {
-  if(is_object($template)) {
-    if(empty($template->parsed)) {
+  if (is_object($template)) {
+    if (empty($template->parsed)) {
       parsetemplate($template);
     }
 
-    foreach($template->files as $section => $filename) {
+    foreach ($template->files as $section => $filename) {
       $template->display($section);
     }
   } else {
@@ -674,11 +674,11 @@ 
  * @return mixed
  */
 function parsetemplate($template, $array = false) {
-  if(is_object($template)) {
+  if (is_object($template)) {
     global $user;
 
-    if(!empty($array) && is_array($array)) {
-      foreach($array as $key => $data) {
+    if (!empty($array) && is_array($array)) {
+      foreach ($array as $key => $data) {
         $template->assign_var($key, $data);
       }
     }
@@ -719,7 +719,7 @@ 
 
   $template_ex = '.tpl.html';
 
-  if($template === false) {
+  if ($template === false) {
     return sys_file_read(TEMPLATE_DIR . '/' . $files . $template_ex);
   }
 
@@ -739,7 +739,7 @@ 
   !empty($sn_mvc['i18n']['']) ? lng_load_i18n($sn_mvc['i18n']['']) : false;
   $sn_page_name ? lng_load_i18n($sn_mvc['i18n'][$sn_page_name]) : false;
 
-  foreach($files as &$filename) {
+  foreach ($files as &$filename) {
     $filename = $filename . $template_ex;
   }
 
@@ -764,13 +764,13 @@ 
     'LANG'     => $language ? $language : '',
     'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
 
-    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
+    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
     'FILENAME'       => basename($_SERVER['PHP_SELF']),
   ));
 
-  foreach(lng_get_list() as $lng_id => $lng_data) {
-    if(isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) {
-      foreach($lng_data['LANG_VARIANTS'] as $lang_variant) {
+  foreach (lng_get_list() as $lng_id => $lng_data) {
+    if (isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) {
+      foreach ($lng_data['LANG_VARIANTS'] as $lang_variant) {
         $lng_data1 = $lng_data;
         $lng_data1 = array_merge($lng_data1, $lang_variant);
         $template->assign_block_vars('language', $lng_data1);
@@ -793,8 +793,8 @@ 
   $que = $que['ques'][$que_type][$planet['id_owner']][$planet['id']];
 
   $que_length = 0;
-  if(!empty($que)) {
-    foreach($que as $que_item) {
+  if (!empty($que)) {
+    foreach ($que as $que_item) {
       $template->assign_block_vars('que', que_tpl_parse_element($que_item));
     }
     $que_length = count($que);
@@ -811,7 +811,7 @@ 
 function tpl_planet_density_info(&$template, &$density_price_chart, $user_dark_matter) {
   global $lang;
 
-  foreach($density_price_chart as $density_price_index => &$density_price_data) {
+  foreach ($density_price_chart as $density_price_index => &$density_price_data) {
     $density_cost = $density_price_data;
     $density_number_style = pretty_number($density_cost, true, $user_dark_matter, false, false);
 
@@ -835,7 +835,7 @@ 
 function tpl_assign_select(&$template, $name, $values) {
   !is_array($values) ? $values = array($values => $values) : false;
 
-  foreach($values as $key => $value) {
+  foreach ($values as $key => $value) {
     $template->assign_block_vars($name, array(
       'KEY'   => htmlentities($key, ENT_COMPAT, 'UTF-8'),
       'VALUE' => htmlentities($value, ENT_COMPAT, 'UTF-8'),

includes/classes/Fleet.php

Spacing +22 added lines, -22 removed lines

@@ -284,7 +284,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!');
     }
 
@@ -364,7 +364,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();
     }
@@ -424,7 +424,7 @@ 
     sn_db_transaction_check(true);
 
     // Если флот уже обработан - не существует или возращается - тогда ничего не делаем
-    if($this->isEmpty() || ($this->_is_returning == 1 && $only_resources)) {
+    if ($this->isEmpty() || ($this->_is_returning == 1 && $only_resources)) {
       return $result;
     }
 
@@ -444,7 +444,7 @@ 
 
     // TODO - Проверка, что планета всё еще существует на указанных координатах, а не телепортировалась, не удалена хозяином, не уничтожена врагом
     // Флот, который возвращается на захваченную планету, пропадает
-    if($start && $this->_is_returning == 1 && $planet_arrival['id_owner'] != $this->_playerOwnerId) {
+    if ($start && $this->_is_returning == 1 && $planet_arrival['id_owner'] != $this->_playerOwnerId) {
       $result = RestoreFleetToPlanet($this, $start, $only_resources, $result);
 
       $this->dbDelete();
@@ -452,20 +452,20 @@ 
       return $result;
     }
 
-    if(!$only_resources) {
+    if (!$only_resources) {
       // Landing ships
       $db_changeset = array();
 
-      if($this->_playerOwnerId == $planet_arrival['id_owner']) {
+      if ($this->_playerOwnerId == $planet_arrival['id_owner']) {
         $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);
         }
       }
@@ -476,13 +476,13 @@ 
     }
 
     // Restoring resources to planet
-    if($this->resourcesGetTotal() != 0) {
+    if ($this->resourcesGetTotal() != 0) {
       $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]}'");
     }
 
-    if(!$only_resources) {
+    if (!$only_resources) {
       $this->dbDelete();
     }
 
@@ -516,15 +516,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);
@@ -553,7 +553,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;
     }
 
@@ -689,7 +689,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'];
     }
 
@@ -726,7 +726,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);
@@ -740,13 +740,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;
@@ -755,7 +755,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);
       }

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/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,14 +200,14 @@ 
   }
 
   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;
   }
 
   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);
     }
   }
@@ -221,14 +221,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);
@@ -242,7 +242,7 @@ 
    */
   public function unitsGetArray() {
     $result = array();
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       $result[$unit->unitId] = $unit->count;
     }
 
@@ -266,8 +266,8 @@ 
    */
   public function unitsCountById($unit_id = 0) {
     $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->count;
       }
     }
@@ -348,7 +348,7 @@ 
 
     print('</tr>');
 
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       print('<tr>');
 
       print('<td>');
@@ -399,14 +399,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;
     }
   }