supernova-ws / SuperNova

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

classes/UBE/UBEReport.php

Doc Comments +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
   /**
    * @param UBE $ube
    *
-   * @return bool|string
+   * @return false|string
    *
    * @version 2016-02-25 23:42:45 41a4.68
    */

Spacing +32 added lines, -32 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->doSelectFetch("SELECT ube_report_cypher FROM {{ube_report}} WHERE ube_report_cypher = '{$ube->report_cypher}' LIMIT 1 FOR UPDATE"));
+    } while (classSupernova::$db->doSelectFetch("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,22 +129,22 @@ 
 
     // Сохраняем общую информацию по игрокам
     $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,
 
-        "'" . db_escape($ube->players[$player_id]->name) . "'",
+        "'".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);
 
@@ -159,12 +159,12 @@ 
     $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) {
-        $record_data = '(' . implode(',', $record_data) . ')';
+      foreach ($table_data as &$record_data) {
+        $record_data = '('.implode(',', $record_data).')';
       }
       $fields = $table_data[0];
       unset($table_data[0]);
@@ -186,7 +186,7 @@ 
     $report_cypher = db_escape($report_cypher);
 
     $report_row = classSupernova::$db->doSelectFetch("SELECT * FROM {{ube_report}} WHERE ube_report_cypher = '{$report_cypher}' LIMIT 1");
-    if(!$report_row) {
+    if (!$report_row) {
       return UBE_REPORT_NOT_FOUND;
     }
 
@@ -202,7 +202,7 @@ 
    * @param     $template_result
    */
   public function sn_ube_report_generate(UBE $ube, &$template_result) {
-    if(!is_object($ube)) {
+    if (!is_object($ube)) {
       return;
     }
 
@@ -217,15 +217,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/userOptions.php

Doc Comments +3 added lines

@@ -151,6 +151,9 @@
   }
 
 
+  /**
+   * @param integer $user_id
+   */
   public function __construct($user_id) {
     $this->user_change($user_id);
   }

Spacing +35 added lines, -35 removed lines

@@ -122,10 +122,10 @@ 
 
     $update_cache = false;
 
-    if(!empty($this->to_write)) {
-      foreach($this->to_write as $key => $cork) {
+    if (!empty($this->to_write)) {
+      foreach ($this->to_write as $key => $cork) {
         $value = is_array($this->data[$key]) ? serialize($this->data[$key]) : $this->data[$key]; // Сериализация для массивов при сохранении в БД
-        $this->to_write[$key] = "({$this->user_id}, '" . db_escape($key) . "', '" . db_escape($value) . "')";
+        $this->to_write[$key] = "({$this->user_id}, '".db_escape($key)."', '".db_escape($value)."')";
       }
 
       classSupernova::$gc->db->doReplaceValuesDeprecated(
@@ -143,9 +143,9 @@ 
       $update_cache = true;
     }
 
-    if(!empty($this->to_delete)) {
-      foreach($this->to_delete as $key => &$value) {
-        $value = is_string($key) ? "'". db_escape($key) . "'" : $key;
+    if (!empty($this->to_delete)) {
+      foreach ($this->to_delete as $key => &$value) {
+        $value = is_string($key) ? "'".db_escape($key)."'" : $key;
       }
 
       classSupernova::$db->doDeleteDanger(
@@ -154,7 +154,7 @@ 
           'player_id' => $this->user_id,
         ),
         array(
-          "`option_id` IN (" . implode(',', $this->to_delete) . ")",
+          "`option_id` IN (".implode(',', $this->to_delete).")",
         )
       );
 
@@ -162,7 +162,7 @@ 
       $update_cache = true;
     }
 
-    if($update_cache) {
+    if ($update_cache) {
       $field_name = $this->cached_name();
       classSupernova::$cache->$field_name = $this->data;
     }
@@ -181,11 +181,11 @@ 
     $this->load();
   }
   protected function cached_name() {
-    return 'options_' . $this->user_id;
+    return 'options_'.$this->user_id;
   }
 
   protected function load() {
-    if($this->loaded) {
+    if ($this->loaded) {
       return;
     }
 
@@ -193,7 +193,7 @@ 
     $this->to_write = array();
     $this->to_delete = array();
 
-    if(!$this->user_id) {
+    if (!$this->user_id) {
       $this->loaded = true;
       return;
     }
@@ -201,13 +201,13 @@ 
     $field_name = $this->cached_name();
     $a_data = classSupernova::$cache->$field_name;
 
-    if(!empty($a_data)) {
+    if (!empty($a_data)) {
       $this->data = array_replace_recursive($this->data, $a_data);
       return;
     }
 
     $query = classSupernova::$db->doSelect("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       // $this->data[$row['option_id']] = $row['value'];
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
     }
@@ -284,7 +284,7 @@ 
   }
 
   protected function cached_name() {
-    return 'options_' . $this->user_id;
+    return 'options_'.$this->user_id;
   }
 
   // TODO - serialize/unserialize options
@@ -292,14 +292,14 @@ 
     // Если в массиве индекса только один элемент - значит это просто индекс
     is_array($option_id) && count($option_id) == 1 ? $option_id = reset($option_id) : false;
 
-    if(!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
+    if (!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
       $this->load();
     }
 
-    if(is_array($option_id)) {
+    if (is_array($option_id)) {
       $result = $this->data;
-      foreach($option_id as $sub_key) {
-        if(!isset($result) || !isset($result[$sub_key])) {
+      foreach ($option_id as $sub_key) {
+        if (!isset($result) || !isset($result[$sub_key])) {
           $result = null;
           break;
         }
@@ -317,12 +317,12 @@ 
    * @param null|mixed $value
    */
   public function __set($option, $value = null) {
-    if(empty($option) || !$this->user_id) {
+    if (empty($option) || !$this->user_id) {
       return;
     }
 
     // Если в массиве индекса только один элемент - значит это просто индекс
-    if(is_array($option) && count($option) == 1) {
+    if (is_array($option) && count($option) == 1) {
       // Разворачиваем его в индекс
       $option = array(reset($option) => $value);
       unset($value);
@@ -331,13 +331,13 @@ 
 
     $to_write = array();
     // Адресация многомерного массива через массив индексов в $option
-    if(is_array($option) && isset($value)) {
+    if (is_array($option) && isset($value)) {
       $a_data = &$this->data;
-      foreach($option as $option_id) {
+      foreach ($option as $option_id) {
         !is_array($a_data[$option_id]) ? $a_data[$option_id] = array() : false;
         $a_data = &$a_data[$option_id];
       }
-      if($a_data != $value) {
+      if ($a_data != $value) {
         $a_data = $value;
         $to_write[reset($option)] = null;
       }
@@ -345,11 +345,11 @@ 
       // Пакетная запись из массива ключ -> значение
       !is_array($option) ? $option = array($option => $value) : false;
 
-      foreach($option as $option_id => $option_value) {
-        if($this->data[$option_id] !== $option_value) {
+      foreach ($option as $option_id => $option_value) {
+        if ($this->data[$option_id] !== $option_value) {
           // TODO - вынести отдельно в обработчик
-          if($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON &&  $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
-            sn_setcookie(SN_COOKIE . '_menu_hidden', '0', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
+          if ($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON && $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
+            sn_setcookie(SN_COOKIE.'_menu_hidden', '0', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
           }
 
           $this->data[$option_id] = $option_value;
@@ -358,13 +358,13 @@ 
       }
     }
 
-    if(!empty($to_write)) {
+    if (!empty($to_write)) {
       $field_name = $this->cached_name();
       classSupernova::$cache->$field_name = $this->data;
 
-      foreach($to_write as $option_id => &$option_value) {
+      foreach ($to_write as $option_id => &$option_value) {
         $option_value = is_array($this->data[$option_id]) ? serialize($this->data[$option_id]) : $this->data[$option_id]; // Сериализация для массивов при сохранении в БД
-        $to_write[$option_id] = "({$this->user_id}, '" . db_escape($option_id) . "', '" . db_escape($option_value) . "')";
+        $to_write[$option_id] = "({$this->user_id}, '".db_escape($option_id)."', '".db_escape($option_value)."')";
       }
 
       classSupernova::$gc->db->doReplaceValuesDeprecated(
@@ -380,26 +380,26 @@ 
   }
 
   protected function load() {
-    if($this->loaded) {
+    if ($this->loaded) {
       return;
     }
 
     $this->data = $this->defaults;
 
-    if(!$this->user_id) {
+    if (!$this->user_id) {
       return;
     }
 
     $field_name = $this->cached_name();
     $a_data = classSupernova::$cache->$field_name;
 
-    if(!empty($a_data)) {
+    if (!empty($a_data)) {
       $this->data = array_replace($this->data, $a_data);
       return;
     }
 
     $query = classSupernova::$db->doSelect("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       // $this->data[$row['option_id']] = $row['value'];
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
     }
@@ -415,7 +415,7 @@ 
     return $this->__get($offset);
   }
   public function offsetSet($offset, $value) {
-    if(!is_null($offset)) {
+    if (!is_null($offset)) {
       // $this->data[$offset] = $value;
       $this->__set($offset, $value);
     } else {

classes/RequestInfo.php

Spacing +7 added lines, -7 removed lines

@@ -87,15 +87,15 @@ 
     // Инфа об устройстве и браузере - общая для всех
     sn_db_transaction_start();
     $this->device_cypher = $_COOKIE[SN_COOKIE_D];
-    if($this->device_cypher) {
+    if ($this->device_cypher) {
       $cypher_safe = db_escape($this->device_cypher);
       $device_id = classSupernova::$db->doSelectFetch("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE");
-      if(!empty($device_id['device_id'])) {
+      if (!empty($device_id['device_id'])) {
         $this->device_id = $device_id['device_id'];
       }
     }
 
-    if($this->device_id <= 0) {
+    if ($this->device_id <= 0) {
       do {
         $cypher_safe = db_escape($this->device_cypher = sys_random_string());
         $row = classSupernova::$db->doSelectFetch("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE");
@@ -118,10 +118,10 @@ 
     $this->page_address_id = db_get_set_unique_id_value($this->page_address, 'url_id', 'security_url', 'url_string');
     sn_db_transaction_commit();
 
-    if($this->write_full_url) {
+    if ($this->write_full_url) {
       sn_db_transaction_start();
       $this->page_url = substr($_SERVER['REQUEST_URI'], strlen(SN_ROOT_RELATIVE));
-      if(strpos($_SERVER['REQUEST_URI'], '/simulator.php') === 0) {
+      if (strpos($_SERVER['REQUEST_URI'], '/simulator.php') === 0) {
         $this->page_url = '/simulator.php';
       }
       $this->page_url_id = db_get_set_unique_id_value($this->page_url, 'url_id', 'security_url', 'url_string');
@@ -144,7 +144,7 @@ 
    */
   public function db_security_entry_insert($user_id_unsafe) {
     // TODO $user_id = !empty(self::$user['id']) ? self::$user['id'] : 'NULL';
-    if(empty($user_id_unsafe)) {
+    if (empty($user_id_unsafe)) {
       // self::flog('Нет ИД пользователя');
       return true;
     }
@@ -166,7 +166,7 @@ 
   public function db_counter_insert($user_id_unsafe) {
     global $sys_stop_log_hit;
 
-    if($sys_stop_log_hit || !classSupernova::$config->game_counter) {
+    if ($sys_stop_log_hit || !classSupernova::$config->game_counter) {
       return;
     }
 

classes/FleetList.php

Spacing +25 added lines, -25 removed lines

@@ -33,18 +33,18 @@ 
     $fleets_added = array();
 
     $query = doquery(
-      "SELECT * FROM `{{fleets}}`" .
-      (!empty($where_safe) ? " WHERE {$where_safe}" : '') .
+      "SELECT * FROM `{{fleets}}`".
+      (!empty($where_safe) ? " WHERE {$where_safe}" : '').
       " FOR UPDATE;"
     );
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       /**
        * @var Fleet $fleet
        */
       $fleet = $this->_createElement();
       $fleet->dbRowParse($row);
 
-      if(isset($this[$fleet->dbId])) {
+      if (isset($this[$fleet->dbId])) {
         // Нужно ли ????
         classSupernova::$debug->error('Fleet list already set');
       }
@@ -121,11 +121,11 @@ 
   public static function dbGetFleetListCurrentTick() {
     return static::dbGetFleetList(
       "
-    (`fleet_start_time` <= " . SN_TIME_NOW . " AND `fleet_mess` = 0)
+    (`fleet_start_time` <= " . SN_TIME_NOW." AND `fleet_mess` = 0)
     OR
-    (`fleet_end_stay` <= " . SN_TIME_NOW . " AND `fleet_end_stay` > 0 AND `fleet_mess` = 0)
+    (`fleet_end_stay` <= " . SN_TIME_NOW." AND `fleet_end_stay` > 0 AND `fleet_mess` = 0)
     OR
-    (`fleet_end_time` <= " . SN_TIME_NOW . ")");
+    (`fleet_end_time` <= " . SN_TIME_NOW.")");
   }
 
   /**
@@ -145,7 +145,7 @@ 
     AND `fleet_end_planet` = {$planet_row['planet']}
     AND `fleet_end_type`   = {$planet_row['planet_type']}
     AND `fleet_owner` = {$fleet_owner_id}
-    AND `fleet_mission` IN (" . MT_ATTACK . "," . MT_ACS . "," . MT_DESTROY . ")
+    AND `fleet_mission` IN (".MT_ATTACK.",".MT_ACS.",".MT_DESTROY.")
     AND `fleet_mess` = 0"
     );
   }
@@ -170,7 +170,7 @@ 
    * @return static
    */
   public static function dbGetFleetListAndMissileByCoordinates($coordinates, $for_phalanx = false) {
-    if(empty($coordinates) || !is_array($coordinates)) {
+    if (empty($coordinates) || !is_array($coordinates)) {
       return array();
     }
 
@@ -199,8 +199,8 @@ 
      * @var Fleet[] $array_of_Fleet
      */
     $array_of_Fleet = array();
-    if(!empty($fleet_db_list) && $fleet_db_list->count()) {
-      foreach($fleet_db_list->_container as $fleet_id => $objFleet) {
+    if (!empty($fleet_db_list) && $fleet_db_list->count()) {
+      foreach ($fleet_db_list->_container as $fleet_id => $objFleet) {
         $array_of_Fleet[$fleet_id] = $objFleet;
       }
       $planet_fleets = flt_get_fleets_to_planet_by_array_of_Fleet($array_of_Fleet);
@@ -225,16 +225,16 @@ 
     return static::dbGetFleetList(
       "(
       fleet_start_galaxy = {$galaxy}
-      AND fleet_start_system = {$system}" .
-      ($planet ? " AND fleet_start_planet = {$planet}" : '') .
-      ($planet_type != PT_ALL ? " AND fleet_start_type = {$planet_type}" : '') .
-      ($for_phalanx ? '' : " AND fleet_mess = 1") .
+      AND fleet_start_system = {$system}".
+      ($planet ? " AND fleet_start_planet = {$planet}" : '').
+      ($planet_type != PT_ALL ? " AND fleet_start_type = {$planet_type}" : '').
+      ($for_phalanx ? '' : " AND fleet_mess = 1").
       ") OR (
       fleet_end_galaxy = {$galaxy}
-      AND fleet_end_system = {$system}" .
-      ($planet ? " AND fleet_end_planet = {$planet}" : '') .
-      ($planet_type != PT_ALL ? " AND fleet_end_type = {$planet_type} " : '') .
-      ($for_phalanx ? '' : " AND fleet_mess = 0") .
+      AND fleet_end_system = {$system}".
+      ($planet ? " AND fleet_end_planet = {$planet}" : '').
+      ($planet_type != PT_ALL ? " AND fleet_end_type = {$planet_type} " : '').
+      ($for_phalanx ? '' : " AND fleet_mess = 0").
       ")"
     );
   }
@@ -246,10 +246,10 @@ 
    */
   public function dbMergeMissileList($where) {
     $query = doquery(
-      "SELECT * FROM `{{iraks}}`" .
-      (!empty($where) ? " WHERE {$where}" : '') .
+      "SELECT * FROM `{{iraks}}`".
+      (!empty($where) ? " WHERE {$where}" : '').
       " FOR UPDATE;");
-    while($missile_db_row = db_fetch($query)) {
+    while ($missile_db_row = db_fetch($query)) {
       /**
        * @var Fleet $objFleet
        */
@@ -271,7 +271,7 @@ 
    */
   public static function dbGetFleetListAndMissileINCOMING($owner_id) {
     $owner_id_safe = idval($owner_id);
-    if(empty($owner_id_safe)) {
+    if (empty($owner_id_safe)) {
       return array();
     }
 
@@ -305,10 +305,10 @@ 
    */
   public static function fleet_count_flying($player_id, $mission_id = 0) {
     $player_id_safe = idval($player_id);
-    if(!empty($player_id_safe)) {
+    if (!empty($player_id_safe)) {
       $mission_id_safe = intval($mission_id);
       $result = static::db_fleet_count(
-        "`fleet_owner` = {$player_id_safe}" .
+        "`fleet_owner` = {$player_id_safe}".
         ($mission_id_safe ? " AND `fleet_mission` = {$mission_id_safe}" : '')
       );
     } else {

classes/PlayerList.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
    * @version 41a6.16
    */
   protected function db_load_player_by_id($player_id) {
-    if(isset($this[$player_id])) {
+    if (isset($this[$player_id])) {
       return;
     }
 

classes/UBE/UBEPlayerList.php

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
       UBE_PLAYER_IS_DEFENDER => array(),
     );
 
-    foreach($this->_container as $player_id => $UBEPlayer) {
+    foreach ($this->_container as $player_id => $UBEPlayer) {
       $result[$UBEPlayer->getSide() ? UBE_PLAYER_IS_ATTACKER : UBE_PLAYER_IS_DEFENDER][$player_id] = $UBEPlayer->getDbRow();
     }
 
@@ -70,8 +70,8 @@ 
    */
   public function get_first_player_on_side($side) {
     $result = null;
-    foreach($this->_container as $player_id => $UBEPlayer) {
-      if($UBEPlayer->getSide() == $side) {
+    foreach ($this->_container as $player_id => $UBEPlayer) {
+      if ($UBEPlayer->getSide() == $side) {
         $result = $UBEPlayer;
         break;
       }
@@ -88,7 +88,7 @@ 
    */
   public function get_player_sides() {
     $result = array();
-    foreach($this->_container as $player_id => $UBEPlayer) {
+    foreach ($this->_container as $player_id => $UBEPlayer) {
       $result[$player_id] = $UBEPlayer->getSide() ? UBE_PLAYER_IS_ATTACKER : UBE_PLAYER_IS_DEFENDER;
     }
 
@@ -96,7 +96,7 @@ 
   }
 
   public function ubeLoadPlayersAndSetSideFromFleetIdList(array $added_fleets, UBEFleetList $fleetList, $side = UBE_PLAYER_IS_DEFENDER) {
-    foreach($added_fleets as $fleet_id) {
+    foreach ($added_fleets as $fleet_id) {
       $this->db_load_player_by_id($fleetList[$fleet_id]->owner_id, $side);
     }
   }

classes/UBE/UBEDebug.php

Spacing +12 added lines, -12 removed lines

@@ -11,7 +11,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump_header() {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -48,7 +48,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump(UBEUnit $unit, $desc = '', UBEUnit $before = null) {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -75,7 +75,7 @@ 
 //  print("<td>" . $this->units_lost . "</td>");
 //  print("<td>" . $this->units_restored . "</td>");
 //  print("<td>" . $this->capacity . "</td>");
-    print("<td>" . round($unit->share_of_side_armor, 4) . "</td>");
+    print("<td>".round($unit->share_of_side_armor, 4)."</td>");
     print('</tr>');
   }
 
@@ -86,7 +86,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump_footer() {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -101,16 +101,16 @@ 
    * @return UBEUnit
    */
   public static function unit_dump_defender(UBEUnit $attacking_unit_pool, UBEUnit $defending_unit_pool, $defending_fleet_id) {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return null;
     }
 
     $classLocale = classLocale::$lang;
 
-    print("[{$attacking_unit_pool->unitId}]{$classLocale['tech'][$attacking_unit_pool->unitId]}" .
-      ' attacks ' .
-      $defending_fleet_id . '@' . "[{$defending_unit_pool->unitId}]{$classLocale['tech'][$defending_unit_pool->unitId]}" .
-      ' with ' . pretty_number($defending_unit_pool->attack_income) .
+    print("[{$attacking_unit_pool->unitId}]{$classLocale['tech'][$attacking_unit_pool->unitId]}".
+      ' attacks '.
+      $defending_fleet_id.'@'."[{$defending_unit_pool->unitId}]{$classLocale['tech'][$defending_unit_pool->unitId]}".
+      ' with '.pretty_number($defending_unit_pool->attack_income).
       '<br>'
     );
     $before = clone $defending_unit_pool;
@@ -127,7 +127,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump_delta(UBEUnit $unit, $field, UBEUnit $before = null) {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -136,8 +136,8 @@ 
     print(pretty_number($unit->$field));
     print("</td>");
     print("<td>");
-    if(!empty($before)) {
-      print('' . pretty_number($unit->$field - $before->$field) . '');
+    if (!empty($before)) {
+      print(''.pretty_number($unit->$field - $before->$field).'');
     }
     print("</td>");
   }

classes/UBE/UBERound.php

Spacing +7 added lines, -7 removed lines

@@ -36,8 +36,8 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function make_snapshot(UBEFleetList $UBEFleetList) {
-    foreach($UBEFleetList->_container as $fleet_id => $UBEFleet) {
-      foreach($UBEFleet->unit_list->_container as $UBEUnit) {
+    foreach ($UBEFleetList->_container as $fleet_id => $UBEFleet) {
+      foreach ($UBEFleet->unit_list->_container as $UBEUnit) {
         $this->snapshot[$fleet_id][$UBEUnit->unitId] = new UBESnapshotUnit();
         $this->snapshot[$fleet_id][$UBEUnit->unitId]->init_from_UBEUnit($UBEUnit);
       }
@@ -53,12 +53,12 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function sql_generate_unit_array(array &$sql_perform_ube_report_unit, &$unit_sort_order, UBEFleetList $UBEFleetList, array $outer_prefix) {
-    foreach($this->snapshot as $fleet_id => $fleet_snapshot) {
+    foreach ($this->snapshot as $fleet_id => $fleet_snapshot) {
       $inner_prefix = array(
         $UBEFleetList[$fleet_id]->owner_id,
         $fleet_id,
       );
-      foreach($fleet_snapshot as $unit_id => $unit_snapshot) {
+      foreach ($fleet_snapshot as $unit_id => $unit_snapshot) {
         $sql_perform_ube_report_unit[] = array_merge(
           $outer_prefix,
           $inner_prefix,
@@ -101,7 +101,7 @@ 
       UBE_PLAYER_IS_DEFENDER => array(),
     );
 
-    foreach($this->snapshot as $fleet_id => $fleet_snapshot) {
+    foreach ($this->snapshot as $fleet_id => $fleet_snapshot) {
       $fleet_owner_id = $ube->fleet_list[$fleet_id]->owner_id;
       $planet_ube_row = $ube->fleet_list[$fleet_id]->UBE_PLANET;
 
@@ -111,13 +111,13 @@ 
         'PLAYER_NAME' => htmlentities($ube->players[$fleet_owner_id]->name, ENT_COMPAT, 'UTF-8'),
       );
 
-      if(is_array($planet_ube_row)) {
+      if (is_array($planet_ube_row)) {
         $template_fleet += $planet_ube_row;
         $template_fleet[PLANET_NAME] = $template_fleet[PLANET_NAME] ? htmlentities($template_fleet[PLANET_NAME], ENT_COMPAT, 'UTF-8') : '';
         $template_fleet['PLANET_TYPE_TEXT'] = $lang['sys_planet_type_sh'][$template_fleet['PLANET_TYPE']];
       }
 
-      foreach($fleet_snapshot as $unit_id => $unit_snapshot) {
+      foreach ($fleet_snapshot as $unit_id => $unit_snapshot) {
         $template_fleet['.']['ship'][] = $unit_snapshot->report_render_unit($prevSnapshot[$fleet_id][$unit_id]);
       }