supernova-ws / SuperNova

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'][] = OldDbChangeSet::db_changeset_prepare_unit($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 = array(
@@ -1149,12 +1148,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})";
@@ -1168,10 +1167,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;
@@ -1186,16 +1185,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}'");
@@ -1214,15 +1213,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)) // Сохраняем изменения юнитов на планете - если они есть
       {
         OldDbChangeSet::db_changeset_apply($db_changeset);
       }
@@ -1231,34 +1230,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");
@@ -1266,7 +1265,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'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, -$units_lost, $combat_data[UBE_PLAYERS][$destination_user_id][UBE_PLAYER_DATA], $planet_id);
@@ -1186,11 +1160,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)
@@ -1202,16 +1178,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))
@@ -1222,10 +1196,12 @@ 
         }
         DBStaticPlanet::db_planet_set_by_id($planet_id, implode(',', $temp));
       }
-      if(!empty($db_changeset)) // Сохраняем изменения юнитов на планете - если они есть
+      if(!empty($db_changeset)) {
+        // Сохраняем изменения юнитов на планете - если они есть
       {
         OldDbChangeSet::db_changeset_apply($db_changeset);
       }
+      }
     }
   }
 
@@ -1242,8 +1218,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;

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];

admin/adm_user_analyze.php

Indentation +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
     0 => $row['visit_time'], // start
     1 => $row['visit_time'], // end
   )
-   //: false
-   ;
+    //: false
+    ;
 }
 
 $session_list = array();

Spacing +13 added lines, -13 removed lines

@@ -19,13 +19,13 @@ 
 // define('SESSION_INTERRUPT', 15*60); // Можно увеличить до 4 часов - никито не может сидеть 2 суток с перерывом менее 4 часов
 // define('SUSPICIOUS_LONG', 2 * 60*60); // Тогда это увеличиваем до, скажем суток - и там смотрим
 
-define('SESSION_INTERRUPT', 1 * 60*60); // Можно увеличить до 4 часов - никито не может сидеть 2 суток с перерывом менее 4 часов
-define('SUSPICIOUS_LONG', 16 * 60*60); // Тогда это увеличиваем до, скажем суток - и там смотрим
+define('SESSION_INTERRUPT', 1 * 60 * 60); // Можно увеличить до 4 часов - никито не может сидеть 2 суток с перерывом менее 4 часов
+define('SUSPICIOUS_LONG', 16 * 60 * 60); // Тогда это увеличиваем до, скажем суток - и там смотрим
 
 
 function check_suspicious(&$session, &$session_list_last_id, &$row) {
   $session[2] = $session[1] - $session[0];
-  if($session[2] > SUSPICIOUS_LONG)
+  if ($session[2] > SUSPICIOUS_LONG)
   {
     $session[2] = pretty_time($session[2]);
     $session[0] = date(FMT_DATE_TIME_SQL, $session[0]);
@@ -46,24 +46,24 @@ 
 $session_list = array();
 $query = doquery("SELECT `visit_time`, user_id FROM {{counter}} where user_id <> 0 and visit_time > UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 7 DAY)) order by user_id, visit_time;");
 $session = array();
-if($row = db_fetch($query)) {
+if ($row = db_fetch($query)) {
   $session = array(
     0 => strtotime($row['visit_time']), // start
     1 => strtotime($row['visit_time']), // end
   );
   $last_id = $row['user_id'];
 }
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $row['visit_time'] = strtotime($row['visit_time']);
-  if($last_id == $row['user_id']) {
+  if ($last_id == $row['user_id']) {
     // Тот же юзер
-    if($row['visit_time'] - $session[1] <= SESSION_INTERRUPT) { // Та же сессия
+    if ($row['visit_time'] - $session[1] <= SESSION_INTERRUPT) { // Та же сессия
       $session[1] = $row['visit_time'];
     } else {
       // Новая сессия
 //      check_suspicious($session, $session_list[$last_id], $row);
       $session[2] = $session[1] - $session[0];
-      if($session[2] > SUSPICIOUS_LONG)
+      if ($session[2] > SUSPICIOUS_LONG)
       {
         $session[2] = pretty_time($session[2]);
         $session[0] = date(FMT_DATE_TIME_SQL, $session[0]);
@@ -78,7 +78,7 @@ 
   } else {
 //    check_suspicious($session, $session_list[$last_id], $row);
     $session[2] = $session[1] - $session[0];
-      if($session[2] > SUSPICIOUS_LONG)
+      if ($session[2] > SUSPICIOUS_LONG)
       {
         $session[2] = pretty_time($session[2]);
         $session[0] = date(FMT_DATE_TIME_SQL, $session[0]);
@@ -93,11 +93,11 @@ 
   }
 }
 
-if($last_id) {
+if ($last_id) {
   // check_suspicious($session, $session_list[$last_id], $row = array('time' => 0));
   $session[2] = $session[1] - $session[0];
 
-  if($session[2] > SUSPICIOUS_LONG)
+  if ($session[2] > SUSPICIOUS_LONG)
   {
     $session[2] = pretty_time($session[2]);
     $session[0] = date(FMT_DATE_TIME_SQL, $session[0]);
@@ -111,9 +111,9 @@ 
 print("<td>ID</td><td>Username</td><td>Start</td><td>End</td><td>Length</td>");
 print("<td>Last online</td>");
 print("</tr>");
-foreach($session_list as $user_id => $value) {
+foreach ($session_list as $user_id => $value) {
   $user_record = doquery("SELECT `username`, onlinetime FROM {{users}} WHERE id = {$user_id};", true);
-  foreach($value as $interval_data) {
+  foreach ($value as $interval_data) {
     print("<tr>");
     print("<td>{$user_id}</td><td>{$user_record['username']}</td><td>{$interval_data[0]}</td><td>{$interval_data[1]}</td><td>{$interval_data[2]}</td>");
     print("<td>" . date(FMT_DATE_TIME_SQL, $user_record['onlinetime']) . "</td>");

admin/adm_log_main.php

Braces +3 added lines, -6 removed lines

@@ -22,12 +22,10 @@ 
 if($delete = sys_get_param_id('delete'))
 {
   doquery("DELETE FROM `{{logs}}` WHERE `log_id` = {$delete} LIMIT 1;");
-}
-elseif(sys_get_param_str('delete_update_info'))
+} elseif(sys_get_param_str('delete_update_info'))
 {
   doquery("DELETE FROM `{{logs}}` WHERE `log_code` in (103, 180, 191);");
-}
-elseif(sys_get_param_str('deleteall') == 'yes')
+} elseif(sys_get_param_str('deleteall') == 'yes')
 {
 //  doquery("TRUNCATE TABLE `{{logs}}`");
 }
@@ -51,8 +49,7 @@ 
     }
   }
   $template->assign_vars($errorInfo);
-}
-else
+} else
 {
   $template = gettemplate('admin/adm_log_main', true);
 

Spacing +7 added lines, -7 removed lines

@@ -18,26 +18,26 @@ 
 
 messageBoxAdminAccessDenied(AUTH_LEVEL_ADMINISTRATOR);
 
-if($delete = sys_get_param_id('delete'))
+if ($delete = sys_get_param_id('delete'))
 {
   doquery("DELETE FROM `{{logs}}` WHERE `log_id` = {$delete} LIMIT 1;");
 }
-elseif(sys_get_param_str('delete_update_info'))
+elseif (sys_get_param_str('delete_update_info'))
 {
   doquery("DELETE FROM `{{logs}}` WHERE `log_code` in (103, 180, 191);");
 }
-elseif(sys_get_param_str('deleteall') == 'yes')
+elseif (sys_get_param_str('deleteall') == 'yes')
 {
 //  doquery("TRUNCATE TABLE `{{logs}}`");
 }
 
-if($detail = sys_get_param_id('detail'))
+if ($detail = sys_get_param_id('detail'))
 {
   $template = gettemplate('admin/adm_log_main_detail', true);
 
   $errorInfo = doquery("SELECT * FROM `{{logs}}` WHERE `log_id` = {$detail} LIMIT 1;", true);
   $error_dump = unserialize($errorInfo['log_dump']);
-  if(is_array($error_dump))
+  if (is_array($error_dump))
   {
     foreach ($error_dump as $key => $value)
     {
@@ -57,11 +57,11 @@ 
 
   $i = 0;
   $query = doquery("SELECT * FROM `{{logs}}` ORDER BY log_id DESC LIMIT 100;");
-  while($u = db_fetch($query))
+  while ($u = db_fetch($query))
   {
     $i++;
     $v = array();
-    foreach($u as $key => $value)
+    foreach ($u as $key => $value)
     {
       $v[strtoupper($key)] = $value;
     }

admin/adm_message_list.php

Braces +1 added lines, -2 removed lines

@@ -72,8 +72,7 @@
 if(sys_get_param('page_prev') && $int_page_current > 1)
 {
   $int_page_current--;
-}
-elseif(sys_get_param('page_next') && $int_page_current < $page_max)
+} elseif(sys_get_param('page_next') && $int_page_current < $page_max)
 {
   $int_page_current++;
 }

Spacing +11 added lines, -11 removed lines

@@ -8,8 +8,8 @@ 
  *
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
@@ -28,9 +28,9 @@ 
   ),
 );
 $template->assign_block_vars('int_type_selected', $allowed_types[-1]);
-foreach($sn_message_class_list as $key => $value)
+foreach ($sn_message_class_list as $key => $value)
 {
-  if($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX)
+  if ($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX)
   {
     continue;
   }
@@ -43,19 +43,19 @@ 
 
 
 $message_delete = sys_get_param_id('msg_del');
-if(sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete))
+if (sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete))
 {
   $message_delete = implode(', ', $message_delete);
 }
 
-if($message_delete)
+if ($message_delete)
 {
   doquery("DELETE FROM {{messages}} WHERE `message_id` in ({$message_delete});");
   $template->assign_block_vars('result', array('MESSAGE' => sprintf($lang['mlst_messages_deleted'], $message_delete)));
 }
 
 
-if(sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year')))
+if (sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year')))
 {
   $delete_date = "{$year}-{$month}-{$day}";
   doquery("DELETE FROM {{messages}} WHERE message_time <= UNIX_TIMESTAMP('{$delete_date}')" . ($int_type_selected >= 0 ? " AND `message_type` = {$int_type_selected}" : ''));
@@ -68,16 +68,16 @@ 
 
 $int_page_current = min(sys_get_param_id('int_page_current', 1), $page_max);
 
-if(sys_get_param('page_prev') && $int_page_current > 1)
+if (sys_get_param('page_prev') && $int_page_current > 1)
 {
   $int_page_current--;
 }
-elseif(sys_get_param('page_next') && $int_page_current < $page_max)
+elseif (sys_get_param('page_next') && $int_page_current < $page_max)
 {
   $int_page_current++;
 }
 
-for($i = 1; $i <= $page_max; $i++)
+for ($i = 1; $i <= $page_max; $i++)
 {
   $template->assign_block_vars('page', array('NUMBER' => $i));
 }
@@ -85,7 +85,7 @@ 
 $StartRec = ($int_page_current - 1) * 25;
 
 $Messages = db_message_list_admin_by_type($int_type_selected, $StartRec);
-while($row = db_fetch($Messages))
+while ($row = db_fetch($Messages))
 {
   $row['FROM'] = htmlentities($row['FROM'], ENT_COMPAT, 'UTF-8');
   $row['OWNER_NAME'] = htmlentities($row['OWNER_NAME'], ENT_COMPAT, 'UTF-8');

admin/includes/admin_planet_edit.inc.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list){return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list));}
+function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list) {return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list)); }
 function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list)
 {
   global $lang;
@@ -19,19 +19,19 @@ 
   return $mode;
 }
 
-function admin_planet_edit_template(&$template, $edit_planet_row, $mode){return sn_function_call('admin_planet_edit_template', array(&$template, $edit_planet_row, $mode));}
+function admin_planet_edit_template(&$template, $edit_planet_row, $mode) {return sn_function_call('admin_planet_edit_template', array(&$template, $edit_planet_row, $mode)); }
 function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode)
 {
   global $lang;
 
   $unit_list = sn_get_groups($mode);
-  if(empty($unit_list))
+  if (empty($unit_list))
   {
     return;
   }
   $name_list = $lang['tech'];
 
-  foreach($unit_list as $unit_id)
+  foreach ($unit_list as $unit_id)
   {
     $template->assign_block_vars('unit', array(
       'ID'    => $unit_id,
@@ -42,10 +42,10 @@ 
   }
 }
 
-function admin_planet_edit_query_string($unit_id, $unit_amount, $mode){return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode));}
+function admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode)); }
 function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode)
 {
-  if($unit_amount && in_array($unit_id, sn_get_groups($mode)))
+  if ($unit_amount && in_array($unit_id, sn_get_groups($mode)))
   {
     $unit_amount = round($unit_amount);
     $unit_name = get_unit_param($unit_id, P_NAME);

Braces +4 added lines, -8 removed lines

@@ -1,8 +1,7 @@ 
 <?php
 
 function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list){return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list));}
-function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list)
-{
+function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list) {
   global $lang;
 
   $admin_planet_edit_mode_list = array_merge(isset($admin_planet_edit_mode_list) ? $admin_planet_edit_mode_list : array(), array(
@@ -20,8 +19,7 @@ 
 }
 
 function admin_planet_edit_template(&$template, $edit_planet_row, $mode){return sn_function_call('admin_planet_edit_template', array(&$template, $edit_planet_row, $mode));}
-function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode)
-{
+function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode) {
   global $lang;
 
   $unit_list = sn_get_groups($mode);
@@ -43,15 +41,13 @@ 
 }
 
 function admin_planet_edit_query_string($unit_id, $unit_amount, $mode){return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode));}
-function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode)
-{
+function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {
   if($unit_amount && in_array($unit_id, sn_get_groups($mode)))
   {
     $unit_amount = round($unit_amount);
     $unit_name = get_unit_param($unit_id, P_NAME);
     $result = "{$unit_name} = GREATEST(0, {$unit_name} + ({$unit_amount}))";
-  }
-  else
+  } else
   {
     $result = '';
   }