supernova-ws / SuperNova

includes/includes/coe_simulator_helpers.php

Doc Comments +6 added lines

@@ -1,5 +1,8 @@ 
 <?php
 
+/**
+ * @param string $type
+ */
 function sn_ube_simulator_encode_replay($combat, $type)
 {
   $strPacked = "{$type}!";
@@ -58,6 +61,9 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Преобразовывает данные симулятора в данные для расчета боя
+/**
+ * @param boolean $attacker
+ */
 function sn_ube_simulator_fill_side(&$combat_data, $side_info, $attacker, $player_id = -1)
 {
   global $ube_convert_techs;

Spacing +20 added lines, -20 removed lines

@@ -4,9 +4,9 @@ 
 {
   $strPacked = "{$type}!";
 
-  foreach($combat as $fleetID => $fleetCompress)
+  foreach ($combat as $fleetID => $fleetCompress)
   {
-    foreach($fleetCompress as $key => $value)
+    foreach ($fleetCompress as $key => $value)
     {
       $value = intval($value);
       $strPacked .= "{$key},{$value};";
@@ -22,29 +22,29 @@ 
   $fleet_id = 0;
 
   $arr_data_unpacked = explode('!', $str_data);
-  foreach($arr_data_unpacked as $data_piece)
+  foreach ($arr_data_unpacked as $data_piece)
   {
-    if(!$data_piece)
+    if (!$data_piece)
     {
       continue;
     }
 
-    if($data_piece == 'A' || $data_piece == 'D')
+    if ($data_piece == 'A' || $data_piece == 'D')
     {
       $fleet_type = $data_piece;
       continue;
     }
 
     $arr_unit_strings = explode(';', $data_piece);
-    foreach($arr_unit_strings as $str_unit_string)
+    foreach ($arr_unit_strings as $str_unit_string)
     {
-      if(!$str_unit_string)
+      if (!$str_unit_string)
       {
         continue;
       }
 
       $arr_unit_data = explode(',', $str_unit_string);
-      if($arr_unit_data[1])
+      if ($arr_unit_data[1])
       {
         $unpacked[$fleet_type][$fleet_id][$arr_unit_data[0]] = intval($arr_unit_data[1]);
       }
@@ -64,48 +64,48 @@ 
 
   $player_id = $player_id == -1 ? count($combat_data[UBE_PLAYERS]) : $player_id;
 
-  foreach($side_info as $fleet_data)
+  foreach ($side_info as $fleet_data)
   {
     $combat_data[UBE_PLAYERS][$player_id][UBE_NAME] = $attacker ? 'Attacker' : 'Defender';
     $combat_data[UBE_PLAYERS][$player_id][UBE_ATTACKER] = $attacker;
 
     $combat_data[UBE_FLEETS][$player_id][UBE_OWNER] = $player_id;
-    foreach($fleet_data as $unit_id => $unit_count)
+    foreach ($fleet_data as $unit_id => $unit_count)
     {
-      if(!$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)
       {
         $combat_data[UBE_FLEETS][$player_id][UBE_COUNT][$unit_id] = $unit_count;
       }
-      elseif($unit_type == UNIT_RESOURCES)
+      elseif ($unit_type == UNIT_RESOURCES)
       {
         $combat_data[UBE_FLEETS][$player_id][UBE_RESOURCES][$unit_id] = $unit_count;
       }
-      elseif($unit_type == UNIT_TECHNOLOGIES)
+      elseif ($unit_type == UNIT_TECHNOLOGIES)
       {
         $combat_data[UBE_PLAYERS][$player_id][UBE_BONUSES][$ube_convert_techs[$unit_id]] += $unit_count * get_unit_param($unit_id, P_BONUS_VALUE) / 100;
       }
-      elseif($unit_type == UNIT_GOVERNORS)
+      elseif ($unit_type == UNIT_GOVERNORS)
       {
-        if($unit_id == MRC_FORTIFIER)
+        if ($unit_id == MRC_FORTIFIER)
         {
-          foreach($ube_convert_techs as $ube_id)
+          foreach ($ube_convert_techs as $ube_id)
           {
             $combat_data[UBE_FLEETS][$player_id][UBE_BONUSES][$ube_id] += $unit_count * get_unit_param($unit_id, P_BONUS_VALUE) / 100;
           }
         }
       }
-      elseif($unit_type == UNIT_MERCENARIES)
+      elseif ($unit_type == UNIT_MERCENARIES)
       {
-        if($unit_id == MRC_ADMIRAL)
+        if ($unit_id == MRC_ADMIRAL)
         {
-          foreach($ube_convert_techs as $ube_id)
+          foreach ($ube_convert_techs as $ube_id)
           {
             $combat_data[UBE_PLAYERS][$player_id][UBE_BONUSES][$ube_id] += $unit_count * get_unit_param($unit_id, P_BONUS_VALUE) / 100;
           }

Braces +8 added lines, -16 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function sn_ube_simulator_encode_replay($combat, $type)
-{
+function sn_ube_simulator_encode_replay($combat, $type) {
   $strPacked = "{$type}!";
 
   foreach($combat as $fleetID => $fleetCompress)
@@ -17,8 +16,7 @@ 
   return $strPacked;
 }
 
-function sn_ube_simulator_decode_replay($str_data)
-{
+function sn_ube_simulator_decode_replay($str_data) {
   $fleet_id = 0;
 
   $arr_data_unpacked = explode('!', $str_data);
@@ -58,8 +56,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Преобразовывает данные симулятора в данные для расчета боя
-function sn_ube_simulator_fill_side(&$combat_data, $side_info, $attacker, $player_id = -1)
-{
+function sn_ube_simulator_fill_side(&$combat_data, $side_info, $attacker, $player_id = -1) {
   global $ube_convert_techs;
 
   $player_id = $player_id == -1 ? count($combat_data[UBE_PLAYERS]) : $player_id;
@@ -82,16 +79,13 @@ 
       if($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE)
       {
         $combat_data[UBE_FLEETS][$player_id][UBE_COUNT][$unit_id] = $unit_count;
-      }
-      elseif($unit_type == UNIT_RESOURCES)
+      } elseif($unit_type == UNIT_RESOURCES)
       {
         $combat_data[UBE_FLEETS][$player_id][UBE_RESOURCES][$unit_id] = $unit_count;
-      }
-      elseif($unit_type == UNIT_TECHNOLOGIES)
+      } elseif($unit_type == UNIT_TECHNOLOGIES)
       {
         $combat_data[UBE_PLAYERS][$player_id][UBE_BONUSES][$ube_convert_techs[$unit_id]] += $unit_count * get_unit_param($unit_id, P_BONUS_VALUE) / 100;
-      }
-      elseif($unit_type == UNIT_GOVERNORS)
+      } elseif($unit_type == UNIT_GOVERNORS)
       {
         if($unit_id == MRC_FORTIFIER)
         {
@@ -100,8 +94,7 @@ 
             $combat_data[UBE_FLEETS][$player_id][UBE_BONUSES][$ube_id] += $unit_count * get_unit_param($unit_id, P_BONUS_VALUE) / 100;
           }
         }
-      }
-      elseif($unit_type == UNIT_MERCENARIES)
+      } elseif($unit_type == UNIT_MERCENARIES)
       {
         if($unit_id == MRC_ADMIRAL)
         {
@@ -115,8 +108,7 @@ 
   }
 }
 
-function sn_ube_simulator_fleet_converter($sym_attacker, $sym_defender)
-{
+function sn_ube_simulator_fleet_converter($sym_attacker, $sym_defender) {
   $combat_data = array(
     UBE_OPTIONS => array(
       UBE_SIMULATOR => sys_get_param_int('simulator'),

includes/includes/flt_functions.php

Doc Comments +3 added lines

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @return double
+ */
 function flt_fleet_speed($user, $fleet)
 {
   if (!is_array($fleet))

Spacing +79 added lines, -79 removed lines

@@ -8,11 +8,11 @@ 
   }
 
   $speeds = array();
-  if(!empty($fleet))
+  if (!empty($fleet))
   {
     foreach ($fleet as $ship_id => $amount)
     {
-      if($amount && in_array($ship_id, sn_get_groups(array('fleet', 'missile'))))
+      if ($amount && in_array($ship_id, sn_get_groups(array('fleet', 'missile'))))
       {
         $single_ship_data = get_ship_data($ship_id, $user);
         $speeds[] = $single_ship_data['speed'];
@@ -26,15 +26,15 @@ 
 function flt_travel_distance($from, $to) {
   global $config;
 
-  if($from['galaxy'] != $to['galaxy'])
+  if ($from['galaxy'] != $to['galaxy'])
   {
     $distance = abs($from['galaxy'] - $to['galaxy']) * $config->uni_galaxy_distance;
   }
-  elseif($from['system'] != $to['system'])
+  elseif ($from['system'] != $to['system'])
   {
     $distance = abs($from['system'] - $to['system']) * 5 * 19 + 2700;
   }
-  elseif($from['planet'] != $to['planet'])
+  elseif ($from['planet'] != $to['planet'])
   {
     $distance = abs($from['planet'] - $to['planet']) * 5 + 1000;
   }
@@ -65,14 +65,14 @@ 
 
   $game_fleet_speed = flt_server_flight_speed_multiplier();
   $fleet_speed = flt_fleet_speed($user_row, $fleet_array);
-  if(!empty($fleet_array) && $fleet_speed && $game_fleet_speed)
+  if (!empty($fleet_array) && $fleet_speed && $game_fleet_speed)
   {
     $speed_percent = $speed_percent ? max(min($speed_percent, 10), 1) : 10;
     $real_speed = $speed_percent * sqrt($fleet_speed);
 
     $duration = max(1, round((35000 / $speed_percent * sqrt($distance * 10 / $fleet_speed) + 10) / $game_fleet_speed));
 
-    foreach($fleet_array as $ship_id => $ship_count)
+    foreach ($fleet_array as $ship_id => $ship_count)
     {
       if (!$ship_id || !$ship_count)
       {
@@ -126,19 +126,19 @@ 
 
   $config_bashing_attacks = $config->fleet_bashing_attacks;
   $config_bashing_interval = $config->fleet_bashing_interval;
-  if(!$config_bashing_attacks) {
+  if (!$config_bashing_attacks) {
     // Bashing allowed - protection disabled
     return ATTACK_ALLOWED;
   }
 
   $bashing_result = ATTACK_BASHING;
-  if($user['ally_id'] && $enemy['ally_id']) {
+  if ($user['ally_id'] && $enemy['ally_id']) {
     $relations = ali_relations($user['ally_id'], $enemy['ally_id']);
-    if(!empty($relations)) {
+    if (!empty($relations)) {
       $relations = $relations[$enemy['ally_id']];
-      switch($relations['alliance_diplomacy_relation']) {
+      switch ($relations['alliance_diplomacy_relation']) {
         case ALLY_DIPLOMACY_WAR:
-          if(SN_TIME_NOW - $relations['alliance_diplomacy_time'] <= $config->fleet_bashing_war_delay) {
+          if (SN_TIME_NOW - $relations['alliance_diplomacy_time'] <= $config->fleet_bashing_war_delay) {
             $bashing_result = ATTACK_BASHING_WAR_DELAY;
           } else {
             return ATTACK_ALLOWED;
@@ -175,9 +175,9 @@ 
 //    }
 //  }
   $bashing_fleet_list = fleet_list_bashing($user['id'], $planet_dst);
-  foreach($bashing_fleet_list as $fleet_row) {
+  foreach ($bashing_fleet_list as $fleet_row) {
     // Checking for ACS - each ACS count only once
-    if($fleet_row['fleet_group']) {
+    if ($fleet_row['fleet_group']) {
       $bashing_list["{$user['id']}_{$fleet_row['fleet_group']}"] = $fleet_row['fleet_start_time'];
     } else {
       $bashing_list[] = $fleet_row['fleet_start_time'];
@@ -185,12 +185,12 @@ 
   }
 
   // Check for joining to ACS - if there are already fleets in ACS no checks should be done
-  if($mission == MT_AKS && $bashing_list["{$user['id']}_{$fleet_group}"]) {
+  if ($mission == MT_AKS && $bashing_list["{$user['id']}_{$fleet_group}"]) {
     return ATTACK_ALLOWED;
   }
 
   $query = doquery("SELECT bashing_time FROM {{bashing}} WHERE bashing_user_id = {$user['id']} AND bashing_planet_id = {$planet_dst['id']} AND bashing_time >= {$time_limit};");
-  while($bashing_row = db_fetch($query)) {
+  while ($bashing_row = db_fetch($query)) {
     $bashing_list[] = $bashing_row['bashing_time'];
   }
 
@@ -199,9 +199,9 @@ 
   $last_attack = 0;
   $wave = 0;
   $attack = 1;
-  foreach($bashing_list as &$bash_time) {
+  foreach ($bashing_list as &$bash_time) {
     $attack++;
-    if($bash_time - $last_attack > $config_bashing_interval || $attack > $config_bashing_attacks) {
+    if ($bash_time - $last_attack > $config_bashing_interval || $attack > $config_bashing_attacks) {
       $attack = 1;
       $wave++;
     }
@@ -212,21 +212,21 @@ 
   return ($wave > $config->fleet_bashing_waves ? $bashing_result : ATTACK_ALLOWED);
 }
 
-function flt_can_attack($planet_src, $planet_dst, $fleet = array(), $mission, $options = false){return sn_function_call('flt_can_attack', array($planet_src, $planet_dst, $fleet, $mission, $options, &$result));}
+function flt_can_attack($planet_src, $planet_dst, $fleet = array(), $mission, $options = false) {return sn_function_call('flt_can_attack', array($planet_src, $planet_dst, $fleet, $mission, $options, &$result)); }
 function sn_flt_can_attack($planet_src, $planet_dst, $fleet = array(), $mission, $options = false, &$result) {
   //TODO: try..catch
   global $config, $user;
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     return $result = ATTACK_OWN_VACATION;
   }
 
-  if(empty($fleet) || !is_array($fleet)) {
+  if (empty($fleet) || !is_array($fleet)) {
     return $result = ATTACK_NO_FLEET;
   }
 
   $sn_groups_mission = sn_get_groups('missions');
-  if(!isset($sn_groups_mission[$mission])) {
+  if (!isset($sn_groups_mission[$mission])) {
     return $result = ATTACK_MISSION_ABSENT;
   }
   $sn_data_mission = $sn_groups_mission[$mission];
@@ -245,32 +245,32 @@ 
   $resources = 0;
   $ship_ids = sn_get_groups('fleet');
   $resource_ids = sn_get_groups('resources_loot');
-  foreach($fleet as $ship_id => $ship_count) {
+  foreach ($fleet as $ship_id => $ship_count) {
     $is_ship = in_array($ship_id, $ship_ids);
     $is_resource = in_array($ship_id, $resource_ids);
-    if(!$is_ship && !$is_resource) {
+    if (!$is_ship && !$is_resource) {
       // TODO Спецобработчик для Капитана и модулей
 //      return ATTACK_WRONG_UNIT;
     }
 
-    if($ship_count < 0) {
+    if ($ship_count < 0) {
       return $result = $is_ship ? ATTACK_SHIP_COUNT_WRONG : ATTACK_RESOURCE_COUNT_WRONG;
     }
 
-    if($ship_count > mrc_get_level($user, $planet_src, $ship_id)) {
+    if ($ship_count > mrc_get_level($user, $planet_src, $ship_id)) {
       // TODO ATTACK_NO_MISSILE
       return $result = $is_ship ? ATTACK_NO_SHIPS : ATTACK_NO_RESOURCES;
     }
 
-    if($is_ship) {
+    if ($is_ship) {
       $single_ship_data = get_ship_data($ship_id, $user);
-      if($single_ship_data[P_SPEED] <= 0) {
+      if ($single_ship_data[P_SPEED] <= 0) {
         return $result = ATTACK_ZERO_SPEED;
       }
       $ships += $ship_count;
       $recyclers += in_array($ship_id, sn_get_groups('flt_recyclers')) ? $ship_count : 0;
       $spies += $ship_id == SHIP_SPY ? $ship_count : 0;
-    } elseif($is_resource) {
+    } elseif ($is_resource) {
       $resources += $ship_count;
     }
   }
@@ -281,7 +281,7 @@ 
   }
 */
 
-  if(isset($options['resources']) && $options['resources'] > 0 && !(isset($sn_data_mission['transport']) && $sn_data_mission['transport'])) {
+  if (isset($options['resources']) && $options['resources'] > 0 && !(isset($sn_data_mission['transport']) && $sn_data_mission['transport'])) {
     return $result = ATTACK_RESOURCE_FORBIDDEN;
   }
 
@@ -293,35 +293,35 @@ 
   */
 
   $speed = $options['fleet_speed_percent'];
-  if($speed && ($speed != intval($speed) || $speed < 1 || $speed > 10)) {
+  if ($speed && ($speed != intval($speed) || $speed < 1 || $speed > 10)) {
     return $result = ATTACK_WRONG_SPEED;
   }
 
   $travel_data = flt_travel_data($user, $planet_src, $planet_dst, $fleet, $options['fleet_speed_percent']);
 
 
-  if(mrc_get_level($user, $planet_src, RES_DEUTERIUM) < $fleet[RES_DEUTERIUM] + $travel_data['consumption']) {
+  if (mrc_get_level($user, $planet_src, RES_DEUTERIUM) < $fleet[RES_DEUTERIUM] + $travel_data['consumption']) {
     return $result = ATTACK_NO_FUEL;
   }
 
-  if($travel_data['consumption'] > $travel_data['capacity']) {
+  if ($travel_data['consumption'] > $travel_data['capacity']) {
     return $result = ATTACK_TOO_FAR;
   }
 
-  if($travel_data['hold'] < $resources) {
+  if ($travel_data['hold'] < $resources) {
     return $result = ATTACK_OVERLOADED;
   }
 
   $fleet_start_time = SN_TIME_NOW + $travel_data['duration'];
 
   $fleet_group = $options['fleet_group'];
-  if($fleet_group) {
-    if($mission != MT_AKS) {
+  if ($fleet_group) {
+    if ($mission != MT_AKS) {
       return $result = ATTACK_WRONG_MISSION;
     };
 
     $acs = doquery("SELECT * FROM {{aks}} WHERE id = '{$fleet_group}' LIMIT 1;", '', true);
-    if(!$acs['id']) {
+    if (!$acs['id']) {
       return $result = ATTACK_NO_ACS;
     }
 
@@ -329,70 +329,70 @@ 
       return $result = ATTACK_ACS_WRONG_TARGET;
     }
 
-    if ($fleet_start_time>$acs['ankunft']) {
+    if ($fleet_start_time > $acs['ankunft']) {
       return $result = ATTACK_ACS_TOO_LATE;
     }
   }
 
   $flying_fleets = $options['flying_fleets'];
-  if(!$flying_fleets) {
+  if (!$flying_fleets) {
 //    $flying_fleets = doquery("SELECT COUNT(fleet_id) AS `flying_fleets` FROM {{fleets}} WHERE `fleet_owner` = '{$user['id']}';", '', true);
 //    $flying_fleets = $flying_fleets['flying_fleets'];
     $flying_fleets = fleet_count_flying($user['id']);
   }
-  if(GetMaxFleets($user) <= $flying_fleets && $mission != MT_MISSILE) {
+  if (GetMaxFleets($user) <= $flying_fleets && $mission != MT_MISSILE) {
     return $result = ATTACK_NO_SLOTS;
   }
 
   // В одиночку шпионские зонды могут летать только в миссии Шпионаж, Передислокация и Транспорт
-  if($ships && $spies && $spies == $ships && !($mission == MT_SPY || $mission == MT_RELOCATE || $mission == MT_TRANSPORT)) {
+  if ($ships && $spies && $spies == $ships && !($mission == MT_SPY || $mission == MT_RELOCATE || $mission == MT_TRANSPORT)) {
     return $result = ATTACK_SPIES_LONLY;
   }
 
   // Checking for no planet
-  if(!$planet_dst['id_owner']) {
-    if($mission == MT_COLONIZE && !$fleet[SHIP_COLONIZER]) {
+  if (!$planet_dst['id_owner']) {
+    if ($mission == MT_COLONIZE && !$fleet[SHIP_COLONIZER]) {
       return $result = ATTACK_NO_COLONIZER;
     }
 
-    if($mission == MT_EXPLORE || $mission == MT_COLONIZE) {
+    if ($mission == MT_EXPLORE || $mission == MT_COLONIZE) {
       return $result = ATTACK_ALLOWED;
     }
     return $result = ATTACK_NO_TARGET;
   }
 
-  if($mission == MT_RECYCLE) {
-    if($planet_dst['debris_metal'] + $planet_dst['debris_crystal'] <= 0) {
+  if ($mission == MT_RECYCLE) {
+    if ($planet_dst['debris_metal'] + $planet_dst['debris_crystal'] <= 0) {
       return $result = ATTACK_NO_DEBRIS;
     }
-    if($recyclers <= 0) {
+    if ($recyclers <= 0) {
       return $result = ATTACK_NO_RECYCLERS;
     }
     return $result = ATTACK_ALLOWED;
   }
 
   // Got planet. Checking if it is ours
-  if($planet_dst['id_owner'] == $user['id']) {
-    if($mission == MT_TRANSPORT || $mission == MT_RELOCATE) {
+  if ($planet_dst['id_owner'] == $user['id']) {
+    if ($mission == MT_TRANSPORT || $mission == MT_RELOCATE) {
       return $result = ATTACK_ALLOWED;
     }
     return $planet_src['id'] == $planet_dst['id'] ? ATTACK_SAME : ATTACK_OWN;
   }
 
   // No, planet not ours. Cutting mission that can't be send to not-ours planet
-  if($mission == MT_RELOCATE || $mission == MT_COLONIZE || $mission == MT_EXPLORE) {
+  if ($mission == MT_RELOCATE || $mission == MT_COLONIZE || $mission == MT_EXPLORE) {
     return $result = ATTACK_WRONG_MISSION;
   }
 
   $enemy = db_user_by_id($planet_dst['id_owner']);
   // We cannot attack or send resource to users in VACATION mode
-  if($enemy['vacation'] && $mission != MT_RECYCLE) {
+  if ($enemy['vacation'] && $mission != MT_RECYCLE) {
     return $result = ATTACK_VACATION;
   }
 
   // Multi IP protection
   // TODO: Here we need a procedure to check proxies
-  if(sys_is_multiaccount($user, $enemy)) {
+  if (sys_is_multiaccount($user, $enemy)) {
     return $result = ATTACK_SAME_IP;
   }
 
@@ -400,8 +400,8 @@ 
   $enemy_points = $enemy['total_points'];
 
   // Is it transport? If yes - checking for buffing to prevent mega-alliance destroyer
-  if($mission == MT_TRANSPORT) {
-    if($user_points >= $enemy_points || $config->allow_buffing) {
+  if ($mission == MT_TRANSPORT) {
+    if ($user_points >= $enemy_points || $config->allow_buffing) {
       return $result = ATTACK_ALLOWED;
     } else {
       return $result = ATTACK_BUFFING;
@@ -411,65 +411,65 @@ 
   // Only aggresive missions passed to this point. HOLD counts as passive but aggresive
 
   // Is it admin with planet protection?
-  if($planet_dst['id_level'] > $user['authlevel']) {
+  if ($planet_dst['id_level'] > $user['authlevel']) {
     return $result = ATTACK_ADMIN;
   }
 
   // Okay. Now skipping protection checks for inactive longer then 1 week
-  if(!$enemy['onlinetime'] || $enemy['onlinetime'] >= (SN_TIME_NOW - 60*60*24*7)) {
-    if(
+  if (!$enemy['onlinetime'] || $enemy['onlinetime'] >= (SN_TIME_NOW - 60 * 60 * 24 * 7)) {
+    if (
       ($enemy_points <= $config->game_noob_points && $user_points > $config->game_noob_points)
       ||
       ($config->game_noob_factor && $user_points > $enemy_points * $config->game_noob_factor)
     ) {
-      if($mission != MT_HOLD) {
+      if ($mission != MT_HOLD) {
         return $result = ATTACK_NOOB;
       }
-      if($mission == MT_HOLD && !($user['ally_id'] && $user['ally_id'] == $enemy['ally_id'] && $config->ally_help_weak)) {
+      if ($mission == MT_HOLD && !($user['ally_id'] && $user['ally_id'] == $enemy['ally_id'] && $config->ally_help_weak)) {
         return $result = ATTACK_NOOB;
       }
     }
   }
 
   // Is it HOLD mission? If yes - there should be ally deposit
-  if($mission == MT_HOLD) {
-    if(mrc_get_level($user, $planet_dst, STRUC_ALLY_DEPOSIT)) {
+  if ($mission == MT_HOLD) {
+    if (mrc_get_level($user, $planet_dst, STRUC_ALLY_DEPOSIT)) {
       return $result = ATTACK_ALLOWED;
     }
     return $result = ATTACK_NO_ALLY_DEPOSIT;
   }
 
-  if($mission == MT_SPY) {
+  if ($mission == MT_SPY) {
     return $result = $spies >= 1 ? ATTACK_ALLOWED : ATTACK_NO_SPIES;
   }
 
   // Is it MISSILE mission?
-  if($mission == MT_MISSILE) {
+  if ($mission == MT_MISSILE) {
     $sn_data_mip = get_unit_param(UNIT_DEF_MISSILE_INTERPLANET);
-    if(mrc_get_level($user, $planet_src, STRUC_SILO) < $sn_data_mip[P_REQUIRE][STRUC_SILO]) {
+    if (mrc_get_level($user, $planet_src, STRUC_SILO) < $sn_data_mip[P_REQUIRE][STRUC_SILO]) {
       return $result = ATTACK_NO_SILO;
     }
 
-    if(!$fleet[UNIT_DEF_MISSILE_INTERPLANET]) {
+    if (!$fleet[UNIT_DEF_MISSILE_INTERPLANET]) {
       return $result = ATTACK_NO_MISSILE;
     }
 
     $distance = abs($planet_dst['system'] - $planet_src['system']);
     $mip_range = flt_get_missile_range($user);
-    if($distance > $mip_range || $planet_dst['galaxy'] != $planet_src['galaxy']) {
+    if ($distance > $mip_range || $planet_dst['galaxy'] != $planet_src['galaxy']) {
       return $result = ATTACK_MISSILE_TOO_FAR;
     }
 
-    if(isset($options['target_structure']) && $options['target_structure'] && !in_array($options['target_structure'], sn_get_groups('defense_active'))) {
+    if (isset($options['target_structure']) && $options['target_structure'] && !in_array($options['target_structure'], sn_get_groups('defense_active'))) {
       return $result = ATTACK_WRONG_STRUCTURE;
     }
   }
 
-  if($mission == MT_DESTROY && $planet_dst['planet_type'] != PT_MOON) {
+  if ($mission == MT_DESTROY && $planet_dst['planet_type'] != PT_MOON) {
     return $result = ATTACK_WRONG_MISSION;
   }
 
-  if($mission == MT_ATTACK || $mission == MT_AKS || $mission == MT_DESTROY) {
+  if ($mission == MT_ATTACK || $mission == MT_AKS || $mission == MT_DESTROY) {
     return $result = flt_bashing_check($user, $enemy, $planet_dst, $mission, $travel_data['duration'], $fleet_group);
   }
 
@@ -495,18 +495,18 @@ 
   $from = $from['planet'];
 
   $can_attack = flt_can_attack($from, $to, $fleet, $mission, $options);
-  if($can_attack != ATTACK_ALLOWED) {
+  if ($can_attack != ATTACK_ALLOWED) {
     $internal_transaction ? sn_db_transaction_rollback() : false;
     return $can_attack;
   }
 
   $fleet_group = isset($options['fleet_group']) ? floatval($options['fleet_group']) : 0;
 
-  $travel_data  = flt_travel_data($user, $from, $to, $fleet, $options['fleet_speed_percent']);
+  $travel_data = flt_travel_data($user, $from, $to, $fleet, $options['fleet_speed_percent']);
 
   $fleet_start_time = SN_TIME_NOW + $travel_data['duration'];
 
-  if($mission == MT_EXPLORE || $mission == MT_HOLD) {
+  if ($mission == MT_EXPLORE || $mission == MT_HOLD) {
     $stay_duration = $options['stay_time'] * 3600;
     $stay_time     = $fleet_start_time + $stay_duration;
   } else {
@@ -519,20 +519,20 @@ 
   $fleet_string      = '';
   $db_changeset = array();
   $planet_fields = array();
-  foreach($fleet as $unit_id => $amount)
+  foreach ($fleet as $unit_id => $amount)
   {
-    if(!$amount || !$unit_id)
+    if (!$amount || !$unit_id)
     {
       continue;
     }
 
-    if(in_array($unit_id, sn_get_groups('fleet')))
+    if (in_array($unit_id, sn_get_groups('fleet')))
     {
       $fleet_ship_count += $amount;
       $fleet_string     .= "{$unit_id},{$amount};";
       $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, -$amount, $user, $from['id']);
     }
-    elseif(in_array($unit_id, sn_get_groups('resources_loot')))
+    elseif (in_array($unit_id, sn_get_groups('resources_loot')))
     {
       $planet_fields[pname_resource_name($unit_id)]['delta'] -= $amount;
     }
@@ -640,7 +640,7 @@ 
 
   $ship_data = array();
   $fleet_array = array();
-  foreach($ship_list as $transport_id => $cork)
+  foreach ($ship_list as $transport_id => $cork)
   {
     $ship_data[$transport_id] = flt_travel_data($user, $from, $to, array($transport_id => 1), 10);
   }
@@ -649,10 +649,10 @@ 
   $fleet_hold = 0;
   $fleet_capacity = 0;
   $fuel_total = $fuel_left = mrc_get_level($user, $from, RES_DEUTERIUM);
-  foreach($ship_data as $transport_id => &$ship_info)
+  foreach ($ship_data as $transport_id => &$ship_info)
   {
     $ship_loaded = min($ship_list[$transport_id], ceil($resource_amount / $ship_info['hold']), floor($fuel_left / $ship_info['consumption']));
-    if($ship_loaded)
+    if ($ship_loaded)
     {
       $fleet_array[$transport_id] = $ship_loaded;
       $resource_amount -= min($resource_amount, $ship_info['hold'] * $ship_loaded);

Braces +9 added lines, -18 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function flt_fleet_speed($user, $fleet)
-{
+function flt_fleet_speed($user, $fleet) {
   if (!is_array($fleet))
   {
     $fleet = array($fleet => 1);
@@ -29,16 +28,13 @@ 
   if($from['galaxy'] != $to['galaxy'])
   {
     $distance = abs($from['galaxy'] - $to['galaxy']) * $config->uni_galaxy_distance;
-  }
-  elseif($from['system'] != $to['system'])
+  } elseif($from['system'] != $to['system'])
   {
     $distance = abs($from['system'] - $to['system']) * 5 * 19 + 2700;
-  }
-  elseif($from['planet'] != $to['planet'])
+  } elseif($from['planet'] != $to['planet'])
   {
     $distance = abs($from['planet'] - $to['planet']) * 5 + 1000;
-  }
-  else
+  } else
   {
     $distance = 5;
   }
@@ -55,8 +51,7 @@ 
  *
  * @return array
  */
-function flt_travel_data($user_row, $from, $to, $fleet_array, $speed_percent = 10)
-{
+function flt_travel_data($user_row, $from, $to, $fleet_array, $speed_percent = 10) {
   $distance = flt_travel_distance($from, $to);
 
   $consumption = 0;
@@ -120,8 +115,7 @@ 
   );
 }
 
-function flt_bashing_check($user, $enemy, $planet_dst, $mission, $flight_duration, $fleet_group = 0)
-{
+function flt_bashing_check($user, $enemy, $planet_dst, $mission, $flight_duration, $fleet_group = 0) {
   global $config;
 
   $config_bashing_attacks = $config->fleet_bashing_attacks;
@@ -531,8 +525,7 @@ 
       $fleet_ship_count += $amount;
       $fleet_string     .= "{$unit_id},{$amount};";
       $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, -$amount, $user, $from['id']);
-    }
-    elseif(in_array($unit_id, sn_get_groups('resources_loot')))
+    } elseif(in_array($unit_id, sn_get_groups('resources_loot')))
     {
       $planet_fields[pname_resource_name($unit_id)]['delta'] -= $amount;
     }
@@ -624,8 +617,7 @@ 
 //ini_set('error_reporting', E_ALL ^ E_NOTICE);
 }
 
-function flt_calculate_ship_to_transport_sort($a, $b)
-{
+function flt_calculate_ship_to_transport_sort($a, $b) {
   return $a['transport_effectivness'] == $b['transport_effectivness'] ? 0 : ($a['transport_effectivness'] > $b['transport_effectivness'] ? -1 : 1);
 }
 
@@ -634,8 +626,7 @@ 
 // $resource_amount - how much amount of resources need to be transported
 // $from - transport from
 // $to - transport to
-function flt_calculate_fleet_to_transport($ship_list, $resource_amount, $from, $to)
-{
+function flt_calculate_fleet_to_transport($ship_list, $resource_amount, $from, $to) {
   global $user;
 
   $ship_data = array();

includes/includes/flt_mission_spy.php

Doc Comments +3 added lines

@@ -29,6 +29,9 @@
   }
 }
 
+/**
+ * @param string $group_name
+ */
 function flt_spy_scan($target_planet, $group_name, $section_title, $target_user = array())
 {
   global $lang;

Spacing +14 added lines, -14 removed lines

@@ -12,9 +12,9 @@ 
 // ----------------------------------------------------------------------------------------------------------------
 function coe_compress_add_units($unit_group, $target_planet, &$compress_data, $target_user = array())
 {
-  foreach($unit_group as $unit_id)
+  foreach ($unit_group as $unit_id)
   {
-    if(($unit_count = mrc_get_level($target_user, $target_planet, $unit_id, false, true)) > 0)
+    if (($unit_count = mrc_get_level($target_user, $target_planet, $unit_id, false, true)) > 0)
     {
       $compress_data[$unit_id] = $unit_count;
     }
@@ -34,9 +34,9 @@ 
   global $lang;
 
   $result = "<tr><td class=\"c\" colspan=\"4\">{$section_title}</td></tr>";
-  foreach(sn_get_groups($group_name) as $unit_id)
+  foreach (sn_get_groups($group_name) as $unit_id)
   {
-    if(($unit_amount = mrc_get_level($target_user, $target_planet, $unit_id, false, true)) > 0)
+    if (($unit_amount = mrc_get_level($target_user, $target_planet, $unit_id, false, true)) > 0)
     {
       $result .= "<tr><td align=\"left\" colspan=\"3\">{$lang['tech'][$unit_id]}</td><td align=\"right\">{$unit_amount}</td></tr>";
     }
@@ -63,7 +63,7 @@ 
   $spying_user_row   = &$mission_data['src_user'];
   $spying_planet_row = &$mission_data['src_planet'];
 
-  if(!isset($target_user_row['id']) || !isset($target_planet_row['id']) || !isset($spying_user_row['id']))
+  if (!isset($target_user_row['id']) || !isset($target_planet_row['id']) || !isset($spying_user_row['id']))
   {
 //    doquery("UPDATE {{fleets}} SET `fleet_mess` = 1 WHERE `fleet_id` = {$fleet_row['fleet_id']} LIMIT 1;");
     fleet_send_back($fleet_row);
@@ -71,14 +71,14 @@ 
   }
 
   $fleet_array = sys_unit_str2arr($fleet_row['fleet_array']);
-  if($fleet_array[SHIP_SPY] > 0)
+  if ($fleet_array[SHIP_SPY] > 0)
   {
     $TargetSpyLvl      = GetSpyLevel($target_user_row);
     $CurrentSpyLvl     = GetSpyLevel($spying_user_row);
     $spy_diff_empire = $CurrentSpyLvl - $TargetSpyLvl;
 
     $spy_probes = $fleet_array[SHIP_SPY];
-    $spy_diff   = $spy_diff_empire + sqrt($spy_probes) - 1 ;
+    $spy_diff   = $spy_diff_empire + sqrt($spy_probes) - 1;
 
     $combat_pack[0] = array(
       RES_METAL => $target_planet_row['metal'],
@@ -94,7 +94,7 @@ 
     $spy_message .= "<td width=220>{$lang['sys_metal']}</td><td width=220 align=right>" . pretty_number($target_planet_row['metal']) . "</td>";
     $spy_message .= "<td width=220>{$lang['sys_crystal']}</td></td><td width=220 align=right>" . pretty_number($target_planet_row['crystal']) . "</td>";
     $spy_message .= "</tr><tr>";
-    $spy_message .= "<td width=220>{$lang['sys_deuterium']}</td><td width=220 align=right>" . pretty_number($target_planet_row['deuterium'])  . "</td>";
+    $spy_message .= "<td width=220>{$lang['sys_deuterium']}</td><td width=220 align=right>" . pretty_number($target_planet_row['deuterium']) . "</td>";
     $spy_message .= "<td width=220>{$lang['sys_energy']}</td><td width=220 align=right>" . pretty_number($target_planet_row['energy_max']) . "</td>";
     $spy_message .= "</tr>";
     if ($spy_diff >= 2)
@@ -111,7 +111,7 @@ 
       $spy_message .= "<div class='spy_long'>" . flt_spy_scan($target_planet_row, 'structures', $lang['tech'][UNIT_STRUCTURES], $target_user_row) . "</div>";
     }
 
-    if($spy_diff_empire >= 0)
+    if ($spy_diff_empire >= 0)
     {
       $spy_message .= "<div class='spy_long'>" . flt_spy_scan($target_planet_row, 'tech', $lang['tech'][UNIT_TECHNOLOGIES], $target_user_row) . "</div>";
       coe_compress_add_units(array(TECH_WEAPON, TECH_SHIELD, TECH_ARMOR), $target_planet_row, $combat_pack[0], $target_user_row);
@@ -121,14 +121,14 @@ 
     $simulator_link = sn_ube_simulator_encode_replay($combat_pack, 'D');
 
     $target_unit_list = 0;
-    foreach(sn_get_groups('fleet') as $unit_id)
+    foreach (sn_get_groups('fleet') as $unit_id)
     {
       $target_unit_list += max(0, mrc_get_level($target_user_row, $target_planet_row, $unit_id, false, true));
     }
 
     $spy_detected = $spy_probes * $target_unit_list / 4 * pow(2, $TargetSpyLvl - $CurrentSpyLvl);
 
-    if(mt_rand(0, 99) > $spy_detected)
+    if (mt_rand(0, 99) > $spy_detected)
     {
       $spy_outcome_str = sprintf($lang['sys_mess_spy_detect_chance'], $spy_detected);
       $spy_detected = false;
@@ -153,7 +153,7 @@ 
 
     $target_user_id = $fleet_row['fleet_target_owner'];
 
-    if($spy_detected)
+    if ($spy_detected)
     {
 //      doquery("DELETE FROM {{fleets}} WHERE `fleet_id` = '{$fleet_row['fleet_id']}' LIMIT 1;");
       db_fleet_delete($fleet_row['fleet_id']);
@@ -163,7 +163,7 @@ 
       $spy_cost = get_unit_param(SHIP_SPY, P_COST);
 
       DBStaticPlanet::db_planet_set_by_id($debris_planet_id,
-        "`debris_metal` = `debris_metal` + ". floor($spy_probes * $spy_cost[RES_METAL] * 0.3) .", `debris_crystal` = `debris_crystal` + ". floor($spy_probes * $spy_cost[RES_CRYSTAL] * 0.3));
+        "`debris_metal` = `debris_metal` + " . floor($spy_probes * $spy_cost[RES_METAL] * 0.3) . ", `debris_crystal` = `debris_crystal` + " . floor($spy_probes * $spy_cost[RES_CRYSTAL] * 0.3));
 
       $target_message .= "<br />{$lang['sys_mess_spy_destroyed_enemy']}";
 
@@ -176,7 +176,7 @@ 
     msg_send_simple_message($target_user_id, '', $fleet_row['fleet_start_time'], MSG_TYPE_SPY, $lang['sys_mess_spy_control'], $lang['sys_mess_spy_activity'], $target_message);
   }
 
-  if(!$spy_detected)
+  if (!$spy_detected)
   {
 //    doquery("UPDATE {{fleets}} SET `fleet_mess` = '1' WHERE `fleet_id` = '{$fleet_row['fleet_id']}' LIMIT 1;");
     fleet_send_back($fleet_row);

Braces +5 added lines, -10 removed lines

@@ -10,8 +10,7 @@ 
  * @copyright 2008
  */
 // ----------------------------------------------------------------------------------------------------------------
-function coe_compress_add_units($unit_group, $target_planet, &$compress_data, $target_user = array())
-{
+function coe_compress_add_units($unit_group, $target_planet, &$compress_data, $target_user = array()) {
   foreach($unit_group as $unit_id)
   {
     if(($unit_count = mrc_get_level($target_user, $target_planet, $unit_id, false, true)) > 0)
@@ -29,8 +28,7 @@ 
   }
 }
 
-function flt_spy_scan($target_planet, $group_name, $section_title, $target_user = array())
-{
+function flt_spy_scan($target_planet, $group_name, $section_title, $target_user = array()) {
   global $lang;
 
   $result = "<tr><td class=\"c\" colspan=\"4\">{$section_title}</td></tr>";
@@ -53,8 +51,7 @@ 
   return $result;
 }
 
-function flt_mission_spy(&$mission_data)
-{
+function flt_mission_spy(&$mission_data) {
   global $lang;
 
   $fleet_row         = &$mission_data['fleet'];
@@ -132,8 +129,7 @@ 
     {
       $spy_outcome_str = sprintf($lang['sys_mess_spy_detect_chance'], $spy_detected);
       $spy_detected = false;
-    }
-    else
+    } else
     {
       $spy_outcome_str = $lang['sys_mess_spy_destroyed'];
       $spy_detected = true;
@@ -168,8 +164,7 @@ 
       $target_message .= "<br />{$lang['sys_mess_spy_destroyed_enemy']}";
 
       $result = CACHE_FLEET | CACHE_PLANET_DST;
-    }
-    else
+    } else
     {
       $result = CACHE_FLEET;
     }

includes/includes/mrc_mercenary.php

Doc Comments +4 added lines

@@ -26,6 +26,10 @@
   return true;
 }
 
+/**
+ * @param integer $mode
+ * @param integer $mercenary_id
+ */
 function mrc_mercenary_hire($mode, $user, $mercenary_id) {
   global $config, $lang, $sn_powerup_buy_discounts;
 

Indentation +2 added lines, -2 removed lines

@@ -62,8 +62,8 @@
     if($mercenary_level) {
       $darkmater_cost = eco_get_total_cost($mercenary_id, $mercenary_level);
       if(!$config->empire_mercenary_temporary && $mercenary_level_old) {
-       $darkmater_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level_old);
-       $darkmater_cost[BUILD_CREATE][RES_DARK_MATTER] -= $darkmater_cost_old[BUILD_CREATE][RES_DARK_MATTER];
+        $darkmater_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level_old);
+        $darkmater_cost[BUILD_CREATE][RES_DARK_MATTER] -= $darkmater_cost_old[BUILD_CREATE][RES_DARK_MATTER];
       }
       $darkmater_cost = ceil($darkmater_cost[BUILD_CREATE][RES_DARK_MATTER] * $mercenary_period * $sn_powerup_buy_discounts[$mercenary_period] / $config->empire_mercenary_base_period);
     } else {

Spacing +24 added lines, -24 removed lines

@@ -7,16 +7,16 @@ 
   global $config;
 
   $mercenary_info = get_unit_param($mercenary_id);
-  if($config->empire_mercenary_temporary || $mercenary_info[P_UNIT_TYPE] == UNIT_PLANS)
+  if ($config->empire_mercenary_temporary || $mercenary_info[P_UNIT_TYPE] == UNIT_PLANS)
   {
     return true;
   }
 
-  if(isset($mercenary_info[P_REQUIRE]))
+  if (isset($mercenary_info[P_REQUIRE]))
   {
-    foreach($mercenary_info[P_REQUIRE] as $unit_id => $unit_level)
+    foreach ($mercenary_info[P_REQUIRE] as $unit_id => $unit_level)
     {
-      if(mrc_get_level($user, null, $unit_id) < $unit_level)
+      if (mrc_get_level($user, null, $unit_id) < $unit_level)
       {
         return false;
       }
@@ -33,35 +33,35 @@ 
     $is_permanent = $mode == UNIT_PLANS || !$config->empire_mercenary_temporary;
     $cost_alliance_multiplyer = (SN_IN_ALLY === true && $mode == UNIT_PLANS ? $config->ali_bonus_members : 1);
     $cost_alliance_multiplyer = $cost_alliance_multiplyer >= 1 ? $cost_alliance_multiplyer : 1;
-    if(!in_array($mercenary_id, sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries'))) {
+    if (!in_array($mercenary_id, sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries'))) {
       throw new Exception($lang['mrc_msg_error_wrong_mercenary'], ERR_ERROR);
     }
 
-    if(!mrc_officer_accessible($user, $mercenary_id)) {
+    if (!mrc_officer_accessible($user, $mercenary_id)) {
       throw new Exception($lang['mrc_msg_error_requirements'], ERR_ERROR);
     }
 
     $mercenary_level = sys_get_param_int('mercenary_level');
-    if($mercenary_level < 0 || $mercenary_level > get_unit_param($mercenary_id, P_MAX_STACK)) {
+    if ($mercenary_level < 0 || $mercenary_level > get_unit_param($mercenary_id, P_MAX_STACK)) {
       throw new Exception($lang['mrc_msg_error_wrong_level'], ERR_ERROR);
     }
 
-    if($mercenary_level && !array_key_exists($mercenary_period = sys_get_param_int('mercenary_period'), $sn_powerup_buy_discounts)) {
+    if ($mercenary_level && !array_key_exists($mercenary_period = sys_get_param_int('mercenary_period'), $sn_powerup_buy_discounts)) {
       throw new Exception($lang['mrc_msg_error_wrong_period'], ERR_ERROR);
     }
 
     sn_db_transaction_start();
 
     $mercenary_level_old = mrc_get_level($user, $planetrow, $mercenary_id, true, true);
-    if($config->empire_mercenary_temporary && $mercenary_level_old && $mercenary_level) {
+    if ($config->empire_mercenary_temporary && $mercenary_level_old && $mercenary_level) {
       throw new Exception($lang['mrc_msg_error_already_hired'], ERR_ERROR); // Can't hire already hired temp mercenary - dismiss first
-    } elseif($config->empire_mercenary_temporary && !$mercenary_level_old && !$mercenary_level) {
+    } elseif ($config->empire_mercenary_temporary && !$mercenary_level_old && !$mercenary_level) {
       throw new Exception('', ERR_NONE); // Can't dismiss (!$mercenary_level) not hired (!$mercenary_level_old) temp mercenary. But no error
     }
 
-    if($mercenary_level) {
+    if ($mercenary_level) {
       $darkmater_cost = eco_get_total_cost($mercenary_id, $mercenary_level);
-      if(!$config->empire_mercenary_temporary && $mercenary_level_old) {
+      if (!$config->empire_mercenary_temporary && $mercenary_level_old) {
        $darkmater_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level_old);
        $darkmater_cost[BUILD_CREATE][RES_DARK_MATTER] -= $darkmater_cost_old[BUILD_CREATE][RES_DARK_MATTER];
       }
@@ -71,13 +71,13 @@ 
     }
     $darkmater_cost *= $cost_alliance_multiplyer;
 
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < $darkmater_cost) {
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < $darkmater_cost) {
       throw new Exception($lang['mrc_msg_error_no_resource'], ERR_ERROR);
     }
 
-    if(($darkmater_cost && $mercenary_level) || !$is_permanent) {
+    if (($darkmater_cost && $mercenary_level) || !$is_permanent) {
       $unit_row = DBStaticUnit::db_unit_by_location($user['id'], LOC_USER, $user['id'], $mercenary_id);
-      if(is_array($unit_row) && ($dismiss_left_days = floor((strtotime($unit_row['unit_time_finish']) - SN_TIME_NOW) / PERIOD_DAY))) {
+      if (is_array($unit_row) && ($dismiss_left_days = floor((strtotime($unit_row['unit_time_finish']) - SN_TIME_NOW) / PERIOD_DAY))) {
         $dismiss_full_cost = eco_get_total_cost($mercenary_id, $unit_row['unit_level']);
         $dismiss_full_cost = $dismiss_full_cost[BUILD_CREATE][RES_DARK_MATTER];
 
@@ -95,7 +95,7 @@ 
       DBStaticUnit::db_unit_list_delete($user['id'], LOC_USER, $user['id'], $mercenary_id);
     }
 
-    if($darkmater_cost && $mercenary_level) {
+    if ($darkmater_cost && $mercenary_level) {
       DBStaticUnit::db_unit_set_insert(
         "unit_player_id = {$user['id']},
         unit_location_type = " . LOC_USER . ",
@@ -130,7 +130,7 @@ 
   $mode = in_array($mode, array(UNIT_MERCENARIES, UNIT_PLANS)) ? $mode : UNIT_MERCENARIES;
   $is_permanent = $mode == UNIT_PLANS || !$config->empire_mercenary_temporary;
 
-  if($mercenary_id = sys_get_param_int('mercenary_id'))
+  if ($mercenary_id = sys_get_param_int('mercenary_id'))
   {
     $operation_result = mrc_mercenary_hire($mode, $user, $mercenary_id);
   }
@@ -139,12 +139,12 @@ 
 
   $template = gettemplate('mrc_mercenary_hire', true);
 
-  if(!empty($operation_result))
+  if (!empty($operation_result))
   {
     $template->assign_block_vars('result', $operation_result);
   }
 
-  foreach($sn_powerup_buy_discounts as $hire_period => $hire_discount)
+  foreach ($sn_powerup_buy_discounts as $hire_period => $hire_discount)
   {
     $template->assign_block_vars('period', array(
       'LENGTH'   => $hire_period,
@@ -157,13 +157,13 @@ 
   $user_dark_matter = mrc_get_level($user, '', RES_DARK_MATTER);
   $cost_alliance_multiplyer = (SN_IN_ALLY === true && $mode == UNIT_PLANS ? $config->ali_bonus_members : 1);
   $cost_alliance_multiplyer = $cost_alliance_multiplyer >= 1 ? $cost_alliance_multiplyer : 1;
-  foreach(sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries') as $mercenary_id)
+  foreach (sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries') as $mercenary_id)
   {
     {
       $mercenary = get_unit_param($mercenary_id);
       $mercenary_bonus = $mercenary['bonus'];
       $mercenary_bonus = $mercenary_bonus >= 0 ? "+{$mercenary_bonus}" : "{$mercenary_bonus}";
-      switch($mercenary['bonus_type'])
+      switch ($mercenary['bonus_type'])
       {
         case BONUS_PERCENT:
           $mercenary_bonus = "{$mercenary_bonus}% ";
@@ -181,7 +181,7 @@ 
       $mercenary_level = mrc_get_level($user, null, $mercenary_id, false, true);
       $mercenary_level_bonus = max(0, mrc_get_level($user, null, $mercenary_id) - $mercenary_level);
       $total_cost_old = 0;
-      if($is_permanent)
+      if ($is_permanent)
       {
         $total_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level);
         $total_cost_old = $total_cost_old[BUILD_CREATE][RES_DARK_MATTER] * $cost_alliance_multiplyer;
@@ -205,13 +205,13 @@ 
         'BONUS_TYPE'  => $mercenary['bonus_type'],
         'HIRE_END'    => $mercenary_time_finish && $mercenary_time_finish >= SN_TIME_NOW ? date(FMT_DATE_TIME, $mercenary_time_finish) : '',
         'HIRE_LEFT_PERCENT'    => $mercenary_time_finish && $mercenary_time_finish >= SN_TIME_NOW
-          ? round(($mercenary_time_finish - SN_TIME_NOW)/($mercenary_time_finish - $mercenary_time_start) * 100, 1)
+          ? round(($mercenary_time_finish - SN_TIME_NOW) / ($mercenary_time_finish - $mercenary_time_start) * 100, 1)
           : 0,
         'CAN_BUY'     => mrc_officer_accessible($user, $mercenary_id),
       ));
 
       $upgrade_cost = 1;
-      for($i = $config->empire_mercenary_temporary ? 1 : $mercenary_level + 1; $mercenary['max'] ? ($i <= $mercenary['max']) : $upgrade_cost <= $user_dark_matter; $i++)
+      for ($i = $config->empire_mercenary_temporary ? 1 : $mercenary_level + 1; $mercenary['max'] ? ($i <= $mercenary['max']) : $upgrade_cost <= $user_dark_matter; $i++)
       {
         $total_cost = eco_get_total_cost($mercenary_id, $i);
         $total_cost[BUILD_CREATE][RES_DARK_MATTER] *= $cost_alliance_multiplyer;

Braces +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 lng_include('mrc_mercenary');
 
-function mrc_officer_accessible(&$user, $mercenary_id)
-{
+function mrc_officer_accessible(&$user, $mercenary_id) {
   global $config;
 
   $mercenary_info = get_unit_param($mercenary_id);

includes/includes/ube_attack_calculate.php

Doc Comments +15 added lines

@@ -108,6 +108,9 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Заполняет данные по флоту
+/**
+ * @param boolean $is_attacker
+ */
 function ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker){return sn_function_call('ube_attack_prepare_fleet', array(&$combat_data, &$fleet, $is_attacker));}
 function sn_ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker)
 {
@@ -331,6 +334,9 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Вычисление дополнительной информации для расчета раунда
+/**
+ * @param integer $round
+ */
 function sn_ube_combat_round_prepare(&$combat_data, $round)
 {
   global $ube_combat_bonus_list;
@@ -393,6 +399,9 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рассчитывает результат столкновения флотов ака раунд
+/**
+ * @param integer $round
+ */
 function sn_ube_combat_round_crossfire_fleet(&$combat_data, $round)
 {
   if(BE_DEBUG === true)
@@ -510,6 +519,9 @@ 
   }
 }
 
+/**
+ * @param double $amplified_damage
+ */
 function sn_ube_combat_round_crossfire_unit_damage_current(&$defend_fleet_data, $defend_unit_id, &$amplified_damage, &$units_lost, &$units_boomed, &$combat_options)
 {
   $unit_is_lost = false;
@@ -632,6 +644,9 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Анализирует результаты раунда и генерирует данные для следующего раунда
+/**
+ * @param integer $round
+ */
 function sn_ube_combat_round_analyze(&$combat_data, $round)
 {
   $round_data = &$combat_data[UBE_ROUNDS][$round];

Spacing +128 added lines, -129 removed lines

@@ -51,7 +51,7 @@ 
 
 */
 
-if(BE_DEBUG === true)
+if (BE_DEBUG === true)
 {
   require_once('ube_zi_helpers.php');
 }
@@ -83,7 +83,7 @@ 
 {
   global $ube_convert_techs;
 
-  if(!isset($combat_data[UBE_PLAYERS][$player_id]))
+  if (!isset($combat_data[UBE_PLAYERS][$player_id]))
   {
     $combat_data[UBE_PLAYERS][$player_id] = array(UBE_ATTACKER => $is_attacker);
     $player_info = &$combat_data[UBE_PLAYERS][$player_id];
@@ -95,7 +95,7 @@ 
     $player_info[UBE_PLAYER_DATA] = $player_data;
 
     $admiral_bonus = mrc_get_level($player_data, false, MRC_ADMIRAL) * get_unit_param(MRC_ADMIRAL, P_BONUS_VALUE) / 100;
-    foreach($ube_convert_techs as $unit_id => $ube_id)
+    foreach ($ube_convert_techs as $unit_id => $ube_id)
     {
       $player_info[UBE_BONUSES][$ube_id] += mrc_get_level($player_data, false, $unit_id) * get_unit_param($unit_id, P_BONUS_VALUE) / 100 + $admiral_bonus;
     }
@@ -108,7 +108,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Заполняет данные по флоту
-function ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker){return sn_function_call('ube_attack_prepare_fleet', array(&$combat_data, &$fleet, $is_attacker));}
+function ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker) {return sn_function_call('ube_attack_prepare_fleet', array(&$combat_data, &$fleet, $is_attacker)); }
 function sn_ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker)
 {
   $fleet_owner_id = $fleet['fleet_owner'];
@@ -121,15 +121,15 @@ 
   $combat_data[UBE_FLEETS][$fleet_id][UBE_OWNER] = $fleet_owner_id;
   $fleet_info = &$combat_data[UBE_FLEETS][$fleet_id];
   $fleet_info[UBE_FLEET_GROUP] = $fleet['fleet_group'];
-  foreach($fleet_data as $unit_id => $unit_count)
+  foreach ($fleet_data as $unit_id => $unit_count)
   {
-    if(!$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)
     {
       $fleet_info[UBE_COUNT][$unit_id] = $unit_count;
     }
@@ -169,23 +169,23 @@ 
   $combat_data[UBE_FLEETS][0] = array(UBE_OWNER => $player_id);
   $fleet_info = &$combat_data[UBE_FLEETS][0];
 
-  foreach(sn_get_groups('combat') as $unit_id)
+  foreach (sn_get_groups('combat') as $unit_id)
   {
-    if($unit_count = mrc_get_level($player, $planet, $unit_id))
+    if ($unit_count = mrc_get_level($player, $planet, $unit_id))
     {
       $fleet_info[UBE_COUNT][$unit_id] = $unit_count;
     }
   }
 
-  foreach(sn_get_groups('resources_loot') as $resource_id)
+  foreach (sn_get_groups('resources_loot') as $resource_id)
   {
     $fleet_info[UBE_RESOURCES][$resource_id] = floor(mrc_get_level($player, $planet, $resource_id));
   }
 
-  if($fortifier_level = mrc_get_level($player, $planet, MRC_FORTIFIER))
+  if ($fortifier_level = mrc_get_level($player, $planet, MRC_FORTIFIER))
   {
     $fortifier_bonus = $fortifier_level * get_unit_param(MRC_FORTIFIER, P_BONUS_VALUE) / 100;
-    foreach($ube_combat_bonus_list as $ube_id)
+    foreach ($ube_combat_bonus_list as $ube_id)
     {
       $fleet_info[UBE_BONUSES][$ube_id] += $fortifier_bonus;
     }
@@ -201,7 +201,7 @@ 
     PLANET_SIZE   => $planet['diameter'],
   );
 
-  $combat_data[UBE_OPTIONS][UBE_DEFENDER_ACTIVE] = $player['onlinetime'] >= $combat_data[UBE_TIME] - 60*60*24*7;
+  $combat_data[UBE_OPTIONS][UBE_DEFENDER_ACTIVE] = $player['onlinetime'] >= $combat_data[UBE_TIME] - 60 * 60 * 24 * 7;
 }
 
 
@@ -241,12 +241,12 @@ 
 //    ube_attack_prepare_fleet($combat_data, $fleet, false);
 //  }
   $fleet_list_on_hold = fleet_list_on_hold($fleet_row['fleet_end_galaxy'], $fleet_row['fleet_end_system'], $fleet_row['fleet_end_planet'], $fleet_row['fleet_end_type'], $ube_time);
-  foreach($fleet_list_on_hold as $fleet) {
+  foreach ($fleet_list_on_hold as $fleet) {
     ube_attack_prepare_fleet($combat_data, $fleet, false);
   }
 
   // Готовим инфу по атакующим
-  if($fleet_row['fleet_group'])
+  if ($fleet_row['fleet_group'])
   {
 //    $fleets = doquery("SELECT * FROM {{fleets}} WHERE fleet_group = {$fleet_row['fleet_group']} FOR UPDATE");
 //    while($fleet = db_fetch($fleets))
@@ -254,7 +254,7 @@ 
 //      ube_attack_prepare_fleet($combat_data, $fleet, true);
 //    }
     $acs_fleet_list = fleet_list_by_group($fleet_row['fleet_group']);
-    foreach($acs_fleet_list as $fleet) {
+    foreach ($acs_fleet_list as $fleet) {
       ube_attack_prepare_fleet($combat_data, $fleet, true);
     }
   }
@@ -279,13 +279,13 @@ 
 
   // Готовим информацию для первого раунда - проводим все нужные вычисления из исходных данных
   $first_round_data = array();
-  foreach($combat_data[UBE_FLEETS] as $fleet_id => &$fleet_info)
+  foreach ($combat_data[UBE_FLEETS] as $fleet_id => &$fleet_info)
   {
     $fleet_info[UBE_COUNT] = is_array($fleet_info[UBE_COUNT]) ? $fleet_info[UBE_COUNT] : array();
     $player_data = &$combat_data[UBE_PLAYERS][$fleet_info[UBE_OWNER]];
     $fleet_info[UBE_FLEET_TYPE] = $player_data[UBE_ATTACKER] ? UBE_ATTACKERS : UBE_DEFENDERS;
 
-    foreach($ube_combat_bonus_list as $bonus_id => $bonus_value)
+    foreach ($ube_combat_bonus_list as $bonus_id => $bonus_value)
     {
       // Вычисляем бонус игрока
       $bonus_value = isset($player_data[UBE_BONUSES][$bonus_id]) ? $player_data[UBE_BONUSES][$bonus_id] : 0;
@@ -294,16 +294,16 @@ 
     }
 
     $first_round_data[$fleet_id][UBE_COUNT] = $fleet_info[UBE_PRICE] = array();
-    foreach($fleet_info[UBE_COUNT] as $unit_id => $unit_count)
+    foreach ($fleet_info[UBE_COUNT] as $unit_id => $unit_count)
     {
-      if($unit_count <= 0)
+      if ($unit_count <= 0)
       {
         continue;
       }
 
       $unit_info = get_unit_param($unit_id);
       // Заполняем информацию о кораблях в информации флота
-      foreach($ube_combat_bonus_list as $bonus_id => $bonus_value)
+      foreach ($ube_combat_bonus_list as $bonus_id => $bonus_value)
       {
         $fleet_info[$bonus_id][$unit_id] = floor($unit_info[$ube_convert_to_techs[$bonus_id]] * (1 + $fleet_info[UBE_BONUSES][$bonus_id]));
       }
@@ -346,16 +346,16 @@ 
   $is_simulator = $combat_data[UBE_OPTIONS][UBE_SIMULATOR];
 
   $round_data = &$combat_data[UBE_ROUNDS][$round];
-  foreach($round_data[UBE_FLEETS] as $fleet_id => &$fleet_data)
+  foreach ($round_data[UBE_FLEETS] as $fleet_id => &$fleet_data)
   {
     // Кэшируем переменные для легкого доступа к подмассивам
     $fleet_info = &$combat_data[UBE_FLEETS][$fleet_id];
     $fleet_data[UBE_FLEET_INFO] = &$fleet_info;
     $fleet_type = $fleet_info[UBE_FLEET_TYPE];
 
-    foreach($fleet_data[UBE_COUNT] as $unit_id => $unit_count)
+    foreach ($fleet_data[UBE_COUNT] as $unit_id => $unit_count)
     {
-      if($unit_count <= 0)
+      if ($unit_count <= 0)
       {
         continue;
       }
@@ -365,7 +365,7 @@ 
       // Для не-симулятора - рандомизируем каждый раунд значения атаки и щитов
       $fleet_data[UBE_ATTACK_BASE][$unit_id] = floor($fleet_info[UBE_ATTACK][$unit_id] * ($is_simulator ? 1 : mt_rand(80, 120) / 100));
       $fleet_data[UBE_SHIELD_BASE][$unit_id] = floor($fleet_info[UBE_SHIELD][$unit_id] * ($is_simulator ? 1 : mt_rand(80, 120) / 100));
-      $fleet_data[UBE_ARMOR_BASE][$unit_id]  = floor($fleet_info[UBE_ARMOR][$unit_id]);// * ($is_simulator ? 1 : mt_rand(80, 120) / 100));
+      $fleet_data[UBE_ARMOR_BASE][$unit_id]  = floor($fleet_info[UBE_ARMOR][$unit_id]); // * ($is_simulator ? 1 : mt_rand(80, 120) / 100));
 
       $fleet_data[UBE_ATTACK][$unit_id] = $fleet_data[UBE_ATTACK_BASE][$unit_id] * $unit_count;
       $fleet_data[UBE_SHIELD][$unit_id] = $fleet_data[UBE_SHIELD_BASE][$unit_id] * $unit_count;
@@ -375,24 +375,24 @@ 
     }
 
     // Суммируем данные по флоту
-    foreach($ube_combat_bonus_list as $bonus_id)
+    foreach ($ube_combat_bonus_list as $bonus_id)
     {
       $round_data[$fleet_type][$bonus_id][$fleet_id] += is_array($fleet_data[$bonus_id]) ? array_sum($fleet_data[$bonus_id]) : 0;
     }
   }
 
   // Суммируем данные по атакующим и защитникам
-  foreach($ube_combat_bonus_list as $bonus_id)
+  foreach ($ube_combat_bonus_list as $bonus_id)
   {
     $round_data[UBE_TOTAL][UBE_DEFENDERS][$bonus_id] = array_sum($round_data[UBE_DEFENDERS][$bonus_id]);
     $round_data[UBE_TOTAL][UBE_ATTACKERS][$bonus_id] = array_sum($round_data[UBE_ATTACKERS][$bonus_id]);
   }
 
   // Высчитываем долю атаки, приходящейся на юнит равную отношению брони юнита к общей броне - крупные цели атакуют чаще
-  foreach($round_data[UBE_FLEETS] as &$fleet_data)
+  foreach ($round_data[UBE_FLEETS] as &$fleet_data)
   {
     $fleet_type = $fleet_data[UBE_FLEET_INFO][UBE_FLEET_TYPE];
-    foreach($fleet_data[UBE_COUNT] as $unit_id => $unit_count)
+    foreach ($fleet_data[UBE_COUNT] as $unit_id => $unit_count)
     {
       $fleet_data[UBE_DAMAGE_PERCENT][$unit_id] = $fleet_data[UBE_ARMOR][$unit_id] / $round_data[UBE_TOTAL][$fleet_type][UBE_ARMOR];
     }
@@ -403,24 +403,24 @@ 
 // Рассчитывает результат столкновения флотов ака раунд
 function sn_ube_combat_round_crossfire_fleet(&$combat_data, $round)
 {
-  if(BE_DEBUG === true)
+  if (BE_DEBUG === true)
   {
     // sn_ube_combat_helper_round_header($round);
   }
 
   $round_data = &$combat_data[UBE_ROUNDS][$round];
   // Проводим бой. Сталкиваем каждый корабль атакующего с каждым кораблем атакуемого
-  foreach($round_data[UBE_ATTACKERS][UBE_ATTACK] as $attack_fleet_id => $temp)
+  foreach ($round_data[UBE_ATTACKERS][UBE_ATTACK] as $attack_fleet_id => $temp)
   {
     $attack_fleet_data = &$round_data[UBE_FLEETS][$attack_fleet_id];
-    foreach($round_data[UBE_DEFENDERS][UBE_ATTACK] as $defend_fleet_id => $temp2)
+    foreach ($round_data[UBE_DEFENDERS][UBE_ATTACK] as $defend_fleet_id => $temp2)
     {
       $defend_fleet_data = &$round_data[UBE_FLEETS][$defend_fleet_id];
 
-      foreach($attack_fleet_data[UBE_COUNT] as $attack_unit_id => $attack_unit_count)
+      foreach ($attack_fleet_data[UBE_COUNT] as $attack_unit_id => $attack_unit_count)
       {
         // if($attack_unit_count <= 0) continue; // TODO: Это пока нельзя включать - вот если будут "боевые порядки юнитов..."
-        foreach($defend_fleet_data[UBE_COUNT] as $defend_unit_id => $defend_unit_count)
+        foreach ($defend_fleet_data[UBE_COUNT] as $defend_unit_id => $defend_unit_count)
         {
           sn_ube_combat_round_crossfire_unit2($attack_fleet_data, $defend_fleet_data, $attack_unit_id, $defend_unit_id, $combat_data[UBE_OPTIONS]);
           sn_ube_combat_round_crossfire_unit2($defend_fleet_data, $attack_fleet_data, $defend_unit_id, $attack_unit_id, $combat_data[UBE_OPTIONS]);
@@ -429,7 +429,7 @@ 
     }
   }
 
-  if(BE_DEBUG === true)
+  if (BE_DEBUG === true)
   {
     // sn_ube_combat_helper_round_footer();
   }
@@ -477,7 +477,7 @@ 
   $boom = 0;
   $boom_limit = 75;
   $random = $combat_options[UBE_SIMULATOR] ? $boom_limit / 2 : mt_rand(0, 100);
-  if($armor_damage && $units_left > 0 && $last_unit_percent <= $boom_limit && $last_unit_percent <= $random)
+  if ($armor_damage && $units_left > 0 && $last_unit_percent <= $boom_limit && $last_unit_percent <= $random)
   {
     $boom = 1;
     $units_left--;
@@ -487,7 +487,7 @@ 
 
   $defend_fleet_data[UBE_COUNT][$defend_unit_id] = $units_left;
 
-  if(BE_DEBUG === true)
+  if (BE_DEBUG === true)
   {
     $debug_unit_crossfire_result = array(
       'attack_unit_id' => $attack_unit_id,
@@ -526,7 +526,7 @@ 
   $units_lost = $units_lost ? $units_lost : 0;
 
   $boom_limit = 75; // Взрываемся на 75% прочности
-  if($defend_fleet_data[UBE_COUNT][$defend_unit_id] > 0 && $amplified_damage)
+  if ($defend_fleet_data[UBE_COUNT][$defend_unit_id] > 0 && $amplified_damage)
   {
     // $defend_fleet_info = &$defend_fleet_data[UBE_FLEET_INFO];
 
@@ -539,18 +539,18 @@ 
     $defend_fleet_data[UBE_ARMOR_REST][$defend_unit_id] -= $damage_to_armor;
 
     // Если брони не осталось - юнит потерян
-    if($defend_fleet_data[UBE_ARMOR_REST][$defend_unit_id] <= 0)
+    if ($defend_fleet_data[UBE_ARMOR_REST][$defend_unit_id] <= 0)
     {
       $unit_is_lost = true;
     }
     // Если броня осталось, но не осталось щитов - прошел дамадж по броне и надо проверить - не взорвался ли корабль
-    elseif($defend_fleet_data[UBE_SHIELD_REST][$defend_unit_id] <= 0)
+    elseif ($defend_fleet_data[UBE_SHIELD_REST][$defend_unit_id] <= 0)
     {
       $last_unit_hp = $defend_fleet_data[UBE_ARMOR_REST][$defend_unit_id];
       $last_unit_percent = $last_unit_hp / $defend_fleet_data[UBE_ARMOR_BASE][$defend_unit_id] * 100;
 
       $random = $combat_options[UBE_SIMULATOR] ? $boom_limit / 2 : mt_rand(0, 100);
-      if($last_unit_percent <= $boom_limit && $last_unit_percent <= $random)
+      if ($last_unit_percent <= $boom_limit && $last_unit_percent <= $random)
       {
         $unit_is_lost = true;
         $units_boomed++;
@@ -563,11 +563,11 @@ 
     $defend_fleet_data[UBE_ARMOR][$defend_unit_id] -= $damage_to_armor;
     $defend_fleet_data[UBE_SHIELD][$defend_unit_id] -= $damage_to_shield;
 
-    if($unit_is_lost)
+    if ($unit_is_lost)
     {
       $units_lost++;
       $defend_fleet_data[UBE_COUNT][$defend_unit_id]--;
-      if($defend_fleet_data[UBE_COUNT][$defend_unit_id])
+      if ($defend_fleet_data[UBE_COUNT][$defend_unit_id])
       {
         $defend_fleet_data[UBE_ARMOR_REST][$defend_unit_id] = $defend_fleet_data[UBE_ARMOR_BASE][$defend_unit_id];
         $defend_fleet_data[UBE_SHIELD_REST][$defend_unit_id] = $defend_fleet_data[UBE_SHIELD_BASE][$defend_unit_id];
@@ -582,7 +582,7 @@ 
 // Рассчитывает результат столкновения двух юнитов ака ход
 function sn_ube_combat_round_crossfire_unit2(&$attack_fleet_data, &$defend_fleet_data, $attack_unit_id, $defend_unit_id, &$combat_options)
 {
-  if($defend_fleet_data[UBE_COUNT][$defend_unit_id] <= 0)
+  if ($defend_fleet_data[UBE_COUNT][$defend_unit_id] <= 0)
   {
     return;
   }
@@ -625,16 +625,16 @@ 
 
   $outcome = array();
   $next_round_fleet = array();
-  foreach($round_data[UBE_FLEETS] as $fleet_id => &$fleet_data)
+  foreach ($round_data[UBE_FLEETS] as $fleet_id => &$fleet_data)
   {
-    if(array_sum($fleet_data[UBE_COUNT]) <= 0)
+    if (array_sum($fleet_data[UBE_COUNT]) <= 0)
     {
       continue;
     }
 
-    foreach($fleet_data[UBE_COUNT] as $unit_id => $unit_count)
+    foreach ($fleet_data[UBE_COUNT] as $unit_id => $unit_count)
     {
-      if($unit_count <= 0)
+      if ($unit_count <= 0)
       {
         continue;
       }
@@ -646,17 +646,17 @@ 
   }
 
   // Проверяем - если кого-то не осталось или не осталось обоих - заканчиваем цикл
-  if(count($outcome) == 0 || $round == 10)
+  if (count($outcome) == 0 || $round == 10)
   {
     $round_data[UBE_OUTCOME] = UBE_COMBAT_RESULT_DRAW_END;
   }
-  elseif(count($outcome) == 1)
+  elseif (count($outcome) == 1)
   {
     $round_data[UBE_OUTCOME] = isset($outcome[UBE_ATTACKERS]) ? UBE_COMBAT_RESULT_WIN : UBE_COMBAT_RESULT_LOSS;
   }
-  elseif(count($outcome) == 2)
+  elseif (count($outcome) == 2)
   {
-    if($round < 10)
+    if ($round < 10)
     {
       $combat_data[UBE_ROUNDS][$round + 1][UBE_FLEETS] = $next_round_fleet;
     }
@@ -674,7 +674,7 @@ 
   $start = microtime(true);
   sn_ube_combat_prepare_first_round($combat_data);
 
-  for($round = 1; $round <= 10; $round++)
+  for ($round = 1; $round <= 10; $round++)
   {
     // Готовим данные для раунда
     sn_ube_combat_round_prepare($combat_data, $round);
@@ -683,7 +683,7 @@ 
     sn_ube_combat_round_crossfire_fleet($combat_data, $round);
 
     // Анализируем итоги текущего раунда и готовим данные для следующего
-    if(sn_ube_combat_round_analyze($combat_data, $round) != UBE_COMBAT_RESULT_DRAW)
+    if (sn_ube_combat_round_analyze($combat_data, $round) != UBE_COMBAT_RESULT_DRAW)
     {
       break;
     }
@@ -704,7 +704,7 @@ 
   $combat_data[UBE_OPTIONS][UBE_EXCHANGE] = array(RES_METAL => $config->rpg_exchange_metal);
 
   $exchange = &$combat_data[UBE_OPTIONS][UBE_EXCHANGE];
-  foreach(array(RES_CRYSTAL => 'rpg_exchange_crystal', RES_DEUTERIUM => 'rpg_exchange_deuterium', RES_DARK_MATTER => 'rpg_exchange_darkMatter') as $resource_id => $resource_name)
+  foreach (array(RES_CRYSTAL => 'rpg_exchange_crystal', RES_DEUTERIUM => 'rpg_exchange_deuterium', RES_DARK_MATTER => 'rpg_exchange_darkMatter') as $resource_id => $resource_name)
   {
     $exchange[$resource_id] = $config->$resource_name * $exchange[RES_METAL];
   }
@@ -718,7 +718,7 @@ 
   $outcome[UBE_DEBRIS] = array();
 
   // Генерируем результат боя
-  foreach($fleets_info as $fleet_id => &$fleet_info)
+  foreach ($fleets_info as $fleet_id => &$fleet_info)
   {
     $fleet_type = $fleet_info[UBE_FLEET_TYPE];
     // Инициализируем массив результатов для флота
@@ -729,32 +729,32 @@ 
     $fleet_outcome = &$outcome[UBE_FLEETS][$fleet_id];
     $fleet_data = &$last_round_data[UBE_FLEETS][$fleet_id];
 
-    foreach($fleet_info[UBE_COUNT] as $unit_id => $unit_count)
+    foreach ($fleet_info[UBE_COUNT] as $unit_id => $unit_count)
     {
       // Вычисляем сколько юнитов осталось и сколько потеряно
       $units_left = $fleet_data[UBE_COUNT][$unit_id];
 
       // Восстановление обороны - 75% от уничтоженной
-      if($fleet_info[UBE_TYPE][$unit_id] == UNIT_DEFENCE)
+      if ($fleet_info[UBE_TYPE][$unit_id] == UNIT_DEFENCE)
       {
         $giveback_chance = 75; // TODO Configure
         $units_lost = $unit_count - $units_left;
-        if($combat_data[UBE_OPTIONS][UBE_SIMULATOR])
+        if ($combat_data[UBE_OPTIONS][UBE_SIMULATOR])
         { // for simulation just return 75% of loss
           $units_giveback = round($units_lost * $giveback_chance / 100);
         }
         else
         {
-          if($unit_count > 10)
+          if ($unit_count > 10)
           { // if there were more then 10 defense elements - mass-calculating giveback
             $units_giveback = round($units_lost * mt_rand($giveback_chance * 0.8, $giveback_chance * 1.2) / 100);
           }
           else
           { //if there were less then 10 defense elements - calculating giveback per element
             $units_giveback = 0;
-            for($i = 1; $i <= $units_lost; $i++)
+            for ($i = 1; $i <= $units_lost; $i++)
             {
-              if(mt_rand(1,100) <= $giveback_chance)
+              if (mt_rand(1, 100) <= $giveback_chance)
               {
                 $units_giveback++;
               }
@@ -773,13 +773,13 @@ 
       $outcome[$fleet_type][UBE_CAPACITY][$fleet_id] += $fleet_info[UBE_CAPACITY][$unit_id] * $units_left;
 
       // Вычисляем потери в ресурсах
-      if($units_lost)
+      if ($units_lost)
       {
         $fleet_outcome[UBE_UNITS_LOST][$unit_id] = $units_lost;
 
-        foreach($fleet_info[UBE_PRICE] as $resource_id => $unit_prices)
+        foreach ($fleet_info[UBE_PRICE] as $resource_id => $unit_prices)
         {
-          if(!$unit_prices[$unit_id])
+          if (!$unit_prices[$unit_id])
           {
             continue;
           }
@@ -789,7 +789,7 @@ 
           $fleet_outcome[UBE_RESOURCES_LOST][$resource_id] += $resources_lost;
 
           // Если это корабль - прибавляем потери к обломкам на орбите
-          if($fleet_info[UBE_TYPE][$unit_id] == UNIT_SHIPS)
+          if ($fleet_info[UBE_TYPE][$unit_id] == UNIT_SHIPS)
           {
             $outcome[UBE_DEBRIS][$resource_id] += floor($resources_lost * ($combat_data[UBE_OPTIONS][UBE_SIMULATOR] ? 30 : mt_rand(20, 40)) / 100); // TODO: Configurize
           }
@@ -802,7 +802,7 @@ 
     }
 
     // На планете ($fleet_id = 0) ресурсы в космос не выбрасываются
-    if($fleet_id == 0)
+    if ($fleet_id == 0)
     {
       continue;
     }
@@ -810,7 +810,7 @@ 
     // Количество ресурсов флота
     $fleet_total_resources = empty($fleet_info[UBE_RESOURCES]) ? 0 : array_sum($fleet_info[UBE_RESOURCES]);
     // Если на борту нет ресурсов - зачем нам все это?
-    if($fleet_total_resources == 0)
+    if ($fleet_total_resources == 0)
     {
       continue;
     }
@@ -818,13 +818,13 @@ 
     // Емкость трюмов флота
     $fleet_capacity = $outcome[$fleet_type][UBE_CAPACITY][$fleet_id];
     // Если емкость трюмов меньше количество ресурсов - часть ресов выбрасываем нахуй
-    if($fleet_capacity < $fleet_total_resources)
+    if ($fleet_capacity < $fleet_total_resources)
     {
       $left_percent = $fleet_capacity / $fleet_total_resources; // Сколько ресурсов будет оставлено
-      foreach($fleet_info[UBE_RESOURCES] as $resource_id => $resource_amount)
+      foreach ($fleet_info[UBE_RESOURCES] as $resource_id => $resource_amount)
       {
         // Не просчитываем ресурсы, которых нет на борту кораблей флота
-        if(!$resource_amount)
+        if (!$resource_amount)
         {
           continue;
         }
@@ -847,9 +847,9 @@ 
   // SFR - Small Fleet Reconnaissance ака РМФ
   $outcome[UBE_SFR] = count($combat_data[UBE_ROUNDS]) == 2 && $outcome[UBE_COMBAT_RESULT] == UBE_COMBAT_RESULT_LOSS;
 
-  if(!$combat_data[UBE_OPTIONS][UBE_LOADED])
+  if (!$combat_data[UBE_OPTIONS][UBE_LOADED])
   {
-    if($combat_data[UBE_OPTIONS][UBE_MOON_WAS])
+    if ($combat_data[UBE_OPTIONS][UBE_MOON_WAS])
     {
       $outcome[UBE_MOON] = UBE_MOON_WAS;
     }
@@ -859,10 +859,10 @@ 
     }
 
     // Лутаем ресурсы - если аттакер выиграл
-    if($outcome[UBE_COMBAT_RESULT] == UBE_COMBAT_RESULT_WIN)
+    if ($outcome[UBE_COMBAT_RESULT] == UBE_COMBAT_RESULT_WIN)
     {
       sn_ube_combat_analyze_loot($combat_data);
-      if($combat_data[UBE_OPTIONS][UBE_MOON_WAS] && $combat_data[UBE_OPTIONS][UBE_MISSION_TYPE] == MT_DESTROY)
+      if ($combat_data[UBE_OPTIONS][UBE_MOON_WAS] && $combat_data[UBE_OPTIONS][UBE_MISSION_TYPE] == MT_DESTROY)
       {
         sn_ube_combat_analyze_moon_destroy($combat_data);
       }
@@ -881,7 +881,7 @@ 
   $planet_looted_in_metal = 0;
   $planet_resource_looted = array();
   $planet_resource_total = is_array($planet_resource_list) ? array_sum($planet_resource_list) : 0;
-  if($planet_resource_total && ($total_capacity = array_sum($outcome[UBE_ATTACKERS][UBE_CAPACITY])))
+  if ($planet_resource_total && ($total_capacity = array_sum($outcome[UBE_ATTACKERS][UBE_CAPACITY])))
   {
     // Можно вывести только половину ресурсов, но не больше, чем общая вместимость флотов атакующих
     $planet_lootable = min($planet_resource_total / 2, $total_capacity);
@@ -892,11 +892,11 @@ 
     $total_lootable = min($planet_lootable, $total_capacity);
 
     // Вычисляем сколько ресурсов вывезено
-    foreach($outcome[UBE_ATTACKERS][UBE_CAPACITY] as $fleet_id => $fleet_capacity)
+    foreach ($outcome[UBE_ATTACKERS][UBE_CAPACITY] as $fleet_id => $fleet_capacity)
     {
       $looted_in_metal = 0;
       $fleet_loot_data = array();
-      foreach($planet_resource_list as $resource_id => $resource_amount)
+      foreach ($planet_resource_list as $resource_id => $resource_amount)
       {
         // TODO Восстанавливаем ошибку округления - придумать нормальный алгоритм - вроде round() должно быть достаточно. Проверить
         $fleet_lootable_percent = $fleet_capacity / $total_capacity;
@@ -919,25 +919,25 @@ 
 function sn_ube_combat_analyze_moon(&$outcome, $is_simulator)
 {
   $outcome[UBE_DEBRIS_TOTAL] = 0;
-  foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) // TODO via array
+  foreach (array(RES_METAL, RES_CRYSTAL) as $resource_id) // TODO via array
   {
     $outcome[UBE_DEBRIS_TOTAL] += $outcome[UBE_DEBRIS][$resource_id];
   }
 
-  if($outcome[UBE_DEBRIS_TOTAL])
+  if ($outcome[UBE_DEBRIS_TOTAL])
   {
     // TODO uni_calculate_moon_chance
     $moon_chance = min($outcome[UBE_DEBRIS_TOTAL] / 1000000, 30); // TODO Configure
     $moon_chance = $moon_chance >= 1 ? $moon_chance : 0;
     $outcome[UBE_MOON_CHANCE] = $moon_chance;
-    if($moon_chance)
+    if ($moon_chance)
     {
-      if($is_simulator || mt_rand(1, 100) <= $moon_chance)
+      if ($is_simulator || mt_rand(1, 100) <= $moon_chance)
       {
         $outcome[UBE_MOON_SIZE] = round($is_simulator ? $moon_chance * 150 + 1999 : mt_rand($moon_chance * 100 + 1000, $moon_chance * 200 + 2999));
         $outcome[UBE_MOON] = UBE_MOON_CREATE_SUCCESS;
 
-        if($outcome[UBE_DEBRIS_TOTAL] <= 30000000)
+        if ($outcome[UBE_DEBRIS_TOTAL] <= 30000000)
         {
           $outcome[UBE_DEBRIS_TOTAL] = 0;
           $outcome[UBE_DEBRIS] = array();
@@ -948,7 +948,7 @@ 
           $moon_debris_left_percent = ($outcome[UBE_DEBRIS_TOTAL] - $moon_debris_spent) / $outcome[UBE_DEBRIS_TOTAL];
 
           $outcome[UBE_DEBRIS_TOTAL] = 0;
-          foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) // TODO via array
+          foreach (array(RES_METAL, RES_CRYSTAL) as $resource_id) // TODO via array
           {
             $outcome[UBE_DEBRIS][$resource_id] = floor($outcome[UBE_DEBRIS][$resource_id] * $moon_debris_left_percent);
             $outcome[UBE_DEBRIS_TOTAL] += $outcome[UBE_DEBRIS][$resource_id];
@@ -972,11 +972,11 @@ 
 {
   // TODO: $is_simulator
   $reapers = 0;
-  foreach($combat_data[UBE_ROUNDS][count($combat_data[UBE_ROUNDS])-1][UBE_FLEETS] as $fleet_data)
+  foreach ($combat_data[UBE_ROUNDS][count($combat_data[UBE_ROUNDS]) - 1][UBE_FLEETS] as $fleet_data)
   {
-    if($fleet_data[UBE_FLEET_INFO][UBE_FLEET_TYPE] == UBE_ATTACKERS)
+    if ($fleet_data[UBE_FLEET_INFO][UBE_FLEET_TYPE] == UBE_ATTACKERS)
     {
-      foreach($fleet_data[UBE_COUNT] as $unit_id => $unit_count)
+      foreach ($fleet_data[UBE_COUNT] as $unit_id => $unit_count)
       {
         // TODO: Работа по группам - группа "Уничтожители лун"
         $reapers += ($unit_id == SHIP_HUGE_DEATH_STAR) ? $unit_count : 0;
@@ -985,7 +985,7 @@ 
   }
 
   $moon_size = $combat_data[UBE_OUTCOME][UBE_PLANET][PLANET_SIZE];
-  if($reapers)
+  if ($reapers)
   {
     $random = mt_rand(1, 100);
     $combat_data[UBE_OUTCOME][UBE_MOON_DESTROY_CHANCE] = max(1, min(99, round((100 - sqrt($moon_size)) * sqrt($reapers))));
@@ -1019,38 +1019,37 @@ 
     $planet_info[PLANET_SYSTEM],
     $planet_info[PLANET_PLANET],
     htmlentities($planet_info[PLANET_NAME], ENT_COMPAT, 'UTF-8'),
-    $lang[$outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' :
-      ($outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')
+    $lang[$outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' : ($outcome['UBE_COMBAT_RESULT'] == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')
     ]
   );
 
   $text_defender = '';
-  foreach($outcome[UBE_DEBRIS] as $resource_id => $resource_amount)
+  foreach ($outcome[UBE_DEBRIS] as $resource_id => $resource_amount)
   {
-    if($resource_id == RES_DEUTERIUM)
+    if ($resource_id == RES_DEUTERIUM)
     {
       continue;
     }
 
     $text_defender .= "{$lang['tech'][$resource_id]}: " . pretty_number($resource_amount) . '<br />';
   }
-  if($text_defender)
+  if ($text_defender)
   {
     $text_defender = "{$lang['ube_report_msg_body_debris']}{$text_defender}<br />";
   }
 
-  if($outcome[UBE_MOON] == UBE_MOON_CREATE_SUCCESS)
+  if ($outcome[UBE_MOON] == UBE_MOON_CREATE_SUCCESS)
   {
     $text_defender .= "{$lang['ube_report_moon_created']} {$outcome[UBE_MOON_SIZE]} {$lang['sys_kilometers_short']}<br /><br />";
   }
-  elseif($outcome[UBE_MOON] == UBE_MOON_CREATE_FAILED)
+  elseif ($outcome[UBE_MOON] == UBE_MOON_CREATE_FAILED)
   {
     $text_defender .= "{$lang['ube_report_moon_chance']} {$outcome[UBE_MOON_CHANCE]}%<br /><br />";
   }
 
-  if($combat_data[UBE_OPTIONS][UBE_MISSION_TYPE] == MT_DESTROY)
+  if ($combat_data[UBE_OPTIONS][UBE_MISSION_TYPE] == MT_DESTROY)
   {
-    if($outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_NONE)
+    if ($outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_NONE)
     {
       $text_defender .= $lang['ube_report_moon_reapers_none'];
     }
@@ -1068,7 +1067,7 @@ 
   $text_defender .= "{$lang['ube_report_info_link']}: <a href=\"index.php?page=battle_report&cypher={$combat_data[UBE_REPORT_CYPHER]}\">{$combat_data[UBE_REPORT_CYPHER]}</a>";
 
   // TODO: Оптимизировать отсылку сообщений - отсылать пакетами
-  foreach($combat_data[UBE_PLAYERS] as $player_id => $player_info)
+  foreach ($combat_data[UBE_PLAYERS] as $player_id => $player_info)
   {
     $message = $text_common . ($outcome[UBE_SFR] && $player_info[UBE_ATTACKER] ? $lang['ube_report_msg_body_sfr'] : $text_defender);
     msg_send_simple_message($player_id, '', $combat_data[UBE_TIME], MSG_TYPE_COMBAT, $lang['sys_mess_tower'], $lang['sys_mess_attack_report'], $message);
@@ -1080,7 +1079,7 @@ 
 // ------------------------------------------------------------------------------------------------
 // Записывает результат боя в БД
 /** @noinspection SpellCheckingInspection */
-function ube_combat_result_apply(&$combat_data){return sn_function_call('ube_combat_result_apply', array(&$combat_data));}
+function ube_combat_result_apply(&$combat_data) {return sn_function_call('ube_combat_result_apply', array(&$combat_data)); }
 function sn_ube_combat_result_apply(&$combat_data)
 {
 // TODO: Поменять все отладки на запросы
@@ -1090,7 +1089,7 @@ 
   $planet_info = &$outcome[UBE_PLANET];
   $planet_id = $planet_info[PLANET_ID];
   // Обновляем поле обломков на планете
-  if(!$combat_data[UBE_OPTIONS][UBE_COMBAT_ADMIN] && !empty($outcome[UBE_DEBRIS]))
+  if (!$combat_data[UBE_OPTIONS][UBE_COMBAT_ADMIN] && !empty($outcome[UBE_DEBRIS]))
   {
     DBStaticPlanet::db_planet_set_by_gspt($planet_info[PLANET_GALAXY], $planet_info[PLANET_SYSTEM], $planet_info[PLANET_PLANET], PT_PLANET,
       "`debris_metal` = `debris_metal` + " . floor($outcome[UBE_DEBRIS][RES_METAL]) . ", `debris_crystal` = `debris_crystal` + " . floor($outcome[UBE_DEBRIS][RES_CRYSTAL])
@@ -1102,9 +1101,9 @@ 
   );
 
   $fleets_outcome = &$outcome[UBE_FLEETS];
-  foreach($combat_data[UBE_FLEETS] as $fleet_id => &$fleet_info)
+  foreach ($combat_data[UBE_FLEETS] as $fleet_id => &$fleet_info)
   {
-    if($fleet_info[UBE_FLEET_GROUP])
+    if ($fleet_info[UBE_FLEET_GROUP])
     {
       $db_save[UBE_FLEET_GROUP][$fleet_info[UBE_FLEET_GROUP]] = $fleet_info[UBE_FLEET_GROUP];
     }
@@ -1117,28 +1116,28 @@ 
     $old_fleet_count = array_sum($fleet_info[UBE_COUNT]);
     $new_fleet_count = $old_fleet_count - array_sum($fleets_outcome[$fleet_id][UBE_UNITS_LOST]);
     // Перебираем юниты если во время боя количество юнитов изменилось и при этом во флоту остались юниты или это планета
-    if($new_fleet_count != $old_fleet_count && (!$fleet_id || $new_fleet_count))
+    if ($new_fleet_count != $old_fleet_count && (!$fleet_id || $new_fleet_count))
     {
       // Просматриваем результаты изменения флотов
-      foreach($fleet_info[UBE_COUNT] as $unit_id => $unit_count)
+      foreach ($fleet_info[UBE_COUNT] as $unit_id => $unit_count)
       {
         // Перебираем аутком на случай восстановления юнитов
-        $units_lost = (float)$fleets_outcome[$fleet_id][UBE_UNITS_LOST][$unit_id];
+        $units_lost = (float) $fleets_outcome[$fleet_id][UBE_UNITS_LOST][$unit_id];
 
         $units_left = $unit_count - $units_lost;
-        if($fleet_id)
+        if ($fleet_id)
         {
           // Не планета - всегда сразу записываем строку итогов флота
           $fleet_query[$unit_id] = "{$unit_id},{$units_left}";
         }
-        elseif($units_lost)
+        elseif ($units_lost)
         {
           // Планета - записываем в ИД юнита его потери только если есть потери
           $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, -$units_lost, $combat_data[UBE_PLAYERS][$destination_user_id][UBE_PLAYER_DATA], $planet_id);
         }
       }
 
-      if($fleet_id)
+      if ($fleet_id)
       {
         // Для флотов перегенерируем массив как одно вхождение в SET SQL-запроса
 //        $fleet_query = implode(';', $fleet_query);
@@ -1151,12 +1150,12 @@ 
 
     $fleet_delta = array();
     // Если во флоте остались юниты или это планета - генерируем изменение ресурсов
-    if($new_fleet_count || !$fleet_id)
+    if ($new_fleet_count || !$fleet_id)
     {
-      foreach(sn_get_groups('resources_loot') as $resource_id)
+      foreach (sn_get_groups('resources_loot') as $resource_id)
       {
-        $resource_change = (float)$fleets_outcome[$fleet_id][UBE_RESOURCES_LOOTED][$resource_id] + (float)$fleets_outcome[$fleet_id][UBE_CARGO_DROPPED][$resource_id];
-        if($resource_change)
+        $resource_change = (float) $fleets_outcome[$fleet_id][UBE_RESOURCES_LOOTED][$resource_id] + (float) $fleets_outcome[$fleet_id][UBE_CARGO_DROPPED][$resource_id];
+        if ($resource_change)
         {
           $resource_db_name = ($fleet_id ? 'fleet_resource_' : '') . pname_resource_name($resource_id);
 //          $fleet_query[] = "`{$resource_db_name}` = `{$resource_db_name}` - ({$resource_change})";
@@ -1170,10 +1169,10 @@ 
           continue;
         }
     */
-    if($fleet_id && $new_fleet_count)
+    if ($fleet_id && $new_fleet_count)
     {
       // Если защитник и не РМФ - отправляем флот назад
-      if(($fleet_info[UBE_FLEET_TYPE] == UBE_DEFENDERS && !$outcome[UBE_SFR]) || $fleet_info[UBE_FLEET_TYPE] == UBE_ATTACKERS)
+      if (($fleet_info[UBE_FLEET_TYPE] == UBE_DEFENDERS && !$outcome[UBE_SFR]) || $fleet_info[UBE_FLEET_TYPE] == UBE_ATTACKERS)
       {
 //        $fleet_query[] = '`fleet_mess` = 1';
         $fleet_query['fleet_mess'] = 1;
@@ -1188,16 +1187,16 @@ 
 
 //global $debug;
 //    $fleet_query = implode(',', $fleet_query);
-    if($fleet_id) // Не планета
+    if ($fleet_id) // Не планета
     {
-      if($fleet_info[UBE_FLEET_TYPE] == UBE_ATTACKERS && $outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_DIED)
+      if ($fleet_info[UBE_FLEET_TYPE] == UBE_ATTACKERS && $outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_DIED)
       {
         $new_fleet_count = 0;
       }
 
-      if($new_fleet_count)
+      if ($new_fleet_count)
       {
-        if(!empty($fleet_query) || !empty($fleet_delta))
+        if (!empty($fleet_query) || !empty($fleet_delta))
         {
 //          doquery("UPDATE {{fleets}} SET {$fleet_query}, `fleet_amount` = '{$new_fleet_count}' WHERE `fleet_id` = {$fleet_id} LIMIT 1");
 //          db_fleet_update_set_safe_string($fleet_id, "{$fleet_query}, `fleet_amount` = '{$new_fleet_count}'");
@@ -1216,15 +1215,15 @@ 
     else // Планета
     {
       // Сохраняем изменения ресурсов - если они есть
-      if(!empty($fleet_delta))
+      if (!empty($fleet_delta))
       {
         $temp = array();
-        foreach($fleet_delta as $resource_db_name => $resource_amount) {
+        foreach ($fleet_delta as $resource_db_name => $resource_amount) {
           $temp[] = "`{$resource_db_name}` = `{$resource_db_name}` + ({$resource_amount})";
         }
         DBStaticPlanet::db_planet_set_by_id($planet_id, implode(',', $temp));
       }
-      if(!empty($db_changeset)) // Сохраняем изменения юнитов на планете - если они есть
+      if (!empty($db_changeset)) // Сохраняем изменения юнитов на планете - если они есть
       {
         db_changeset_apply($db_changeset);
       }
@@ -1233,34 +1232,34 @@ 
 
   // TODO: Связать сабы с флотами констраинтами ON DELETE SET NULL
   // $db_save[UBE_FLEET_GROUP][$fleet_info[UBE_FLEET_GROUP]] = $fleet_info[UBE_FLEET_GROUP];
-  if(!empty($db_save[UBE_FLEET_GROUP]))
+  if (!empty($db_save[UBE_FLEET_GROUP]))
   {
     $db_save[UBE_FLEET_GROUP] = implode(',', $db_save[UBE_FLEET_GROUP]);
     doquery("DELETE FROM {{aks}} WHERE `id` IN ({$db_save[UBE_FLEET_GROUP]})");
   }
 
-  if($outcome[UBE_MOON] == UBE_MOON_CREATE_SUCCESS)
+  if ($outcome[UBE_MOON] == UBE_MOON_CREATE_SUCCESS)
   {
     $moon_row = uni_create_moon($planet_info[PLANET_GALAXY], $planet_info[PLANET_SYSTEM], $planet_info[PLANET_PLANET], $destination_user_id, $outcome[UBE_MOON_SIZE], '', false);
     $outcome[UBE_MOON_NAME] = $moon_row['name'];
     unset($moon_row);
   }
-  elseif($outcome[UBE_MOON] == UBE_MOON_DESTROY_SUCCESS)
+  elseif ($outcome[UBE_MOON] == UBE_MOON_DESTROY_SUCCESS)
   {
     DBStaticPlanet::db_planet_delete_by_id($planet_id);
   }
 
   {
     $bashing_list = array();
-    foreach($combat_data[UBE_PLAYERS] as $player_id => $player_info)
+    foreach ($combat_data[UBE_PLAYERS] as $player_id => $player_info)
     {
-      if($player_info[UBE_ATTACKER])
+      if ($player_info[UBE_ATTACKER])
       {
-        if($outcome[UBE_MOON] != UBE_MOON_DESTROY_SUCCESS)
+        if ($outcome[UBE_MOON] != UBE_MOON_DESTROY_SUCCESS)
         {
           $bashing_list[] = "({$player_id}, {$planet_id}, {$combat_data[UBE_TIME]})";
         }
-        if($combat_data[UBE_OPTIONS][UBE_MISSION_TYPE] == MT_ATTACK && $combat_data[UBE_OPTIONS][UBE_DEFENDER_ACTIVE])
+        if ($combat_data[UBE_OPTIONS][UBE_MISSION_TYPE] == MT_ATTACK && $combat_data[UBE_OPTIONS][UBE_DEFENDER_ACTIVE])
         {
           $str_loose_or_win = $outcome[UBE_COMBAT_RESULT] == UBE_COMBAT_RESULT_WIN ? 'raidswin' : 'raidsloose';
           db_user_set_by_id($player_id, "`xpraid` = `xpraid` + 1, `raids` = `raids` + 1, `{$str_loose_or_win}` = `{$str_loose_or_win}` + 1");
@@ -1268,7 +1267,7 @@ 
       }
     }
     $bashing_list = implode(',', $bashing_list);
-    if($bashing_list)
+    if ($bashing_list)
     {
       doquery("INSERT INTO {{bashing}} (bashing_user_id, bashing_planet_id, bashing_time) VALUES {$bashing_list};");
     }

Braces +45 added lines, -70 removed lines

@@ -79,8 +79,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Заполняет данные по игроку
-function ube_attack_prepare_player(&$combat_data, $player_id, $is_attacker)
-{
+function ube_attack_prepare_player(&$combat_data, $player_id, $is_attacker) {
   global $ube_convert_techs;
 
   if(!isset($combat_data[UBE_PLAYERS][$player_id]))
@@ -99,8 +98,7 @@ 
     {
       $player_info[UBE_BONUSES][$ube_id] += mrc_get_level($player_data, false, $unit_id) * get_unit_param($unit_id, P_BONUS_VALUE) / 100 + $admiral_bonus;
     }
-  }
-  else
+  } else
   {
     $combat_data[UBE_PLAYERS][$player_id][UBE_ATTACKER] = $combat_data[UBE_PLAYERS][$player_id][UBE_ATTACKER] || $is_attacker;
   }
@@ -109,8 +107,7 @@ 
 // ------------------------------------------------------------------------------------------------
 // Заполняет данные по флоту
 function ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker){return sn_function_call('ube_attack_prepare_fleet', array(&$combat_data, &$fleet, $is_attacker));}
-function sn_ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker)
-{
+function sn_ube_attack_prepare_fleet(&$combat_data, &$fleet, $is_attacker) {
   $fleet_owner_id = $fleet['fleet_owner'];
   $fleet_id = $fleet['fleet_id'];
 
@@ -257,8 +254,7 @@ 
     foreach($acs_fleet_list as $fleet) {
       ube_attack_prepare_fleet($combat_data, $fleet, true);
     }
-  }
-  else
+  } else
   {
     ube_attack_prepare_fleet($combat_data, $fleet_row, true);
   }
@@ -273,8 +269,7 @@ 
 }
 
 // ------------------------------------------------------------------------------------------------
-function sn_ube_combat_prepare_first_round(&$combat_data)
-{
+function sn_ube_combat_prepare_first_round(&$combat_data) {
   global $ube_combat_bonus_list, $ube_convert_to_techs;
 
   // Готовим информацию для первого раунда - проводим все нужные вычисления из исходных данных
@@ -339,8 +334,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Вычисление дополнительной информации для расчета раунда
-function sn_ube_combat_round_prepare(&$combat_data, $round)
-{
+function sn_ube_combat_round_prepare(&$combat_data, $round) {
   global $ube_combat_bonus_list;
 
   $is_simulator = $combat_data[UBE_OPTIONS][UBE_SIMULATOR];
@@ -401,8 +395,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рассчитывает результат столкновения флотов ака раунд
-function sn_ube_combat_round_crossfire_fleet(&$combat_data, $round)
-{
+function sn_ube_combat_round_crossfire_fleet(&$combat_data, $round) {
   if(BE_DEBUG === true)
   {
     // sn_ube_combat_helper_round_header($round);
@@ -437,8 +430,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рассчитывает результат столкновения двух юнитов ака ход
-function sn_ube_combat_round_crossfire_unit(&$attack_fleet_data, &$defend_fleet_data, $attack_unit_id, $defend_unit_id, &$combat_options)
-{
+function sn_ube_combat_round_crossfire_unit(&$attack_fleet_data, &$defend_fleet_data, $attack_unit_id, $defend_unit_id, &$combat_options) {
   $attack_fleet_info = &$attack_fleet_data[UBE_FLEET_INFO];
   $defend_fleet_info = &$defend_fleet_data[UBE_FLEET_INFO];
   $defend_unit_armor = $defend_fleet_info[UBE_ARMOR][$defend_unit_id];
@@ -518,8 +510,7 @@ 
   }
 }
 
-function sn_ube_combat_round_crossfire_unit_damage_current(&$defend_fleet_data, $defend_unit_id, &$amplified_damage, &$units_lost, &$units_boomed, &$combat_options)
-{
+function sn_ube_combat_round_crossfire_unit_damage_current(&$defend_fleet_data, $defend_unit_id, &$amplified_damage, &$units_lost, &$units_boomed, &$combat_options) {
   $unit_is_lost = false;
 
   $units_boomed = $units_boomed ? $units_boomed : 0;
@@ -580,8 +571,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рассчитывает результат столкновения двух юнитов ака ход
-function sn_ube_combat_round_crossfire_unit2(&$attack_fleet_data, &$defend_fleet_data, $attack_unit_id, $defend_unit_id, &$combat_options)
-{
+function sn_ube_combat_round_crossfire_unit2(&$attack_fleet_data, &$defend_fleet_data, $attack_unit_id, $defend_unit_id, &$combat_options) {
   if($defend_fleet_data[UBE_COUNT][$defend_unit_id] <= 0)
   {
     return;
@@ -618,8 +608,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Анализирует результаты раунда и генерирует данные для следующего раунда
-function sn_ube_combat_round_analyze(&$combat_data, $round)
-{
+function sn_ube_combat_round_analyze(&$combat_data, $round) {
   $round_data = &$combat_data[UBE_ROUNDS][$round];
   $round_data[UBE_OUTCOME] = UBE_COMBAT_RESULT_DRAW;
 
@@ -649,12 +638,10 @@ 
   if(count($outcome) == 0 || $round == 10)
   {
     $round_data[UBE_OUTCOME] = UBE_COMBAT_RESULT_DRAW_END;
-  }
-  elseif(count($outcome) == 1)
+  } elseif(count($outcome) == 1)
   {
     $round_data[UBE_OUTCOME] = isset($outcome[UBE_ATTACKERS]) ? UBE_COMBAT_RESULT_WIN : UBE_COMBAT_RESULT_LOSS;
-  }
-  elseif(count($outcome) == 2)
+  } elseif(count($outcome) == 2)
   {
     if($round < 10)
     {
@@ -667,8 +654,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Общий алгоритм расчета боя
-function sn_ube_combat(&$combat_data)
-{
+function sn_ube_combat(&$combat_data) {
   // TODO: Сделать атаку по типам,  когда они будут
 
   $start = microtime(true);
@@ -696,8 +682,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Разбирает данные боя для генерации отчета
-function sn_ube_combat_analyze(&$combat_data)
-{
+function sn_ube_combat_analyze(&$combat_data) {
   global $config;
 
 //  $combat_data[UBE_OUTCOME] = array();
@@ -742,14 +727,12 @@ 
         if($combat_data[UBE_OPTIONS][UBE_SIMULATOR])
         { // for simulation just return 75% of loss
           $units_giveback = round($units_lost * $giveback_chance / 100);
-        }
-        else
+        } else
         {
           if($unit_count > 10)
           { // if there were more then 10 defense elements - mass-calculating giveback
             $units_giveback = round($units_lost * mt_rand($giveback_chance * 0.8, $giveback_chance * 1.2) / 100);
-          }
-          else
+          } else
           { //if there were less then 10 defense elements - calculating giveback per element
             $units_giveback = 0;
             for($i = 1; $i <= $units_lost; $i++)
@@ -852,8 +835,7 @@ 
     if($combat_data[UBE_OPTIONS][UBE_MOON_WAS])
     {
       $outcome[UBE_MOON] = UBE_MOON_WAS;
-    }
-    else
+    } else
     {
       sn_ube_combat_analyze_moon($outcome, $combat_data[UBE_OPTIONS][UBE_SIMULATOR]);
     }
@@ -872,8 +854,7 @@ 
 }
 
 // ------------------------------------------------------------------------------------------------
-function sn_ube_combat_analyze_loot(&$combat_data)
-{
+function sn_ube_combat_analyze_loot(&$combat_data) {
   $exchange = &$combat_data[UBE_OPTIONS][UBE_EXCHANGE];
   $planet_resource_list = &$combat_data[UBE_FLEETS][0][UBE_RESOURCES];
   $outcome = &$combat_data[UBE_OUTCOME];
@@ -916,13 +897,14 @@ 
 }
 
 // ------------------------------------------------------------------------------------------------
-function sn_ube_combat_analyze_moon(&$outcome, $is_simulator)
-{
+function sn_ube_combat_analyze_moon(&$outcome, $is_simulator) {
   $outcome[UBE_DEBRIS_TOTAL] = 0;
-  foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) // TODO via array
+  foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) {
+    // TODO via array
   {
     $outcome[UBE_DEBRIS_TOTAL] += $outcome[UBE_DEBRIS][$resource_id];
   }
+  }
 
   if($outcome[UBE_DEBRIS_TOTAL])
   {
@@ -941,35 +923,33 @@ 
         {
           $outcome[UBE_DEBRIS_TOTAL] = 0;
           $outcome[UBE_DEBRIS] = array();
-        }
-        else
+        } else
         {
           $moon_debris_spent = 30000000;
           $moon_debris_left_percent = ($outcome[UBE_DEBRIS_TOTAL] - $moon_debris_spent) / $outcome[UBE_DEBRIS_TOTAL];
 
           $outcome[UBE_DEBRIS_TOTAL] = 0;
-          foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) // TODO via array
+          foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) {
+            // TODO via array
           {
             $outcome[UBE_DEBRIS][$resource_id] = floor($outcome[UBE_DEBRIS][$resource_id] * $moon_debris_left_percent);
+          }
             $outcome[UBE_DEBRIS_TOTAL] += $outcome[UBE_DEBRIS][$resource_id];
           }
         }
-      }
-      else
+      } else
       {
         $outcome[UBE_MOON] = UBE_MOON_CREATE_FAILED;
       }
     }
-  }
-  else
+  } else
   {
     $outcome[UBE_MOON] = UBE_MOON_NONE;
   }
 }
 
 // ------------------------------------------------------------------------------------------------
-function sn_ube_combat_analyze_moon_destroy(&$combat_data)
-{
+function sn_ube_combat_analyze_moon_destroy(&$combat_data) {
   // TODO: $is_simulator
   $reapers = 0;
   foreach($combat_data[UBE_ROUNDS][count($combat_data[UBE_ROUNDS])-1][UBE_FLEETS] as $fleet_data)
@@ -993,8 +973,7 @@ 
     $combat_data[UBE_OUTCOME][UBE_MOON] = $random <= $combat_data[UBE_OUTCOME][UBE_MOON_DESTROY_CHANCE] ? UBE_MOON_DESTROY_SUCCESS : UBE_MOON_DESTROY_FAILED;
     $random = mt_rand(1, 100);
     $combat_data[UBE_OUTCOME][UBE_MOON_REAPERS] = $random <= $combat_data[UBE_OUTCOME][UBE_MOON_REAPERS_DIE_CHANCE] ? UBE_MOON_REAPERS_DIED : UBE_MOON_REAPERS_RETURNED;
-  }
-  else
+  } else
   {
     $combat_data[UBE_OUTCOME][UBE_MOON_REAPERS] = UBE_MOON_REAPERS_NONE;
   }
@@ -1002,8 +981,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рассылает письма всем участникам боя
-function sn_ube_message_send(&$combat_data)
-{
+function sn_ube_message_send(&$combat_data) {
   global $lang;
 
   // TODO: Отсылать каждому игроку сообщение на его языке!
@@ -1042,8 +1020,7 @@ 
   if($outcome[UBE_MOON] == UBE_MOON_CREATE_SUCCESS)
   {
     $text_defender .= "{$lang['ube_report_moon_created']} {$outcome[UBE_MOON_SIZE]} {$lang['sys_kilometers_short']}<br /><br />";
-  }
-  elseif($outcome[UBE_MOON] == UBE_MOON_CREATE_FAILED)
+  } elseif($outcome[UBE_MOON] == UBE_MOON_CREATE_FAILED)
   {
     $text_defender .= "{$lang['ube_report_moon_chance']} {$outcome[UBE_MOON_CHANCE]}%<br /><br />";
   }
@@ -1053,8 +1030,7 @@ 
     if($outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_NONE)
     {
       $text_defender .= $lang['ube_report_moon_reapers_none'];
-    }
-    else
+    } else
     {
       $text_defender .= "{$lang['ube_report_moon_reapers_wave']}. {$lang['ube_report_moon_reapers_chance']} {$outcome[UBE_MOON_DESTROY_CHANCE]}%. ";
       $text_defender .= $lang[$outcome[UBE_MOON] == UBE_MOON_DESTROY_SUCCESS ? 'ube_report_moon_reapers_success' : 'ube_report_moon_reapers_failure'] . "<br />";
@@ -1081,8 +1057,7 @@ 
 // Записывает результат боя в БД
 /** @noinspection SpellCheckingInspection */
 function ube_combat_result_apply(&$combat_data){return sn_function_call('ube_combat_result_apply', array(&$combat_data));}
-function sn_ube_combat_result_apply(&$combat_data)
-{
+function sn_ube_combat_result_apply(&$combat_data) {
 // TODO: Поменять все отладки на запросы
   $destination_user_id = $combat_data[UBE_FLEETS][0][UBE_OWNER];
 
@@ -1130,8 +1105,7 @@ 
         {
           // Не планета - всегда сразу записываем строку итогов флота
           $fleet_query[$unit_id] = "{$unit_id},{$units_left}";
-        }
-        elseif($units_lost)
+        } elseif($units_lost)
         {
           // Планета - записываем в ИД юнита его потери только если есть потери
           $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, -$units_lost, $combat_data[UBE_PLAYERS][$destination_user_id][UBE_PLAYER_DATA], $planet_id);
@@ -1188,11 +1162,13 @@ 
 
 //global $debug;
 //    $fleet_query = implode(',', $fleet_query);
-    if($fleet_id) // Не планета
+    if($fleet_id) {
+      // Не планета
     {
       if($fleet_info[UBE_FLEET_TYPE] == UBE_ATTACKERS && $outcome[UBE_MOON_REAPERS] == UBE_MOON_REAPERS_DIED)
       {
         $new_fleet_count = 0;
+    }
       }
 
       if($new_fleet_count)
@@ -1204,16 +1180,14 @@ 
           $fleet_query['fleet_amount'] = $new_fleet_count;
           fleet_update_set($fleet_id, $fleet_query, $fleet_delta);
         }
-      }
-      else
+      } else
       {
         // Удаляем пустые флоты
         // doquery("DELETE FROM {{fleets}} WHERE `fleet_id` = {$fleet_id} LIMIT 1");
         db_fleet_delete($fleet_id);
         DBStaticUnit::db_unit_list_delete(0, LOC_FLEET, $fleet_id, 0);
       }
-    }
-    else // Планета
+    } else // Планета
     {
       // Сохраняем изменения ресурсов - если они есть
       if(!empty($fleet_delta))
@@ -1224,10 +1198,12 @@ 
         }
         DBStaticPlanet::db_planet_set_by_id($planet_id, implode(',', $temp));
       }
-      if(!empty($db_changeset)) // Сохраняем изменения юнитов на планете - если они есть
+      if(!empty($db_changeset)) {
+        // Сохраняем изменения юнитов на планете - если они есть
       {
         db_changeset_apply($db_changeset);
       }
+      }
     }
   }
 
@@ -1244,8 +1220,7 @@ 
     $moon_row = uni_create_moon($planet_info[PLANET_GALAXY], $planet_info[PLANET_SYSTEM], $planet_info[PLANET_PLANET], $destination_user_id, $outcome[UBE_MOON_SIZE], '', false);
     $outcome[UBE_MOON_NAME] = $moon_row['name'];
     unset($moon_row);
-  }
-  elseif($outcome[UBE_MOON] == UBE_MOON_DESTROY_SUCCESS)
+  } elseif($outcome[UBE_MOON] == UBE_MOON_DESTROY_SUCCESS)
   {
     DBStaticPlanet::db_planet_delete_by_id($planet_id);
   }

includes/includes/ube_report.php

Doc Comments +6 added lines

@@ -281,6 +281,9 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Читает боевой отчет из БД
+/**
+ * @param string $report_cypher
+ */
 function sn_ube_report_load($report_cypher)
 {
   $report_cypher = db_escape($report_cypher);
@@ -480,6 +483,9 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Парсит инфу о раунде для темплейта
+/**
+ * @param integer $round
+ */
 function sn_ube_report_round_fleet(&$combat_data, $round)
 {
   global $lang;

Spacing +83 added lines, -83 removed lines

@@ -7,7 +7,7 @@ 
   global $config;
 
   // Если уже есть ИД репорта - значит репорт был взят из таблицы. С таким мы не работаем
-  if($combat_data[UBE_REPORT_CYPHER])
+  if ($combat_data[UBE_REPORT_CYPHER])
   {
     return false;
   }
@@ -17,7 +17,7 @@ 
   {
     $combat_data[UBE_REPORT_CYPHER] = sys_random_string(32);
   }
-  while(doquery("SELECT ube_report_cypher FROM {{ube_report}} WHERE ube_report_cypher = '{$combat_data[UBE_REPORT_CYPHER]}' LIMIT 1 FOR UPDATE", true));
+  while (doquery("SELECT ube_report_cypher FROM {{ube_report}} WHERE ube_report_cypher = '{$combat_data[UBE_REPORT_CYPHER]}' LIMIT 1 FOR UPDATE", true));
 
   // Инициализация таблицы для пакетной вставки информации
   $sql_perform = array(
@@ -113,55 +113,55 @@ 
       `ube_report_time_combat` = '" . date(FMT_DATE_TIME_SQL, $combat_data[UBE_TIME]) . "',
       `ube_report_time_spent` = {$combat_data[UBE_TIME_SPENT]},
 
-      `ube_report_combat_admin` = " . (int)$combat_data[UBE_OPTIONS][UBE_COMBAT_ADMIN] . ",
+      `ube_report_combat_admin` = " . (int) $combat_data[UBE_OPTIONS][UBE_COMBAT_ADMIN] . ",
       `ube_report_mission_type` = {$combat_data[UBE_OPTIONS][UBE_MISSION_TYPE]},
 
       `ube_report_combat_result` = {$outcome[UBE_COMBAT_RESULT]},
-      `ube_report_combat_sfr` = " . (int)$outcome[UBE_SFR] .",
+      `ube_report_combat_sfr` = " . (int) $outcome[UBE_SFR] . ",
 
-      `ube_report_debris_metal` = " . (float)$outcome[UBE_DEBRIS][RES_METAL] . ",
-      `ube_report_debris_crystal` = " . (float)$outcome[UBE_DEBRIS][RES_CRYSTAL] . ",
+      `ube_report_debris_metal` = " . (float) $outcome[UBE_DEBRIS][RES_METAL] . ",
+      `ube_report_debris_crystal` = " . (float) $outcome[UBE_DEBRIS][RES_CRYSTAL] . ",
       `ube_report_debris_total_in_metal` = " . $ube_report_debris_total_in_metal . ",
 
-      `ube_report_planet_id`          = " . (int)$outcome[UBE_PLANET][PLANET_ID] . ",
+      `ube_report_planet_id`          = " . (int) $outcome[UBE_PLANET][PLANET_ID] . ",
       `ube_report_planet_name`        = '" . db_escape($outcome[UBE_PLANET][PLANET_NAME]) . "',
-      `ube_report_planet_size`        = " . (int)$outcome[UBE_PLANET][PLANET_SIZE] . ",
-      `ube_report_planet_galaxy`      = " . (int)$outcome[UBE_PLANET][PLANET_GALAXY] . ",
-      `ube_report_planet_system`      = " . (int)$outcome[UBE_PLANET][PLANET_SYSTEM] . ",
-      `ube_report_planet_planet`      = " . (int)$outcome[UBE_PLANET][PLANET_PLANET] . ",
-      `ube_report_planet_planet_type` = " . (int)$outcome[UBE_PLANET][PLANET_TYPE] . ",
+      `ube_report_planet_size`        = " . (int) $outcome[UBE_PLANET][PLANET_SIZE] . ",
+      `ube_report_planet_galaxy`      = " . (int) $outcome[UBE_PLANET][PLANET_GALAXY] . ",
+      `ube_report_planet_system`      = " . (int) $outcome[UBE_PLANET][PLANET_SYSTEM] . ",
+      `ube_report_planet_planet`      = " . (int) $outcome[UBE_PLANET][PLANET_PLANET] . ",
+      `ube_report_planet_planet_type` = " . (int) $outcome[UBE_PLANET][PLANET_TYPE] . ",
 
-      `ube_report_moon` = " . (int)$outcome[UBE_MOON] .",
-      `ube_report_moon_chance` = " . (int)$outcome[UBE_MOON_CHANCE] . ",
-      `ube_report_moon_size` = " . (float)$outcome[UBE_MOON_SIZE] . ",
+      `ube_report_moon` = " . (int) $outcome[UBE_MOON] . ",
+      `ube_report_moon_chance` = " . (int) $outcome[UBE_MOON_CHANCE] . ",
+      `ube_report_moon_size` = " . (float) $outcome[UBE_MOON_SIZE] . ",
 
-      `ube_report_moon_reapers` = " . (int)$outcome[UBE_MOON_REAPERS] . ",
-      `ube_report_moon_destroy_chance` = " . (int)$outcome[UBE_MOON_DESTROY_CHANCE] . ",
-      `ube_report_moon_reapers_die_chance` = " . (int)$outcome[UBE_MOON_REAPERS_DIE_CHANCE] . ",
+      `ube_report_moon_reapers` = " . (int) $outcome[UBE_MOON_REAPERS] . ",
+      `ube_report_moon_destroy_chance` = " . (int) $outcome[UBE_MOON_DESTROY_CHANCE] . ",
+      `ube_report_moon_reapers_die_chance` = " . (int) $outcome[UBE_MOON_REAPERS_DIE_CHANCE] . ",
 
-      `ube_report_capture_result` = " . (int)$outcome[UBE_CAPTURE_RESULT] . "
+      `ube_report_capture_result` = " . (int) $outcome[UBE_CAPTURE_RESULT] . "
   ");
   $ube_report_id = $combat_data[UBE_REPORT_ID] = db_insert_id();
 
   // Сохраняем общую информацию по игрокам
-  foreach($combat_data[UBE_PLAYERS] as $player_id => &$player_info)
+  foreach ($combat_data[UBE_PLAYERS] as $player_id => &$player_info)
   {
     $sql_perform['ube_report_player'][] = array(
       $ube_report_id,
       $player_id,
 
       "'" . db_escape($player_info[UBE_NAME]) . "'",
-      (int)$player_info[UBE_ATTACKER],
+      (int) $player_info[UBE_ATTACKER],
 
-      (float)$player_info[UBE_BONUSES][UBE_ATTACK],
-      (float)$player_info[UBE_BONUSES][UBE_SHIELD],
-      (float)$player_info[UBE_BONUSES][UBE_ARMOR],
+      (float) $player_info[UBE_BONUSES][UBE_ATTACK],
+      (float) $player_info[UBE_BONUSES][UBE_SHIELD],
+      (float) $player_info[UBE_BONUSES][UBE_ARMOR],
     );
   }
 
   // Всякая информация по флотам
   $unit_sort_order = 0;
-  foreach($combat_data[UBE_FLEETS] as $fleet_id => &$fleet_info)
+  foreach ($combat_data[UBE_FLEETS] as $fleet_id => &$fleet_info)
   {
     // Сохраняем общую информацию по флотам
     $sql_perform['ube_report_fleet'][] = array(
@@ -169,20 +169,20 @@ 
       $fleet_info[UBE_OWNER],
       $fleet_id,
 
-      (float)$fleet_info[UBE_PLANET][PLANET_ID],
+      (float) $fleet_info[UBE_PLANET][PLANET_ID],
       "'" . db_escape($fleet_info[UBE_PLANET][PLANET_NAME]) . "'",
-      (int)$fleet_info[UBE_PLANET][PLANET_GALAXY],
-      (int)$fleet_info[UBE_PLANET][PLANET_SYSTEM],
-      (int)$fleet_info[UBE_PLANET][PLANET_PLANET],
-      (int)$fleet_info[UBE_PLANET][PLANET_TYPE],
-
-      (float)$fleet_info[UBE_RESOURCES][RES_METAL],
-      (float)$fleet_info[UBE_RESOURCES][RES_CRYSTAL],
-      (float)$fleet_info[UBE_RESOURCES][RES_DEUTERIUM],
-
-      (float)$fleet_info[UBE_BONUSES][UBE_ATTACK],
-      (float)$fleet_info[UBE_BONUSES][UBE_SHIELD],
-      (float)$fleet_info[UBE_BONUSES][UBE_ARMOR],
+      (int) $fleet_info[UBE_PLANET][PLANET_GALAXY],
+      (int) $fleet_info[UBE_PLANET][PLANET_SYSTEM],
+      (int) $fleet_info[UBE_PLANET][PLANET_PLANET],
+      (int) $fleet_info[UBE_PLANET][PLANET_TYPE],
+
+      (float) $fleet_info[UBE_RESOURCES][RES_METAL],
+      (float) $fleet_info[UBE_RESOURCES][RES_CRYSTAL],
+      (float) $fleet_info[UBE_RESOURCES][RES_DEUTERIUM],
+
+      (float) $fleet_info[UBE_BONUSES][UBE_ATTACK],
+      (float) $fleet_info[UBE_BONUSES][UBE_SHIELD],
+      (float) $fleet_info[UBE_BONUSES][UBE_ARMOR],
     );
 
     // Сохраняем итоговую информацию по ресурсам флота - потеряно, выброшено, увезено
@@ -191,25 +191,25 @@ 
       $ube_report_id,
       $fleet_id,
 
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST][RES_METAL],
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST][RES_CRYSTAL],
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST][RES_DEUTERIUM],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST][RES_METAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST][RES_CRYSTAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST][RES_DEUTERIUM],
 
-      (float)$fleet_outcome_data[UBE_CARGO_DROPPED][RES_METAL],
-      (float)$fleet_outcome_data[UBE_CARGO_DROPPED][RES_CRYSTAL],
-      (float)$fleet_outcome_data[UBE_CARGO_DROPPED][RES_DEUTERIUM],
+      (float) $fleet_outcome_data[UBE_CARGO_DROPPED][RES_METAL],
+      (float) $fleet_outcome_data[UBE_CARGO_DROPPED][RES_CRYSTAL],
+      (float) $fleet_outcome_data[UBE_CARGO_DROPPED][RES_DEUTERIUM],
 
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_METAL],
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_CRYSTAL],
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_DEUTERIUM],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_METAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_CRYSTAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_DEUTERIUM],
 
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST_IN_METAL][RES_METAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST_IN_METAL][RES_METAL],
     );
 
     // Сохраняем результаты по юнитам - потеряно и восстановлено
-    foreach($fleet_info[UBE_COUNT] as $unit_id => $unit_count)
+    foreach ($fleet_info[UBE_COUNT] as $unit_id => $unit_count)
     {
-      if($fleet_outcome_data[UBE_UNITS_LOST][$unit_id] || $fleet_outcome_data[UBE_DEFENCE_RESTORE][$unit_id])
+      if ($fleet_outcome_data[UBE_UNITS_LOST][$unit_id] || $fleet_outcome_data[UBE_DEFENCE_RESTORE][$unit_id])
       {
         $unit_sort_order++;
         $sql_perform['ube_report_outcome_unit'][] = array(
@@ -217,8 +217,8 @@ 
           $fleet_id,
 
           $unit_id,
-          (float)$fleet_outcome_data[UBE_DEFENCE_RESTORE][$unit_id],
-          (float)$fleet_outcome_data[UBE_UNITS_LOST][$unit_id],
+          (float) $fleet_outcome_data[UBE_DEFENCE_RESTORE][$unit_id],
+          (float) $fleet_outcome_data[UBE_UNITS_LOST][$unit_id],
 
           $unit_sort_order,
         );
@@ -228,11 +228,11 @@ 
 
   // Сохраняем информацию о раундах
   $unit_sort_order = 0;
-  foreach($combat_data[UBE_ROUNDS] as $round => &$round_data)
+  foreach ($combat_data[UBE_ROUNDS] as $round => &$round_data)
   {
-    foreach($round_data[UBE_FLEETS] as $fleet_id => &$fleet_data)
+    foreach ($round_data[UBE_FLEETS] as $fleet_id => &$fleet_data)
     {
-      foreach($fleet_data[UBE_COUNT] as $unit_id => $unit_count)
+      foreach ($fleet_data[UBE_COUNT] as $unit_id => $unit_count)
       {
         $unit_sort_order++;
 
@@ -244,7 +244,7 @@ 
 
           $unit_id,
           $unit_count,
-          (int)$fleet_data[UBE_UNITS_BOOM][$unit_id],
+          (int) $fleet_data[UBE_UNITS_BOOM][$unit_id],
 
           $fleet_data[UBE_ATTACK][$unit_id],
           $fleet_data[UBE_SHIELD][$unit_id],
@@ -261,13 +261,13 @@ 
   }
 
   // Пакетная вставка данных
-  foreach($sql_perform as $table_name => $table_data)
+  foreach ($sql_perform as $table_name => $table_data)
   {
-    if(count($table_data) < 2)
+    if (count($table_data) < 2)
     {
       continue;
     }
-    foreach($table_data as &$record_data)
+    foreach ($table_data as &$record_data)
     {
       $record_data = '(' . implode(',', $record_data) . ')';
     }
@@ -286,7 +286,7 @@ 
   $report_cypher = db_escape($report_cypher);
 
   $report_row = doquery("SELECT * FROM {{ube_report}} WHERE ube_report_cypher = '{$report_cypher}' LIMIT 1", true);
-  if(!$report_row)
+  if (!$report_row)
   {
     return UBE_REPORT_NOT_FOUND;
   }
@@ -340,7 +340,7 @@ 
   $outcome = &$combat_data[UBE_OUTCOME];
 
   $query = doquery("SELECT * FROM {{ube_report_player}} WHERE `ube_report_id` = {$report_row['ube_report_id']}");
-  while($player_row = db_fetch($query))
+  while ($player_row = db_fetch($query))
   {
     $combat_data[UBE_PLAYERS][$player_row['ube_report_player_player_id']] = array(
       UBE_NAME => $player_row['ube_report_player_name'],
@@ -355,7 +355,7 @@ 
   }
 
   $query = doquery("SELECT * FROM {{ube_report_fleet}} WHERE `ube_report_id` = {$report_row['ube_report_id']}");
-  while($fleet_row = db_fetch($query))
+  while ($fleet_row = db_fetch($query))
   {
     $combat_data[UBE_FLEETS][$fleet_row['ube_report_fleet_fleet_id']] = array(
       UBE_OWNER => $fleet_row['ube_report_fleet_player_id'],
@@ -389,7 +389,7 @@ 
   $rounds_data = &$combat_data[UBE_ROUNDS];
 
   $query = doquery("SELECT * FROM {{ube_report_unit}} WHERE `ube_report_id` = {$report_row['ube_report_id']} ORDER BY `ube_report_unit_sort_order`");
-  while($round_row = db_fetch($query))
+  while ($round_row = db_fetch($query))
   {
     $round = $round_row['ube_report_unit_round'];
     $fleet_id = $round_row['ube_report_unit_fleet_id'];
@@ -397,7 +397,7 @@ 
     $side = $combat_data[UBE_FLEETS][$fleet_id][UBE_FLEET_TYPE];
     $rounds_data[$round][$side][UBE_ATTACK][$fleet_id] = 0;
 
-    if(!isset($rounds_data[$round][UBE_FLEETS][$fleet_id]))
+    if (!isset($rounds_data[$round][UBE_FLEETS][$fleet_id]))
     {
       $rounds_data[$round][UBE_FLEETS][$fleet_id] = array();
     }
@@ -418,7 +418,7 @@ 
 
 
   $query = doquery("SELECT * FROM {{ube_report_outcome_fleet}} WHERE `ube_report_id` = {$report_row['ube_report_id']}");
-  while($row = db_fetch($query))
+  while ($row = db_fetch($query))
   {
     $fleet_id = $row['ube_report_outcome_fleet_fleet_id'];
 
@@ -452,10 +452,10 @@ 
   }
 
   $query = doquery("SELECT * FROM {{ube_report_outcome_unit}} WHERE `ube_report_id` = {$report_row['ube_report_id']} ORDER BY `ube_report_outcome_unit_sort_order`");
-  while($row = db_fetch($query))
+  while ($row = db_fetch($query))
   {
     $fleet_id = $row['ube_report_outcome_unit_fleet_id'];
-    $side= $combat_data[UBE_FLEETS][$fleet_id][UBE_FLEET_TYPE];
+    $side = $combat_data[UBE_FLEETS][$fleet_id][UBE_FLEET_TYPE];
     $outcome[$side][UBE_FLEETS][$fleet_id][UBE_UNITS_LOST][$row['ube_report_outcome_unit_unit_id']] = $row['ube_report_outcome_unit_lost'];
     $outcome[$side][UBE_FLEETS][$fleet_id][UBE_DEFENCE_RESTORE][$row['ube_report_outcome_unit_unit_id']] = $row['ube_report_outcome_unit_restored'];
   }
@@ -487,10 +487,10 @@ 
   $fleets_info = &$combat_data[UBE_FLEETS];
   $round_template = array();
   $round_data = &$combat_data[UBE_ROUNDS][$round];
-  foreach(array(UBE_ATTACKERS, UBE_DEFENDERS) as $side)
+  foreach (array(UBE_ATTACKERS, UBE_DEFENDERS) as $side)
   {
     $round_data[$side][UBE_ATTACK] = $round_data[$side][UBE_ATTACK] ? $round_data[$side][UBE_ATTACK] : array();
-    foreach($round_data[$side][UBE_ATTACK] as $fleet_id => $temp)
+    foreach ($round_data[$side][UBE_ATTACK] as $fleet_id => $temp)
     {
       $fleet_data = &$round_data[UBE_FLEETS][$fleet_id];
       $fleet_data_prev = &$combat_data[UBE_ROUNDS][$round - 1][UBE_FLEETS][$fleet_id];
@@ -500,14 +500,14 @@ 
         'PLAYER_NAME' => htmlentities($combat_data[UBE_PLAYERS][$fleets_info[$fleet_id][UBE_OWNER]][UBE_NAME], ENT_COMPAT, 'UTF-8'),
       );
 
-      if(is_array($combat_data[UBE_FLEETS][$fleet_id][UBE_PLANET]))
+      if (is_array($combat_data[UBE_FLEETS][$fleet_id][UBE_PLANET]))
       {
         $fleet_template += $combat_data[UBE_FLEETS][$fleet_id][UBE_PLANET];
         $fleet_template[PLANET_NAME] = $fleet_template[PLANET_NAME] ? htmlentities($fleet_template[PLANET_NAME], ENT_COMPAT, 'UTF-8') : '';
         $fleet_template['PLANET_TYPE_TEXT'] = $lang['sys_planet_type_sh'][$fleet_template['PLANET_TYPE']];
       }
 
-      foreach($fleet_data[UBE_COUNT] as $unit_id => $unit_count)
+      foreach ($fleet_data[UBE_COUNT] as $unit_id => $unit_count)
       {
         $shields_original = $fleet_data[UBE_SHIELD_BASE][$unit_id] * $fleet_data_prev[UBE_COUNT][$unit_id];
         $ship_template = array(
@@ -540,11 +540,11 @@ 
   global $lang;
 
   $result = array();
-  if(!empty($array))
+  if (!empty($array))
   {
-    foreach($array as $unit_id => $unit_count)
+    foreach ($array as $unit_id => $unit_count)
     {
-      if($unit_count)
+      if ($unit_count)
       {
         $result[] = array(
           'NAME' => $lang['tech'][$unit_id],
@@ -552,7 +552,7 @@ 
         );
       }
     }
-    if($header && count($result))
+    if ($header && count($result))
     {
       array_unshift($result, array('NAME' => $header));
     }
@@ -565,7 +565,7 @@ 
 // Генерирует данные для отчета из разобранных данных боя
 function sn_ube_report_generate(&$combat_data, &$template_result)
 {
-  if(!is_array($combat_data))
+  if (!is_array($combat_data))
   {
     return;
   }
@@ -577,7 +577,7 @@ 
   $fleets_info = &$combat_data[UBE_FLEETS];
   $outcome = &$combat_data[UBE_OUTCOME];
   // Генерируем отчет по флотам
-  for($round = 1; $round <= count($combat_data[UBE_ROUNDS]) - 1; $round++)
+  for ($round = 1; $round <= count($combat_data[UBE_ROUNDS]) - 1; $round++)
   {
     $round_template = array(
       'NUMBER' => $round,
@@ -589,13 +589,13 @@ 
   }
 
   // Боевые потери флотов
-  foreach(array(UBE_ATTACKERS, UBE_DEFENDERS) as $side)
+  foreach (array(UBE_ATTACKERS, UBE_DEFENDERS) as $side)
   {
-    if(!is_array($outcome[$side][UBE_FLEETS]))
+    if (!is_array($outcome[$side][UBE_FLEETS]))
     {
       continue;
     }
-    foreach($outcome[$side][UBE_FLEETS] as $fleet_id => $temp)
+    foreach ($outcome[$side][UBE_FLEETS] as $fleet_id => $temp)
     {
       $player_info = &$players_info[$fleets_info[$fleet_id][UBE_OWNER]];
       $fleet_outcome = &$outcome[UBE_FLEETS][$fleet_id];
@@ -620,9 +620,9 @@ 
 
   // Обломки
   $debris = array();
-  foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id)
+  foreach (array(RES_METAL, RES_CRYSTAL) as $resource_id)
   {
-    if($resource_amount = $outcome[UBE_DEBRIS][$resource_id])
+    if ($resource_amount = $outcome[UBE_DEBRIS][$resource_id])
     {
       $debris[] = array(
         'NAME' => $lang['tech'][$resource_id],
@@ -635,7 +635,7 @@ 
 
   // Координаты, тип и название планеты - если есть
 //R  $planet_owner_id = $combat_data[UBE_FLEETS][0][UBE_OWNER];
-  if(isset($combat_data[UBE_OUTCOME][UBE_PLANET]))
+  if (isset($combat_data[UBE_OUTCOME][UBE_PLANET]))
   {
     $template_result += $combat_data[UBE_OUTCOME][UBE_PLANET];
     $template_result[PLANET_NAME] = str_replace(' ', '&nbsp;', htmlentities($template_result[PLANET_NAME], ENT_COMPAT, 'UTF-8'));

Braces +5 added lines, -10 removed lines

@@ -2,8 +2,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Записывает боевой отчет в БД
-function sn_ube_report_save(&$combat_data)
-{
+function sn_ube_report_save(&$combat_data) {
   global $config;
 
   // Если уже есть ИД репорта - значит репорт был взят из таблицы. С таким мы не работаем
@@ -281,8 +280,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Читает боевой отчет из БД
-function sn_ube_report_load($report_cypher)
-{
+function sn_ube_report_load($report_cypher) {
   $report_cypher = db_escape($report_cypher);
 
   $report_row = doquery("SELECT * FROM {{ube_report}} WHERE ube_report_cypher = '{$report_cypher}' LIMIT 1", true);
@@ -480,8 +478,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Парсит инфу о раунде для темплейта
-function sn_ube_report_round_fleet(&$combat_data, $round)
-{
+function sn_ube_report_round_fleet(&$combat_data, $round) {
   global $lang;
 
   $fleets_info = &$combat_data[UBE_FLEETS];
@@ -535,8 +532,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Рендерит таблицу общего результата боя
-function sn_ube_report_table_render(&$array, $header)
-{
+function sn_ube_report_table_render(&$array, $header) {
   global $lang;
 
   $result = array();
@@ -563,8 +559,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Генерирует данные для отчета из разобранных данных боя
-function sn_ube_report_generate(&$combat_data, &$template_result)
-{
+function sn_ube_report_generate(&$combat_data, &$template_result) {
   if(!is_array($combat_data))
   {
     return;

includes/includes/upd_helpers.php

Doc Comments +3 added lines

@@ -107,6 +107,9 @@
   }
 }
 
+/**
+ * @param string $table
+ */
 function upd_alter_table($table, $alters, $condition = true) {
   global $config, $update_tables;
 

Spacing +36 added lines, -36 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('IN_UPDATE')) {
+if (!defined('IN_UPDATE')) {
   die('Trying to call update helpers externally!');
 }
 
@@ -8,13 +8,13 @@ 
   global $update_tables;
 
   upd_add_more_time();
-  if(!$no_log) {
+  if (!$no_log) {
     upd_log_message("Performing query '{$query}'");
   }
 
   // classSupernova::$db->sn_db_connect();
-  if(!(strpos($query, '{{') === false)) {
-    foreach($update_tables as $tableName => $cork) {
+  if (!(strpos($query, '{{') === false)) {
+    foreach ($update_tables as $tableName => $cork) {
       $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix . $tableName, $query);
     }
   }
@@ -26,9 +26,9 @@ 
   global $config, $sys_log_disabled;
 
   $config->db_loadItem($key);
-  if($condition || !isset($config->$key)) {
+  if ($condition || !isset($config->$key)) {
     upd_add_more_time();
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       upd_log_message("Updating config key '{$key}' with value '{$default_value}'");
     }
     $config->db_saveItem($key, $default_value);
@@ -56,7 +56,7 @@ 
 function upd_log_message($message) {
   global $sys_log_disabled, $upd_log, $debug;
 
-  if($sys_log_disabled)
+  if ($sys_log_disabled)
   {
 //    print("{$message}<br />");
   } else {
@@ -68,15 +68,15 @@ 
 function upd_unset_table_info($table_name) {
   global $update_tables, $update_indexes, $update_foreigns;
 
-  if(isset($update_tables[$table_name])) {
+  if (isset($update_tables[$table_name])) {
     unset($update_tables[$table_name]);
   }
 
-  if(isset($update_indexes[$table_name])) {
+  if (isset($update_indexes[$table_name])) {
     unset($update_indexes[$table_name]);
   }
 
-  if(isset($update_foreigns[$table_name])) {
+  if (isset($update_foreigns[$table_name])) {
     unset($update_foreigns[$table_name]);
   }
 }
@@ -90,18 +90,18 @@ 
   upd_unset_table_info($tableName);
 
   $q1 = upd_do_query("SHOW FULL COLUMNS FROM {$prefix_table_name};", true);
-  while($r1 = db_fetch($q1)) {
+  while ($r1 = db_fetch($q1)) {
     $update_tables[$tableName][$r1['Field']] = $r1;
   }
 
   $q1 = upd_do_query("SHOW INDEX FROM {$prefix_table_name};", true);
-  while($r1 = db_fetch($q1)) {
+  while ($r1 = db_fetch($q1)) {
     $update_indexes[$tableName][$r1['Key_name']] .= "{$r1['Column_name']},";
     $update_indexes_full[$tableName][$r1['Key_name']][$r1['Column_name']] = $r1;
   }
 
-  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name). "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
-  while($r1 = db_fetch($q1)) {
+  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name) . "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
+  while ($r1 = db_fetch($q1)) {
     $table_referenced = str_replace($config->db_prefix, '', $r1['REFERENCED_TABLE_NAME']);
 
     $update_foreigns[$tableName][$r1['CONSTRAINT_NAME']] .= "{$r1['COLUMN_NAME']},{$table_referenced},{$r1['REFERENCED_COLUMN_NAME']};";
@@ -111,7 +111,7 @@ 
 function upd_alter_table($table, $alters, $condition = true) {
   global $config, $update_tables;
 
-  if(!$condition) {
+  if (!$condition) {
     return;
   }
 
@@ -119,7 +119,7 @@ 
   $alters_print = is_array($alters) ? dump($alters) : $alters;
   upd_log_message("Altering table '{$table}' with alterations {$alters_print}");
 
-  if(!is_array($alters)) {
+  if (!is_array($alters)) {
     $alters = array($alters);
   }
 
@@ -130,7 +130,7 @@ 
   //$result = db_query($qry);
   $result = upd_do_query($qry);
   $error = db_error();
-  if($error) {
+  if ($error) {
     die("Altering error for table `{$table}`: {$error}<br />{$alters_print}");
   }
 
@@ -153,11 +153,11 @@ 
 function upd_create_table($table_name, $declaration) {
   global $config, $update_tables;
 
-  if(!$update_tables[$table_name]) {
+  if (!$update_tables[$table_name]) {
     upd_do_query('set foreign_key_checks = 0;', true);
     $result = upd_do_query("CREATE TABLE IF NOT EXISTS `{$config->db_prefix}{$table_name}` {$declaration}");
     $error = db_error();
-    if($error) {
+    if ($error) {
       die("Creating error for table `{$table_name}`: {$error}<br />" . dump($declaration));
     }
     upd_do_query('set foreign_key_checks = 1;', true);
@@ -183,14 +183,14 @@ 
 
 
 function upd_db_unit_changeset_prepare($unit_id, $unit_value, $user, $planet_id = null) {
-  if(!is_array($user)) {
+  if (!is_array($user)) {
     // TODO - remove later
     print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_unit_changeset_prepare() - USER is not ARRAY</h1>');
     pdump(debug_backtrace());
     die('USER is not ARRAY');
   }
 
-  if(!isset($user['id']) || !$user['id']) {
+  if (!isset($user['id']) || !$user['id']) {
     // TODO - remove later
     print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_unit_changeset_prepare() - USER[id] пустой</h1>');
     pdump($user);
@@ -205,7 +205,7 @@ 
 
   $db_changeset = array();
   $temp = upd_db_unit_by_location($user['id'], $unit_location, $location_id, $unit_id, true, 'unit_id');
-  if($temp['unit_id']) {
+  if ($temp['unit_id']) {
     // update
     $db_changeset = array(
       'action' => SQL_OP_UPDATE,
@@ -251,53 +251,53 @@ 
 
 
 function upd_db_changeset_apply($db_changeset) {
-  if(!is_array($db_changeset) || empty($db_changeset)) {
+  if (!is_array($db_changeset) || empty($db_changeset)) {
     return;
   }
 
-  foreach($db_changeset as $table_name => $table_data) {
-    foreach($table_data as $record_id => $conditions) {
+  foreach ($db_changeset as $table_name => $table_data) {
+    foreach ($table_data as $record_id => $conditions) {
       $where = '';
-      if(!empty($conditions['where'])) {
+      if (!empty($conditions['where'])) {
         $where = 'WHERE ' . implode(' AND ', $conditions['where']);
       }
 
       $fields = array();
-      if($conditions['fields']) {
-        foreach($conditions['fields'] as $field_name => $field_data) {
+      if ($conditions['fields']) {
+        foreach ($conditions['fields'] as $field_name => $field_data) {
           $condition = "`{$field_name}` = ";
           $value = '';
-          if($field_data['delta']) {
+          if ($field_data['delta']) {
             $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
-          } elseif($field_data['set']) {
-            $value = (is_string($field_data['set']) ? "'{$field_data['set']}'": $field_data['set']);
+          } elseif ($field_data['set']) {
+            $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
           }
-          if($value) {
+          if ($value) {
             $fields[] = $condition . $value;
           }
         }
       }
       $fields = implode(',', $fields);
 
-      switch($conditions['action']) {
+      switch ($conditions['action']) {
         case SQL_OP_DELETE:
           upd_do_query("DELETE FROM {{{$table_name}}} {$where}");
           break;
 
         case SQL_OP_UPDATE:
-          if($fields) {
+          if ($fields) {
             upd_do_query("UPDATE {{{$table_name}}} SET {$fields} {$where}");
           }
           break;
 
         case SQL_OP_INSERT:
-          if($fields) {
+          if ($fields) {
             upd_do_query("INSERT INTO {{{$table_name}}} SET {$fields}");
           }
           break;
 
         case SQL_OP_REPLACE:
-          if($fields) {
+          if ($fields) {
             upd_do_query("REPLACE INTO {{{$table_name}}} SET {$fields}");
           }
           break;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 
 function upd_db_unit_by_location($user_id = 0, $location_type, $location_id, $unit_snid = 0, $for_update = false, $fields = '*') {
   return db_fetch(upd_do_query(
-    "SELECT {$fields}
+    "select {$fields}
     FROM {{unit}}
     WHERE
       `unit_location_type` = {$location_type} AND `unit_location_id` = {$location_id} AND " . DBStaticUnit::db_unit_time_restrictions() .

includes/template.php

Doc Comments +6 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
  * @param string    $title
  * @param string    $dest
  * @param int       $time
- * @param bool|true $show_header
+ * @param boolean $show_header
  */
 function message($mes, $title = 'Error', $dest = '', $time = 5, $show_header = true) {
   $template = gettemplate('message_body', true);
@@ -195,7 +195,7 @@ 
  * @param bool|true       $isDisplayTopNav
  * @param string          $metatags
  * @param bool|false      $AdminPage
- * @param bool|true       $isDisplayMenu
+ * @param boolean       $isDisplayMenu
  *
  * @return mixed
  */
@@ -208,7 +208,6 @@ 
  * @param string          $title
  * @param bool|true       $isDisplayTopNav
  * @param string          $metatags
- * @param bool|false      $AdminPage
  * @param bool|true       $isDisplayMenu
  * @param bool|int|string $exitStatus - Код или сообщение выхода
  */
@@ -352,10 +351,10 @@ 
 
 /**
  * @param $time
- * @param $event
+ * @param integer $event
  * @param $msg
- * @param $prefix
- * @param $is_decrease
+ * @param string $prefix
+ * @param boolean $is_decrease
  * @param $fleet_flying_row
  * @param $fleet_flying_sorter
  * @param $fleet_flying_events
@@ -650,7 +649,7 @@ 
 }
 
 /**
- * @param array|string  $files
+ * @param string  $files
  * @param template|bool $template
  * @param string|bool   $template_path
  *

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,
@@ -280,7 +280,7 @@ 
     'design/css/jquery-ui.css' => '',
     'design/css/global.min.css' => '',
   );
-  $is_login ? $standard_css['design/css/login.min.css'] = '': false;
+  $is_login ? $standard_css['design/css/login.min.css'] = '' : false;
   $standard_css += array(
 //    'design/css/design/css/global-ie.min.css' => '', // TODO
     TEMPLATE_PATH . '/_template.min.css' => '',
@@ -291,9 +291,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,
@@ -340,12 +340,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)));
   }
 
@@ -353,8 +353,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']);
@@ -377,7 +377,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();
 
@@ -415,7 +415,7 @@ 
  * @param string   $type
  */
 function tpl_topnav_event_build(&$template, $fleet_flying_list, $type = 'fleet') {
-  if(empty($fleet_flying_list)) {
+  if (empty($fleet_flying_list)) {
     return;
   }
 
@@ -424,19 +424,19 @@ 
   $fleet_event_count = 0;
   $fleet_flying_sorter = array();
   $fleet_flying_events = array();
-  foreach($fleet_flying_list as &$fleet_flying_row) {
+  foreach ($fleet_flying_list as &$fleet_flying_row) {
     $will_return = true;
-    if($fleet_flying_row['fleet_mess'] == 0) {
+    if ($fleet_flying_row['fleet_mess'] == 0) {
       // cut fleets on Hold and Expedition
-      if($fleet_flying_row['fleet_start_time'] >= SN_TIME_NOW) {
+      if ($fleet_flying_row['fleet_start_time'] >= SN_TIME_NOW) {
         $fleet_flying_row['fleet_mission'] == MT_RELOCATE ? $will_return = false : false;
         tpl_topnav_event_build_helper($fleet_flying_row['fleet_start_time'], EVENT_FLEET_ARRIVE, $lang['sys_event_arrive'], 'fleet_end_', !$will_return, $fleet_flying_row, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
       }
-      if($fleet_flying_row['fleet_end_stay']) {
+      if ($fleet_flying_row['fleet_end_stay']) {
         tpl_topnav_event_build_helper($fleet_flying_row['fleet_end_stay'], EVENT_FLEET_STAY, $lang['sys_event_stay'], 'fleet_end_', false, $fleet_flying_row, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
       }
     }
-    if($will_return) {
+    if ($will_return) {
       tpl_topnav_event_build_helper($fleet_flying_row['fleet_end_time'], EVENT_FLEET_RETURN, $lang['sys_event_return'], 'fleet_start_', true, $fleet_flying_row, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
     }
   }
@@ -444,7 +444,7 @@ 
   asort($fleet_flying_sorter);
 
   $fleet_flying_count = count($fleet_flying_list);
-  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),
@@ -472,7 +472,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 '';
   }
 
@@ -493,8 +493,8 @@ 
 
   $ThisUsersPlanets = DBStaticPlanet::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;
     }
 
@@ -520,8 +520,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,
@@ -535,13 +535,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 = doquery("SELECT * FROM {{notes}} WHERE `owner` = {$user['id']} AND `sticky` = 1 ORDER BY priority DESC, time DESC");
-  while($note_row = db_fetch($notes_query)) {
+  while ($note_row = db_fetch($notes_query)) {
     note_assign($template, $note_row);
   }
 
@@ -552,7 +552,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']
@@ -629,7 +629,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,
@@ -644,12 +644,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 {
@@ -664,11 +664,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);
       }
     }
@@ -710,7 +710,7 @@ 
 
   $template_ex = '.tpl.html';
 
-  if($template === false) {
+  if ($template === false) {
     return sys_file_read(TEMPLATE_DIR . '/' . $files . $template_ex);
   }
 
@@ -730,7 +730,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;
   }
 
@@ -755,13 +755,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);
@@ -787,7 +787,7 @@ 
 //  }
 
   $fleet_flying_list[0] = fleet_list_by_owner_id($user['id']);
-  foreach($fleet_flying_list[0] as $fleet_id => $fleet_flying_row) {
+  foreach ($fleet_flying_list[0] as $fleet_id => $fleet_flying_row) {
     $fleet_flying_list[$fleet_flying_row['fleet_mission']][$fleet_id] = &$fleet_flying_list[0][$fleet_id];
   }
 
@@ -806,8 +806,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);
@@ -824,7 +824,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);
 
@@ -848,7 +848,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'),

resources.php

Indentation +9 added lines, -9 removed lines

@@ -92,9 +92,9 @@ 
 
 for ($Option = 10; $Option >= 0; $Option--)
 {
- $template->assign_block_vars('option', array(
-   'VALUE' => $Option * 10,
- ));
+  $template->assign_block_vars('option', array(
+    'VALUE' => $Option * 10,
+  ));
 }
 
 $caps_real = eco_get_planet_caps($user, $planetrow, 3600);
@@ -163,14 +163,14 @@ 
 int_calc_storage_bar(RES_DEUTERIUM);
 
 $template->assign_vars(array(
- 'PLANET_NAME'          => $planetrow['name'],
- 'PLANET_TYPE'          => $planetrow['planet_type'],
- 'PLANET_DENSITY_INDEX' => $planet_density_index,
- 'PLANET_CORE_TEXT'     => $lang['uni_planet_density_types'][$planet_density_index],
+  'PLANET_NAME'          => $planetrow['name'],
+  'PLANET_TYPE'          => $planetrow['planet_type'],
+  'PLANET_DENSITY_INDEX' => $planet_density_index,
+  'PLANET_CORE_TEXT'     => $lang['uni_planet_density_types'][$planet_density_index],
 
- 'PRODUCTION_LEVEL'     => floor($caps_real['efficiency'] * 100),
+  'PRODUCTION_LEVEL'     => floor($caps_real['efficiency'] * 100),
 
- 'PAGE_HINT'            => $lang['res_hint'],
+  'PAGE_HINT'            => $lang['res_hint'],
 ));
 
 display($template, $lang['res_planet_production']);

Spacing +9 added lines, -9 removed lines

@@ -46,11 +46,11 @@ 
   ));
 };
 
-$ValidList['percent'] = array (  0,  10,  20,  30,  40,  50,  60,  70,  80,  90, 100 );
+$ValidList['percent'] = array(0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100);
 $template = gettemplate('resources', true);
 
 $transmutation_result = sn_sys_planet_core_transmute($user, $planetrow);
-if(!empty($transmutation_result))
+if (!empty($transmutation_result))
 {
   $template->assign_block_vars('result', $transmutation_result); // array('STATUS' => $transmutation_result['STATUS'], 'MESSAGE' => $transmutation_result['MESSAGE']));
 }
@@ -59,20 +59,20 @@ 
 $production = $_POST['production'];
 //$SubQry     = '';
 $SubQry     = array();
-if(is_array($production)) {
-  foreach($production as $prod_id => $percent) {
-    if($percent > 100 || $percent < 0) {
+if (is_array($production)) {
+  foreach ($production as $prod_id => $percent) {
+    if ($percent > 100 || $percent < 0) {
       $debug->warning('Supplying wrong production percent (less then 0 or greater then 100)', 'Hack attempt', 302, array('base_dump' => true));
       die();
     }
 
     $prod_id = intval($prod_id);
-    if(in_array($prod_id, $sn_group_factories) && get_unit_param($prod_id, P_MINING_IS_MANAGED)) {
+    if (in_array($prod_id, $sn_group_factories) && get_unit_param($prod_id, P_MINING_IS_MANAGED)) {
       $field_name              = pname_factory_production_field_name($prod_id);
       $percent                 = floor($percent / 10);
       $planetrow[$field_name]  = $percent;
       //$SubQry                 .= "`{$field_name}` = '{$percent}',";
-      $SubQry[]                 = "`{$field_name}` = '{$percent}'";
+      $SubQry[] = "`{$field_name}` = '{$percent}'";
     } else {
       $debug->warning('Supplying wrong ID in production array - attempt to change some field - ID' . $prod_id, 'Resource Page', 301);
       continue;
@@ -108,9 +108,9 @@ 
   'ENERGY_TYPE'    => pretty_number($caps_real['production'][RES_ENERGY][0], true, true),
 ));
 
-foreach($sn_group_factories as $unit_id)
+foreach ($sn_group_factories as $unit_id)
 {
-  if(mrc_get_level($user, $planetrow, $unit_id) > 0 && get_unit_param($unit_id))
+  if (mrc_get_level($user, $planetrow, $unit_id) > 0 && get_unit_param($unit_id))
   {
     $level_plain = mrc_get_level($user, $planetrow, $unit_id, false, true);
     $template->assign_block_vars('production', array(

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-function int_calc_storage_bar($resource_id)
-{
+function int_calc_storage_bar($resource_id) {
   global $lang, $template, $caps_real, $planetrow, $user;
 
   $totalProduction      = $caps_real['total'][$resource_id];