supernova-ws / SuperNova

classes/UBE/UBEReport.php

Spacing +29 added lines, -29 removed lines

@@ -13,14 +13,14 @@ 
    */
   public function sn_ube_report_save($ube) {
     // Если уже есть ИД репорта - значит репорт был взят из таблицы. С таким мы не работаем
-    if($ube->get_cypher()) {
+    if ($ube->get_cypher()) {
       return false;
     }
 
     // Генерируем уникальный секретный ключ и проверяем наличие в базе
     do {
       $ube->report_cypher = sys_random_string(32);
-    } while(classSupernova::$db->doSelectFetchArray("SELECT ube_report_cypher FROM {{ube_report}} WHERE ube_report_cypher = '{$ube->report_cypher}' LIMIT 1 FOR UPDATE"));
+    } while (classSupernova::$db->doSelectFetchArray("SELECT ube_report_cypher FROM {{ube_report}} WHERE ube_report_cypher = '{$ube->report_cypher}' LIMIT 1 FOR UPDATE"));
 
     // Инициализация таблицы для пакетной вставки информации
     $sql_perform = array(
@@ -106,21 +106,21 @@ 
 
     // Сохраняем общую информацию о бое
     classSupernova::$db->doInsertSet(TABLE_UBE_REPORT, array(
-        'ube_report_cypher'             => (string)$ube->report_cypher,
-        'ube_report_time_combat'        => (string)date(FMT_DATE_TIME_SQL, $ube->combat_timestamp),
-        'ube_report_time_spent'         => (float)$ube->time_spent,
-        'ube_report_combat_admin'       => (int)$ube->is_admin_in_combat,
-        'ube_report_mission_type'       => (int)$ube->mission_type_id,
-        'ube_report_combat_result'      => (int)$ube->combat_result,
-        'ube_report_combat_sfr'         => (int)$ube->is_small_fleet_recce,
-        'ube_report_planet_id'          => (int)$ube->ube_planet_info[PLANET_ID],
-        'ube_report_planet_name'        => (string)$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_capture_result'     => (int)$ube->capture_result,
+        'ube_report_cypher'             => (string) $ube->report_cypher,
+        'ube_report_time_combat'        => (string) date(FMT_DATE_TIME_SQL, $ube->combat_timestamp),
+        'ube_report_time_spent'         => (float) $ube->time_spent,
+        'ube_report_combat_admin'       => (int) $ube->is_admin_in_combat,
+        'ube_report_mission_type'       => (int) $ube->mission_type_id,
+        'ube_report_combat_result'      => (int) $ube->combat_result,
+        'ube_report_combat_sfr'         => (int) $ube->is_small_fleet_recce,
+        'ube_report_planet_id'          => (int) $ube->ube_planet_info[PLANET_ID],
+        'ube_report_planet_name'        => (string) $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_capture_result'     => (int) $ube->capture_result,
       )
       + $ube->debris->report_generate_array()
       + $ube->moon_calculator->report_generate_array()
@@ -129,7 +129,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,
@@ -137,14 +137,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);
 
@@ -160,9 +160,9 @@ 
 
     // Пакетная вставка данных
     // First row is a list of field names
-    foreach($sql_perform as $table_name => &$table_data) {
+    foreach ($sql_perform as $table_name => &$table_data) {
       // If only field names in this table - doing nothing
-      if(count($table_data) < 2) {
+      if (count($table_data) < 2) {
         continue;
       }
       // Picking up field names
@@ -185,7 +185,7 @@ 
     $report_cypher = db_escape($report_cypher);
 
     $report_row = classSupernova::$db->doSelectFetchArray("SELECT * FROM {{ube_report}} WHERE ube_report_cypher = '{$report_cypher}' LIMIT 1");
-    if(!$report_row) {
+    if (!$report_row) {
       return UBE_REPORT_NOT_FOUND;
     }
 
@@ -201,7 +201,7 @@ 
    * @param     $template_result
    */
   public function sn_ube_report_generate(UBE $ube, &$template_result) {
-    if(!is_object($ube)) {
+    if (!is_object($ube)) {
       return;
     }
 
@@ -216,15 +216,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'   => classLocale::$lang['tech'][$resource_id],
           'AMOUNT' => pretty_number($resource_amount),

classes/UBE/UBEMoonCalculator.php

Spacing +20 added lines, -20 removed lines

@@ -72,7 +72,7 @@ 
 
     $debris_for_moon = $debris->debris_total();
 
-    if(!$debris_for_moon) {
+    if (!$debris_for_moon) {
       return;
     }
 
@@ -80,12 +80,12 @@ 
     $moon_chance = min($debris_for_moon / UBE_MOON_DEBRIS_PER_PERCENT, UBE_MOON_PERCENT_MAX); // TODO Configure
     $moon_chance = $moon_chance >= UBE_MOON_PERCENT_MIN ? $moon_chance : 0;
     $this->create_chance = $moon_chance;
-    if($moon_chance) {
-      if($is_simulator || mt_rand(1, 100) <= $moon_chance) {
+    if ($moon_chance) {
+      if ($is_simulator || mt_rand(1, 100) <= $moon_chance) {
         $this->status = UBE_MOON_CREATE_SUCCESS;
         $this->moon_diameter = round($is_simulator ? $moon_chance * 150 + 1999 : mt_rand($moon_chance * 100 + 1000, $moon_chance * 200 + 2999));
 
-        if($debris_for_moon <= UBE_MOON_DEBRIS_MAX_SPENT) {
+        if ($debris_for_moon <= UBE_MOON_DEBRIS_MAX_SPENT) {
           $debris->_reset();
         } else {
           $moon_debris_left_percent = ($debris_for_moon - UBE_MOON_DEBRIS_MAX_SPENT) / $debris_for_moon;
@@ -104,7 +104,7 @@ 
    */
   protected function moon_destroy_try($reapers) {
     // TODO: $is_simulator
-    if($reapers <= 0) {
+    if ($reapers <= 0) {
       return;
     }
 
@@ -122,8 +122,8 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function calculate_moon(UBE $ube) {
-    if(UBE_MOON_EXISTS == $this->status) {
-      if($ube->mission_type_id == MT_DESTROY && $ube->combat_result == UBE_COMBAT_RESULT_WIN) {
+    if (UBE_MOON_EXISTS == $this->status) {
+      if ($ube->mission_type_id == MT_DESTROY && $ube->combat_result == UBE_COMBAT_RESULT_WIN) {
         $reapers = $ube->fleet_list->ube_calculate_attack_reapers();
         $this->moon_destroy_try($reapers);
       }
@@ -137,12 +137,12 @@ 
    */
   public function report_generate_array() {
     return array(
-      'ube_report_moon'                    => (int)$this->status,
-      'ube_report_moon_chance'             => (int)$this->create_chance,
-      'ube_report_moon_size'               => (float)$this->moon_diameter,
-      'ube_report_moon_reapers'            => (int)$this->reapers_status,
-      'ube_report_moon_destroy_chance'     => (int)$this->destroy_chance,
-      'ube_report_moon_reapers_die_chance' => (int)$this->reaper_die_chance,
+      'ube_report_moon'                    => (int) $this->status,
+      'ube_report_moon_chance'             => (int) $this->create_chance,
+      'ube_report_moon_size'               => (float) $this->moon_diameter,
+      'ube_report_moon_reapers'            => (int) $this->reapers_status,
+      'ube_report_moon_destroy_chance'     => (int) $this->destroy_chance,
+      'ube_report_moon_reapers_die_chance' => (int) $this->reaper_die_chance,
     );
   }
 
@@ -173,11 +173,11 @@ 
    * @param $planet_id
    */
   public function db_apply_result($planet_info, $destination_user_id) {
-    if($this->status == UBE_MOON_CREATE_SUCCESS) {
+    if ($this->status == UBE_MOON_CREATE_SUCCESS) {
       $moon_row = uni_create_moon($planet_info[PLANET_GALAXY], $planet_info[PLANET_SYSTEM], $planet_info[PLANET_PLANET], $destination_user_id, $this->moon_diameter, '', false);
       $this->moon_name = $moon_row['name'];
       unset($moon_row);
-    } elseif($this->status == UBE_MOON_DESTROY_SUCCESS) {
+    } elseif ($this->status == UBE_MOON_DESTROY_SUCCESS) {
       DBStaticPlanet::db_planet_delete_by_id($planet_info[PLANET_ID]);
     }
   }
@@ -186,14 +186,14 @@ 
     $classLocale = classLocale::$lang;
 
     $text_defender = '';
-    if($this->status == UBE_MOON_CREATE_SUCCESS) {
+    if ($this->status == UBE_MOON_CREATE_SUCCESS) {
       $text_defender .= "{$classLocale['ube_report_moon_created']} {$this->moon_diameter} {$classLocale['sys_kilometers_short']}<br /><br />";
-    } elseif($this->status == UBE_MOON_CREATE_FAILED) {
+    } elseif ($this->status == UBE_MOON_CREATE_FAILED) {
       $text_defender .= "{$classLocale['ube_report_moon_chance']} {$this->create_chance}%<br /><br />";
     }
 
-    if($ube->mission_type_id == MT_DESTROY) {
-      if($this->reapers_status == UBE_MOON_REAPERS_NONE) {
+    if ($ube->mission_type_id == MT_DESTROY) {
+      if ($this->reapers_status == UBE_MOON_REAPERS_NONE) {
         $text_defender .= classLocale::$lang['ube_report_moon_reapers_none'];
       } else {
         $text_defender .= "{$classLocale['ube_report_moon_reapers_wave']}. {$classLocale['ube_report_moon_reapers_chance']} {$this->destroy_chance}%. ";
@@ -222,7 +222,7 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function ubeInitLoadStatis($destination_planet) {
-    if($destination_planet['planet_type'] == PT_MOON || is_array($moon = DBStaticPlanet::db_planet_by_parent($destination_planet['id'], true, '`id`'))) {
+    if ($destination_planet['planet_type'] == PT_MOON || is_array($moon = DBStaticPlanet::db_planet_by_parent($destination_planet['id'], true, '`id`'))) {
       $this->status = UBE_MOON_EXISTS;
       $this->moon_diameter = !empty($moon['planet_type']) && $moon['planet_type'] == PT_MOON ? $moon['diameter'] : $destination_planet['diameter'];
       $this->reapers_status = UBE_MOON_REAPERS_NONE;

classes/UBE/UBE.php

Spacing +44 added lines, -45 removed lines

@@ -150,7 +150,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);
     }
 
@@ -181,7 +181,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;
 
@@ -194,7 +194,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;
       }
 
@@ -223,11 +223,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();
       }
     }
@@ -247,7 +247,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)
@@ -259,9 +259,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);
@@ -326,7 +326,7 @@ 
     $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) {
       DBStaticPlanet::db_planet_update_by_gspt(
         $this->ube_planet_info[PLANET_GALAXY], $this->ube_planet_info[PLANET_SYSTEM], $this->ube_planet_info[PLANET_PLANET], PT_PLANET,
         array(),
@@ -337,10 +337,10 @@ 
       );
     }
 
-    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 {
@@ -348,9 +348,9 @@ 
 
         // Сохраняем изменения ресурсов - если они есть
         $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_amount;
           }
@@ -360,9 +360,9 @@ 
           );
         }
 
-        if($ship_count_lost) {
+        if ($ship_count_lost) {
           $planet_row_cache = $this->players[$destination_user_id]->getDbRow();
-          foreach($UBEFleet->unit_list->_container as $UBEUnit) {
+          foreach ($UBEFleet->unit_list->_container as $UBEUnit) {
             DBStaticUnit::dbUpdateOrInsertUnit($UBEUnit->unitId, -$UBEUnit->units_lost, $planet_row_cache, $this->ube_planet_info[PLANET_ID]);
           }
         }
@@ -372,7 +372,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);
       DBStaticFleetACS::db_acs_delete_by_list($fleet_group_id_list);
     }
@@ -380,14 +380,14 @@ 
     $this->moon_calculator->db_apply_result($this->ube_planet_info, $destination_user_id);
 
     $bashing_list = array();
-    foreach($this->players->get_player_sides() as $player_id => $player_side) {
-      if($player_side != UBE_PLAYER_IS_ATTACKER) {
+    foreach ($this->players->get_player_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[] = array($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';
         DBStaticUser::db_user_adjust_by_id(
           $player_id,
@@ -399,7 +399,7 @@ 
         );
       }
     }
-    if(!empty($bashing_list)) {
+    if (!empty($bashing_list)) {
       DBStaticFleetBashing::db_bashing_insert($bashing_list);
     }
 
@@ -425,20 +425,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 .= "{$classLocale['tech'][$resource_id]}: " . pretty_number($resource_amount) . '<br />';
     }
-    if($text_defender) {
+    if ($text_defender) {
       $text_defender = "{$classLocale['ube_report_msg_body_debris']}{$text_defender}<br />";
     }
 
@@ -448,7 +447,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);
       DBStaticMessages::msg_send_simple_message($player_id, '', $this->combat_timestamp, MSG_TYPE_COMBAT, classLocale::$lang['sys_mess_tower'], classLocale::$lang['sys_mess_attack_report'], $message);
     }
@@ -484,11 +483,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);
 
@@ -496,32 +495,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);
           }
         }
@@ -590,7 +589,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);
@@ -618,9 +617,9 @@ 
     $ube->sn_ube_combat();
     $ube_report = new UBEReport();
 
-    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;
       }
     }
@@ -668,7 +667,7 @@ 
     $this->debris->load_from_report_row($report_row);
 
     $query = classSupernova::$db->doSelect("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);
     }
 

classes/Fleet.php

Spacing +3 added lines, -3 removed lines

@@ -1325,14 +1325,14 @@
       if (FLIGHT_ALLOWED == $validateResult[$missionType]) {
         $this->allowed_missions[$missionType] = $mission;
       } else {
-        if($missionType == $this->mission_type) {
+        if ($missionType == $this->mission_type) {
         }
         unset($this->allowed_missions[$missionType]);
       }
     }
 
-    if(empty($this->allowed_missions)) {
-      if($this->mission_type != MT_NONE && isset($validateResult[$this->mission_type])) {
+    if (empty($this->allowed_missions)) {
+      if ($this->mission_type != MT_NONE && isset($validateResult[$this->mission_type])) {
         throw new ExceptionFleetInvalid($validateResult[$this->mission_type], $validateResult[$this->mission_type]);
       } else {
         throw new ExceptionFleetInvalid(FLIGHT_MISSION_IMPOSSIBLE, FLIGHT_MISSION_IMPOSSIBLE);

classes/Account.php

Spacing +17 added lines, -17 removed lines

@@ -79,8 +79,8 @@ 
     $this->reset();
     $this->db = is_object($db) ? $db : classSupernova::$db;
 
-    foreach($this->table_check as $table_name) {
-      if(empty($this->db->table_list[$table_name])) {
+    foreach ($this->table_check as $table_name) {
+      if (empty($this->db->table_list[$table_name])) {
         die('Если вы видите это сообщение первый раз после обновления релиза - просто перегрузите страницу.<br />
               В противном случае - сообщите Администрации сервера об ошибке.<br/>
               Не хватает таблицы для работы системы авторизации: ' . $table_name);
@@ -104,7 +104,7 @@ 
    */
   // OK v4.6
   public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) {
-    if(!$this->password_check($old_password_unsafe)) {
+    if (!$this->password_check($old_password_unsafe)) {
       return false;
     }
 
@@ -125,7 +125,7 @@ 
   // OK v4.5
   public function assign_from_db_row($row) {
     $this->reset();
-    if(empty($row) || !is_array($row)) {
+    if (empty($row) || !is_array($row)) {
       return false;
     }
     $this->account_id = $row['account_id'];
@@ -242,11 +242,11 @@ 
         `account_email` = LOWER('{$email_safe}'),
         `account_language` = '{$language_safe}'"
     );
-    if(!$result) {
+    if (!$result) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
-    if(!($account_id = $this->db->db_insert_id())) {
+    if (!($account_id = $this->db->db_insert_id())) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
@@ -276,7 +276,7 @@ 
       WHERE `account_id` = '{$account_id_safe}'"
     ) ? true : false;
 
-    if($result) {
+    if ($result) {
       $result = $this->db_get_by_id($this->account_id);
     }
 
@@ -363,7 +363,7 @@ 
   public function metamatter_change($change_type, $metamatter, $comment = '', $already_changed = false) {
     global $debug, $mm_change_legit;
 
-    if(!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
+    if (!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
       $debug->error('Ошибка при попытке манипуляции с ММ');
 
       return false;
@@ -373,7 +373,7 @@ 
 
     $mm_change_legit = true;
     // $sn_data_metamatter_db_name = pname_resource_name(RES_METAMATTER);
-    if($already_changed) {
+    if ($already_changed) {
       $metamatter_total_delta = 0;
       $result = -1;
     } else {
@@ -387,13 +387,13 @@ 
         ($metamatter_total_delta ? ", `account_immortal` = IF(`account_metamatter_total` + '{$metamatter_total_delta}' >= {$classConfig->player_metamatter_immortal}, NOW(), `account_immortal`), `account_metamatter_total` = `account_metamatter_total` + '{$metamatter_total_delta}'" : '') .
         " WHERE `account_id` = {$account_id_safe}"
       );
-      if(!$result) {
+      if (!$result) {
         $debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
       }
       $result = classSupernova::$db->db_affected_rows();
     }
 
-    if(empty(core_auth::$user['id'])) {
+    if (empty(core_auth::$user['id'])) {
       $user_list = PlayerToAccountTranslate::db_translate_get_users_from_account_list(core_auth::$main_provider->provider_id, $this->account_id);
       reset($user_list);
       $user_id_unsafe = key($user_list);
@@ -402,30 +402,30 @@ 
     }
     $user_id_safe = $this->db->db_escape($user_id_unsafe);
 
-    if(!$result) {
+    if (!$result) {
       $debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
     }
 
-    if(!$already_changed) {
+    if (!$already_changed) {
       $this->account_metamatter += $metamatter;
       $this->account_metamatter_total += $metamatter_total_delta;
     }
 
-    if(is_array($comment)) {
+    if (is_array($comment)) {
       $comment = call_user_func_array('sprintf', $comment);
     }
 
     $result = $this->db_mm_log_insert($comment, $change_type, $metamatter, $user_id_unsafe);
 
-    if($metamatter > 0 && !empty($user_id_safe)) {
+    if ($metamatter > 0 && !empty($user_id_safe)) {
       $old_referral = db_referral_get_by_id($user_id_safe);
-      if($old_referral['id']) {
+      if ($old_referral['id']) {
         $dark_matter_from_metamatter = $metamatter * AFFILIATE_MM_TO_REFERRAL_DM;
         db_referral_update_dm($user_id_safe, $dark_matter_from_metamatter);
         $new_referral = db_referral_get_by_id($user_id_safe);
 
         $partner_bonus = floor($new_referral['dark_matter'] / classSupernova::$config->rpg_bonus_divisor) - ($old_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum ? floor($old_referral['dark_matter'] / classSupernova::$config->rpg_bonus_divisor) : 0);
-        if($partner_bonus > 0 && $new_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum) {
+        if ($partner_bonus > 0 && $new_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum) {
           rpg_points_change($new_referral['id_partner'], RPG_REFERRAL_BOUGHT_MM, $partner_bonus, "Incoming MM From Referral ID {$user_id_safe}");
         }
       }

classes/DBRow.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
    * @param db_mysql|null $db
    */
   public static function setDb($db = null) {
-    if(empty($db) || !($db instanceof db_mysql)) {
+    if (empty($db) || !($db instanceof db_mysql)) {
       $db = null;
     }
     static::$db = !empty($db) || !class_exists('classSupernova', false) ? $db : classSupernova::$db;
@@ -452,7 +452,7 @@ 
       }
     }
 
-    if(empty($set)) {
+    if (empty($set)) {
       $theResult = true;
     } else {
       $theResult = classSupernova::$db->doUpdateRowAdjust(

classes/template_compile.php

Spacing +13 added lines, -13 removed lines

@@ -138,9 +138,9 @@ 
 
     preg_match_all('#<!-- INCLUDE (\{\$?[A-Z0-9\-_]+\}|[a-zA-Z0-9\_\-\+\./]+) -->#', $code, $matches);
     $include_blocks = $matches[1];
-    if($include_blocks)
+    if ($include_blocks)
     {
-      foreach($include_blocks as &$included_file)
+      foreach ($include_blocks as &$included_file)
       {
         $included_file .= '.tpl.html';
       }
@@ -446,8 +446,8 @@ 
 
     $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
-    $tag_template_php .= '$_'. $tag_args . '_val = &' . $varref . '[$_'. $tag_args. '_i];';
-    $tag_template_php .= '$this->_block_value["'. $tag_args . '"] = &' . $varref . '[$_'. $tag_args. '_i];';
+    $tag_template_php .= '$_' . $tag_args . '_val = &' . $varref . '[$_' . $tag_args . '_i];';
+    $tag_template_php .= '$this->_block_value["' . $tag_args . '"] = &' . $varref . '[$_' . $tag_args . '_i];';
 
     return $tag_template_php;
   }
@@ -551,10 +551,10 @@ 
         break;
 
         case 'is':
-          $is_arg_start = ($tokens[$i-1] == ')') ? array_pop($is_arg_stack) : $i-1;
+          $is_arg_start = ($tokens[$i - 1] == ')') ? array_pop($is_arg_stack) : $i - 1;
           $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
 
-          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
+          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i + 1));
 
           array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens);
 
@@ -814,11 +814,11 @@ 
     }
     else if ($include_last_iterator)
     {
-      return '$_'. $blocks[$blockcount] . '_val';
+      return '$_' . $blocks[$blockcount] . '_val';
     }
     else
     {
-      return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
+      return '$_' . $blocks[$blockcount - 1] . '_val[\'' . $blocks[$blockcount] . '\']';
     }
   }
 
@@ -835,7 +835,7 @@ 
     if ($fp = @fopen($filename, 'wb'))
     {
       @flock($fp, LOCK_EX);
-      @fwrite ($fp, $data);
+      @fwrite($fp, $data);
       @flock($fp, LOCK_UN);
       @fclose($fp);
 
@@ -852,7 +852,7 @@ 
   */
   private function minify($html)
   {
-    if(!classSupernova::$config->tpl_minifier)
+    if (!classSupernova::$config->tpl_minifier)
     {
       return $html;
     }
@@ -862,14 +862,14 @@ 
     $html = preg_replace('/(<script[^>]*?>.*?<\/script>)/si', '#pre#', $html);
     $html = preg_replace('/>[\s]*</', '><', $html); // Strip spacechars between tags
     $html = preg_replace('/[\s]+/', ' ', $html); // Replace several spacechars with one space
-    if(!empty($pre[0]))
+    if (!empty($pre[0]))
     {
-      foreach($pre[0] as $tag)
+      foreach ($pre[0] as $tag)
       {
         $tag = preg_replace('/^\ *\/\/[^\<]*?$/m', ' ', $tag); // Strips comments - except those that contains HTML comment inside
         $tag = preg_replace('/[\ \t]{2,}/', ' ', $tag); // Replace several spaces by one
         $tag = preg_replace('/\s{2,}/', "\r\n", $tag); // Replace several linefeeds by one
-        $html = preg_replace('/#pre#/', $tag, $html,1);
+        $html = preg_replace('/#pre#/', $tag, $html, 1);
       }
     }
 

classes/FleetValidator.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
     'checkSpeedPercentOld'       => FLIGHT_FLEET_SPEED_WRONG,
     'checkTargetInUniverse'      => FLIGHT_VECTOR_BEYOND_UNIVERSE,
     'checkTargetNotSource'       => FLIGHT_VECTOR_SAME_SOURCE,
-    'checkSenderNoVacation'      => FLIGHT_PLAYER_VACATION_OWN,  // tODO
+    'checkSenderNoVacation'      => FLIGHT_PLAYER_VACATION_OWN, // tODO
     'checkTargetNoVacation'      => FLIGHT_PLAYER_VACATION,
     'checkFleetNotEmpty'         => FLIGHT_SHIPS_NO_SHIPS,
     // 'checkUnitsPositive'         => FLIGHT_SHIPS_NEGATIVE, // Unused - 'cause it's not allowed to put negative units into Unit class
@@ -158,7 +158,7 @@ 
         $this->checkMissionRestrictions($action);
       } else {
         // No - then just performing action
-        if($exception) {
+        if ($exception) {
           throw new ExceptionFleetInvalid($action, $action);
         } else {
           return $action;

classes/db_mysql.php

Spacing +3 added lines, -3 removed lines

@@ -589,7 +589,7 @@ 
 
     global $user, $dm_change_legit, $mm_change_legit;
 
-    switch(true) {
+    switch (true) {
       case stripos($query, 'RUNCATE TABL') != false:
       case stripos($query, 'ROP TABL') != false:
       case stripos($query, 'ENAME TABL') != false:
@@ -651,7 +651,7 @@ 
     $prefix_length = strlen($this->db_prefix);
 
     $tl = array();
-    while($row = $this->db_fetch($query)) {
+    while ($row = $this->db_fetch($query)) {
       foreach ($row as $table_name) {
         if (strpos($table_name, $this->db_prefix) === 0) {
           $table_name = substr($table_name, $prefix_length);
@@ -785,7 +785,7 @@ 
     if (is_bool($query)) {
       throw new Exception('Result of SHOW STATUS command is boolean - which should never happen. Connection to DB is lost?');
     }
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[$row['Variable_name']] = $row['Value'];
     }