supernova-ws / SuperNova

includes/classes/UBE/UBE.php

Doc Comments +2 added lines, -2 removed lines

@@ -464,7 +464,7 @@ 
    * Преобразовывает данные симулятора в данные для расчета боя
    *
    * @param     $side_info
-   * @param     $attacker
+   * @param     boolean $attacker
    * @param int $player_id
    *
    * @version 41a6.22
@@ -572,7 +572,7 @@ 
   }
 
   /**
-   * @param $template
+   * @param null|template $template
    *
    * @return template
    */

Spacing +44 added lines, -45 removed lines

@@ -147,7 +147,7 @@ 
     $this->players->db_load_player_by_id($player_id, UBE_PLAYER_IS_DEFENDER);
 
     $player_db_row = $this->players[$player_id]->getDbRow();
-    if($fortifier_level = mrc_get_level($player_db_row, $this->combatMission->dst_planet, MRC_FORTIFIER)) {
+    if ($fortifier_level = mrc_get_level($player_db_row, $this->combatMission->dst_planet, MRC_FORTIFIER)) {
       $this->planet_bonus->add_unit_by_snid(MRC_FORTIFIER, $fortifier_level);
     }
 
@@ -179,7 +179,7 @@ 
     $this->rounds[0] = new UBERound(0);
     $this->rounds[0]->make_snapshot($this->fleet_list);
 
-    for($round = 1; $round <= 10; $round++) {
+    for ($round = 1; $round <= 10; $round++) {
       // Проводим раунд
       defined('DEBUG_UBE') ? print("Round {$round}<br>") : false;
 
@@ -192,7 +192,7 @@ 
 
       // Анализируем итоги текущего раунда и готовим данные для следующего
       $this->combat_result = $this->fleet_list->ubeAnalyzeFleetOutcome($round);
-      if($this->combat_result != UBE_COMBAT_RESULT_DRAW) {
+      if ($this->combat_result != UBE_COMBAT_RESULT_DRAW) {
         break;
       }
 
@@ -221,11 +221,11 @@ 
     // Генерируем результат боя
     $this->fleet_list->ube_analyze_fleets($this->is_simulator, $this->debris, $this->resource_exchange_rates);
 
-    if(!$this->is_ube_loaded) {
+    if (!$this->is_ube_loaded) {
       $this->moon_calculator->calculate_moon($this);
 
       // Лутаем ресурсы - если аттакер выиграл
-      if($this->combat_result == UBE_COMBAT_RESULT_WIN) {
+      if ($this->combat_result == UBE_COMBAT_RESULT_WIN) {
         $this->sn_ube_combat_analyze_loot();
       }
     }
@@ -245,7 +245,7 @@ 
       RES_DEUTERIUM => 0,
     );
 
-    if(
+    if (
       (($planet_resource_total = $this->fleet_list[0]->get_resources_amount()) > 0)
       &&
       (($total_capacity = $this->fleet_list->ube_get_capacity_attackers()) > 0)
@@ -257,9 +257,9 @@ 
       $planet_lootable_percent = $planet_lootable / $planet_resource_total;
 
       // Вычисляем сколько ресурсов вывезено
-      foreach($this->fleet_list->_container as $fleet_id => $fleet) {
+      foreach ($this->fleet_list->_container as $fleet_id => $fleet) {
         $looted_in_metal = 0;
-        foreach($this->fleet_list[0]->resource_list as $resource_id => $resource_amount) {
+        foreach ($this->fleet_list[0]->resource_list as $resource_id => $resource_amount) {
           // Вычисляем какой процент общей емкости трюмов атакующих будет задействован
           $fleet_lootable_percent = $fleet->fleet_capacity / $total_capacity;
           $looted = floor($resource_amount * $planet_lootable_percent * $fleet_lootable_percent);
@@ -325,16 +325,16 @@ 
     $destination_user_id = $this->fleet_list[0]->owner_id;
 
     // Обновляем поле обломков на планете
-    if(!$this->is_admin_in_combat && $this->debris->debris_total() > 0) {
+    if (!$this->is_admin_in_combat && $this->debris->debris_total() > 0) {
       db_planet_set_by_gspt($this->ube_planet_info[PLANET_GALAXY], $this->ube_planet_info[PLANET_SYSTEM], $this->ube_planet_info[PLANET_PLANET], PT_PLANET,
         "`debris_metal` = `debris_metal` + " . $this->debris->debris_get_resource(RES_METAL) . ", `debris_crystal` = `debris_crystal` + " . $this->debris->debris_get_resource(RES_CRYSTAL)
       );
     }
 
-    foreach($this->fleet_list->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->fleet_list->_container as $fleet_id => $UBEFleet) {
       $ship_count_lost = $UBEFleet->unit_list->unitCountLost();
 
-      if($fleet_id) {
+      if ($fleet_id) {
         // Флот
         $UBEFleet->db_save_combat_result_fleet($this->is_small_fleet_recce, $this->moon_calculator->get_reapers_status());
       } else {
@@ -342,19 +342,19 @@ 
 
         // Сохраняем изменения ресурсов - если они есть
         $resource_delta = $UBEFleet->ube_combat_result_calculate_resources();
-        if(!empty($resource_delta)) {
+        if (!empty($resource_delta)) {
           $temp = array();
-          foreach($resource_delta as $resource_id => $resource_amount) {
+          foreach ($resource_delta as $resource_id => $resource_amount) {
             $resource_db_name = pname_resource_name($resource_id);
             $temp[] = "`{$resource_db_name}` = `{$resource_db_name}` + ({$resource_amount})";
           }
           db_planet_set_by_id($this->ube_planet_info[PLANET_ID], implode(',', $temp));
         }
 
-        if($ship_count_lost) {
+        if ($ship_count_lost) {
           $db_changeset = array();
           $planet_row_cache = $this->players[$destination_user_id]->getDbRow();
-          foreach($UBEFleet->unit_list->_container as $UBEUnit) {
+          foreach ($UBEFleet->unit_list->_container as $UBEUnit) {
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($UBEUnit->unitId, -$UBEUnit->units_lost, $planet_row_cache, $this->ube_planet_info[PLANET_ID]);
           }
           db_changeset_apply($db_changeset);
@@ -365,7 +365,7 @@ 
     // TODO: Связать сабы с флотами констраинтами ON DELETE SET NULL
     // Для САБов
     $fleet_group_id_list = $this->fleet_list->ube_get_groups();
-    if(!empty($fleet_group_id_list)) {
+    if (!empty($fleet_group_id_list)) {
       $fleet_group_id_list = implode(',', $fleet_group_id_list);
       db_acs_delete_by_list($fleet_group_id_list);
     }
@@ -374,19 +374,19 @@ 
 
     $bashing_list = array();
     $players_sides = $this->players->get_player_sides();
-    foreach($players_sides as $player_id => $player_side) {
-      if($player_side != UBE_PLAYER_IS_ATTACKER) {
+    foreach ($players_sides as $player_id => $player_side) {
+      if ($player_side != UBE_PLAYER_IS_ATTACKER) {
         continue;
       }
-      if($this->moon_calculator->get_status() != UBE_MOON_DESTROY_SUCCESS) {
+      if ($this->moon_calculator->get_status() != UBE_MOON_DESTROY_SUCCESS) {
         $bashing_list[] = "({$player_id}, {$this->ube_planet_info[PLANET_ID]}, {$this->combat_timestamp})";
       }
-      if($this->mission_type_id == MT_ATTACK && $this->is_defender_active_player) {
+      if ($this->mission_type_id == MT_ATTACK && $this->is_defender_active_player) {
         $str_loose_or_win = $this->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");
       }
     }
-    if(!empty($bashing_list)) {
+    if (!empty($bashing_list)) {
       $bashing_list = implode(',', $bashing_list);
       db_bashing_insert($bashing_list);
     }
@@ -413,20 +413,19 @@ 
       $planet_info[PLANET_SYSTEM],
       $planet_info[PLANET_PLANET],
       htmlentities($planet_info[PLANET_NAME], ENT_COMPAT, 'UTF-8'),
-      classLocale::$lang[$this->combat_result == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' :
-        ($this->combat_result == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
+      classLocale::$lang[$this->combat_result == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' : ($this->combat_result == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
     );
 
     $text_defender = '';
     $debris = $this->debris->get_debris();
-    foreach($debris as $resource_id => $resource_amount) {
-      if($resource_id == RES_DEUTERIUM) {
+    foreach ($debris as $resource_id => $resource_amount) {
+      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 />";
     }
 
@@ -436,7 +435,7 @@ 
 
     // TODO: Оптимизировать отсылку сообщений - отсылать пакетами
     $player_sides = $this->players->get_player_sides();
-    foreach($player_sides as $player_id => $player_side) {
+    foreach ($player_sides as $player_id => $player_side) {
       $message = $text_common . ($this->is_small_fleet_recce && ($player_side == UBE_PLAYER_IS_ATTACKER) ? classLocale::$lang['ube_report_msg_body_sfr'] : $text_defender);
       msg_send_simple_message($player_id, '', $this->combat_timestamp, MSG_TYPE_COMBAT, classLocale::$lang['sys_mess_tower'], classLocale::$lang['sys_mess_attack_report'], $message);
     }
@@ -473,11 +472,11 @@ 
     $player_id = $player_id == -1 ? $this->players->count() : $player_id;
     $fleet_id = $player_id; // FOR SIMULATOR!
 
-    if(empty($this->players[$player_id])) {
+    if (empty($this->players[$player_id])) {
       $this->players[$player_id] = new UBEPlayer();
     }
 
-    foreach($side_info as $fleet_data) {
+    foreach ($side_info as $fleet_data) {
       $this->players[$player_id]->name = $player_id;
       $this->players[$player_id]->setSide($attacker);
 
@@ -485,32 +484,32 @@ 
       $this->fleet_list[$fleet_id] = $objFleet;
 
       $this->fleet_list[$fleet_id]->owner_id = $player_id;
-      foreach($fleet_data as $unit_id => $unit_count) {
-        if(!$unit_count) {
+      foreach ($fleet_data as $unit_id => $unit_count) {
+        if (!$unit_count) {
           continue;
         }
 
         $unit_type = get_unit_param($unit_id, P_UNIT_TYPE);
 
-        if($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) {
+        if ($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) {
           $this->fleet_list[$fleet_id]->unit_list->unitAdjustCount($unit_id, $unit_count);
-        } elseif($unit_type == UNIT_RESOURCES) {
+        } elseif ($unit_type == UNIT_RESOURCES) {
           $this->fleet_list[$fleet_id]->resource_list[$unit_id] = $unit_count;
-        } elseif($unit_type == UNIT_TECHNOLOGIES) {
-          if($unit_id == TECH_WEAPON) {
+        } elseif ($unit_type == UNIT_TECHNOLOGIES) {
+          if ($unit_id == TECH_WEAPON) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_WEAPON, $unit_count);
-          } elseif($unit_id == TECH_SHIELD) {
+          } elseif ($unit_id == TECH_SHIELD) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_SHIELD, $unit_count);
-          } elseif($unit_id == TECH_ARMOR) {
+          } elseif ($unit_id == TECH_ARMOR) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_ARMOR, $unit_count);
           }
-        } elseif($unit_type == UNIT_GOVERNORS) {
-          if($unit_id == MRC_FORTIFIER) {
+        } elseif ($unit_type == UNIT_GOVERNORS) {
+          if ($unit_id == MRC_FORTIFIER) {
             // Фортифаер даёт бонус ко всему
             $this->planet_bonus->add_unit_by_snid(MRC_FORTIFIER, $unit_count);
           }
-        } elseif($unit_type == UNIT_MERCENARIES) {
-          if($unit_id == MRC_ADMIRAL) {
+        } elseif ($unit_type == UNIT_MERCENARIES) {
+          if ($unit_id == MRC_ADMIRAL) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(MRC_ADMIRAL, $unit_count);
           }
         }
@@ -581,7 +580,7 @@ 
 
     $ube_report = new UBEReport();
     $ube = $ube_report->sn_ube_report_load(sys_get_param_str('cypher'));
-    if($ube != UBE_REPORT_NOT_FOUND) {
+    if ($ube != UBE_REPORT_NOT_FOUND) {
       $ube_report->sn_ube_report_generate($ube, $template_result);
 
       $template = gettemplate('ube_combat_report', $template);
@@ -614,9 +613,9 @@ 
 //    sn_ube_report_save($combat_data);
 //  }
 
-    if(sys_get_param_str('reload')) {
+    if (sys_get_param_str('reload')) {
       $ube_new = $ube_report->sn_ube_report_load($ube->get_cypher()); // $combat_data = sn_ube_report_load($combat_data[UBE_REPORT_CYPHER]);
-      if($ube_new != UBE_REPORT_NOT_FOUND && is_object($ube_new)) {
+      if ($ube_new != UBE_REPORT_NOT_FOUND && is_object($ube_new)) {
         $ube = $ube_new;
       }
     }
@@ -664,7 +663,7 @@ 
     $this->debris->load_from_report_row($report_row);
 
     $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)) {
       $this->players->init_player_from_report_info($player_row);
     }
 

includes/classes/UBE/UBEDebris.php

Doc Comments +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
   }
 
   /**
-   * @param $moon_debris_left_part
+   * @param double $moon_debris_left_part
    */
   public function debris_adjust_proportional($moon_debris_left_part) {
     foreach($this->debris as $resource_id => &$resource_amount) {
@@ -104,7 +104,7 @@ 
   /**
    * @param classConfig $config
    *
-   * @return int
+   * @return double
    */
   public function debris_in_metal($config) {
     return floatval(

Spacing +7 added lines, -7 removed lines

@@ -30,7 +30,7 @@ 
    */
   public function debris_add_resource($resource_id, $resource_amount) {
     // В обломках может быть только металл или кристалл
-    if($resource_id != RES_METAL && $resource_id != RES_CRYSTAL) {
+    if ($resource_id != RES_METAL && $resource_id != RES_CRYSTAL) {
       return;
     }
     $this->debris[$resource_id] += $resource_amount;
@@ -41,7 +41,7 @@ 
    * @param bool  $is_simulator
    */
   public function add_wrecks(array $wreckage, $is_simulator) {
-    foreach($wreckage as $resource_id => $resource_amount) {
+    foreach ($wreckage as $resource_id => $resource_amount) {
       $this->debris_add_resource($resource_id, floor($resource_amount *
         ($is_simulator
           ? UBE_SHIP_WRECKS_TO_DEBRIS_AVG
@@ -57,7 +57,7 @@ 
    * @param bool  $is_simulator
    */
   public function add_cargo_drop(array $dropped_resources, $is_simulator) {
-    foreach($dropped_resources as $resource_id => $resource_amount) {
+    foreach ($dropped_resources as $resource_id => $resource_amount) {
       $this->debris_add_resource($resource_id, floor($resource_amount *
         ($is_simulator
           ? UBE_CARGO_DROPPED_TO_DEBRIS_AVG
@@ -96,7 +96,7 @@ 
    * @param $moon_debris_left_part
    */
   public function debris_adjust_proportional($moon_debris_left_part) {
-    foreach($this->debris as $resource_id => &$resource_amount) {
+    foreach ($this->debris as $resource_id => &$resource_amount) {
       $resource_amount = floor($resource_amount * $moon_debris_left_part);
     }
   }
@@ -121,9 +121,9 @@ 
    */
   public function report_generate_sql(classConfig $config) {
     return "
-      `ube_report_debris_metal` = " . (float)$this->debris_get_resource(RES_METAL) . ",
-      `ube_report_debris_crystal` = " . (float)$this->debris_get_resource(RES_CRYSTAL) . ",
-      `ube_report_debris_total_in_metal` = " . (float)$this->debris_in_metal($config) . ", ";
+      `ube_report_debris_metal` = " . (float) $this->debris_get_resource(RES_METAL) . ",
+      `ube_report_debris_crystal` = " . (float) $this->debris_get_resource(RES_CRYSTAL) . ",
+      `ube_report_debris_total_in_metal` = " . (float) $this->debris_in_metal($config) . ", ";
   }
 
   /**

includes/classes/UBE/UBEFleetList.php

Doc Comments +3 added lines

@@ -278,6 +278,9 @@
     return count($this->ube_side_present_at_round_start);
   }
 
+  /**
+   * @param integer $round
+   */
   public function ubeAnalyzeFleetOutcome($round) {
     $this->ube_actualize_sides();
 

Spacing +23 added lines, -23 removed lines

@@ -82,13 +82,13 @@ 
    */
   public function ube_db_load_fleets_outcome($report_row) {
     $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'];
       $this[$fleet_id]->load_outcome_from_report_row($row);
     }
 
     $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'];
       $this[$fleet_id]->load_unit_outcome_from_row($row);
     }
@@ -108,7 +108,7 @@ 
       UBE_PLAYER_IS_DEFENDER => array(),
     );
 
-    foreach($this->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->_container as $fleet_id => $UBEFleet) {
       $result[$UBEFleet->is_attacker][] = array(
         'ID'          => $fleet_id,
         'NAME'        => $ube->players[$UBEFleet->owner_id]->name,
@@ -131,11 +131,11 @@ 
    */
   public function ube_analyze_fleets($is_simulator, UBEDebris $debris, array $resource_exchange_rates) {
     // Генерируем результат боя
-    foreach($this->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->_container as $fleet_id => $UBEFleet) {
       // Инициализируем массив результатов для флота
 //      $this->init_fleet_outcome_and_link_to_side($UBEFleet);
 
-      foreach($UBEFleet->unit_list->_container as $UBEUnit) {
+      foreach ($UBEFleet->unit_list->_container as $UBEUnit) {
         $UBEUnit->ube_analyze_unit($is_simulator);
       }
 
@@ -152,10 +152,10 @@ 
       $this->resources_lost_in_metal = array(
         RES_METAL => 0,
       );
-      foreach($UBEFleet->resources_lost_on_units as $resource_id => $resource_amount) {
+      foreach ($UBEFleet->resources_lost_on_units as $resource_id => $resource_amount) {
         $UBEFleet->resources_lost_in_metal[RES_METAL] += $resource_amount * $resource_exchange_rates[$resource_id];
       }
-      foreach($UBEFleet->cargo_dropped as $resource_id => $resource_amount) {
+      foreach ($UBEFleet->cargo_dropped as $resource_id => $resource_amount) {
         $UBEFleet->resources_lost_in_metal[RES_METAL] += $resource_amount * $resource_exchange_rates[$resource_id];
       }
     }
@@ -166,8 +166,8 @@ 
    */
   public function ube_get_groups() {
     $result = array();
-    foreach($this->_container as $UBEFleet) {
-      if($UBEFleet->group_id) {
+    foreach ($this->_container as $UBEFleet) {
+      if ($UBEFleet->group_id) {
         $result[$UBEFleet->group_id] = $UBEFleet->group_id;
       }
     }
@@ -180,8 +180,8 @@ 
    */
   public function ube_get_capacity_attackers() {
     $result = 0;
-    foreach($this->_container as $UBEFleet) {
-      if($UBEFleet->is_attacker) {
+    foreach ($this->_container as $UBEFleet) {
+      if ($UBEFleet->is_attacker) {
         $result += $UBEFleet->fleet_capacity;
       }
     }
@@ -195,7 +195,7 @@ 
    */
   public function ube_db_load_from_report_row(array $report_row, UBE $ube) {
     $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)) {
       $objFleet = new UBEFleet();
       $objFleet->load_from_report($fleet_row, $ube);
       $this[$objFleet->db_id] = $objFleet;
@@ -209,20 +209,20 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function ube_prepare_for_next_round($is_simulator) {
-    foreach($this->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->_container as $fleet_id => $UBEFleet) {
       $UBEFleet->prepare_for_next_round($is_simulator);
     }
 
     // Суммируем данные по атакующим и защитникам
     $this->ube_total[UBE_PLAYER_IS_ATTACKER]->_reset();
     $this->ube_total[UBE_PLAYER_IS_DEFENDER]->_reset();
-    foreach($this->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->_container as $fleet_id => $UBEFleet) {
       $this->ube_total[$UBEFleet->is_attacker]->add_unit_stats_array($UBEFleet->total_stats);
     }
 //pvar_dump($this->ube_total);
 
     // Высчитываем долю атаки, приходящейся на юнит равную отношению брони юнита к общей броне - крупные цели атакуют чаще
-    foreach($this->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->_container as $fleet_id => $UBEFleet) {
       $UBEFleet->calculate_unit_partial_data($this->ube_total[$UBEFleet->is_attacker]);
     }
   }
@@ -236,7 +236,7 @@ 
    */
   public function ube_calculate_attack_results(UBE $ube) {
     // Каждый флот атакует все
-    foreach($this->_container as $attack_fleet_data) {
+    foreach ($this->_container as $attack_fleet_data) {
       defined('DEBUG_UBE') ? print("Fleet {$attack_fleet_data->db_id} attacks<br /><div style='margin-left: 30px;'>") : false;
 
       $attack_fleet_data->attack_fleets($this, $ube->is_simulator);
@@ -251,8 +251,8 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function ube_actualize_sides() {
-    foreach($this->_container as $UBEFleet) {
-      if($UBEFleet->get_unit_count() > 0) {
+    foreach ($this->_container as $UBEFleet) {
+      if ($UBEFleet->get_unit_count() > 0) {
         $this->ube_side_present_at_round_start[$UBEFleet->is_attacker] = 1;
       }
     }
@@ -265,8 +265,8 @@ 
    */
   public function ube_calculate_attack_reapers() {
     $reapers = 0;
-    foreach($this->_container as $fleet_id => $UBERoundFleetCombat) {
-      if($UBERoundFleetCombat->is_attacker == UBE_PLAYER_IS_ATTACKER) {
+    foreach ($this->_container as $fleet_id => $UBERoundFleetCombat) {
+      if ($UBERoundFleetCombat->is_attacker == UBE_PLAYER_IS_ATTACKER) {
         $reapers += $UBERoundFleetCombat->unit_list->unitCountReapers();
       }
     }
@@ -283,10 +283,10 @@ 
 
     $result = UBE_COMBAT_RESULT_DRAW;
     // Проверяем результат боя
-    if($this->ube_get_sides_count() == 0 || $round >= 10) {
+    if ($this->ube_get_sides_count() == 0 || $round >= 10) {
       // Если кого-то не осталось или не осталось обоих - заканчиваем цикл
       $result = UBE_COMBAT_RESULT_DRAW_END;
-    } elseif($this->ube_get_sides_count() == 1) {
+    } elseif ($this->ube_get_sides_count() == 1) {
       // Если осталась одна сторона - она и выиграла
       $result = isset($this->ube_side_present_at_round_start[UBE_PLAYER_IS_ATTACKER]) ? UBE_COMBAT_RESULT_WIN : UBE_COMBAT_RESULT_LOSS;
     }
@@ -303,7 +303,7 @@ 
    * @version 41a6.16
    */
   public function ubeInitGetAttackers(Fleet $objFleet, UBEPlayerList $players) {
-    if($objFleet->group_id) {
+    if ($objFleet->group_id) {
       $fleets_added = $this->dbLoadWhere("`fleet_group` = {$objFleet->group_id}");
     } else {
       $this->ube_insert_from_Fleet($objFleet);

includes/classes/UBE/UBEReport.php

Doc Comments +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
   /**
    * @param UBE $ube
    *
-   * @return bool|string
+   * @return false|string
    *
    * @version 2016-02-25 23:42:45 41a4.68
    */
@@ -186,7 +186,7 @@ 
   // ------------------------------------------------------------------------------------------------
   // Читает боевой отчет из БД
   /**
-   * @param $report_cypher
+   * @param string $report_cypher
    *
    * @return string|UBE
    */

Spacing +24 added lines, -24 removed lines

@@ -15,14 +15,14 @@ 
     global $config;
 
     // Если уже есть ИД репорта - значит репорт был взят из таблицы. С таким мы не работаем
-    if($ube->get_cypher()) {
+    if ($ube->get_cypher()) {
       return false;
     }
 
     // Генерируем уникальный секретный ключ и проверяем наличие в базе
     do {
       $ube->report_cypher = sys_random_string(32);
-    } while(doquery("SELECT ube_report_cypher FROM {{ube_report}} WHERE ube_report_cypher = '{$ube->report_cypher}' LIMIT 1 FOR UPDATE", true));
+    } while (doquery("SELECT ube_report_cypher FROM {{ube_report}} WHERE ube_report_cypher = '{$ube->report_cypher}' LIMIT 1 FOR UPDATE", true));
 
     // Инициализация таблицы для пакетной вставки информации
     $sql_perform = array(
@@ -113,21 +113,21 @@ 
       `ube_report_time_combat` = '" . date(FMT_DATE_TIME_SQL, $ube->combat_timestamp) . "',
       `ube_report_time_spent` = {$ube->time_spent},
 
-      `ube_report_combat_admin` = " . (int)$ube->is_admin_in_combat . ",
+      `ube_report_combat_admin` = " . (int) $ube->is_admin_in_combat . ",
       `ube_report_mission_type` = {$ube->mission_type_id},
 
       `ube_report_combat_result` = {$ube->combat_result},
-      `ube_report_combat_sfr` = " . (int)$ube->is_small_fleet_recce . ",
+      `ube_report_combat_sfr` = " . (int) $ube->is_small_fleet_recce . ",
 
-      `ube_report_planet_id`          = " . (int)$ube->ube_planet_info[PLANET_ID] . ",
+      `ube_report_planet_id`          = " . (int) $ube->ube_planet_info[PLANET_ID] . ",
       `ube_report_planet_name`        = '" . db_escape($ube->ube_planet_info[PLANET_NAME]) . "',
-      `ube_report_planet_size`        = " . (int)$ube->ube_planet_info[PLANET_SIZE] . ",
-      `ube_report_planet_galaxy`      = " . (int)$ube->ube_planet_info[PLANET_GALAXY] . ",
-      `ube_report_planet_system`      = " . (int)$ube->ube_planet_info[PLANET_SYSTEM] . ",
-      `ube_report_planet_planet`      = " . (int)$ube->ube_planet_info[PLANET_PLANET] . ",
-      `ube_report_planet_planet_type` = " . (int)$ube->ube_planet_info[PLANET_TYPE] . ",
+      `ube_report_planet_size`        = " . (int) $ube->ube_planet_info[PLANET_SIZE] . ",
+      `ube_report_planet_galaxy`      = " . (int) $ube->ube_planet_info[PLANET_GALAXY] . ",
+      `ube_report_planet_system`      = " . (int) $ube->ube_planet_info[PLANET_SYSTEM] . ",
+      `ube_report_planet_planet`      = " . (int) $ube->ube_planet_info[PLANET_PLANET] . ",
+      `ube_report_planet_planet_type` = " . (int) $ube->ube_planet_info[PLANET_TYPE] . ",
 
-      `ube_report_capture_result` = " . (int)$ube->capture_result . ", "
+      `ube_report_capture_result` = " . (int) $ube->capture_result . ", "
       . $ube->debris->report_generate_sql($config)
       . $ube->moon_calculator->report_generate_sql();
 
@@ -136,7 +136,7 @@ 
 
     // Сохраняем общую информацию по игрокам
     $player_sides = $ube->players->get_player_sides();
-    foreach($player_sides as $player_id => $player_side) {
+    foreach ($player_sides as $player_id => $player_side) {
       $sql_perform['ube_report_player'][] = array(
         $ube_report_id,
         $player_id,
@@ -144,14 +144,14 @@ 
         "'" . db_escape($ube->players[$player_id]->name) . "'",
         $ube->players[$player_id]->getSide() == UBE_PLAYER_IS_ATTACKER ? 1 : 0,
 
-        (float)$ube->players[$player_id]->player_bonus->calcBonus(P_ATTACK),
-        (float)$ube->players[$player_id]->player_bonus->calcBonus(P_SHIELD),
-        (float)$ube->players[$player_id]->player_bonus->calcBonus(P_ARMOR),
+        (float) $ube->players[$player_id]->player_bonus->calcBonus(P_ATTACK),
+        (float) $ube->players[$player_id]->player_bonus->calcBonus(P_SHIELD),
+        (float) $ube->players[$player_id]->player_bonus->calcBonus(P_ARMOR),
       );
     }
 
     // Всякая информация по флотам
-    foreach($ube->fleet_list->_container as $fleet_id => $UBEFleet) {
+    foreach ($ube->fleet_list->_container as $fleet_id => $UBEFleet) {
       // Сохраняем общую информацию по флотам
       $sql_perform['ube_report_fleet'][] = $UBEFleet->sql_generate_array($ube_report_id);
 
@@ -167,11 +167,11 @@ 
     $ube->rounds->sql_generate_unit_array($sql_perform['ube_report_unit'], $ube_report_id, $ube->fleet_list);
 
     // Пакетная вставка данных
-    foreach($sql_perform as $table_name => $table_data) {
-      if(count($table_data) < 2) {
+    foreach ($sql_perform as $table_name => $table_data) {
+      if (count($table_data) < 2) {
         continue;
       }
-      foreach($table_data as &$record_data) {
+      foreach ($table_data as &$record_data) {
         $record_data = '(' . implode(',', $record_data) . ')';
       }
       $fields = $table_data[0];
@@ -194,7 +194,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;
     }
 
@@ -210,7 +210,7 @@ 
    * @param     $template_result
    */
   function sn_ube_report_generate(UBE $ube, &$template_result) {
-    if(!is_object($ube)) {
+    if (!is_object($ube)) {
       return;
     }
 
@@ -227,15 +227,15 @@ 
 
     // Координаты, тип и название планеты - если есть
 //R  $planet_owner_id = $combat_data[UBE_FLEETS][0][UBE_OWNER];
-    if(isset($ube->ube_planet_info)) {
+    if (isset($ube->ube_planet_info)) {
       $template_result += $ube->ube_planet_info;
       $template_result[PLANET_NAME] = str_replace(' ', '&nbsp;', htmlentities($template_result[PLANET_NAME], ENT_COMPAT, 'UTF-8'));
     }
 
     // Обломки
     $debris = array();
-    foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) {
-      if($resource_amount = $ube->debris->debris_get_resource($resource_id)) {
+    foreach (array(RES_METAL, RES_CRYSTAL) as $resource_id) {
+      if ($resource_amount = $ube->debris->debris_get_resource($resource_id)) {
         $debris[] = array(
           'NAME'   => $lang['tech'][$resource_id],
           'AMOUNT' => pretty_number($resource_amount),

includes/db/db_queries_ally.php

Doc Comments +1 added lines, -1 removed lines

@@ -293,7 +293,7 @@
 }
 
 /**
- * @param $ranklist
+ * @param string $ranklist
  * @param $user
  */
 function db_ally_update_ranklist($ranklist, $user) {

includes/db/db_queries_chat.php

Doc Comments +3 added lines, -3 removed lines

@@ -17,9 +17,9 @@ 
 
 /**
  * @param $user_id
- * @param $nick
+ * @param string $nick
  * @param $ally_id
- * @param $message
+ * @param string $message
  * @param $chat_message_sender_name
  * @param $chat_message_recipient_id
  * @param $chat_message_recipient_name
@@ -55,7 +55,7 @@ 
  * @param $alliance
  * @param $where_add
  * @param $start_row
- * @param $page_limit
+ * @param integer $page_limit
  *
  * @return array|bool|mysqli_result|null
  */

includes/db/db_queries_fleet.php

Doc Comments +6 added lines, -2 removed lines

@@ -22,6 +22,10 @@ 
   doquery('DELETE FROM `{{aks}}` WHERE `id` NOT IN (SELECT DISTINCT `fleet_group` FROM `{{fleets}}`);');
 }
 
+/**
+ * @param double $arrival
+ * @param integer $target_structure
+ */
 function db_missile_insert($target_coord, $user, $planetrow, $arrival, $fleet_ship_count, $target_structure) {
   doquery(
     "INSERT INTO `{{iraks}}` SET
@@ -114,14 +118,14 @@ 
 
 
 /**
- * @param $fleet_group_id_list
+ * @param string $fleet_group_id_list
  */
 function db_acs_delete_by_list($fleet_group_id_list) {
   doquery("DELETE FROM {{aks}} WHERE `id` IN ({$fleet_group_id_list})");
 }
 
 /**
- * @param $bashing_list
+ * @param string $bashing_list
  */
 function db_bashing_insert($bashing_list) {
   doquery("INSERT INTO {{bashing}} (bashing_user_id, bashing_planet_id, bashing_time) VALUES {$bashing_list};");

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * DB ACS functions
- */
+   * DB ACS functions
+   */
 
 /* ACS ****************************************************************************************************************/
 /**

includes/db/db_queries_news_and_surveys.php

Doc Comments +4 added lines, -4 removed lines

@@ -79,9 +79,9 @@ 
 }
 
 /**
- * @param $template
- * @param $query_where
- * @param $query_limit
+ * @param template $template
+ * @param string $query_where
+ * @param integer $query_limit
  *
  * @return array|bool|mysqli_result|null
  */
@@ -105,7 +105,7 @@ 
  * @param $user
  * @param $survey_id
  * @param $survey_vote_id
- * @param $user_name_safe
+ * @param string $user_name_safe
  */
 function db_survey_vote_insert(&$user, $survey_id, $survey_vote_id, $user_name_safe) {
   doquery("INSERT INTO {{survey_votes}} SET `survey_parent_id` = {$survey_id}, `survey_parent_answer_id` = {$survey_vote_id}, `survey_vote_user_id` = {$user['id']}, `survey_vote_user_name` = '{$user_name_safe}';");

includes/functions/int_fleet_events.php

Doc Comments +2 added lines, -2 removed lines

@@ -69,8 +69,8 @@
 
 /**
  * @param Fleet $objFleet
- * @param       $ov_label
- * @param       $planet_end_type
+ * @param       integer $ov_label
+ * @param       integer $planet_end_type
  *
  * @return mixed
  */

Spacing +11 added lines, -11 removed lines

@@ -6,26 +6,26 @@ 
   $fleet_events = array();
   $fleet_number = 0;
 
-  if($objFleetList->count() <= 0) {
+  if ($objFleetList->count() <= 0) {
     return;
   }
 
-  foreach($objFleetList->_container as $objFleet) {
+  foreach ($objFleetList->_container as $objFleet) {
     $planet_start_type = $objFleet->fleet_start_type == PT_MOON ? PT_MOON : PT_PLANET;
     $planet_start = db_planet_by_gspt($objFleet->fleet_start_galaxy, $objFleet->fleet_start_system, $objFleet->fleet_start_planet, $planet_start_type, false, 'name');
     $objFleet->fleet_start_name = $planet_start['name'];
 
     $planet_end_type = $objFleet->fleet_end_type == PT_MOON ? PT_MOON : PT_PLANET;
-    if($objFleet->fleet_end_planet > $config->game_maxPlanet) {
+    if ($objFleet->fleet_end_planet > $config->game_maxPlanet) {
       $objFleet->fleet_end_name = $lang['ov_fleet_exploration'];
-    } elseif($objFleet->mission_type == MT_COLONIZE) {
+    } elseif ($objFleet->mission_type == MT_COLONIZE) {
       $objFleet->fleet_end_name = $lang['ov_fleet_colonization'];
     } else {
       $planet_end = db_planet_by_gspt($objFleet->fleet_end_galaxy, $objFleet->fleet_end_system, $objFleet->fleet_end_planet, $planet_end_type, false, 'name');
       $objFleet->fleet_end_name = $planet_end['name'];
     }
 
-    if($objFleet->time_arrive_to_target > SN_TIME_NOW && !$objFleet->isReturning() && $objFleet->mission_type != MT_MISSILE &&
+    if ($objFleet->time_arrive_to_target > SN_TIME_NOW && !$objFleet->isReturning() && $objFleet->mission_type != MT_MISSILE &&
       ($planet_scanned === false
         ||
         (
@@ -39,11 +39,11 @@ 
       $fleet_events[] = flt_register_event_objFleet($objFleet, 0, $planet_end_type);
     }
 
-    if($objFleet->time_mission_job_complete > SN_TIME_NOW && !$objFleet->isReturning() && $planet_scanned === false && $objFleet->mission_type != MT_MISSILE) {
+    if ($objFleet->time_mission_job_complete > SN_TIME_NOW && !$objFleet->isReturning() && $planet_scanned === false && $objFleet->mission_type != MT_MISSILE) {
       $fleet_events[] = flt_register_event_objFleet($objFleet, 1, $planet_end_type);
     }
 
-    if(
+    if (
       $objFleet->time_return_to_source > SN_TIME_NOW && $objFleet->mission_type != MT_MISSILE && ($objFleet->isReturning() || ($objFleet->mission_type != MT_RELOCATE && $objFleet->mission_type != MT_COLONIZE)) &&
       (
         ($planet_scanned === false && $objFleet->playerOwnerId == $user['id'])
@@ -59,7 +59,7 @@ 
       $fleet_events[] = flt_register_event_objFleet($objFleet, 2, $planet_end_type);
     }
 
-    if($objFleet->mission_type == MT_MISSILE) {
+    if ($objFleet->mission_type == MT_MISSILE) {
       $fleet_events[] = flt_register_event_objFleet($objFleet, 3, $planet_end_type);
     }
   }
@@ -79,7 +79,7 @@ 
 
   $is_this_planet = false;
 
-  switch($objFleet->ov_label = $ov_label) {
+  switch ($objFleet->ov_label = $ov_label) {
     case 0:
       $objFleet->event_time = $objFleet->time_arrive_to_target;
       $is_this_planet = (
@@ -110,9 +110,9 @@ 
 
   }
 
-  $objFleet->ov_this_planet = $is_this_planet;// || $planet_scanned != false;
+  $objFleet->ov_this_planet = $is_this_planet; // || $planet_scanned != false;
 
-  if($objFleet->playerOwnerId == $user['id']) {
+  if ($objFleet->playerOwnerId == $user['id']) {
     $user_data = $user;
   } else {
     $user_data = db_user_by_id($objFleet->playerOwnerId);