supernova-ws / SuperNova

includes/classes/UBE/UBEFleet.php

Doc Comments +11 added lines, -4 removed lines

@@ -150,7 +150,7 @@ 
   }
 
   /**
-   * @param $ube_report_id
+   * @param integer $ube_report_id
    *
    * @return array
    *
@@ -288,7 +288,7 @@ 
 
 
   /**
-   * @param $ube_report_id
+   * @param integer $ube_report_id
    *
    * @return array
    */
@@ -336,7 +336,7 @@ 
   // Рендерит таблицу общего результата боя
   /**
    * @param $array
-   * @param $lang_header_index
+   * @param string $lang_header_index
    *
    * @return array
    */
@@ -362,6 +362,9 @@ 
   }
 
 
+  /**
+   * @param integer $ube_report_id
+   */
   public function sql_generate_outcome_unit_array(&$sql_perform_report_unit, $ube_report_id) {
     $fleet_id = $this->db_id;
 
@@ -468,6 +471,10 @@ 
     $this->fleet_capacity -= $fleet_total_resources;
   }
 
+  /**
+   * @param integer $is_small_fleet_recce
+   * @param integer $reapers_status
+   */
   public function db_save_combat_result_fleet($is_small_fleet_recce, $reapers_status) {
     $ship_count_initial = $this->unit_list->unitsCount();
     $ship_count_lost = $this->unit_list->unitCountLost();
@@ -535,7 +542,7 @@ 
 
   /**
    * @param UBEFleetList $fleet_list
-   * @param              $is_simulator
+   * @param              boolean $is_simulator
    *
    * @version 2016-02-25 23:42:45 41a4.68
    */

Spacing +64 added lines, -64 removed lines

@@ -162,20 +162,20 @@ 
       $this->owner_id,
       $this->db_id,
 
-      (float)$this->UBE_PLANET[PLANET_ID],
-      "'" . db_escape($this->UBE_PLANET[PLANET_NAME]) . "'",
-      (int)$this->UBE_PLANET[PLANET_GALAXY],
-      (int)$this->UBE_PLANET[PLANET_SYSTEM],
-      (int)$this->UBE_PLANET[PLANET_PLANET],
-      (int)$this->UBE_PLANET[PLANET_TYPE],
-
-      (float)$this->resource_list[RES_METAL],
-      (float)$this->resource_list[RES_CRYSTAL],
-      (float)$this->resource_list[RES_DEUTERIUM],
-
-      (float)$this->fleet_bonus->calcBonus(P_ATTACK),
-      (float)$this->fleet_bonus->calcBonus(P_SHIELD),
-      (float)$this->fleet_bonus->calcBonus(P_ARMOR),
+      (float) $this->UBE_PLANET[PLANET_ID],
+      "'".db_escape($this->UBE_PLANET[PLANET_NAME])."'",
+      (int) $this->UBE_PLANET[PLANET_GALAXY],
+      (int) $this->UBE_PLANET[PLANET_SYSTEM],
+      (int) $this->UBE_PLANET[PLANET_PLANET],
+      (int) $this->UBE_PLANET[PLANET_TYPE],
+
+      (float) $this->resource_list[RES_METAL],
+      (float) $this->resource_list[RES_CRYSTAL],
+      (float) $this->resource_list[RES_DEUTERIUM],
+
+      (float) $this->fleet_bonus->calcBonus(P_ATTACK),
+      (float) $this->fleet_bonus->calcBonus(P_SHIELD),
+      (float) $this->fleet_bonus->calcBonus(P_ARMOR),
     );
   }
 
@@ -189,13 +189,13 @@ 
     $this->owner_id = $objFleet->playerOwnerId;
     $this->group_id = $objFleet->group_id;
 
-    foreach($objFleet->shipsIterator() as $unit_id => $unit) {
-      if(!$unit->count) {
+    foreach ($objFleet->shipsIterator() as $unit_id => $unit) {
+      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->unit_list->unitAdjustCount($unit_id, $unit->count);
       }
     }
@@ -231,13 +231,13 @@ 
 //      }
 //    }
 
-    foreach($sn_group_combat as $unit_id) {
-      if($unit_count = mrc_get_level($player_db_row, $planet_row, $unit_id)) {
+    foreach ($sn_group_combat as $unit_id) {
+      if ($unit_count = mrc_get_level($player_db_row, $planet_row, $unit_id)) {
         $this->unit_list->unitAdjustCount($unit_id, $unit_count);
       }
     }
 
-    foreach(sn_get_groups('resources_loot') as $resource_id) {
+    foreach (sn_get_groups('resources_loot') as $resource_id) {
       $this->resource_list[$resource_id] = floor(mrc_get_level($player_db_row, $planet_row, $resource_id));
     }
 
@@ -296,27 +296,27 @@ 
       $ube_report_id,
       $this->db_id,
 
-      (float)$this->resources_lost_on_units[RES_METAL],
-      (float)$this->resources_lost_on_units[RES_CRYSTAL],
-      (float)$this->resources_lost_on_units[RES_DEUTERIUM],
-      (float)$this->cargo_dropped[RES_METAL],
-      (float)$this->cargo_dropped[RES_CRYSTAL],
-      (float)$this->cargo_dropped[RES_DEUTERIUM],
-      (float)$this->resources_looted[RES_METAL],
-      (float)$this->resources_looted[RES_CRYSTAL],
-      (float)$this->resources_looted[RES_DEUTERIUM],
-      (float)$this->resources_lost_in_metal[RES_METAL],
+      (float) $this->resources_lost_on_units[RES_METAL],
+      (float) $this->resources_lost_on_units[RES_CRYSTAL],
+      (float) $this->resources_lost_on_units[RES_DEUTERIUM],
+      (float) $this->cargo_dropped[RES_METAL],
+      (float) $this->cargo_dropped[RES_CRYSTAL],
+      (float) $this->cargo_dropped[RES_DEUTERIUM],
+      (float) $this->resources_looted[RES_METAL],
+      (float) $this->resources_looted[RES_CRYSTAL],
+      (float) $this->resources_looted[RES_DEUTERIUM],
+      (float) $this->resources_lost_in_metal[RES_METAL],
     );
   }
 
   public function report_render_outcome_side_fleet() {
     $UBE_DEFENCE_RESTORE = array();
     $UBE_UNITS_LOST = array();
-    foreach($this->unit_list->_container as $UBEUnit) {
-      if($UBEUnit->units_restored) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
+      if ($UBEUnit->units_restored) {
         $UBE_DEFENCE_RESTORE[$UBEUnit->unitId] = $UBEUnit->units_restored;
       }
-      if($UBEUnit->units_lost) {
+      if ($UBEUnit->units_lost) {
         $UBE_UNITS_LOST[$UBEUnit->unitId] = $UBEUnit->units_lost;
       }
     }
@@ -341,16 +341,16 @@ 
    */
   protected function report_render_outcome_side_fleet_line(&$array, $lang_header_index) {
     $result = array();
-    if(!empty($array)) {
-      foreach($array as $unit_id => $unit_count) {
-        if($unit_count) {
+    if (!empty($array)) {
+      foreach ($array as $unit_id => $unit_count) {
+        if ($unit_count) {
           $result[] = array(
             'NAME' => classLocale::$lang['tech'][$unit_id],
             'LOSS' => pretty_number($unit_count),
           );
         }
       }
-      if($lang_header_index && count($result)) {
+      if ($lang_header_index && count($result)) {
         array_unshift($result, array('NAME' => classLocale::$lang[$lang_header_index]));
       }
     }
@@ -363,16 +363,16 @@ 
     $fleet_id = $this->db_id;
 
     $unit_sort_order = 0;
-    foreach($this->unit_list->_container as $UBEUnit) {
-      if($UBEUnit->units_lost || $UBEUnit->units_restored) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
+      if ($UBEUnit->units_lost || $UBEUnit->units_restored) {
         $unit_sort_order++;
         $sql_perform_report_unit[] = array(
           $ube_report_id,
           $fleet_id,
 
           $UBEUnit->unitId,
-          (float)$UBEUnit->units_restored,
-          (float)$UBEUnit->units_lost,
+          (float) $UBEUnit->units_restored,
+          (float) $UBEUnit->units_lost,
 
           $unit_sort_order,
         );
@@ -388,9 +388,9 @@ 
   function ube_combat_result_calculate_resources() {
     $resource_delta_fleet = array();
     // Если во флоте остались юниты или это планета - генерируем изменение ресурсов
-    foreach(sn_get_groups('resources_loot') as $resource_id) {
-      $resource_change = (float)$this->resources_looted[$resource_id] + (float)$this->cargo_dropped[$resource_id];
-      if($resource_change) {
+    foreach (sn_get_groups('resources_loot') as $resource_id) {
+      $resource_change = (float) $this->resources_looted[$resource_id] + (float) $this->cargo_dropped[$resource_id];
+      if ($resource_change) {
         $resource_delta_fleet[$resource_id] = -($resource_change);
       }
     }
@@ -423,12 +423,12 @@ 
     );
 
     $this->fleet_capacity = 0;
-    foreach($this->unit_list->_container as $UBEUnit) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
       $this->fleet_capacity += $UBEUnit->capacity * $UBEUnit->getCount();
 
-      if($UBEUnit->units_lost) {
-        foreach($UBEUnit->price as $resource_id => $unit_resource_price) {
-          if(!$unit_resource_price) {
+      if ($UBEUnit->units_lost) {
+        foreach ($UBEUnit->price as $resource_id => $unit_resource_price) {
+          if (!$unit_resource_price) {
             continue;
           }
 
@@ -436,7 +436,7 @@ 
           $this->resources_lost_on_units[$resource_id] += $resources_lost;
           // Если это корабль - прибавляем потери к обломкам на орбите
           // TODO - опция выбрасывания обороны в обломки
-          if($UBEUnit->getType() == UNIT_SHIPS) {
+          if ($UBEUnit->getType() == UNIT_SHIPS) {
             $this->resources_lost_on_ships[$resource_id] += $resources_lost;
           }
         }
@@ -448,11 +448,11 @@ 
 
     // Если емкость трюмов меньше количество ресурсов - часть ресов выбрасываем нахуй
     // На планете ($fleet_id = 0) ресурсы в космос не выбрасываются
-    if($this->db_id != 0 && $this->fleet_capacity < $fleet_total_resources) {
+    if ($this->db_id != 0 && $this->fleet_capacity < $fleet_total_resources) {
       $drop_share = 1 - $this->fleet_capacity / $fleet_total_resources; // Какая часть ресурсов выброшена
-      foreach($this->resource_list as $resource_id => &$resource_amount) {
+      foreach ($this->resource_list as $resource_id => &$resource_amount) {
         // Не просчитываем ресурсы, которых нет на борту кораблей флота
-        if(!$resource_amount) {
+        if (!$resource_amount) {
           continue;
         }
 
@@ -473,19 +473,19 @@ 
     $objFleet2->setDbId($this->db_id);
 
     // Если это была миссия Уничтожения И звезда смерти взорвалась И мы работаем с аттакерами - значит все аттакеры умерли
-    if($this->is_attacker == UBE_PLAYER_IS_ATTACKER && $reapers_status == UBE_MOON_REAPERS_DIED) {
+    if ($this->is_attacker == UBE_PLAYER_IS_ATTACKER && $reapers_status == UBE_MOON_REAPERS_DIED) {
       $objFleet2->dbDelete();
-    } elseif($ship_count_initial == 0) { // $ship_count_lost == $ship_count_initial ||
+    } elseif ($ship_count_initial == 0) { // $ship_count_lost == $ship_count_initial ||
       $objFleet2->dbDelete();
     } else {
-      if($ship_count_lost) {
+      if ($ship_count_lost) {
         // Просматриваем результаты изменения флотов
-        foreach($this->unit_list->_container as $UBEUnit) {
+        foreach ($this->unit_list->_container as $UBEUnit) {
           // Перебираем аутком на случай восстановления юнитов
 //          if(($units_left = $UBEUnit->getCount() - (float)$UBEUnit->units_lost) > 0) {
 //            $fleet_real_array[$UBEUnit->unitId] = $units_left;
 //          };
-          if(floatval($UBEUnit->units_lost) != 0) {
+          if (floatval($UBEUnit->units_lost) != 0) {
             $objFleet2->shipAdjustCount($UBEUnit->unitId, floatval($UBEUnit->units_lost));
           };
         }
@@ -495,7 +495,7 @@ 
       $objFleet2->resourcesAdjust($resource_delta_fleet);
 
       // Если защитник и не РМФ - отправляем флот назад
-      if($this->is_attacker == UBE_PLAYER_IS_ATTACKER || ($this->is_attacker == UBE_PLAYER_IS_DEFENDER && !$is_small_fleet_recce)) {
+      if ($this->is_attacker == UBE_PLAYER_IS_ATTACKER || ($this->is_attacker == UBE_PLAYER_IS_DEFENDER && !$is_small_fleet_recce)) {
         $objFleet2->markReturned();
       }
       $objFleet2->dbSave();
@@ -525,7 +525,7 @@ 
   public function calculate_unit_partial_data(UBEASA $side_ASA) {
     $this->fleet_share_of_side_armor = $this->total_stats[P_ARMOR] / $side_ASA->getArmor();
 
-    foreach($this->unit_list->_container as $UBEUnit) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
       $UBEUnit->share_of_side_armor = $UBEUnit->pool_armor / $side_ASA->getArmor();
     }
   }
@@ -537,9 +537,9 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function attack_fleets(UBEFleetList $fleet_list, $is_simulator) {
-    foreach($fleet_list->_container as $defending_fleet) {
+    foreach ($fleet_list->_container as $defending_fleet) {
       // Не атакуются флоты на своей стороне
-      if($this->is_attacker == $defending_fleet->is_attacker) {
+      if ($this->is_attacker == $defending_fleet->is_attacker) {
         continue;
       }
       $this->attack_fleet($defending_fleet, $is_simulator);
@@ -555,12 +555,12 @@ 
   public function attack_fleet(UBEFleet $defending_fleet, $is_simulator) {
     UBEDebug::unit_dump_header();
 
-    foreach($this->unit_list->_container as $attacking_unit_pool) {
+    foreach ($this->unit_list->_container as $attacking_unit_pool) {
       UBEDebug::unit_dump($attacking_unit_pool, 'attacker');
 
       // if($attack_unit_count <= 0) continue; // TODO: Это пока нельзя включать - вот если будут "боевые порядки юнитов..."
-      foreach($defending_fleet->unit_list->_container as $defending_unit_pool) {
-        if($defending_unit_pool->isEmpty()) {
+      foreach ($defending_fleet->unit_list->_container as $defending_unit_pool) {
+        if ($defending_unit_pool->isEmpty()) {
           continue;
         }
 

includes/includes/flt_flying_fleet_handler2.php

Doc Comments +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  *
  * @param Fleet $objFleet
  * @param bool  $start
- * @param null  $result
+ * @param integer  $result
  *
  * @return mixed
  */

Spacing +7 added lines, -11 removed lines

@@ -19,15 +19,11 @@ 
 // ------------------------------------------------------------------
 function flt_flyingFleetsSort($a, $b) {
   // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
-  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
-    // Если время - одинаковое, сравниваем события флотов
+  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 : // Если время - одинаковое, сравниваем события флотов
     // Если события - одинаковые, то флоты равны
-    ($a['fleet_event'] == $b['fleet_event'] ? 0 :
-      // Если события разные - первыми считаем прибывающие флоты
-      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 :
-        // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
-        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 :
-          // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
+    ($a['fleet_event'] == $b['fleet_event'] ? 0 : // Если события разные - первыми считаем прибывающие флоты
+      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
+        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
           // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
           (
           0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -45,13 +41,13 @@ 
     $handler = fopen('event.log', 'a+');
   }
 
-  fwrite($handler, date(FMT_DATE_TIME_SQL, time()) . ' ' . $msg . "\r\n");
+  fwrite($handler, date(FMT_DATE_TIME_SQL, time()).' '.$msg."\r\n");
 }
 
 // ------------------------------------------------------------------
 function flt_flying_fleet_handler($skip_fleet_update = false) {
   if (true) {
-    if(!defined('IN_AJAX')) {
+    if (!defined('IN_AJAX')) {
       print('<div style="color: red; font-size: 300%">Fleet handler is disabled</div>');
       pdump('Fleet handler is disabled');
     }
@@ -177,7 +173,7 @@ 
     MT_EXPLORE   => 'flt_mission_explore',
   );
   foreach ($missions_used as $mission_id => $cork) {
-    require_once(SN_ROOT_PHYSICAL . "includes/includes/{$mission_files[$mission_id]}" . DOT_PHP_EX);
+    require_once(SN_ROOT_PHYSICAL."includes/includes/{$mission_files[$mission_id]}".DOT_PHP_EX);
   }
 
 //log_file('Обработка миссий');

includes/classes/core_auth.php

Doc Comments +7 added lines, -1 removed lines

@@ -286,7 +286,6 @@ 
   /**
    * Функция пытается залогиниться по всем известным провайдерам
    *
-   * @param null $result
    */
   public function login() {
     if(empty(sn_module::$sn_module_list['auth'])) {
@@ -823,10 +822,17 @@ 
 
   // OK v4.5
   // TODO - REMEMBER_ME
+
+  /**
+   * @param integer $period
+   */
   protected static function cookie_set($value, $impersonate = false, $period = null) {
     sn_setcookie($impersonate ? SN_COOKIE_U_I : SN_COOKIE_U, $value, $period === null ? SN_TIME_NOW + PERIOD_YEAR : $period, SN_ROOT_RELATIVE);
   }
 
+  /**
+   * @param string $message
+   */
   protected static function flog($message, $die = false) {
     if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
       return;

Spacing +17 added lines, -17 removed lines

@@ -224,7 +224,7 @@ 
       // Проверить наличие такого имени в истории имён
       do {
         sn_db_transaction_rollback();
-        $this->player_suggested_name = 'Emperor ' . mt_rand($max_user_id + 1, $max_user_id + 1000);
+        $this->player_suggested_name = 'Emperor '.mt_rand($max_user_id + 1, $max_user_id + 1000);
         sn_db_transaction_start();
       } while (db_player_name_exists($this->player_suggested_name));
 
@@ -233,7 +233,7 @@ 
     if ($player_name_submitted) {
       $this->register_player_db_create($this->player_suggested_name); // OK 4.5
       if ($this->register_status == LOGIN_SUCCESS) {
-        sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
+        sys_redirect(SN_ROOT_VIRTUAL.'overview.php');
       } elseif ($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) {
         // self::$player_suggested_name .= ' ' . $this->account->account_id;
       }
@@ -259,8 +259,8 @@ 
       );
 
     if ($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
-      $prohibited_characters = array_map(function ($value) {
-        return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
+      $prohibited_characters = array_map(function($value) {
+        return "'".htmlentities($value, ENT_QUOTES, 'UTF-8')."'";
       }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
       $template_result[F_PLAYER_REGISTER_MESSAGE] .= implode(', ', $prohibited_characters);
     }
@@ -307,7 +307,7 @@ 
 
     foreach ($this->providers as $provider_id => $provider) {
       $login_status = $provider->login(); // OK v4.5
-      self::flog(($provider->manifest['name'] . '->' . 'login_try - ') . (empty($provider->account->account_id) ? classLocale::$lang['sys_login_messages'][$provider->account_login_status] : dump($provider)));
+      self::flog(($provider->manifest['name'].'->'.'login_try - ').(empty($provider->account->account_id) ? classLocale::$lang['sys_login_messages'][$provider->account_login_status] : dump($provider)));
       if ($login_status == LOGIN_SUCCESS && is_object($provider->account) && $provider->account instanceof Account && $provider->account->account_id) {
         $this->providers_authorised[$provider_id] = &$this->providers[$provider_id];
 
@@ -347,7 +347,7 @@ 
         if (!$this->is_player_register) {
           // Нет - отправляем на процесс регистрации
           $partner_id = sys_get_param_int('id_ref', sys_get_param_int('partner_id'));
-          sys_redirect(SN_ROOT_VIRTUAL . 'index.php?page=player_register&player_register=1' . ($partner_id ? '&id_ref=' . $partner_id : ''));
+          sys_redirect(SN_ROOT_VIRTUAL.'index.php?page=player_register&player_register=1'.($partner_id ? '&id_ref='.$partner_id : ''));
         }
       } else {
         // Да, есть доступные игроки, которые так же прописаны в базе
@@ -407,7 +407,7 @@ 
     }
 
     if ($redirect === true) {
-      sys_redirect(SN_ROOT_RELATIVE . (empty($_COOKIE[SN_COOKIE_U]) ? 'login.php' : 'admin/overview.php'));
+      sys_redirect(SN_ROOT_RELATIVE.(empty($_COOKIE[SN_COOKIE_U]) ? 'login.php' : 'admin/overview.php'));
     } elseif ($redirect !== false) {
       sys_redirect($redirect);
     }
@@ -702,7 +702,7 @@ 
         $user['vacation'] = SN_TIME_NOW;
       }
 
-      $user['user_lastip'] = self::$device->ip_v4_string;// $ip['ip'];
+      $user['user_lastip'] = self::$device->ip_v4_string; // $ip['ip'];
       $user['user_proxy'] = self::$device->ip_v4_proxy_chain; //$ip['proxy_chain'];
 
       $result[F_BANNED_STATUS] = $user['banaday'];
@@ -710,9 +710,9 @@ 
 
       $proxy_safe = static::$db->db_escape(self::$device->ip_v4_proxy_chain);
 
-      DBStaticUser::db_user_set_by_id($user['id'], "`onlinetime` = " . SN_TIME_NOW . ",
-      `banaday` = " . static::$db->db_escape($user['banaday']) . ", `vacation` = " . static::$db->db_escape($user['vacation']) . ",
-      `user_lastip` = '" . static::$db->db_escape($user['user_lastip']) . "', `user_last_proxy` = '{$proxy_safe}', `user_last_browser_id` = " . self::$device->browser_id
+      DBStaticUser::db_user_set_by_id($user['id'], "`onlinetime` = ".SN_TIME_NOW.",
+      `banaday` = " . static::$db->db_escape($user['banaday']).", `vacation` = ".static::$db->db_escape($user['vacation']).",
+      `user_lastip` = '" . static::$db->db_escape($user['user_lastip'])."', `user_last_proxy` = '{$proxy_safe}', `user_last_browser_id` = ".self::$device->browser_id
       );
     }
 
@@ -805,7 +805,7 @@ 
    */
   // OK v4
   public static function password_encode($password, $salt) {
-    return md5($password . $salt);
+    return md5($password.$salt);
   }
   /**
    * Генерирует соль
@@ -831,10 +831,10 @@ 
     }
     list($called, $caller) = debug_backtrace(false);
     $caller_name =
-      (!empty($caller['class']) ? $caller['class'] : '') .
-      (!empty($caller['type']) ? $caller['type'] : '') .
-      (!empty($caller['function']) ? $caller['function'] : '') .
-      (!empty($called['line']) ? ':' . $called['line'] : '');
+      (!empty($caller['class']) ? $caller['class'] : '').
+      (!empty($caller['type']) ? $caller['type'] : '').
+      (!empty($caller['function']) ? $caller['function'] : '').
+      (!empty($called['line']) ? ':'.$called['line'] : '');
 
     $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false;
 
@@ -842,7 +842,7 @@ 
     if ($die) {
       // pdump($caller);
       // pdump(debug_backtrace(false));
-      $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");
+      $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в ".get_called_class()." (располагается в ".get_class()."). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");
     }
   }
 

admin/includes/admin_planet_edit.inc.php

Spacing +3 added lines, -3 removed lines

@@ -21,12 +21,12 @@ 
 
 function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode) {
   $unit_list = sn_get_groups($mode);
-  if(empty($unit_list)) {
+  if (empty($unit_list)) {
     return;
   }
   $name_list = classLocale::$lang['tech'];
 
-  foreach($unit_list as $unit_id) {
+  foreach ($unit_list as $unit_id) {
     $template->assign_block_vars('unit', array(
       'ID'    => $unit_id,
       'NAME'  => $name_list[$unit_id],
@@ -39,7 +39,7 @@ 
 function admin_planet_edit_query_string($unit_id, $unit_amount, $mode) { return sn_function_call(__FUNCTION__, array($unit_id, $unit_amount, $mode)); }
 
 function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {
-  if($unit_amount && in_array($unit_id, sn_get_groups($mode))) {
+  if ($unit_amount && in_array($unit_id, sn_get_groups($mode))) {
     $unit_amount = round($unit_amount);
     $unit_name = get_unit_param($unit_id, P_NAME);
     $result = "{$unit_name} = GREATEST(0, {$unit_name} + ({$unit_amount}))";

includes/functions/uni_functions.php

Braces +3 added lines, -1 removed lines

@@ -253,9 +253,11 @@
   }
 
   // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету
-  if(!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
+  if(!isset($planet_row['id'])) {
+    // || $planet_row['id'] != $user['current_planet']
   {
     $planet_row = db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id');
+  }
     // Если текущей планеты не существует - выставляем Столицу
     if(!isset($planet_row['id'])) {
       $planet_row = db_planet_by_id_and_owner($user['id_planet'], $user['id'], false, 'id');

Spacing +39 added lines, -39 removed lines

@@ -7,12 +7,12 @@ 
 
   $possible_cores = array();
   $probability = 0;
-  foreach($density_list as $possible_core_id => $core_data) {
-    if(!$core_data[UNIT_PLANET_DENSITY_RARITY]) {
+  foreach ($density_list as $possible_core_id => $core_data) {
+    if (!$core_data[UNIT_PLANET_DENSITY_RARITY]) {
       continue;
     }
 
-    if(
+    if (
       // Core type exists
       in_array($possible_core_id, $position_data['core_types'])
       // Limit core type with planet sector count
@@ -33,8 +33,8 @@ 
 
   $random = mt_rand(1, $probability);
   $selected_core = null;
-  foreach($possible_cores as $core_type => $core_info) {
-    if($random <= $core_info[UNIT_PLANET_DENSITY_RARITY]) {
+  foreach ($possible_cores as $core_type => $core_info) {
+    if ($random <= $core_info[UNIT_PLANET_DENSITY_RARITY]) {
       $selected_core = $core_info;
       break;
     }
@@ -57,7 +57,7 @@ 
 function uni_create_planet($Galaxy, $System, $Position, $PlanetOwnerID, $planet_name_unsafe = '', $HomeWorld = false, $options = array()) {
   $Position = intval($Position);
 
-  if(!isset($options['skip_check']) && DBStaticPlanet::db_planet_by_gspt($Galaxy, $System, $Position, PT_PLANET, true, '`id`')) {
+  if (!isset($options['skip_check']) && DBStaticPlanet::db_planet_by_gspt($Galaxy, $System, $Position, PT_PLANET, true, '`id`')) {
     return false;
   }
 
@@ -66,11 +66,11 @@ 
 
   $planet_generator = sn_get_groups('planet_generator');
 
-  if($HomeWorld) {
+  if ($HomeWorld) {
     $position_data = $planet_generator[0];
   } else {
     $position_data = $planet_generator[$Position >= UNIVERSE_RANDOM_PLANET_START || $Position < 1 ? UNIVERSE_RANDOM_PLANET_START : $Position];
-    if($Position >= UNIVERSE_RANDOM_PLANET_START) {
+    if ($Position >= UNIVERSE_RANDOM_PLANET_START) {
       // Корректируем температуру для планеты-странника
       $position_data['t_max_max'] -= UNIVERSE_RANDOM_PLANET_TEMPERATURE_DECREASE * ($Position - UNIVERSE_RANDOM_PLANET_START);
     }
@@ -78,7 +78,7 @@ 
 
   $planet_images = sn_get_groups('planet_images');
   $planet_image = $position_data['planet_images'][mt_rand(0, count($position_data['planet_images']) - 1)];
-  $planet_image .= 'planet' . $planet_images[$planet_image][mt_rand(0, count($planet_images[$planet_image]) - 1)];
+  $planet_image .= 'planet'.$planet_images[$planet_image][mt_rand(0, count($planet_images[$planet_image]) - 1)];
 
   $t_max = sn_rand_gauss_range($position_data['t_max_min'], $position_data['t_max_max'], true, 1.3, true);
   $t_min = $t_max - sn_rand_gauss_range($position_data['t_delta_min'], $position_data['t_delta_max'], true, 1.3, true);
@@ -89,7 +89,7 @@ 
 
   $core_info = uni_create_planet_get_density($position_data, $user_row, $planet_sectors);
 
-  $planet_name_unsafe = $user_row['username'] . ' ' . ($planet_name_unsafe ? $planet_name_unsafe : classLocale::$lang['sys_colo_defaultname']);
+  $planet_name_unsafe = $user_row['username'].' '.($planet_name_unsafe ? $planet_name_unsafe : classLocale::$lang['sys_colo_defaultname']);
 
   $planet['name'] = db_escape(strip_tags(trim($planet_name_unsafe)));
   $planet['id_owner'] = $PlanetOwnerID;
@@ -170,15 +170,15 @@ 
   $moon_name = '';
   $moon_row = array();
   $moon = DBStaticPlanet::db_planet_by_gspt($pos_galaxy, $pos_system, $pos_planet, PT_MOON, false, 'id');
-  if(!$moon['id']) {
+  if (!$moon['id']) {
     $moon_planet = DBStaticPlanet::db_planet_by_gspt($pos_galaxy, $pos_system, $pos_planet, PT_PLANET, true, '`id`, `temp_min`, `temp_max`, `name`, `debris_metal`, `debris_crystal`');
 
-    if($moon_planet['id']) {
+    if ($moon_planet['id']) {
       $base_storage_size = BASE_STORAGE_SIZE;
 
-      if(!$moon_chance) {
+      if (!$moon_chance) {
         $size = mt_rand(1100, 8999);
-      } elseif($moon_chance <= 100) {
+      } elseif ($moon_chance <= 100) {
         $size = mt_rand($moon_chance * 100 + 1000, $moon_chance * 200 + 2999);
       } else {
         $size = $moon_chance;
@@ -194,22 +194,22 @@ 
 
       $field_max = ceil($size / 1000);
 
-      if(isset($options['image']) && $options['image']) {
+      if (isset($options['image']) && $options['image']) {
         $moon_image = $options['image'];
       } else {
         $moon_image = 'mond';
       }
 
       $moon_row = classSupernova::db_ins_record(LOC_PLANET,
-        "`id_owner` = '{$user_id}', `parent_planet` = '{$moon_planet['id']}', `name` = '{$moon_name_safe}', `last_update` = " . SN_TIME_NOW . ", `image` = '{$moon_image}',
-          `galaxy` = '{$pos_galaxy}', `system` = '{$pos_system}', `planet` = '{$pos_planet}', `planet_type` = " . PT_MOON . ",
+        "`id_owner` = '{$user_id}', `parent_planet` = '{$moon_planet['id']}', `name` = '{$moon_name_safe}', `last_update` = ".SN_TIME_NOW.", `image` = '{$moon_image}',
+          `galaxy` = '{$pos_galaxy}', `system` = '{$pos_system}', `planet` = '{$pos_planet}', `planet_type` = ".PT_MOON.",
           `diameter` = '{$size}', `field_max` = '{$field_max}', `density` = 2500, `density_index` = 2, `temp_min` = '{$temp_min}', `temp_max` = '{$temp_max}',
           `metal` = '0', `metal_perhour` = '0', `metal_max` = '{$base_storage_size}',
           `crystal` = '0', `crystal_perhour` = '0', `crystal_max` = '{$base_storage_size}',
           `deuterium` = '0', `deuterium_perhour` = '0', `deuterium_max` = '{$base_storage_size}'"
       );
 
-      if($update_debris) {
+      if ($update_debris) {
         $debris_spent = $moon_chance * 1000000;
         $metal_spent = round(min($moon_planet['debris_metal'], $debris_spent * mt_rand(50, 75) / 100));
         $crystal_spent = min($moon_planet['debris_crystal'], $debris_spent - $metal_spent);
@@ -244,28 +244,28 @@ 
   $planet_row['id'] = $user['current_planet'];
 
   // Пытаемся переключить на новую планету
-  if(($selected_planet = sys_get_param_id('cp')) && $selected_planet != $user['current_planet']) {
+  if (($selected_planet = sys_get_param_id('cp')) && $selected_planet != $user['current_planet']) {
     $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($selected_planet, $user['id'], false, 'id');
   } else {
     $planet_row = DBStaticPlanet::db_planet_by_id($planet_row['id']);
   }
 
   // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету
-  if(!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
+  if (!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
   {
     $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id');
     // Если текущей планеты не существует - выставляем Столицу
-    if(!isset($planet_row['id'])) {
+    if (!isset($planet_row['id'])) {
       $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['id_planet'], $user['id'], false, 'id');
       // Если и столицы не существует - значит что-то очень не так с записью пользователя
-      if(!isset($planet_row['id'])) {
+      if (!isset($planet_row['id'])) {
         classSupernova::$debug->error("User ID {$user['id']} has Capital planet {$user['id_planet']} but this planet does not exists", 'User record error', 502);
       }
     }
   }
 
   // Если производилось переключение планеты - делаем запись в юзере
-  if($user['current_planet'] != $planet_row['id']) {
+  if ($user['current_planet'] != $planet_row['id']) {
     DBStaticUser::db_user_set_by_id($user['id'], "`current_planet` = '{$planet_row['id']}'");
     $user['current_planet'] = $planet_row['id'];
   }
@@ -282,7 +282,7 @@ 
 
 // ----------------------------------------------------------------------------------------------------------------
 function uni_render_coordinates($from, $prefix = '') {
-  return "[{$from[$prefix . 'galaxy']}:{$from[$prefix . 'system']}:{$from[$prefix . 'planet']}]";
+  return "[{$from[$prefix.'galaxy']}:{$from[$prefix.'system']}:{$from[$prefix.'planet']}]";
 }
 
 function uni_render_planet($from) {
@@ -290,17 +290,17 @@ 
 }
 
 function uni_render_planet_full($from, $prefix = '', $html_safe = true, $include_id = false) {
-  if(!$from['id']) {
+  if (!$from['id']) {
     $result = classLocale::$lang['sys_planet_expedition'];
   } else {
     $from_planet_id = $include_id ? (
-      'ID {' . ($from['id'] ? $from['id'] : ($from[$prefix . 'planet_id'] ? $from[$prefix . 'planet_id'] : 0)) . '} '
+      'ID {'.($from['id'] ? $from['id'] : ($from[$prefix.'planet_id'] ? $from[$prefix.'planet_id'] : 0)).'} '
     ) : '';
 
-    $from_planet_type = $from['planet_type'] ? $from['planet_type'] : ($from[$prefix . 'type'] ? $from[$prefix . 'type'] : 0);
-    $from_planet_type = ($from_planet_type ? ' ' . classLocale::$lang['sys_planet_type_sh'][$from_planet_type] : '');
+    $from_planet_type = $from['planet_type'] ? $from['planet_type'] : ($from[$prefix.'type'] ? $from[$prefix.'type'] : 0);
+    $from_planet_type = ($from_planet_type ? ' '.classLocale::$lang['sys_planet_type_sh'][$from_planet_type] : '');
 
-    $result = $from_planet_id . uni_render_coordinates($from, $prefix) . $from_planet_type . ($from['name'] ? ' ' . $from['name'] : '');
+    $result = $from_planet_id.uni_render_coordinates($from, $prefix).$from_planet_type.($from['name'] ? ' '.$from['name'] : '');
     $result = $html_safe ? str_replace(' ', '&nbsp;', htmlentities($result, ENT_COMPAT, 'UTF-8')) : $result;
   }
 
@@ -308,11 +308,11 @@ 
 }
 
 function uni_render_coordinates_url($from, $prefix = '', $page = 'galaxy.php') {
-  return $page . (strpos($page, '?') === false ? '?' : '&') . "galaxy={$from[$prefix . 'galaxy']}&system={$from[$prefix . 'system']}&planet={$from[$prefix . 'planet']}";
+  return $page.(strpos($page, '?') === false ? '?' : '&')."galaxy={$from[$prefix.'galaxy']}&system={$from[$prefix.'system']}&planet={$from[$prefix.'planet']}";
 }
 
 function uni_render_coordinates_href($from, $prefix = '', $mode = 0, $fleet_type = '') {
-  return '<a href="' . uni_render_coordinates_url($from, $prefix, "galaxy.php?mode={$mode}") . '"' . ($fleet_type ? " {$fleet_type}" : '') . '>' . uni_render_coordinates($from, $prefix) . '</a>';
+  return '<a href="'.uni_render_coordinates_url($from, $prefix, "galaxy.php?mode={$mode}").'"'.($fleet_type ? " {$fleet_type}" : '').'>'.uni_render_coordinates($from, $prefix).'</a>';
 }
 
 function uni_get_time_to_jump($moon_row) {
@@ -340,30 +340,30 @@ 
   $coordinates["{$prefix}planet"] = intval($coordinates["{$prefix}planet"]);
 
   return
-    isset($coordinates["{$prefix}galaxy"]) && $coordinates["{$prefix}galaxy"] > 0 && $coordinates["{$prefix}galaxy"] <= Vector::$knownGalaxies&&
-    isset($coordinates["{$prefix}system"]) && $coordinates["{$prefix}system"] > 0 && $coordinates["{$prefix}system"] <= Vector::$knownSystems&&
+    isset($coordinates["{$prefix}galaxy"]) && $coordinates["{$prefix}galaxy"] > 0 && $coordinates["{$prefix}galaxy"] <= Vector::$knownGalaxies &&
+    isset($coordinates["{$prefix}system"]) && $coordinates["{$prefix}system"] > 0 && $coordinates["{$prefix}system"] <= Vector::$knownSystems &&
     isset($coordinates["{$prefix}planet"]) && $coordinates["{$prefix}planet"] > 0 && $coordinates["{$prefix}planet"] <= Vector::$knownPlanets;
 }
 
 function uni_planet_teleport_check($user, $planetrow, $new_coordinates = null) {
   try {
-    if($planetrow['planet_teleport_next'] && $planetrow['planet_teleport_next'] > SN_TIME_NOW) {
+    if ($planetrow['planet_teleport_next'] && $planetrow['planet_teleport_next'] > SN_TIME_NOW) {
       throw new exception(classLocale::$lang['ov_teleport_err_cooldown'], ERR_ERROR);
     }
 
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->planet_teleport_cost) {
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->planet_teleport_cost) {
       throw new exception(classLocale::$lang['ov_teleport_err_no_dark_matter'], ERR_ERROR);
     }
 
     // TODO: Replace quick-check with using gathered flying fleet data
-    if(FleetList::fleet_count_incoming($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'])) {
+    if (FleetList::fleet_count_incoming($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'])) {
       throw new exception(classLocale::$lang['ov_teleport_err_fleet'], ERR_ERROR);
     }
 
-    if(is_array($new_coordinates)) {
+    if (is_array($new_coordinates)) {
       $new_coordinates['planet_type'] = PT_PLANET;
       $incoming = DBStaticPlanet::db_planet_by_vector($new_coordinates, '', true, 'id');
-      if($incoming['id']) {
+      if ($incoming['id']) {
         throw new exception(classLocale::$lang['ov_teleport_err_destination_busy'], ERR_ERROR);
       }
     }
@@ -372,7 +372,7 @@ 
       'result'  => ERR_NONE,
       'message' => '',
     );
-  } catch(exception $e) {
+  } catch (exception $e) {
     $response = array(
       'result'  => $e->getCode(),
       'message' => $e->getMessage(),

includes/pages/contact.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
   $query = db_user_list("`authlevel` > 0 ORDER BY `authlevel` ASC");
 
   // while($row = db_fetch($query))
-  foreach($query as $row) {
+  foreach ($query as $row) {
     $template_result['.']['contact'][] = array(
       'NAME'  => $row['username'],
       'LEVEL' => classLocale::$lang['user_level'][$row['authlevel']],

includes/classes/Account.php

Doc Comments +21 added lines

@@ -171,6 +171,10 @@ 
    * @return bool
    */
   // OK v4.5
+
+  /**
+   * @param string $account_name_unsafe
+   */
   public function db_get_by_name($account_name_unsafe) {
     $this->reset();
 
@@ -207,6 +211,11 @@ 
    *
    */
   // OK v4.5
+
+  /**
+   * @param string $account_name_unsafe
+   * @param string $email_unsafe
+   */
   public function db_get_by_name_or_email($account_name_unsafe, $email_unsafe) {
     $this->reset();
 
@@ -223,6 +232,13 @@ 
    * @throws Exception
    */
   // OK v4.5
+
+  /**
+   * @param string $account_name_unsafe
+   * @param string $password_raw
+   * @param string $email_unsafe
+   * @param string $language_unsafe
+   */
   public function db_create($account_name_unsafe, $password_raw, $email_unsafe, $language_unsafe = null, $salt_unsafe = null) {
     $this->reset();
 
@@ -317,6 +333,11 @@ 
    * @return int|string
    */
   // OK 4.8
+
+  /**
+   * @param integer $change_type
+   * @param double $metamatter
+   */
   protected function db_mm_log_insert($comment, $change_type, $metamatter, $user_id_unsafe) {
     $provider_id_safe = intval(core_auth::$main_provider->provider_id);
     //$account_id_safe = $this->db->db_escape($this->account_id);

Spacing +19 added lines, -19 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 $mm_change_legit;
 
-    if(!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
+    if (!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
       classSupernova::$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 {
@@ -383,17 +383,17 @@ 
       $result = $this->db->doquery(
         "UPDATE {{account}}
         SET
-          `account_metamatter` = `account_metamatter` + '{$metamatter}'" .
-        ($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}'" : '') .
+          `account_metamatter` = `account_metamatter` + '{$metamatter}'".
+        ($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) {
         classSupernova::$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) {
       classSupernova::$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}");
         }
       }

includes/db/db_queries.php

Doc Comments +20 added lines, -15 removed lines

@@ -188,6 +188,11 @@ 
  */
 // OK v4
 // TODO - вынести в отдельный класс
+/**
+ * @param string $db_id_field_name
+ * @param string $db_table_name
+ * @param string $db_value_field_name
+ */
 function db_get_set_unique_id_value($current_value_unsafe, $db_id_field_name, $db_table_name, $db_value_field_name) {
   $current_value_safe = db_escape($current_value_unsafe);
   $value_id = doquery("SELECT `{$db_id_field_name}` AS id_field FROM {{{$db_table_name}}} WHERE `{$db_value_field_name}` = '{$current_value_safe}' LIMIT 1 FOR UPDATE", true);
@@ -220,7 +225,7 @@ 
 
 /**
  * @param $user
- * @param $username_safe
+ * @param string $username_safe
  */
 function db_player_name_history_replace($user, $username_safe) {
   doquery("REPLACE INTO {{player_name_history}} SET `player_id` = {$user['id']}, `player_name` = '{$username_safe}'");
@@ -228,7 +233,7 @@ 
 
 
 /**
- * @param $username_safe
+ * @param string $username_safe
  *
  * @return array|bool|mysqli_result|null
  */
@@ -485,12 +490,12 @@ 
 
 
 /**
- * @param $user_id
- * @param $change_type
+ * @param integer $user_id
+ * @param integer $change_type
  * @param $dark_matter
- * @param $comment
+ * @param string $comment
  * @param $row
- * @param $page_url
+ * @param string $page_url
  */
 function db_log_dark_matter_insert($user_id, $change_type, $dark_matter, $comment, $row, $page_url) {
   doquery(
@@ -506,7 +511,7 @@ 
 /**
  * @param $user_id_safe
  *
- * @return array|bool|mysqli_result|null
+ * @return integer
  */
 function db_referral_get_by_id($user_id_safe) {
   $old_referral = doquery("SELECT * FROM {{referrals}} WHERE `id` = {$user_id_safe} LIMIT 1 FOR UPDATE;", true);
@@ -534,9 +539,9 @@ 
 
 // Quests ***********************************************************************************************************
 /**
- * @param $query_add_select
+ * @param string $query_add_select
  * @param $query_add_from
- * @param $query_add_where
+ * @param string $query_add_where
  *
  * @return array|bool|mysqli_result|null
  */
@@ -580,11 +585,11 @@ 
 }
 
 /**
- * @param $quest_name
- * @param $quest_type
- * @param $quest_description
+ * @param string $quest_name
+ * @param integer $quest_type
+ * @param string $quest_description
  * @param $quest_conditions
- * @param $quest_rewards
+ * @param string $quest_rewards
  * @param $quest_id
  */
 function db_quest_update($quest_name, $quest_type, $quest_description, $quest_conditions, $quest_rewards, $quest_id) {
@@ -607,7 +612,7 @@ 
 /**
  * @param $banner
  * @param $banned
- * @param $reason
+ * @param string $reason
  * @param $ban_until
  */
 function db_ban_insert($banner, $banned, $reason, $ban_until) {
@@ -630,7 +635,7 @@ 
 /**
  * @param $banner
  * @param $banned
- * @param $reason
+ * @param string $reason
  */
 function db_ban_insert_unset($banner, $banned, $reason) {
   doquery(

Spacing +14 added lines, -14 removed lines

@@ -17,11 +17,11 @@ 
 
 function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type) {
   return doquery(
-    "SELECT p.*, u.username" . ($table_parent_columns ? ', p1.name AS parent_name' : '') .
+    "SELECT p.*, u.username".($table_parent_columns ? ', p1.name AS parent_name' : '').
     " FROM {{planets}} AS p
       LEFT JOIN {{users}} AS u ON u.id = p.id_owner" .
-    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '') .
-    " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
+    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '').
+    " WHERE ".($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
 }
 
 function db_planet_list_search($searchtext) {
@@ -121,7 +121,7 @@ 
     ORDER BY
       sp.`{$Rank}_rank`, subject.{$source['id']}
     LIMIT
-      " . $start . ",100;";
+      ".$start.",100;";
     } else { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
       $query_str =
         "SELECT
@@ -134,7 +134,7 @@ 
     ORDER BY
       subject.{$Rank} DESC, subject.{$source['id']}
     LIMIT
-      " . $start . ",100;";
+      ".$start.",100;";
     }
   } else {
     // TODO
@@ -151,7 +151,7 @@ 
   ORDER BY
     sp.`{$Rank}_rank`, subject.id
   LIMIT
-    " . $start . ",100;";
+    ".$start.",100;";
   }
 
   return doquery($query_str);
@@ -374,9 +374,9 @@ 
  */
 function db_payment_list_get($flt_payer, $flt_status, $flt_test, $flt_module) {
   $extra_conditions =
-    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '') .
-    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '') .
-    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '') .
+    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '').
+    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '').
+    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '').
     ($flt_module ? "AND payment_module_name = '{$flt_module}' " : '');
   $query = doquery("SELECT * FROM `{{payment}}` WHERE 1 {$extra_conditions} ORDER BY payment_id DESC;");
 
@@ -404,7 +404,7 @@ 
 
 // Log Online *************************************************************************************************************
 function db_log_online_insert() {
-  doquery("INSERT IGNORE INTO {{log_users_online}} SET online_count = " . classSupernova::$config->var_online_user_count);
+  doquery("INSERT IGNORE INTO {{log_users_online}} SET online_count = ".classSupernova::$config->var_online_user_count);
 }
 
 // Log *************************************************************************************************************
@@ -612,7 +612,7 @@ 
       `ban_user_id` = '{$banned['id']}',
       `ban_user_name` = '{$banned['username']}',
       `ban_reason` = '{$reason}',
-      `ban_time` = " . SN_TIME_NOW . ",
+      `ban_time` = ".SN_TIME_NOW.",
       `ban_until` = {$ban_until},
       `ban_issuer_id` = '{$banner['id']}',
       `ban_issuer_name` = '{$banner['username']}',
@@ -634,7 +634,7 @@ 
       `ban_user_name` = '{$banned['username']}',
       `ban_reason` = '{$reason}',
       `ban_time` = 0,
-      `ban_until` = " . SN_TIME_NOW . ",
+      `ban_until` = ".SN_TIME_NOW.",
       `ban_issuer_id` = '{$banner['id']}',
       `ban_issuer_name` = '{$banner['username']}',
       `ban_issuer_email` = '{$banner['email']}'
@@ -693,9 +693,9 @@ 
 function db_ube_report_get_best_battles() {
   $query = doquery("SELECT *
       FROM {{ube_report}}
-      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS . " DAY))
+      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS." DAY))
       ORDER BY `ube_report_debris_total_in_metal` DESC, `ube_report_id` ASC
-      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW . ";");
+      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW.";");
 
   return $query;
 }

includes/update.php

Braces +3 added lines, -1 removed lines

@@ -756,9 +756,11 @@
         !empty($strings) ? doquery($query_string . implode(',', $strings)) : false;
       }
 
-      if(isset($update_tables['counter']['page'])) // TODO REMOVE
+      if(isset($update_tables['counter']['page'])) {
+        // TODO REMOVE
       {
         update_security_url("SELECT DISTINCT `page` AS url FROM {{counter}}");
+      }
         update_security_url("SELECT DISTINCT `url` AS url FROM {{counter}}");
       }
     }

Spacing +108 added lines, -108 removed lines

@@ -21,7 +21,7 @@ 
    [!] DB code updates
 */
 
-if(!defined('INIT')) {
+if (!defined('INIT')) {
 //  include_once('init.php');
   die('Unauthorized access');
 }
@@ -39,8 +39,8 @@ 
 classSupernova::$config->debug = 0;
 
 
-if(classSupernova::$config->db_version == DB_VERSION) {
-} elseif(classSupernova::$config->db_version > DB_VERSION) {
+if (classSupernova::$config->db_version == DB_VERSION) {
+} elseif (classSupernova::$config->db_version > DB_VERSION) {
   classSupernova::$config->db_saveItem('var_db_update_end', SN_TIME_NOW);
   die(
   'Internal error! Auotupdater detects DB version greater then can be handled!<br />
@@ -49,7 +49,7 @@ 
   );
 }
 
-if(classSupernova::$config->db_version < 26) {
+if (classSupernova::$config->db_version < 26) {
   $sys_log_disabled = true;
 }
 
@@ -68,20 +68,20 @@ 
 $update_tables = array();
 $update_indexes = array();
 $query = upd_do_query('SHOW TABLES;', true);
-while($row = db_fetch_row($query)) {
+while ($row = db_fetch_row($query)) {
   upd_load_table_info($row[0]);
 }
 upd_log_message('Table info loaded. Now looking DB for upgrades...');
 
 upd_do_query('SET FOREIGN_KEY_CHECKS=0;', true);
 
-if($new_version < 37) {
+if ($new_version < 37) {
   require_once('update_old.php');
 }
 
 ini_set('memory_limit', '1024M');
 
-switch($new_version) {
+switch ($new_version) {
   case 37:
     upd_log_version_update();
 
@@ -96,7 +96,7 @@ 
 
     upd_check_key('payment_currency_exchange_mm_', 2500, !classSupernova::$config->payment_currency_exchange_mm_);
 
-    if(!$update_tables['log_metamatter']) {
+    if (!$update_tables['log_metamatter']) {
       upd_create_table('log_metamatter',
         "(
           `id` SERIAL,
@@ -121,7 +121,7 @@ 
       "ADD `payment_test` TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Is this a test payment?'",
     ), !$update_tables['payment']['payment_test']);
 
-    if($update_tables['payment']['payment_test']['Default'] == 1) {
+    if ($update_tables['payment']['payment_test']['Default'] == 1) {
       upd_alter_table('payment', array(
         "MODIFY COLUMN `payment_test` TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Is this a test payment?'",
       ));
@@ -137,15 +137,15 @@ 
       "MODIFY COLUMN `metamatter` BIGINT(20) NOT NULL DEFAULT 0 COMMENT 'Metamatter amount'",
     ), $update_tables['users']['metamatter']['Type'] == 'int(20)');
 
-    $query = upd_do_query("SELECT * FROM {{que}} WHERE `que_type` = " . QUE_RESEARCH . " AND que_unit_id IN (" . TECH_EXPEDITION . "," . TECH_COLONIZATION . ") FOR UPDATE");
-    while($row = db_fetch($query)) {
+    $query = upd_do_query("SELECT * FROM {{que}} WHERE `que_type` = ".QUE_RESEARCH." AND que_unit_id IN (".TECH_EXPEDITION.",".TECH_COLONIZATION.") FOR UPDATE");
+    while ($row = db_fetch($query)) {
       $planet_id = ($row['que_planet_id_origin'] ? $row['que_planet_id_origin'] : $row['que_planet_id']);
       upd_do_query("SELECT id FROM {{planets}} WHERE id = {$planet_id} FOR UPDATE");
       $price = sys_unit_str2arr($row['que_unit_price']);
-      upd_do_query("UPDATE {{planets}} SET " .
-        "`metal` = `metal` + " . ($price[RES_METAL] ? $price[RES_METAL] : 0) . "," .
-        "`crystal` = `crystal` + " . ($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0) . "," .
-        "`deuterium` = `deuterium` + " . ($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0) .
+      upd_do_query("UPDATE {{planets}} SET ".
+        "`metal` = `metal` + ".($price[RES_METAL] ? $price[RES_METAL] : 0).",".
+        "`crystal` = `crystal` + ".($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0).",".
+        "`deuterium` = `deuterium` + ".($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0).
         " WHERE id = {$planet_id}"
       );
       upd_do_query("DELETE FROM {{que}} WHERE que_id = {$row['que_id']}");
@@ -154,10 +154,10 @@ 
     $query = upd_do_query("SELECT unit_id, unit_snid, unit_level, id_planet FROM {{unit}} AS un
     LEFT JOIN {{users}} AS u ON u.id = un.unit_player_id
     LEFT JOIN {{planets}} AS p ON p.id = u.id_planet
-    WHERE unit_snid IN (" . TECH_EXPEDITION . "," . TECH_COLONIZATION . ")
+    WHERE unit_snid IN (" . TECH_EXPEDITION.",".TECH_COLONIZATION.")
     FOR UPDATE");
-    while($row = db_fetch($query)) {
-      if(!$row['id_planet']) {
+    while ($row = db_fetch($query)) {
+      if (!$row['id_planet']) {
         continue;
       }
 
@@ -165,14 +165,14 @@ 
       $unit_level = $row['unit_level'];
       $price = get_unit_param($unit_id, P_COST);
       $factor = $price['factor'];
-      foreach($price as $resource_id => &$resource_amount) {
+      foreach ($price as $resource_id => &$resource_amount) {
         $resource_amount = $resource_amount * (pow($factor, $unit_level) - 1) / ($factor - 1);
       }
       // upd_do_query
-      upd_do_query($q = "UPDATE {{planets}} SET " .
-        "`metal` = `metal` + " . ($price[RES_METAL] ? $price[RES_METAL] : 0) . "," .
-        "`crystal` = `crystal` + " . ($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0) . "," .
-        "`deuterium` = `deuterium` + " . ($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0) .
+      upd_do_query($q = "UPDATE {{planets}} SET ".
+        "`metal` = `metal` + ".($price[RES_METAL] ? $price[RES_METAL] : 0).",".
+        "`crystal` = `crystal` + ".($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0).",".
+        "`deuterium` = `deuterium` + ".($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0).
         " WHERE id = {$row['id_planet']}"
       );
       upd_do_query("DELETE FROM {{unit}} WHERE unit_id = {$row['unit_id']}");
@@ -184,14 +184,14 @@ 
     // Вернуть ресы за уже исследованную Экспедиционную технологию
     upd_check_key('player_max_colonies', -1, classSupernova::$config->player_max_colonies >= 0);
 
-    if(!isset($update_tables['users']['player_rpg_explore_xp'])) {
+    if (!isset($update_tables['users']['player_rpg_explore_xp'])) {
       upd_alter_table('users', array(
         "ADD COLUMN `player_rpg_explore_level` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
         "ADD COLUMN `player_rpg_explore_xp` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
       ), !isset($update_tables['users']['player_rpg_explore_xp']));
     }
 
-    if(!$update_tables['log_users_online']) {
+    if (!$update_tables['log_users_online']) {
       upd_create_table('log_users_online', "(
         `online_timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Measure time',
         `online_count` SMALLINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Users online',
@@ -206,11 +206,11 @@ 
       "ADD `user_time_measured` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'When was time diff measured last time' AFTER `onlinetime`",
     ), !$update_tables['users']['user_time_measured']);
 
-    if($update_tables['rw']) {
+    if ($update_tables['rw']) {
       upd_do_query("DROP TABLE IF EXISTS {{rw}};");
     }
 
-    if(!$update_tables['player_award']) {
+    if (!$update_tables['player_award']) {
       upd_create_table('player_award', "(
         `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
         `award_type_id` int(11) DEFAULT NULL COMMENT 'Award type i.e. order, medal, pennant, rank etc',
@@ -252,14 +252,14 @@ 
     upd_log_version_update();
 
 
-    if(!isset($update_tables['planets']['que_processed'])) {
+    if (!isset($update_tables['planets']['que_processed'])) {
       upd_alter_table('planets', array(
         "ADD COLUMN `que_processed` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `last_update`",
       ), true);
       upd_do_query("UPDATE {{planets}} SET que_processed = last_update;");
     }
 
-    if(!isset($update_tables['users']['que_processed'])) {
+    if (!isset($update_tables['users']['que_processed'])) {
       upd_alter_table('users', array(
         "ADD COLUMN `que_processed` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `onlinetime`",
       ), true);
@@ -267,7 +267,7 @@ 
     }
 
 
-    if(isset($update_tables['planets']['que'])) {
+    if (isset($update_tables['planets']['que'])) {
       $sn_data_aux = array(
         SHIP_SMALL_FIGHTER_WRATH    => array(
           'name' => 'ship_fighter_wrath',
@@ -352,20 +352,20 @@ 
       $unit_data = array();
       $planets = array();
 
-      foreach($planet_unit_list as $unit_id) {
-        if(!($unit_name = get_unit_param($unit_id, P_NAME))) {
+      foreach ($planet_unit_list as $unit_id) {
+        if (!($unit_name = get_unit_param($unit_id, P_NAME))) {
           $unit_name = $sn_data_aux[$unit_id][P_NAME];
         }
-        if(isset($update_tables['planets'][$unit_name])) {
+        if (isset($update_tables['planets'][$unit_name])) {
           $drop[] = "DROP COLUMN `{$unit_name}`";
 
-          if(isset($aux_group[$unit_id])) {
+          if (isset($aux_group[$unit_id])) {
             $units_info[$unit_id] = $sn_data_aux[$unit_id];
             $units_info[$unit_id]['que'] = QUE_HANGAR;
           } else {
             $units_info[$unit_id] = get_unit_param($unit_id);
-            foreach($ques_info as $que_id => $que_data1) {
-              if(in_array($unit_id, $que_data1['unit_list'])) {
+            foreach ($ques_info as $que_id => $que_data1) {
+              if (in_array($unit_id, $que_data1['unit_list'])) {
                 $units_info[$unit_id]['que'] = $que_id;
                 break;
               }
@@ -375,7 +375,7 @@ 
       }
 
       $query = upd_do_query("SELECT * FROM {{planets}} FOR UPDATE");
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $user_id = $row['id_owner'];
         $planet_id = $row['id'];
 
@@ -383,25 +383,25 @@ 
 
         // Конвертируем юниты
         $units_levels = array();
-        foreach($planet_unit_list as $unit_id) {
+        foreach ($planet_unit_list as $unit_id) {
           $unit_name = &$units_info[$unit_id][P_NAME];
-          if(!isset($row[$unit_name]) || !$row[$unit_name]) {
+          if (!isset($row[$unit_name]) || !$row[$unit_name]) {
             continue;
           }
           $units_levels[$unit_id] = $row[$unit_name];
-          $unit_data[] = "({$user_id}," . LOC_PLANET . ",{$planet_id},{$units_info[$unit_id][P_UNIT_TYPE]},{$unit_id},{$units_levels[$unit_id]})";
-          if(count($unit_data) > 30) {
+          $unit_data[] = "({$user_id},".LOC_PLANET.",{$planet_id},{$units_info[$unit_id][P_UNIT_TYPE]},{$unit_id},{$units_levels[$unit_id]})";
+          if (count($unit_data) > 30) {
             $unit_data_max = strlen(implode(',', $unit_data)) > $unit_data_max ? strlen(implode(',', $unit_data)) : $unit_data_max;
-            upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES ' . implode(',', $unit_data) . ';');
+            upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES '.implode(',', $unit_data).';');
             $unit_data = array();
           }
         }
 
         // Конвертируем очередь построек
-        if($row['que']) {
+        if ($row['que']) {
           $que = explode(';', $row['que']);
-          foreach($que as $que_item) {
-            if(!$que_item) {
+          foreach ($que as $que_item) {
+            if (!$que_item) {
               continue;
             }
 
@@ -416,8 +416,8 @@ 
             $unit_factor = $unit_cost[P_FACTOR] ? $unit_cost[P_FACTOR] : 1;
             $price_increase = pow($unit_factor, $unit_level);
             // $unit_time = 0;
-            foreach($unit_cost as $resource_id => &$resource_amount) {
-              if(!in_array($resource_id, $group_resource_loot)) {
+            foreach ($unit_cost as $resource_id => &$resource_amount) {
+              if (!in_array($resource_id, $group_resource_loot)) {
                 unset($unit_cost[$resource_id]);
                 continue;
               }
@@ -431,39 +431,39 @@ 
         }
 
         // Конвертируем очередь верфи
-        if($row['b_hangar_id']) {
+        if ($row['b_hangar_id']) {
           $return_resources = array(RES_METAL => 0, RES_CRYSTAL => 0, RES_DEUTERIUM => 0,);
           $hangar_units = sys_unit_str2arr($row['b_hangar_id']);
-          foreach($hangar_units as $unit_id => $unit_count) {
-            if($unit_count <= 0) {
+          foreach ($hangar_units as $unit_id => $unit_count) {
+            if ($unit_count <= 0) {
               continue;
             }
-            foreach($units_info[$unit_id][P_COST] as $resource_id => $resource_amount) {
-              if(!in_array($resource_id, $group_resource_loot)) {
+            foreach ($units_info[$unit_id][P_COST] as $resource_id => $resource_amount) {
+              if (!in_array($resource_id, $group_resource_loot)) {
                 continue;
               }
               $return_resources[$resource_id] += $unit_count * $resource_amount;
             }
           }
-          if(array_sum($return_resources) > 0) {
+          if (array_sum($return_resources) > 0) {
             upd_do_query("UPDATE {{planets}} SET `metal` = `metal` + {$return_resources[RES_METAL]}, `crystal` = `crystal` + {$return_resources[RES_CRYSTAL]}, `deuterium` = `deuterium` + {$return_resources[RES_DEUTERIUM]} WHERE `id` = {$planet_id} LIMIT 1");
           }
         }
 
 
-        if(count($que_data) > 10) {
+        if (count($que_data) > 10) {
           $que_data_max = strlen(implode(',', $que_data)) > $que_data_max ? strlen(implode(',', $que_data)) : $que_data_max;
-          upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES ' . implode(',', $que_data) . ';');
+          upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES '.implode(',', $que_data).';');
           $que_data = array();
         }
       }
 
-      if(!empty($unit_data)) {
-        upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES ' . implode(',', $unit_data) . ';');
+      if (!empty($unit_data)) {
+        upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES '.implode(',', $unit_data).';');
       }
 
-      if(!empty($que_data)) {
-        upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES ' . implode(',', $que_data) . ';');
+      if (!empty($que_data)) {
+        upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES '.implode(',', $que_data).';');
       }
 
       upd_alter_table('planets', $drop, true);
@@ -473,7 +473,7 @@ 
       JOIN `{{users}}` AS u ON a.`id` = u.`user_as_ally` AND `user_as_ally` IS NOT NULL AND `username` = ''
       SET u.`username` = CONCAT('[', a.`ally_tag`, ']');");
 
-    if($update_indexes['statpoints']['I_stats_id_ally'] != 'id_ally,stat_type,stat_code,') {
+    if ($update_indexes['statpoints']['I_stats_id_ally'] != 'id_ally,stat_type,stat_code,') {
       upd_do_query("SET FOREIGN_KEY_CHECKS=0;");
       upd_alter_table('statpoints', "DROP FOREIGN KEY `FK_stats_id_ally`", $update_foreigns['statpoints']['FK_stats_id_ally']);
       upd_alter_table('statpoints', "DROP KEY `I_stats_id_ally`", $update_indexes['statpoints']['I_stats_id_ally']);
@@ -569,7 +569,7 @@ 
       "ADD CONSTRAINT `FK_users_browser_id` FOREIGN KEY (`user_last_browser_id`) REFERENCES `{{security_browser}}` (`browser_id`) ON DELETE SET NULL ON UPDATE CASCADE",
     ), !isset($update_tables['users']['user_last_proxy']));
 
-    if(!isset($update_tables['notes']['planet_type'])) {
+    if (!isset($update_tables['notes']['planet_type'])) {
       upd_alter_table('notes', array(
         "ADD COLUMN `galaxy` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 0 AFTER `title`",
         "ADD COLUMN `system` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 0 AFTER `galaxy`",
@@ -587,7 +587,7 @@ 
     upd_alter_table('users', "ADD COLUMN `user_bot` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0", !isset($update_tables['users']['user_bot']));
     upd_alter_table('unit', "ADD KEY `I_unit_type_snid` (unit_type, unit_snid) USING BTREE", !$update_indexes['unit']['I_unit_type_snid']);
 
-    if($update_tables['users']['settings_tooltiptime']['Type'] != 'smallint(5) unsigned') {
+    if ($update_tables['users']['settings_tooltiptime']['Type'] != 'smallint(5) unsigned') {
       upd_alter_table('users', array(
         "MODIFY COLUMN `settings_tooltiptime` smallint(5) unsigned NOT NULL DEFAULT '500'",
       ), $update_tables['users']['settings_tooltiptime']['Type'] != 'smallint');
@@ -595,7 +595,7 @@ 
       upd_do_query("UPDATE `{{users}}` SET settings_tooltiptime = 500;");
     }
 
-    if(!isset($update_tables['log_users_online']['online_aggregated'])) {
+    if (!isset($update_tables['log_users_online']['online_aggregated'])) {
       upd_alter_table('log_users_online', "ADD COLUMN `online_aggregated` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0", !isset($update_tables['log_users_online']['online_aggregated']));
       upd_alter_table('log_users_online', array(
         "DROP PRIMARY KEY",
@@ -603,13 +603,13 @@ 
       ), $update_indexes['log_users_online']['PRIMARY'] != 'online_timestamp,online_aggregated,');
     }
 
-    if(!isset($update_tables['users']['gender'])) {
-      upd_alter_table('users', "ADD COLUMN `gender` TINYINT(1) UNSIGNED NOT NULL DEFAULT " . GENDER_UNKNOWN, !isset($update_tables['users']['gender']));
-      upd_do_query("UPDATE {{users}} SET `gender` = IF(UPPER(`sex`) = 'F', " . GENDER_FEMALE . ", IF(UPPER(`sex`) = 'M', " . GENDER_MALE . ", " . GENDER_UNKNOWN . "));");
+    if (!isset($update_tables['users']['gender'])) {
+      upd_alter_table('users', "ADD COLUMN `gender` TINYINT(1) UNSIGNED NOT NULL DEFAULT ".GENDER_UNKNOWN, !isset($update_tables['users']['gender']));
+      upd_do_query("UPDATE {{users}} SET `gender` = IF(UPPER(`sex`) = 'F', ".GENDER_FEMALE.", IF(UPPER(`sex`) = 'M', ".GENDER_MALE.", ".GENDER_UNKNOWN."));");
     }
     upd_alter_table('users', "DROP COLUMN `sex`", isset($update_tables['users']['sex']));
 
-    if(!$update_tables['users']['dark_matter_total']) {
+    if (!$update_tables['users']['dark_matter_total']) {
       upd_alter_table('users', "ADD `dark_matter_total` BIGINT(20) NOT NULL DEFAULT 0 COMMENT 'Total Dark Matter amount ever gained' AFTER `dark_matter`", !$update_tables['users']['dark_matter_total']);
       upd_do_query(
         "UPDATE `{{users}}` AS u
@@ -622,7 +622,7 @@ 
     }
 
     upd_check_key('player_metamatter_immortal', 100000, !isset(classSupernova::$config->player_metamatter_immortal));
-    if(!$update_tables['users']['metamatter_total']) {
+    if (!$update_tables['users']['metamatter_total']) {
       upd_alter_table('users', "ADD `metamatter_total` BIGINT(20) NOT NULL DEFAULT 0 COMMENT 'Total Metamatter amount ever bought'", !$update_tables['users']['metamatter_total']);
 
       upd_do_query(
@@ -634,11 +634,11 @@ 
             (SELECT IF(sum(amount) IS NULL, 0, sum(amount)) FROM {{log_metamatter}} AS mm WHERE mm.user_id = u.id AND mm.amount > 0)
           );");
     }
-    if(!isset($update_tables['users']['immortal'])) {
+    if (!isset($update_tables['users']['immortal'])) {
       upd_alter_table('users', "ADD COLUMN `immortal` TIMESTAMP NULL", !isset($update_tables['users']['immortal']));
       upd_do_query("UPDATE {{users}} SET `immortal` = NOW() WHERE `metamatter_total` > 0;");
     }
-    if(isset($update_tables['player_award'])) {
+    if (isset($update_tables['player_award'])) {
       upd_do_query(
         "UPDATE {{users}} AS u JOIN {{player_award}} AS pa ON u.id = pa.player_id
           SET metamatter_total = 1, immortal = NOW()
@@ -665,7 +665,7 @@ 
       CONSTRAINT `FK_user_id` FOREIGN KEY (`user_id`) REFERENCES `{{users}}` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;");
 
-    if(empty($update_tables['blitz_statpoints'])) {
+    if (empty($update_tables['blitz_statpoints'])) {
       upd_create_table('blitz_statpoints', " (
         `stat_date` int(11) NOT NULL DEFAULT '0',
         `id_owner` bigint(20) unsigned DEFAULT NULL,
@@ -733,7 +733,7 @@ 
       CONSTRAINT `FK_survey_votes_survey_parent_id` FOREIGN KEY (`survey_parent_id`) REFERENCES `{{survey}}` (`survey_id`) ON DELETE CASCADE ON UPDATE CASCADE
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;");
 
-    if(empty($update_tables['security_url'])) {
+    if (empty($update_tables['security_url'])) {
       upd_create_table('security_url', " (
         `url_id` int unsigned NOT NULL AUTO_INCREMENT,
         `url_string` VARCHAR(250) NOT NULL DEFAULT '',
@@ -746,17 +746,17 @@ 
 
         $strings = array();
         $query = doquery($query);
-        while($row = db_fetch($query)) {
-          $strings[] = '("' . db_escape($row['url']) . '")';
-          if(count($strings) > 100) {
-            doquery($query_string . implode(',', $strings));
+        while ($row = db_fetch($query)) {
+          $strings[] = '("'.db_escape($row['url']).'")';
+          if (count($strings) > 100) {
+            doquery($query_string.implode(',', $strings));
             $strings = array();
           }
         }
-        !empty($strings) ? doquery($query_string . implode(',', $strings)) : false;
+        !empty($strings) ? doquery($query_string.implode(',', $strings)) : false;
       }
 
-      if(isset($update_tables['counter']['page'])) // TODO REMOVE
+      if (isset($update_tables['counter']['page'])) // TODO REMOVE
       {
         update_security_url("SELECT DISTINCT `page` AS url FROM {{counter}}");
         update_security_url("SELECT DISTINCT `url` AS url FROM {{counter}}");
@@ -781,7 +781,7 @@ 
       "ADD CONSTRAINT `FK_counter_page_url_id` FOREIGN KEY (`page_url_id`) REFERENCES `{{security_url}}` (`url_id`) ON DELETE CASCADE ON UPDATE CASCADE",
       "ADD CONSTRAINT `FK_counter_plain_url_id` FOREIGN KEY (`plain_url_id`) REFERENCES `{{security_url}}` (`url_id`) ON DELETE CASCADE ON UPDATE CASCADE",
     ), !isset($update_tables['counter']['device_id']));
-    if(isset($update_tables['counter']['ip'])) {
+    if (isset($update_tables['counter']['ip'])) {
       // upd_do_query('UPDATE `{{counter}}` SET `user_ip` = INET_ATON(`ip`), `user_proxy` = `proxy`, `visit_time` = FROM_UNIXTIME(`time`)');
       upd_do_query('UPDATE `{{counter}}` SET `user_ip` = INET_ATON(`ip`), `visit_time` = FROM_UNIXTIME(`time`)');
       upd_do_query('UPDATE `{{counter}}` AS c JOIN {{security_url}} AS u ON u.url_string = c.page SET c.page_url_id = u.url_id');
@@ -832,7 +832,7 @@ 
 
     upd_check_key('stats_history_days', 14, !classSupernova::$config->stats_history_days);
 
-    if(classSupernova::$config->payment_currency_default != 'USD') {
+    if (classSupernova::$config->payment_currency_default != 'USD') {
       upd_check_key('payment_currency_default', 'USD', true);
       upd_check_key('payment_currency_exchange_dm_', 20000, true);
       upd_check_key('payment_currency_exchange_mm_', 20000, true);
@@ -889,7 +889,7 @@ 
 
     $virtual_exploded = explode('/', SN_ROOT_VIRTUAL_PARENT);
     // TODO - переделать всё на db_loadItem... НАВЕРНОЕ
-    upd_check_key('server_email', 'root@' . $virtual_exploded[2], !classSupernova::$config->db_loadItem('server_email'));
+    upd_check_key('server_email', 'root@'.$virtual_exploded[2], !classSupernova::$config->db_loadItem('server_email'));
 
     upd_alter_table('survey_votes', array(
       "DROP FOREIGN KEY `FK_survey_votes_user`",
@@ -915,12 +915,12 @@ 
     function propagade_player_options($old_option_name, $new_option_id) {
       global $update_tables;
 
-      if(!empty($update_tables['users'][$old_option_name])) {
+      if (!empty($update_tables['users'][$old_option_name])) {
         upd_do_query(
           "REPLACE INTO {{player_options}} (`player_id`, `option_id`, `value`)
           SELECT `id`, {$new_option_id}, `{$old_option_name}`
           FROM {{users}}
-          WHERE `user_as_ally` is null and `user_bot` = " . USER_BOT_PLAYER);
+          WHERE `user_as_ally` is null and `user_bot` = ".USER_BOT_PLAYER);
         // TODO - UNCOMMENT !!!
         upd_alter_table('users', array("DROP COLUMN `{$old_option_name}`",));
       }
@@ -949,7 +949,7 @@ 
 
 
     // 2015-08-03 15:05:26 40a6.0
-    if(empty($update_tables['planets']['position_original'])) {
+    if (empty($update_tables['planets']['position_original'])) {
       upd_alter_table('planets', array(
         "ADD COLUMN `position_original` smallint NOT NULL DEFAULT 0",
         "ADD COLUMN `field_max_original` smallint NOT NULL DEFAULT 0",
@@ -964,7 +964,7 @@ 
       upd_do_query('UPDATE {{planets}} SET `position_original` = `planet`, `field_max_original` = `field_max`, `temp_min_original` = `temp_min`, `temp_max_original` = `temp_max`;');
 
       // Миграция тяжмета в оливин
-      upd_do_query('UPDATE {{planets}} SET `density_index` = ' . PLANET_DENSITY_METAL_PERIDOT . ' WHERE `density_index` = 7'); // deprecated define('PLANET_DENSITY_METAL_HEAVY', 7);
+      upd_do_query('UPDATE {{planets}} SET `density_index` = '.PLANET_DENSITY_METAL_PERIDOT.' WHERE `density_index` = 7'); // deprecated define('PLANET_DENSITY_METAL_HEAVY', 7);
 
       // Добавляем планету-странника
       upd_check_key('game_maxPlanet', 16, Vector::$knownPlanets == 15);
@@ -977,12 +977,12 @@ 
 
     // 2015-08-27 19:14:05 40a10.0
     // Старая версия таблицы
-    if(!empty($update_tables['account']['account_is_global']) || empty($update_tables['account']['account_immortal'])) {
+    if (!empty($update_tables['account']['account_is_global']) || empty($update_tables['account']['account_immortal'])) {
       upd_drop_table('account');
       upd_drop_table('account_translate');
     }
 
-    if(empty($update_tables['account'])) {
+    if (empty($update_tables['account'])) {
       upd_create_table('account', " (
           `account_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
           `account_name` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT '',
@@ -1001,7 +1001,7 @@ 
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;");
 
       upd_create_table('account_translate', " (
-          `provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL . " COMMENT 'Account provider',
+          `provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL." COMMENT 'Account provider',
           `provider_account_id` bigint(20) unsigned NOT NULL COMMENT 'Account ID on provider',
           `user_id` bigint(20) unsigned NOT NULL COMMENT 'User ID',
           `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -1016,12 +1016,12 @@ 
             (`account_id`, `account_name`, `account_password`, `account_salt`, `account_email`, `account_register_time`, `account_language`, `account_metamatter`, `account_metamatter_total`, `account_immortal`)
           SELECT
             `id`, `username`, `password`, `salt`, `email_2`, FROM_UNIXTIME(register_time), `lang`, `metamatter`, `metamatter_total`, `immortal`
-          FROM {{users}} WHERE `user_as_ally` IS NULL AND `user_bot` = " . USER_BOT_PLAYER . ";"
+          FROM {{users}} WHERE `user_as_ally` IS NULL AND `user_bot` = " . USER_BOT_PLAYER.";"
       );
 
       upd_do_query(
         "REPLACE INTO {{account_translate}} (`provider_id`, `provider_account_id`, `user_id`, `timestamp`)
-          SELECT " . ACCOUNT_PROVIDER_LOCAL . ", a.account_id, u.id, a.`account_register_time`
+          SELECT " . ACCOUNT_PROVIDER_LOCAL.", a.account_id, u.id, a.`account_register_time`
             FROM {{users}} AS u
             JOIN {{account}} AS a ON
               a.account_name = u.username
@@ -1036,7 +1036,7 @@ 
 
 
     // 2015-09-05 17:07:15 40a10.17
-    upd_alter_table('ube_report', "ADD COLUMN `ube_report_capture_result` tinyint unsigned NOT NULL DEFAULT " . UBE_CAPTURE_DISABLED, empty($update_tables['ube_report']['ube_report_capture_result']));
+    upd_alter_table('ube_report', "ADD COLUMN `ube_report_capture_result` tinyint unsigned NOT NULL DEFAULT ".UBE_CAPTURE_DISABLED, empty($update_tables['ube_report']['ube_report_capture_result']));
 
 
     // 2015-09-07 21:11:48 40a10.19
@@ -1044,18 +1044,18 @@ 
 
 
     // 2015-09-24 11:39:37 40a10.25
-    if(empty($update_tables['log_metamatter']['provider_id'])) {
+    if (empty($update_tables['log_metamatter']['provider_id'])) {
       upd_alter_table('log_metamatter', array(
-        "ADD COLUMN `provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL . " COMMENT 'Account provider'",
+        "ADD COLUMN `provider_id` tinyint unsigned NOT NULL DEFAULT ".ACCOUNT_PROVIDER_LOCAL." COMMENT 'Account provider'",
         "ADD COLUMN `account_id` bigint(20) unsigned NOT NULL DEFAULT 0",
         "ADD COLUMN `account_name` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT ''",
-        "ADD COLUMN `server_name` varchar(128) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT '" . SN_ROOT_VIRTUAL . "'",
+        "ADD COLUMN `server_name` varchar(128) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT '".SN_ROOT_VIRTUAL."'",
       ), empty($update_tables['log_metamatter']['provider_id']));
 
       upd_do_query("UPDATE {{log_metamatter}} SET `account_id` = `user_id`, `account_name` = `username`");
 
       upd_alter_table('payment', array(
-        "ADD COLUMN `payment_provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL . " COMMENT 'Payment account provider'",
+        "ADD COLUMN `payment_provider_id` tinyint unsigned NOT NULL DEFAULT ".ACCOUNT_PROVIDER_LOCAL." COMMENT 'Payment account provider'",
         "ADD COLUMN `payment_account_id` bigint(20) unsigned NOT NULL",
         "ADD COLUMN `payment_account_name` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT ''",
       ), !$update_tables['payment']['payment_account_id']);
@@ -1096,7 +1096,7 @@ 
     upd_check_key('event_halloween_2015_code', '', !isset(classSupernova::$config->event_halloween_2015_code));
     upd_check_key('event_halloween_2015_timestamp', SN_TIME_SQL, !isset(classSupernova::$config->event_halloween_2015_timestamp));
     upd_check_key('event_halloween_2015_units_used', serialize(array()), !isset(classSupernova::$config->event_halloween_2015_units_used));
-    if(empty($update_tables['log_halloween_2015'])) {
+    if (empty($update_tables['log_halloween_2015'])) {
       upd_create_table('log_halloween_2015', " (
       `log_hw2015_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
       `player_id` bigint(20) unsigned NOT NULL COMMENT 'User ID',
@@ -1111,7 +1111,7 @@ 
 
 
     // 2015-11-28 06:30:27 40a19.21
-    if(!isset($update_tables['ube_report']['ube_report_debris_total_in_metal'])) {
+    if (!isset($update_tables['ube_report']['ube_report_debris_total_in_metal'])) {
       upd_alter_table('ube_report', array(
         "ADD COLUMN `ube_report_debris_total_in_metal` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Total debris in metal'",
         "ADD KEY `I_ube_report_time_debris_id` (`ube_report_time_process` DESC, `ube_report_debris_total_in_metal` DESC, `ube_report_id` ASC)", // For Best Battles module
@@ -1126,7 +1126,7 @@ 
 
 
     // 2015-12-06 15:10:58 40b1.0
-    if(!empty($update_indexes['planets']['I_metal_mine'])) {
+    if (!empty($update_indexes['planets']['I_metal_mine'])) {
       upd_alter_table('planets', "DROP KEY `I_metal`", $update_indexes['planets']['I_metal']);
       upd_alter_table('planets', "DROP KEY `I_ship_sattelite_sloth`", $update_indexes['planets']['I_ship_sattelite_sloth']);
       upd_alter_table('planets', "DROP KEY `I_ship_bomber_envy`", $update_indexes['planets']['I_ship_bomber_envy']);
@@ -1189,7 +1189,7 @@ 
   case 40:
     upd_log_version_update();
 
-    if(empty($update_tables['festival'])) {
+    if (empty($update_tables['festival'])) {
       upd_create_table('festival', " (
           `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
           `start` datetime NOT NULL COMMENT 'Festival start datetime',
@@ -1230,7 +1230,7 @@ 
       );
     }
 
-    if(empty($update_tables['festival_unit'])) {
+    if (empty($update_tables['festival_unit'])) {
       upd_create_table('festival_unit', " (
           `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
           `highspot_id` int(10) unsigned DEFAULT NULL,
@@ -1247,7 +1247,7 @@ 
     }
 
     // 2015-12-21 06:06:09 41a0.12
-    if(empty($update_tables['festival_unit_log'])) {
+    if (empty($update_tables['festival_unit_log'])) {
       upd_create_table('festival_unit_log', " (
           `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
           `highspot_id` int(10) unsigned DEFAULT NULL,
@@ -1277,19 +1277,19 @@ 
       $update_tables['security_browser']['browser_user_agent']['Collation'] == 'latin1_bin'
     );
 
-    if($update_indexes_full['security_browser']['I_browser_user_agent']['browser_user_agent']['Index_type'] == 'BTREE') {
+    if ($update_indexes_full['security_browser']['I_browser_user_agent']['browser_user_agent']['Index_type'] == 'BTREE') {
       upd_alter_table('security_browser', "DROP KEY `I_browser_user_agent`", true);
       upd_alter_table('security_browser', "ADD KEY `I_browser_user_agent` (`browser_user_agent`) USING HASH", true);
     }
 
-    if(!empty($update_tables['fleets']['fleet_array'])) {
+    if (!empty($update_tables['fleets']['fleet_array'])) {
       $query = upd_do_query("SELECT * FROM {{fleets}}");
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $unit_list = sys_unit_str2arr($row['fleet_array']);
-        foreach($unit_list as $unit_id => $unit_count) {
+        foreach ($unit_list as $unit_id => $unit_count) {
           upd_do_query(
             "REPLACE INTO {{unit}} (`unit_player_id`,`unit_location_type`,`unit_location_id`,`unit_type`,`unit_snid`,`unit_level`) VALUES
-              ({$row['fleet_owner']}, " . LOC_FLEET . ", {$row['fleet_id']}, 200, {$unit_id}, {$unit_count});",
+              ({$row['fleet_owner']}, ".LOC_FLEET.", {$row['fleet_id']}, 200, {$unit_id}, {$unit_count});",
 //              ({$row['fleet_owner']}, " . LOC_FLEET . ", {$row['fleet_id']}, " . get_unit_param($unit_id, P_UNIT_TYPE) . ", {$unit_id}, {$unit_count});",
             true
           );
@@ -1323,11 +1323,11 @@ 
 
 classSupernova::$cache->unset_by_prefix('lng_');
 
-if($new_version) {
+if ($new_version) {
   classSupernova::$config->db_saveItem('db_version', $new_version);
   upd_log_message("<font color=green>DB version is now {$new_version}</font>");
 } else {
-  upd_log_message("DB version didn't changed from " . classSupernova::$config->db_version);
+  upd_log_message("DB version didn't changed from ".classSupernova::$config->db_version);
 }
 
 classSupernova::$config->db_loadAll();