supernova-ws / SuperNova

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 = '';
   }

banned.php

Spacing +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
 $template = gettemplate('banned_body', true);
 
 $query = doquery("SELECT * FROM {{banned}} ORDER BY `ban_id` DESC;");
-$i=0;
-while($ban_row = db_fetch($query))
+$i = 0;
+while ($ban_row = db_fetch($query))
 {
   $template->assign_block_vars('banlist', array(
     'USER_NAME'   => $ban_row['ban_user_name'],

buildings.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
 $mode = sys_get_param_escaped('mode');
 $mode = (!$mode || $mode == 'buildings') ? QUE_STRUCTURES : ($mode == 'fleet' ? SUBQUE_FLEET : ($mode == 'defense' ? SUBQUE_DEFENSE : ($mode == 'research' ? QUE_RESEARCH : $mode)));
 
-if($building_sort = sys_get_param_id('sort_elements')) {
-  if(!empty($lang['player_option_building_sort'][$building_sort])) {
+if ($building_sort = sys_get_param_id('sort_elements')) {
+  if (!empty($lang['player_option_building_sort'][$building_sort])) {
     classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT, $mode)] = $building_sort;
     classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT_INVERSE, $mode)] = sys_get_param_id('sort_elements_inverse', 0);
   }

time_probe.php

Spacing +4 added lines, -4 removed lines

@@ -13,11 +13,11 @@ 
 $time_server = $time_local  - $time_diff
 */
 
-if($font_size = sys_get_param_str('font_size')) {
-  if(strpos($font_size, '%') !== false) {
+if ($font_size = sys_get_param_str('font_size')) {
+  if (strpos($font_size, '%') !== false) {
     // Размер шрифта в процентах
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
-  } elseif(strpos($font_size, 'px') !== false) {
+  } elseif (strpos($font_size, 'px') !== false) {
     // Размер шрифта в пикселях
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
   } else {
@@ -29,7 +29,7 @@ 
   classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE] = $font_size;
 } else {
   $user_time_diff = playerTimeDiff::user_time_diff_get();
-  if($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
+  if ($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
     $time_diff = intval($user_time_diff[PLAYER_OPTION_TIME_DIFF]);
   } else {
     $user_time_diff = playerTimeDiff::user_time_diff_probe();