supernova-ws / SuperNova

includes/init_secondary.php

Spacing +18 added lines, -18 removed lines

@@ -2,19 +2,19 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
+if (classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
   include(SN_ROOT_PHYSICAL . 'ajax_version_check' . DOT_PHP_EX);
 }
 
-if(classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
+if (classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
   require_once(SN_ROOT_PHYSICAL . "includes/includes/user_birthday_celebrate" . DOT_PHP_EX);
   sn_user_birthday_celebrate();
 }
 
-if(!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
+if (!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
   classSupernova::$config->db_saveItem('var_online_user_count', db_user_count(true));
   classSupernova::$config->db_saveItem('var_online_user_time', SN_TIME_NOW);
-  if(classSupernova::$config->server_log_online) {
+  if (classSupernova::$config->server_log_online) {
     db_log_online_insert();
   }
 }
@@ -41,7 +41,7 @@ 
 $template_result[F_ACCOUNT_IS_AUTHORIZED] = $sys_user_logged_in = !empty($user) && isset($user['id']) && $user['id'];
 //pdump($template_result[F_ACCOUNT_IS_AUTHORIZED]);die();
 
-if(!empty($user['id'])) {
+if (!empty($user['id'])) {
   classSupernova::$user_options->user_change($user['id']);
 }
 
@@ -54,15 +54,15 @@ 
     : false
   );
 
-if($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
-  $prohibited_characters = array_map(function ($value) {
+if ($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
+  $prohibited_characters = array_map(function($value) {
     return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
   }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
   $template_result[F_LOGIN_MESSAGE] .= implode(', ', $prohibited_characters);
 }
 
 
-if(defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
+if (defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
   pdump("Отключи отладку перед продакшном!");
 }
 
@@ -76,17 +76,17 @@ 
   ? define('INSTALL_MODE', GAME_DISABLE_INSTALL)
   : false;
 
-if($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
+if ($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
   $template_result[F_GAME_DISABLE_REASON] = sys_bbcodeParse(
     classSupernova::$config->game_disable == GAME_DISABLE_REASON
       ? classSupernova::$config->game_disable_reason
       : classLocale::$lang['sys_game_disable_reason'][classSupernova::$config->game_disable]
   );
-  if(defined('IN_API')) {
+  if (defined('IN_API')) {
     return;
   }
 
-  if(
+  if (
     ($user['authlevel'] < 1 || !(defined('IN_ADMIN') && IN_ADMIN))
     &&
     !(defined('INSTALL_MODE') && defined('LOGIN_LOGOUT'))
@@ -100,8 +100,8 @@ 
 
 // TODO ban
 // TODO $skip_ban_check
-if($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
-  if(defined('IN_API')) {
+if ($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
+  if (defined('IN_API')) {
     return;
   }
 
@@ -119,13 +119,13 @@ 
 // pdump($allow_anonymous, '$allow_anonymous');
 // pdump($sys_user_logged_in, '$sys_user_logged_in');
 
-if($sys_user_logged_in && INITIAL_PAGE == 'login') {
+if ($sys_user_logged_in && INITIAL_PAGE == 'login') {
   sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
-} elseif($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
+} elseif ($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
 //  pdump($sn_page_name);
 //  pdump(INITIAL_PAGE);
 //  die('{Тут должна быть ваша реклама. Точнее - ввод имени игрока}');
-} elseif(!$allow_anonymous && !$sys_user_logged_in) {
+} elseif (!$allow_anonymous && !$sys_user_logged_in) {
   // sn_setcookie(SN_COOKIE, '', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
   sys_redirect(SN_ROOT_VIRTUAL . 'login.php');
 }
@@ -146,7 +146,7 @@ 
 
 global $skip_fleet_update;
 $skip_fleet_update = $skip_fleet_update || $supernova->options['fleet_update_skip'] || defined('IN_ADMIN');
-if(
+if (
   !$skip_fleet_update
   && !(defined('IN_AJAX') && IN_AJAX === true)
   && SN_TIME_NOW - strtotime(classSupernova::$config->fleet_update_last) > classSupernova::$config->fleet_update_interval
@@ -155,7 +155,7 @@ 
   flt_flying_fleet_handler($skip_fleet_update);
 }
 
-if(!defined('IN_AJAX')) {
+if (!defined('IN_AJAX')) {
   print("Scheduled processes is disabled<br />");
 }
 // scheduler_process();

admin/tools.php

Switch Indentation +63 added lines, -63 removed lines

@@ -34,69 +34,69 @@
 }
 
 switch($mode) {
-  case ADM_TOOL_CONFIG_RELOAD:
-    classSupernova::$config->db_loadAll();
-    sys_refresh_tablelist();
-
-    classSupernova::$config->db_loadItem('game_watchlist');
-    if(classSupernova::$config->game_watchlist) {
-      classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
-    } else {
-      unset(classSupernova::$config->game_watchlist_array);
-    }
-  break;
-
-  case ADM_TOOL_MD5:
-    $template = gettemplate("admin/md5enc", true);
-    $password_seed = sys_get_param_str_unsafe('seed', SN_SYS_SEC_CHARS_ALLOWED);
-    $password_length = sys_get_param_int('length', 16);
-    $string = ($string = sys_get_param_str_unsafe('string')) ? $string : sys_random_string($password_length, $password_seed);
-
-    $template->assign_vars(array(
-      'SEED'   => $password_seed,
-      'LENGTH' => $password_length,
-      'STRING' => htmlentities($string),
-      'MD5'    => md5($string),
-    ));
-    display($template, classLocale::$lang['adm_tools_md5_header'], false, '', true);
-  break;
-
-  case ADM_TOOL_FORCE_ALL:
-    classSupernova::$config->db_saveItem('db_version', 0);
-    require_once('../includes/update.php');
-  break;
-
-  case ADM_TOOL_FORCE_LAST:
-    classSupernova::$config->db_saveItem('db_version', floor(classSupernova::$config->db_version - 1));
-    require_once('../includes/update.php');
-  break;
-
-  case ADM_TOOL_INFO_PHP:
-    phpinfo();
-  break;
-
-  case ADM_TOOL_INFO_SQL:
-    $template = gettemplate("simple_table", true);
-
-    $status = array(
-      classLocale::$lang['adm_tool_sql_server_version'] => classSupernova::$db->db_get_server_info(),
-      classLocale::$lang['adm_tool_sql_client_version'] => classSupernova::$db->db_get_client_info(),
-      classLocale::$lang['adm_tool_sql_host_info']      => classSupernova::$db->db_get_host_info(),
-    );
-    templateAssignTable($template, 'server', $status);
-
-    templateAssignTable($template, 'status', classSupernova::$db->db_get_server_stat());
-    templateAssignTable($template, 'params', classSupernova::$db->db_core_show_status());
-
-    $template->assign_vars(array(
-      'PAGE_HEADER'   => classLocale::$lang['adm_tool_sql_page_header'],
-      'COLUMN_NAME_1' => classLocale::$lang['adm_tool_sql_param_name'],
-      'COLUMN_NAME_2' => classLocale::$lang['adm_tool_sql_param_value'],
-      'TABLE_FOOTER'  => 'test',
-    ));
-
-    display($template, classLocale::$lang['adm_bn_ttle'], false, '', true);
-  break;
+    case ADM_TOOL_CONFIG_RELOAD:
+      classSupernova::$config->db_loadAll();
+      sys_refresh_tablelist();
+
+      classSupernova::$config->db_loadItem('game_watchlist');
+      if(classSupernova::$config->game_watchlist) {
+        classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
+      } else {
+        unset(classSupernova::$config->game_watchlist_array);
+      }
+    break;
+
+    case ADM_TOOL_MD5:
+      $template = gettemplate("admin/md5enc", true);
+      $password_seed = sys_get_param_str_unsafe('seed', SN_SYS_SEC_CHARS_ALLOWED);
+      $password_length = sys_get_param_int('length', 16);
+      $string = ($string = sys_get_param_str_unsafe('string')) ? $string : sys_random_string($password_length, $password_seed);
+
+      $template->assign_vars(array(
+        'SEED'   => $password_seed,
+        'LENGTH' => $password_length,
+        'STRING' => htmlentities($string),
+        'MD5'    => md5($string),
+      ));
+      display($template, classLocale::$lang['adm_tools_md5_header'], false, '', true);
+    break;
+
+    case ADM_TOOL_FORCE_ALL:
+      classSupernova::$config->db_saveItem('db_version', 0);
+      require_once('../includes/update.php');
+    break;
+
+    case ADM_TOOL_FORCE_LAST:
+      classSupernova::$config->db_saveItem('db_version', floor(classSupernova::$config->db_version - 1));
+      require_once('../includes/update.php');
+    break;
+
+    case ADM_TOOL_INFO_PHP:
+      phpinfo();
+    break;
+
+    case ADM_TOOL_INFO_SQL:
+      $template = gettemplate("simple_table", true);
+
+      $status = array(
+        classLocale::$lang['adm_tool_sql_server_version'] => classSupernova::$db->db_get_server_info(),
+        classLocale::$lang['adm_tool_sql_client_version'] => classSupernova::$db->db_get_client_info(),
+        classLocale::$lang['adm_tool_sql_host_info']      => classSupernova::$db->db_get_host_info(),
+      );
+      templateAssignTable($template, 'server', $status);
+
+      templateAssignTable($template, 'status', classSupernova::$db->db_get_server_stat());
+      templateAssignTable($template, 'params', classSupernova::$db->db_core_show_status());
+
+      $template->assign_vars(array(
+        'PAGE_HEADER'   => classLocale::$lang['adm_tool_sql_page_header'],
+        'COLUMN_NAME_1' => classLocale::$lang['adm_tool_sql_param_name'],
+        'COLUMN_NAME_2' => classLocale::$lang['adm_tool_sql_param_value'],
+        'TABLE_FOOTER'  => 'test',
+      ));
+
+      display($template, classLocale::$lang['adm_bn_ttle'], false, '', true);
+    break;
 
 }
 

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
 // if($user['authlevel'] < 1)
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
@@ -25,7 +25,7 @@ 
  */
 function templateAssignTable($template, $str, $status) {
   $template->assign_block_vars('table', classLocale::$lang['adm_tool_sql_table'][$str]);
-  foreach($status as $key => $value) {
+  foreach ($status as $key => $value) {
     $template->assign_block_vars('table.row', array(
       'VALUE_1' => $key,
       'VALUE_2' => $value,
@@ -33,13 +33,13 @@ 
   }
 }
 
-switch($mode) {
+switch ($mode) {
   case ADM_TOOL_CONFIG_RELOAD:
     classSupernova::$config->db_loadAll();
     sys_refresh_tablelist();
 
     classSupernova::$config->db_loadItem('game_watchlist');
-    if(classSupernova::$config->game_watchlist) {
+    if (classSupernova::$config->game_watchlist) {
       classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
     } else {
       unset(classSupernova::$config->game_watchlist_array);

includes/classes/Vector.php

Doc Comments +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
   /**
    * UniverseVector constructor.
    *
-   * @param int|string       $galaxy
-   * @param int|Vector|array $system
+   * @param integer       $galaxy
+   * @param integer $system
    * @param int              $planet
    * @param int              $type
    */

Spacing +6 added lines, -6 removed lines

@@ -13,7 +13,7 @@ 
   public $type = PT_NONE;
 
   public static function _staticInit() {
-    if(static::$_isStaticInit) {
+    if (static::$_isStaticInit) {
       return;
     }
     static::$knownGalaxies = intval(classSupernova::$config->game_maxGalaxy);
@@ -33,9 +33,9 @@ 
   public function __construct($galaxy = 0, $system = 0, $planet = 0, $type = PT_NONE) {
     // static::_staticInit();
 
-    if(is_string($galaxy) && $galaxy == VECTOR_READ_VECTOR && is_object($system) && $system instanceof Vector) {
+    if (is_string($galaxy) && $galaxy == VECTOR_READ_VECTOR && is_object($system) && $system instanceof Vector) {
       $this->readFromVector($system);
-    } elseif(is_string($galaxy) && $galaxy == VECTOR_READ_PARAMS && is_array($system)) {
+    } elseif (is_string($galaxy) && $galaxy == VECTOR_READ_PARAMS && is_array($system)) {
       $this->readFromParamFleets($system);
     } else {
       $this->galaxy = intval($galaxy);
@@ -74,11 +74,11 @@ 
    * @param Vector $vector
    */
   public function distance($vector) {
-    if($this->galaxy != $vector->galaxy) {
+    if ($this->galaxy != $vector->galaxy) {
       $distance = abs($this->galaxy - $vector->galaxy) * classSupernova::$config->uni_galaxy_distance;
-    } elseif($this->system != $vector->system) {
+    } elseif ($this->system != $vector->system) {
       $distance = abs($this->system - $vector->system) * 5 * 19 + 2700;
-    } elseif($this->planet != $vector->planet) {
+    } elseif ($this->planet != $vector->planet) {
       $distance = abs($this->planet - $vector->planet) * 5 + 1000;
       // TODO - uncomment
 //    } elseif($this->type != PT_NONE && $vector->type != PT_NONE && $this->type == $vector->type) {

fleet.php

Spacing +4 added lines, -4 removed lines

@@ -7,9 +7,9 @@ 
 
 // TODO - Переместить это куда-нибудь
 $fleet_page = sys_get_param_int('fleet_page', sys_get_param_int('mode'));
-if($fleet_ship_sort = sys_get_param_id('sort_elements') && $fleet_page == 0) {
+if ($fleet_ship_sort = sys_get_param_id('sort_elements') && $fleet_page == 0) {
   define('IN_AJAX', true);
-  if(!empty(classLocale::$lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
+  if (!empty(classLocale::$lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
     // player_save_option($user, PLAYER_OPTION_FLEET_SHIP_SORT, $fleet_ship_sort);
     // player_save_option($user, PLAYER_OPTION_FLEET_SHIP_SORT_INVERSE, sys_get_param_id('fleet_ship_sort_inverse', 0));
     classSupernova::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT] = $fleet_ship_sort;
@@ -72,7 +72,7 @@ 
 //}
 
 
-switch($fleet_page) {
+switch ($fleet_page) {
   case 3:
 
   case 2:
@@ -90,7 +90,7 @@ 
 
 $objFleet5->fleetPage0Prepare();
 
-switch($fleet_page) {
+switch ($fleet_page) {
   case 1:
     $objFleet5->fleetPage1($planet_type);
   break;

includes/classes/Player.php

Spacing +8 added lines, -8 removed lines

@@ -228,8 +228,8 @@ 
    * @return int|mixed
    */
   public function calcColonyMaxCount($astrotech = -1) {
-    if($astrotech == -1) {
-      if(!isset($this->_dbRow[UNIT_PLAYER_COLONIES_MAX])) {
+    if ($astrotech == -1) {
+      if (!isset($this->_dbRow[UNIT_PLAYER_COLONIES_MAX])) {
 
         $expeditions = get_player_max_expeditons($this->_dbRow);
         $astrotech = mrc_get_level($this->_dbRow, null, TECH_ASTROTECH);
@@ -302,7 +302,7 @@ 
 
 
   public function expeditionsMax() {
-    if($this->expeditionsMax === null) {
+    if ($this->expeditionsMax === null) {
       $this->expeditionsMax = get_player_max_expeditons($this->_dbRow);
     }
 
@@ -310,7 +310,7 @@ 
   }
 
   public function expeditionsFlying() {
-    if($this->expeditionsFlying === null) {
+    if ($this->expeditionsFlying === null) {
       $this->expeditionsFlying = FleetList::fleet_count_flying($this->_dbId, MT_EXPLORE);
     }
 
@@ -319,7 +319,7 @@ 
 
 
   public function fleetsMax() {
-    if($this->fleetMax === null) {
+    if ($this->fleetMax === null) {
       $this->fleetMax = GetMaxFleets($this->_dbRow);
     }
 
@@ -327,7 +327,7 @@ 
   }
 
   public function fleetsFlying() {
-    if($this->fleetFlying === null) {
+    if ($this->fleetFlying === null) {
       $this->fleetFlying = FleetList::fleet_count_flying($this->_dbId);
     }
 
@@ -336,7 +336,7 @@ 
 
 
   public function coloniesMax() {
-    if($this->coloniesMax === null) {
+    if ($this->coloniesMax === null) {
       $this->coloniesMax = get_player_max_colonies($this->_dbRow);
     }
 
@@ -344,7 +344,7 @@ 
   }
 
   public function coloniesCurrent() {
-    if($this->coloniesCurrent === null) {
+    if ($this->coloniesCurrent === null) {
       $this->coloniesCurrent = get_player_current_colonies($this->_dbRow);
     }
 

galaxy.php

Spacing +31 added lines, -31 removed lines

@@ -16,7 +16,7 @@ 
 $uni_system = sys_get_param_int('system', $planetrow['system']);
 $planet = sys_get_param_int('planet', $planetrow['planet']);
 
-if($mode == 'name') {
+if ($mode == 'name') {
   require_once('includes/includes/uni_rename.php');
 }
 
@@ -37,8 +37,8 @@ 
 
 $flying_fleet_count = FleetList::fleet_count_flying($user['id']);
 
-if($mode == 1) {
-} elseif($mode == 2 || $mode == 3) {
+if ($mode == 1) {
+} elseif ($mode == 2 || $mode == 3) {
   $planet = $planetrow['planet'];
 } else {
   $uni_galaxy = $planetrow['galaxy'];
@@ -46,7 +46,7 @@ 
   $planet = $planetrow['planet'];
 }
 
-$uni_galaxy = $uni_galaxy < 1 ? 1 : ($uni_galaxy > Vector::$knownGalaxies? Vector::$knownGalaxies: $uni_galaxy);
+$uni_galaxy = $uni_galaxy < 1 ? 1 : ($uni_galaxy > Vector::$knownGalaxies ? Vector::$knownGalaxies : $uni_galaxy);
 $uni_system = $uni_system < 1 ? 1 : ($uni_system > Vector::$knownSystems ? Vector::$knownSystems : $uni_system);
 $planet = $planet < 1 ? 1 : ($planet > Vector::$knownPlanets + 1 ? Vector::$knownPlanets + 1 : $planet);
 
@@ -64,8 +64,8 @@ 
 $PhalanxRange = GetPhalanxRange($HavePhalanx);
 
 $planet_precache_query = db_planet_list_in_system($uni_galaxy, $uni_system);
-if(!empty($planet_precache_query)) {
-  foreach($planet_precache_query as $planet_row) {
+if (!empty($planet_precache_query)) {
+  foreach ($planet_precache_query as $planet_row) {
     $planet_list[$planet_row['planet']][$planet_row['planet_type']] = $planet_row;
   }
 }
@@ -83,8 +83,8 @@ 
  * @var Fleet[][][] $fleet_list
  */
 $fleet_list = array();
-foreach($system_fleet_list->_container as $objFleetSystem) {
-  if(!$objFleetSystem->isReturning()) {
+foreach ($system_fleet_list->_container as $objFleetSystem) {
+  if (!$objFleetSystem->isReturning()) {
     $fleet_planet = $objFleetSystem->fleet_end_planet;
     $fleet_type = $objFleetSystem->fleet_end_type;
   } else {
@@ -99,7 +99,7 @@ 
 $recycler_info = array();
 $planet_recyclers_orbiting = 0;
 $recyclers_fleet = array();
-foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
   $recycler_info[$recycler_id] = get_ship_data($recycler_id, $user);
   $recyclers_fleet[$recycler_id] = mrc_get_level($user, $planetrow, $recycler_id);
   $planet_recyclers_orbiting += $recyclers_fleet[$recycler_id];
@@ -109,7 +109,7 @@ 
 $fleet_id = 1;
 $fleets = array();
 $config_game_max_planet = Vector::$knownPlanets + 1;
-for($Planet = 1; $Planet < $config_game_max_planet; $Planet++) {
+for ($Planet = 1; $Planet < $config_game_max_planet; $Planet++) {
   unset($uni_galaxyRowPlanet);
   unset($uni_galaxyRowMoon);
   unset($uni_galaxyRowUser);
@@ -119,27 +119,27 @@ 
   $uni_galaxyRowPlanet = $planet_list[$Planet][PT_PLANET];
 
   $planet_fleet_id = 0;
-  if($uni_galaxyRowPlanet['destruyed']) {
+  if ($uni_galaxyRowPlanet['destruyed']) {
     CheckAbandonPlanetState($uni_galaxyRowPlanet);
-  } elseif($uni_galaxyRowPlanet['id']) {
-    if($cached['users'][$uni_galaxyRowPlanet['id_owner']]) {
+  } elseif ($uni_galaxyRowPlanet['id']) {
+    if ($cached['users'][$uni_galaxyRowPlanet['id_owner']]) {
       $uni_galaxyRowUser = $cached['users'][$uni_galaxyRowPlanet['id_owner']];
     } else {
       $uni_galaxyRowUser = db_user_by_id($uni_galaxyRowPlanet['id_owner']);
       $cached['users'][$uni_galaxyRowUser['id']] = $uni_galaxyRowUser;
     }
 
-    if(!$uni_galaxyRowUser['id']) {
+    if (!$uni_galaxyRowUser['id']) {
       $debug->warning("Planet '{$uni_galaxyRowPlanet['name']}' [{$uni_galaxy}:{$uni_system}:{$Planet}] has no owner!", 'Userless planet', 503);
       $uni_galaxyRowPlanet['destruyed'] = SN_TIME_NOW + 60 * 60 * 24;
       $uni_galaxyRowPlanet['id_owner'] = 0;
       db_planet_set_by_id($uni_galaxyRowPlanet['id'], "id_owner = 0, destruyed = {$uni_galaxyRowPlanet['destruyed']}");
     }
 
-    if($uni_galaxyRowUser['id']) {
+    if ($uni_galaxyRowUser['id']) {
       $planetcount++;
-      if($uni_galaxyRowUser['ally_id']) {
-        if($cached['allies'][$uni_galaxyRowUser['ally_id']]) {
+      if ($uni_galaxyRowUser['ally_id']) {
+        if ($cached['allies'][$uni_galaxyRowUser['ally_id']]) {
           $allyquery = $cached['allies'][$uni_galaxyRowUser['ally_id']];
         } else {
           $allyquery = db_ally_get_by_id($uni_galaxyRowUser['ally_id']);
@@ -148,19 +148,19 @@ 
       }
 
       $fleets_to_planet = flt_get_fleets_to_planet_by_array_of_Fleet($fleet_list[$Planet][PT_PLANET]);
-      if(!empty($fleets_to_planet['own']['count'])) {
+      if (!empty($fleets_to_planet['own']['count'])) {
         $planet_fleet_id = $fleet_id;
         $fleets[] = tpl_parse_fleet_sn($fleets_to_planet['own']['total'], $fleet_id);
         $fleet_id++;
       }
 
       $uni_galaxyRowMoon = $planet_list[$Planet][PT_MOON];
-      if($uni_galaxyRowMoon['destruyed']) {
+      if ($uni_galaxyRowMoon['destruyed']) {
         CheckAbandonPlanetState($uni_galaxyRowMoon);
       } else {
         $moon_fleet_id = 0;
         $fleets_to_planet = flt_get_fleets_to_planet_by_array_of_Fleet($fleet_list[$Planet][PT_MOON]);
-        if(!empty($fleets_to_planet['own']['count'])) {
+        if (!empty($fleets_to_planet['own']['count'])) {
           $moon_fleet_id = $fleet_id;
           $fleets[] = tpl_parse_fleet_sn($fleets_to_planet['own']['total'], $fleet_id);
           $fleet_id++;
@@ -171,10 +171,10 @@ 
 
   $recyclers_incoming_capacity = 0;
   $uni_galaxyRowPlanet['debris'] = $uni_galaxyRowPlanet['debris_metal'] + $uni_galaxyRowPlanet['debris_crystal'];
-  if($uni_galaxyRowPlanet['debris']) {
-    if(!empty($fleet_list[$Planet][PT_DEBRIS])) {
-      foreach($fleet_list[$Planet][PT_DEBRIS] as $objFleetToDebris) {
-        if($objFleetToDebris->playerOwnerId == $user['id']) {
+  if ($uni_galaxyRowPlanet['debris']) {
+    if (!empty($fleet_list[$Planet][PT_DEBRIS])) {
+      foreach ($fleet_list[$Planet][PT_DEBRIS] as $objFleetToDebris) {
+        if ($objFleetToDebris->playerOwnerId == $user['id']) {
           $recyclers_incoming_capacity += $objFleetToDebris->shipsGetCapacityRecyclers($recycler_info);
         }
       }
@@ -251,21 +251,21 @@ 
 
 tpl_assign_fleet($template, $fleets);
 
-foreach(sn_get_groups('defense_active') as $unit_id) {
+foreach (sn_get_groups('defense_active') as $unit_id) {
   $template->assign_block_vars('defense_active', array(
     'ID'   => $unit_id,
     'NAME' => classLocale::$lang['tech'][$unit_id],
   ));
 }
 
-foreach($cached['users'] as $PlanetUser) {
-  if(!$PlanetUser) {
+foreach ($cached['users'] as $PlanetUser) {
+  if (!$PlanetUser) {
     continue;
   }
 
   $user_ally = $cached['allies'][$PlanetUser['ally_id']];
-  if(isset($user_ally)) {
-    if($PlanetUser['id'] == $user_ally['ally_owner']) {
+  if (isset($user_ally)) {
+    if ($PlanetUser['id'] == $user_ally['ally_owner']) {
       $user_rank_title = $user_ally['ally_owner_range'];
     } else {
       $ally_ranks = explode(';', $user_ally['ranklist']);
@@ -288,8 +288,8 @@ 
   ));
 }
 
-foreach($cached['allies'] as $PlanetAlly) {
-  if($PlanetAlly) {
+foreach ($cached['allies'] as $PlanetAlly) {
+  if ($PlanetAlly) {
     $template->assign_block_vars('alliances', array(
       'ID'      => $PlanetAlly['id'],
       'NAME_JS' => js_safe_string($PlanetAlly['ally_name']),

includes/includes/flt_page3.inc

Spacing +48 added lines, -48 removed lines

@@ -3,7 +3,7 @@ 
 // @version 1.0
 // @copyright 2008 by Chlorel for XNova
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   $debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
 }
 
@@ -20,25 +20,25 @@ 
   $errorlist .= !is_array($fleetarray) ? classLocale::$lang['fl_no_fleetarray'] : '';
 
   $errorlist = '';
-  if(!$galaxy || $galaxy > Vector::$knownGalaxies|| $galaxy < 1) {
+  if (!$galaxy || $galaxy > Vector::$knownGalaxies || $galaxy < 1) {
     $errorlist .= classLocale::$lang['fl_limit_galaxy'];
   }
-  if(!$system || $system > Vector::$knownSystems|| $system < 1) {
+  if (!$system || $system > Vector::$knownSystems || $system < 1) {
     $errorlist .= classLocale::$lang['fl_limit_system'];
   }
-  if(!$planet || $planet < 1 || ($planet > Vector::$knownPlanets&& $target_mission != MT_EXPLORE)) {
+  if (!$planet || $planet < 1 || ($planet > Vector::$knownPlanets && $target_mission != MT_EXPLORE)) {
     $errorlist .= classLocale::$lang['fl_limit_planet'];
   }
-  if($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type) {
+  if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type) {
     $errorlist .= classLocale::$lang['fl_ownpl_err'];
   }
-  if(!$planet_type) {
+  if (!$planet_type) {
     $errorlist .= classLocale::$lang['fl_no_planettype'];
   }
-  if($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON) {
+  if ($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON) {
     $errorlist .= classLocale::$lang['fl_fleet_err_pl'];
   }
-  if(empty($missiontype[$target_mission])) {
+  if (empty($missiontype[$target_mission])) {
     $errorlist .= classLocale::$lang['fl_bad_mission'];
   }
 
@@ -47,7 +47,7 @@ 
   $TransDeuterium = max(0, sys_get_param_float('resource2'));
   $StorageNeeded = $TransMetal + $TransCrystal + $TransDeuterium;
 
-  if(!$StorageNeeded && $target_mission == MT_TRANSPORT) {
+  if (!$StorageNeeded && $target_mission == MT_TRANSPORT) {
     $errorlist .= classLocale::$lang['fl_noenoughtgoods'];
   }
 
@@ -56,41 +56,41 @@ 
   $user = db_user_by_id($user['id'], true);
   $planetrow = db_planet_by_id($planetrow['id'], true);
 
-  if($target_mission == MT_EXPLORE) {
-    if($MaxExpeditions == 0) {
+  if ($target_mission == MT_EXPLORE) {
+    if ($MaxExpeditions == 0) {
       $errorlist .= classLocale::$lang['fl_expe_notech'];
-    } elseif($FlyingExpeditions >= $MaxExpeditions) {
+    } elseif ($FlyingExpeditions >= $MaxExpeditions) {
       $errorlist .= classLocale::$lang['fl_expe_max'];
     }
   } else {
-    if($TargetPlanet['id_owner']) {
-      if($target_mission == MT_COLONIZE) {
+    if ($TargetPlanet['id_owner']) {
+      if ($target_mission == MT_COLONIZE) {
         $errorlist .= classLocale::$lang['fl_colonized'];
       }
 
-      if($TargetPlanet['id_owner'] == $planetrow['id_owner']) {
-        if($target_mission == MT_ATTACK) {
+      if ($TargetPlanet['id_owner'] == $planetrow['id_owner']) {
+        if ($target_mission == MT_ATTACK) {
           $errorlist .= classLocale::$lang['fl_no_self_attack'];
         }
 
-        if($target_mission == MT_SPY) {
+        if ($target_mission == MT_SPY) {
           $errorlist .= classLocale::$lang['fl_no_self_spy'];
         }
       } else {
-        if($target_mission == MT_RELOCATE) {
+        if ($target_mission == MT_RELOCATE) {
           $errorlist .= classLocale::$lang['fl_only_stay_at_home'];
         }
       }
     } else {
-      if($target_mission < MT_COLONIZE) {
+      if ($target_mission < MT_COLONIZE) {
         $errorlist .= classLocale::$lang['fl_unknow_target'];
       } else {
-        if($target_mission == MT_DESTROY) {
+        if ($target_mission == MT_DESTROY) {
           $errorlist .= classLocale::$lang['fl_nomoon'];
         }
 
-        if($target_mission == MT_RECYCLE) {
-          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0) {
+        if ($target_mission == MT_RECYCLE) {
+          if ($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0) {
             $errorlist .= classLocale::$lang['fl_nodebris'];
           }
         }
@@ -99,13 +99,13 @@ 
   }
 
 
-  if(sn_module::$sn_module['unit_captain']->manifest['active'] && $captain_id = sys_get_param_id('captain_id')) {
+  if (sn_module::$sn_module['unit_captain']->manifest['active'] && $captain_id = sys_get_param_id('captain_id')) {
     $captain = sn_module::$sn_module['unit_captain']->unit_captain_get($planetrow['id']);
 //      mrc_get_level($user, $planetrow, UNIT_CAPTAIN, true);
-    if(!$captain) {
+    if (!$captain) {
       $errorlist .= classLocale::$lang['module_unit_captain_error_no_captain'];
-    } elseif($captain['unit_location_type'] == LOC_PLANET) {
-      if($target_mission == MT_RELOCATE && ($arriving_captain = mrc_get_level($user, $TargetPlanet, UNIT_CAPTAIN, true))) {
+    } elseif ($captain['unit_location_type'] == LOC_PLANET) {
+      if ($target_mission == MT_RELOCATE && ($arriving_captain = mrc_get_level($user, $TargetPlanet, UNIT_CAPTAIN, true))) {
         $errorlist .= classLocale::$lang['module_unit_captain_error_captain_already_bound'];
       }
     } else {
@@ -113,14 +113,14 @@ 
     }
   }
 
-  if($errorlist) {
+  if ($errorlist) {
     sn_db_transaction_rollback();
     message("<span class='error'><ul>{$errorlist}</ul></span>", classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, false);
   }
 
   // On verifie s'il y a assez de vaisseaux sur la planete !
-  foreach($fleetarray as $Ship => $Count) {
-    if($Count > mrc_get_level($user, $planetrow, $Ship)) {
+  foreach ($fleetarray as $Ship => $Count) {
+    if ($Count > mrc_get_level($user, $planetrow, $Ship)) {
       message("<span class='error'><b>{$classLocale['fl_fleet_err']}</b></span>", classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
     }
   }
@@ -131,10 +131,10 @@ 
   //But is it acs??
   //Well all acs fleets must have a fleet code.
   //The co-ords must be the same as where the acs fleet is going.
-  if($fleet_group && sys_get_param_str('acs_target_mr') == "g{$galaxy}s{$system}p{$planet}t{$planet_type}") {
+  if ($fleet_group && sys_get_param_str('acs_target_mr') == "g{$galaxy}s{$system}p{$planet}t{$planet_type}") {
     //ACS attack must exist (if acs fleet has arrived this will also return false (2 checks in 1!!!)
     $aks = db_acs_get_by_group_id($fleet_group);
-    if(!$aks) {
+    if (!$aks) {
       $fleet_group = 0;
     } else {
       //Also it must be mission type 2
@@ -145,31 +145,31 @@ 
       $planet = $aks['planet'];
       $planet_type = $aks['planet_type'];
     }
-  } elseif($target_mission == MT_ACS) {
+  } elseif ($target_mission == MT_ACS) {
     //Check that a failed acs attack isn't being sent, if it is, make it an attack fleet.
     $target_mission = MT_ATTACK;
   }
 
-  if($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
+  if ($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
     $TargetPlanet = array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet, 'id_owner' => 0);
   }
   $options = array('fleet_speed_percent' => $speed_percent, 'fleet_group' => $fleet_group, 'resources' => $StorageNeeded);
   $cant_attack = flt_can_attack($planetrow, $TargetPlanet, $fleetarray, $target_mission, $options);
 
-  if($cant_attack !== FLIGHT_ALLOWED) {
+  if ($cant_attack !== FLIGHT_ALLOWED) {
     message("<span class='error'><b>{$classLocale['fl_attack_error'][$cant_attack]}</b></span>", classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 99);
   }
 
   $speed_possible = array(10, 9, 8, 7, 6, 5, 4, 3, 2, 1);
-  if(!in_array($speed_percent, $speed_possible)) {
+  if (!in_array($speed_percent, $speed_possible)) {
     message("<span class='error'><b>" . classLocale::$lang['fl_cheat_speed'] . "</b></span>", classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
 
   $mission_time_in_seconds = 0;
   $arrival_time = SN_TIME_NOW + $time_to_travel;
-  if($target_mission == MT_ACS && $aks) {
+  if ($target_mission == MT_ACS && $aks) {
 //    if($fleet_start_time > $aks['ankunft']) {
-    if($arrival_time > $aks['ankunft']) {
+    if ($arrival_time > $aks['ankunft']) {
       message(classLocale::$lang['fl_aks_too_slow'] . 'Fleet arrival: ' . date(FMT_DATE_TIME, $arrival_time) . " AKS arrival: " . date(FMT_DATE_TIME, $aks['ankunft']), classLocale::$lang['fl_error']);
     }
     $group_sync_delta_time = $aks['ankunft'] - $arrival_time;
@@ -178,11 +178,11 @@ 
     // Set return time to ACS return time + fleet's time to travel
     $return_time = $aks['ankunft'] + $time_to_travel;
   } else {
-    if($target_mission == MT_EXPLORE || $target_mission == MT_HOLD) {
+    if ($target_mission == MT_EXPLORE || $target_mission == MT_HOLD) {
       $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) : ($target_mission == MT_HOLD ? 12 : 0);
-      if($max_duration) {
+      if ($max_duration) {
         $mission_time_in_hours = sys_get_param_id('missiontime');
-        if($mission_time_in_hours > $max_duration || $mission_time_in_hours < 1) {
+        if ($mission_time_in_hours > $max_duration || $mission_time_in_hours < 1) {
           $debug->warning('Supplying wrong mission time', 'Hack attempt', 302, array('base_dump' => true));
           die();
         }
@@ -196,19 +196,19 @@ 
   $FleetStorage = 0;
 
   $db_changeset = array();
-  foreach($fleetarray as $Ship => $Count) {
+  foreach ($fleetarray as $Ship => $Count) {
     $FleetStorage += get_unit_param($Ship, P_CAPACITY) * $Count;
     $db_changeset['unit'][] = sn_db_unit_changeset_prepare($Ship, -$Count, $user, $planetrow['id']);
   }
   $FleetStorage -= $consumption;
 
-  if($StorageNeeded > $FleetStorage) {
+  if ($StorageNeeded > $FleetStorage) {
     message("<span class='error'><b>" . classLocale::$lang['fl_nostoragespa'] . pretty_number($StorageNeeded - $FleetStorage) . "</b></span>", classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
-  if($planetrow['deuterium'] < $TransDeuterium + $consumption) {
+  if ($planetrow['deuterium'] < $TransDeuterium + $consumption) {
     message("<font color=\"red\"><b>" . classLocale::$lang['fl_no_deuterium'] . pretty_number($TransDeuterium + $consumption - $planetrow['deuterium']) . "</b></font>", classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
-  if(($planetrow['metal'] < $TransMetal) || ($planetrow['crystal'] < $TransCrystal)) {
+  if (($planetrow['metal'] < $TransMetal) || ($planetrow['crystal'] < $TransCrystal)) {
     message("<font color=\"red\"><b>" . classLocale::$lang['fl_no_resources'] . "</b></font>", classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
 
@@ -238,7 +238,7 @@ 
 
   $template = gettemplate('fleet3', true);
 
-  if(is_array($captain)) {
+  if (is_array($captain)) {
     db_unit_set_by_id($captain['unit_id'], "`unit_location_type` = " . LOC_FLEET . ", `unit_location_id` = {$objFleet->dbId}");
   }
 
@@ -251,7 +251,7 @@ 
     'START_LEFT'         => floor($return_time + 1 - SN_TIME_NOW),
   );
 
-  if(!empty($TargetPlanet)) {
+  if (!empty($TargetPlanet)) {
     $template_route += array(
       'END_TYPE_TEXT_SH' => classLocale::$lang['sys_planet_type_sh'][$TargetPlanet['planet_type']],
       'END_COORDS'       => uni_render_coordinates($TargetPlanet),
@@ -264,8 +264,8 @@ 
   $template->assign_block_vars('fleets', $template_route);
 
   $sn_groups_fleet = sn_get_groups('fleet');
-  foreach($fleetarray as $ship_id => $ship_count) {
-    if(in_array($ship_id, $sn_groups_fleet) && $ship_count) {
+  foreach ($fleetarray as $ship_id => $ship_count) {
+    if (in_array($ship_id, $sn_groups_fleet) && $ship_count) {
 //      $ship_base_data = get_ship_data($ship_id, $user);
       $template->assign_block_vars('fleets.ships', array(
         'ID'          => $ship_id,

includes/includes/flt_page5.inc

Spacing +23 added lines, -23 removed lines

@@ -12,7 +12,7 @@ 
 *
 **/
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   $debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
 }
 
@@ -25,7 +25,7 @@ 
 
   $planet_list = array();
 
-  if(is_array($resources_taken))
+  if (is_array($resources_taken))
   {
     $query = implode(',', array_keys($resources_taken));
     $query = " AND `destruyed` = 0 AND `id` IN ({$query})";
@@ -33,16 +33,16 @@ 
     $query = '';
   }
 
-  foreach(sn_get_groups('flt_transports') as $transport_id) {
+  foreach (sn_get_groups('flt_transports') as $transport_id) {
     $transports[$transport_id] = get_unit_param($transport_id, P_CAPACITY);
   }
   arsort($transports);
 
   $planets_db_list = db_planet_list_sorted($user, $planetrow['id'], '*', $query);
   !is_array($planets_db_list) ? $planets_db_list = array() : false;
-  foreach($planets_db_list as $planet_db_data) {
+  foreach ($planets_db_list as $planet_db_data) {
   // begin planet loop
-    if(!$query) {
+    if (!$query) {
       $resources_taken[$planet_db_data['id']] = 1;
     }
     sn_db_transaction_start();
@@ -54,8 +54,8 @@ 
     $planet_id = $planet_db_data['id'];
 
     $planet_resources = 0;
-    foreach(sn_get_groups('resources_loot') as $resource_id) {
-      if($resources_taken[$planet_id] == 1 || $resources_taken[$planet_id][$resource_id]) {
+    foreach (sn_get_groups('resources_loot') as $resource_id) {
+      if ($resources_taken[$planet_id] == 1 || $resources_taken[$planet_id][$resource_id]) {
         $planet_resources += floor(mrc_get_level($user, $planet_db_data, $resource_id, true, true)); // $planet_db_data[get_unit_param($resource_id, P_NAME)]);
       }
     }
@@ -86,8 +86,8 @@ 
     $fleet_capacity = 0;
     $ship_loadout = array();
     $fleet = array();
-    foreach($transports as $ship_id => $ship_capacity) {
-      if($ship_count = mrc_get_level($user, $planet_db_data, $ship_id, true, true)) {
+    foreach ($transports as $ship_id => $ship_capacity) {
+      if ($ship_count = mrc_get_level($user, $planet_db_data, $ship_id, true, true)) {
         $ship_loadout[$ship_id]['capacity'] = $ship_count * $ship_capacity;
         $ship_loadout[$ship_id]['taken'] = 0;
         $fleet_capacity += $ship_loadout[$ship_id]['capacity'];
@@ -98,9 +98,9 @@ 
 
     $will_take = min($planet_resources, $fleet_capacity);
 
-    foreach($ship_loadout as $ship_id => &$planet_ship) {
+    foreach ($ship_loadout as $ship_id => &$planet_ship) {
       $can_take = min($will_take, $planet_ship['capacity']);
-      if($can_take <= 0) {
+      if ($can_take <= 0) {
         continue;
       }
       $planet_ship['capacity'] -= $can_take;
@@ -108,23 +108,23 @@ 
       $fleet[$ship_id] = ceil($planet_ship['taken'] / $transports[$ship_id]);
 
       $will_take -= $can_take;
-      if($will_take <= 0) {
+      if ($will_take <= 0) {
         break;
       }
     }
 
-    if(!empty($fleet)) {
+    if (!empty($fleet)) {
       $travel_data = flt_travel_data($user, $planetrow, $planet_db_data, $fleet, 10);
       $planet_data['FLEET_SPEED'] = $travel_data['fleet_speed'];
       $planet_data['DISTANCE']    = $travel_data['distance'];
       $planet_data['DURATION']    = $travel_data['duration'];
       $planet_data['CONSUMPTION'] = $travel_data['consumption'];
 
-      if(floor(mrc_get_level($user, $planet_db_data, RES_DEUTERIUM, true)) >= $planet_data['CONSUMPTION']) {
+      if (floor(mrc_get_level($user, $planet_db_data, RES_DEUTERIUM, true)) >= $planet_data['CONSUMPTION']) {
         $will_take = min($planet_resources, $fleet_capacity) - $planet_data['CONSUMPTION'];
 
-        foreach(sn_get_groups('resources_loot') as $resource_id) {
-          if($resources_taken[$planet_id] != 1 && !$resources_taken[$planet_id][$resource_id]) {
+        foreach (sn_get_groups('resources_loot') as $resource_id) {
+          if ($resources_taken[$planet_id] != 1 && !$resources_taken[$planet_id][$resource_id]) {
             continue;
           }
 
@@ -133,7 +133,7 @@ 
           $fleet[$resource_id] = min($will_take, $resource_amount);
           $will_take -= $resource_amount;
 
-          if($will_take <= 0) {
+          if ($will_take <= 0) {
             break;
           }
         }
@@ -157,19 +157,19 @@ 
 
 $resources_taken = sys_get_param('resources');
 
-if(!empty($resources_taken))  { // begin processing parameters
+if (!empty($resources_taken)) { // begin processing parameters
   $planet_list = flt_build_gathering($resources_taken);
 
-  foreach($planet_list as $planet_id => $planet_data) {
-    if($planet_data['RESULT'] == FLIGHT_ALLOWED) {
+  foreach ($planet_list as $planet_id => $planet_data) {
+    if ($planet_data['RESULT'] == FLIGHT_ALLOWED) {
       $planet_data['RESULT'] = flt_t_send_fleet($user, $planet_data['PLANET_DB_DATA'], $planetrow, $planet_data['FLEET'], MT_TRANSPORT);
     }
 
     $planet_data['MESSAGE'] = classLocale::$lang['fl_attack_error'][$planet_data['RESULT']];
 
     $template->assign_block_vars('results', $planet_data);
-    if(!empty($planet_data['FLEET']) && $planet_data['RESULT'] == FLIGHT_ALLOWED) {
-      foreach($planet_data['FLEET'] as $unit_id => $amount) {
+    if (!empty($planet_data['FLEET']) && $planet_data['RESULT'] == FLIGHT_ALLOWED) {
+      foreach ($planet_data['FLEET'] as $unit_id => $amount) {
         $template->assign_block_vars('results.units', array(
           'ID'     => $unit_id,
           'NAME'   => classLocale::$lang['tech'][$unit_id],
@@ -182,7 +182,7 @@ 
 
 // Building list of own planets & moons
 $planet_list = flt_build_gathering();
-foreach($planet_list as $planet_data) {
+foreach ($planet_list as $planet_data) {
   $planet_data['DURATION'] = $planet_data['DURATION'] ? pretty_time($planet_data['DURATION']) : classLocale::$lang['flt_no_fuel'];
   $template->assign_block_vars('colonies', $planet_data);
 }

includes/constants.php

Spacing +236 added lines, -236 removed lines

@@ -38,8 +38,8 @@ 
 
 // Game type constants starts with GAME_
 define('GAME_SUPERNOVA', 0);
-define('GAME_OGAME'    , 1);
-define('GAME_BLITZ'    , 2);
+define('GAME_OGAME', 1);
+define('GAME_BLITZ', 2);
 
 // Date & time range constants
 define('DATE_FOREVER', 2000000000);
@@ -52,14 +52,14 @@ 
 define('PERIOD_YEAR', PERIOD_DAY * 365);
 define('PERIOD_FOREVER', PERIOD_YEAR * 100);
 
-define('PERIOD_MINUTE_2' , PERIOD_MINUTE * 2);
-define('PERIOD_MINUTE_3' , PERIOD_MINUTE * 3);
-define('PERIOD_MINUTE_5' , PERIOD_MINUTE * 5);
+define('PERIOD_MINUTE_2', PERIOD_MINUTE * 2);
+define('PERIOD_MINUTE_3', PERIOD_MINUTE * 3);
+define('PERIOD_MINUTE_5', PERIOD_MINUTE * 5);
 define('PERIOD_MINUTE_10', PERIOD_MINUTE * 10);
-define('PERIOD_DAY_3'    , PERIOD_DAY * 3);
-define('PERIOD_WEEK_2'   , PERIOD_WEEK * 2);
-define('PERIOD_MONTH_2'  , PERIOD_MONTH * 2);
-define('PERIOD_MONTH_3'  , PERIOD_MONTH * 3);
+define('PERIOD_DAY_3', PERIOD_DAY * 3);
+define('PERIOD_WEEK_2', PERIOD_WEEK * 2);
+define('PERIOD_MONTH_2', PERIOD_MONTH * 2);
+define('PERIOD_MONTH_3', PERIOD_MONTH * 3);
 
 define('FONT_SIZE_PERCENT_MIN', 56.25);
 define('FONT_SIZE_PERCENT_DEFAULT', 68.75);
@@ -112,100 +112,100 @@ 
 define('SN_SYS_SEC_CHARS_ALLOWED', 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghkmnpqrstuvwxyz0123456789');
 
 // Mot qui sont interdit a la saisie !
-$ListCensure = array ( '/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
+$ListCensure = array('/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
 
 // Confirmation record types
-define('CONFIRM_REGISTRATION'  , 1);
+define('CONFIRM_REGISTRATION', 1);
 define('CONFIRM_PASSWORD_RESET', 2);
-define('CONFIRM_DELETE'        , 3);
+define('CONFIRM_DELETE', 3);
 
 define('AFFILIATE_MM_TO_REFERRAL_DM', 2);
 
 // Ally diplomacy statuses
-define('ALLY_DIPLOMACY_SELF'         , 'self');
-define('ALLY_DIPLOMACY_NEUTRAL'      , 'neutral');
-define('ALLY_DIPLOMACY_WAR'          , 'war');
-define('ALLY_DIPLOMACY_PEACE'        , 'peace');
+define('ALLY_DIPLOMACY_SELF', 'self');
+define('ALLY_DIPLOMACY_NEUTRAL', 'neutral');
+define('ALLY_DIPLOMACY_WAR', 'war');
+define('ALLY_DIPLOMACY_PEACE', 'peace');
 define('ALLY_DIPLOMACY_CONFEDERATION', 'confederation');
-define('ALLY_DIPLOMACY_FEDERATION'   , 'federation');
-define('ALLY_DIPLOMACY_UNION'        , 'union');
-define('ALLY_DIPLOMACY_MASTER'       , 'master');
-define('ALLY_DIPLOMACY_SLAVE'        , 'slave');
+define('ALLY_DIPLOMACY_FEDERATION', 'federation');
+define('ALLY_DIPLOMACY_UNION', 'union');
+define('ALLY_DIPLOMACY_MASTER', 'master');
+define('ALLY_DIPLOMACY_SLAVE', 'slave');
 
 define('ALLY_PROPOSE_SEND', 0);
 
 // Quest types
-define('QUEST_TYPE_BUILD'   , 1);
+define('QUEST_TYPE_BUILD', 1);
 define('QUEST_TYPE_RESEARCH', 2);
-define('QUEST_TYPE_COMBAT'  , 3);
+define('QUEST_TYPE_COMBAT', 3);
 
-define('QUEST_STATUS_NOT_STARTED' , 0);
-define('QUEST_STATUS_STARTED'     , 1);
-define('QUEST_STATUS_COMPLETE'    , 2);
+define('QUEST_STATUS_NOT_STARTED', 0);
+define('QUEST_STATUS_STARTED', 1);
+define('QUEST_STATUS_COMPLETE', 2);
 
 // *** Combat-related constants
 // *** Mission Type constants starts with MT_
-define('MT_NONE'     ,  0);
-define('MT_ATTACK'   ,  1);
-define('MT_ACS'      ,  2);
-define('MT_TRANSPORT',  3);
-define('MT_RELOCATE' ,  4);
-define('MT_HOLD'     ,  5);
-define('MT_SPY'      ,  6);
-define('MT_COLONIZE' ,  7);
-define('MT_RECYCLE'  ,  8);
-define('MT_DESTROY'  ,  9);
-define('MT_MISSILE'  , 10);
-define('MT_EXPLORE'  , 15);
+define('MT_NONE', 0);
+define('MT_ATTACK', 1);
+define('MT_ACS', 2);
+define('MT_TRANSPORT', 3);
+define('MT_RELOCATE', 4);
+define('MT_HOLD', 5);
+define('MT_SPY', 6);
+define('MT_COLONIZE', 7);
+define('MT_RECYCLE', 8);
+define('MT_DESTROY', 9);
+define('MT_MISSILE', 10);
+define('MT_EXPLORE', 15);
 
 // *** Planet Target constants starts with PT_
 define('PT_NONE', 0);
 define('PT_ALL', 0);
 define('PT_PLANET', 1);
 define('PT_DEBRIS', 2);
-define('PT_MOON'  , 3);
+define('PT_MOON', 3);
 
 // *** Unit locations - shows db table where unit belong
 // Also cache indexes
-define('LOC_NONE',    -1);
+define('LOC_NONE', -1);
 define('LOC_UNIVERSE', 0);
-define('LOC_PLANET',   1);
-define('LOC_DEBRIS',   2); // Translates to `planets` table planet_type = 1, `debris_*` fields
-define('LOC_MOON',     3); // Translates to `planets` table planet_type = 3
-define('LOC_USER',     4);
-define('LOC_FLEET',    5);
-define('LOC_ALLY',     6);
-define('LOC_UNIT_NUMERIC',     7);
-define('LOC_UNIT_LIST',     8);
+define('LOC_PLANET', 1);
+define('LOC_DEBRIS', 2); // Translates to `planets` table planet_type = 1, `debris_*` fields
+define('LOC_MOON', 3); // Translates to `planets` table planet_type = 3
+define('LOC_USER', 4);
+define('LOC_FLEET', 5);
+define('LOC_ALLY', 6);
+define('LOC_UNIT_NUMERIC', 7);
+define('LOC_UNIT_LIST', 8);
 
 // ТОЛЬКО ВНУТРЕНЕЕ!!!
-define('LOC_UNIT',    'LOC_UNIT');
-define('LOC_QUE',     'LOC_QUE');
-define('LOC_LOCATION','LOC_LOCATION');
-define('LOC_LOCKS','LOC_LOCKS');
+define('LOC_UNIT', 'LOC_UNIT');
+define('LOC_QUE', 'LOC_QUE');
+define('LOC_LOCATION', 'LOC_LOCATION');
+define('LOC_LOCKS', 'LOC_LOCKS');
 
 // *** Caching masks
-define('CACHE_NOTHING'    ,  0);
-define('CACHE_FLEET'      ,  1);
-define('CACHE_PLANET'     ,  2);
-define('CACHE_USER'       ,  4);
-define('CACHE_SOURCE'     ,  8);
+define('CACHE_NOTHING', 0);
+define('CACHE_FLEET', 1);
+define('CACHE_PLANET', 2);
+define('CACHE_USER', 4);
+define('CACHE_SOURCE', 8);
 define('CACHE_DESTINATION', 16);
-define('CACHE_EVENT'      , 32);
+define('CACHE_EVENT', 32);
 
-define('CACHE_USER_SRC'  , CACHE_USER | CACHE_SOURCE);
-define('CACHE_USER_DST'  , CACHE_USER | CACHE_DESTINATION);
+define('CACHE_USER_SRC', CACHE_USER | CACHE_SOURCE);
+define('CACHE_USER_DST', CACHE_USER | CACHE_DESTINATION);
 define('CACHE_PLANET_SRC', CACHE_PLANET | CACHE_SOURCE);
 define('CACHE_PLANET_DST', CACHE_PLANET | CACHE_DESTINATION);
-define('CACHE_COMBAT'    , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
+define('CACHE_COMBAT', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
 
-define('CACHE_ALL'       , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
+define('CACHE_ALL', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
 
-define('CACHE_NONE'      , CACHE_NOTHING); // Alias for me
+define('CACHE_NONE', CACHE_NOTHING); // Alias for me
 
 // *** Event types
 define('EVENT_FLEET_ARRIVE', 1);
-define('EVENT_FLEET_STAY'  , 2);
+define('EVENT_FLEET_STAY', 2);
 define('EVENT_FLEET_RETURN', 3);
 
 // *** Constants for changing DM
@@ -258,10 +258,10 @@ 
 
 
 // Operation error status HARDCODE!
-define('ERR_NONE'               , 0); // No error
-define('ERR_WARNING'            , 1); // There is warning - something altering normal operation process
-define('ERR_ERROR'              , 2); // There is error - something permits operation from process
-define('ERR_HACK'               , 4); // Operation is qualified as hack attempt
+define('ERR_NONE', 0); // No error
+define('ERR_WARNING', 1); // There is warning - something altering normal operation process
+define('ERR_ERROR', 2); // There is error - something permits operation from process
+define('ERR_HACK', 4); // Operation is qualified as hack attempt
 // New GLOBAL operation results
 //define('RESULT_DEFAULT' , 0); // Default result - all went OK or result really doesn't matter
 //define('RESULT_WARNING' , 1);
@@ -281,7 +281,7 @@ 
 define('SN_PAYMENT_REQUEST_OK', 0);
 define('SN_PAYMENT_REQUEST_ERROR_UNIT_AMOUNT', 1);
 define('SN_PAYMENT_REQUEST_ERROR_PAYLINK_UNSUPPORTED', 2);
-define('SN_PAYMENT_REQUEST_IP_WRONG', 3);  // Неправильный IP входящей системы - обычно хак
+define('SN_PAYMENT_REQUEST_IP_WRONG', 3); // Неправильный IP входящей системы - обычно хак
 define('SN_PAYMENT_REQUEST_COMMAND_UNSUPPORTED', 4); // Неподдерживаемая команда - обычно хак
 define('SN_PAYMENT_REQUEST_SIGNATURE_INVALID', 5); // Неправильная подпись или не сошлась контрольная сумма - обычно хак
 define('SN_MODULE_DISABLED', 6); // Модуль отключен // УНИВЕРСАЛЬНЫЙ ОТВЕТ!
@@ -554,16 +554,16 @@ 
 //define('F_DEVICE_ID',     'F_DEVICE_ID');
 //define('F_DEVICE_CYPHER', 'F_DEVICE_CYPHER');
 
-define('F_PROVIDER_ID',   'F_PROVIDER_ID');
+define('F_PROVIDER_ID', 'F_PROVIDER_ID');
 // define('F_PROVIDER_LIST', 'F_PROVIDER_LIST');
 
 define('F_IMPERSONATE_STATUS', 'F_IMPERSONATE_STATUS');
 define('F_IMPERSONATE_OPERATOR', 'F_IMPERSONATE_OPERATOR');
 
-define('F_LOGIN_STATUS',  'F_LOGIN_STATUS');
+define('F_LOGIN_STATUS', 'F_LOGIN_STATUS');
 define('F_LOGIN_MESSAGE', 'F_LOGIN_MESSAGE');
 
-define('F_PLAYER_REGISTER_STATUS',  'F_PLAYER_REGISTER_STATUS');
+define('F_PLAYER_REGISTER_STATUS', 'F_PLAYER_REGISTER_STATUS');
 define('F_PLAYER_REGISTER_MESSAGE', 'F_PLAYER_REGISTER_MESSAGE');
 
 define('F_USER_ID', 'F_USER_ID');
@@ -607,66 +607,66 @@ 
 
 
 // Option groups
-define('OPT_ALL',      0);
-define('OPT_MESSAGE',  1);
+define('OPT_ALL', 0);
+define('OPT_MESSAGE', 1);
 define('OPT_UNIVERSE', 2);
 define('OPT_INTERFACE', 3);
 
 // Message classes
-define('MSG_TYPE_OUTBOX'   ,  -1);
-define('MSG_TYPE_SPY'      ,   0);
-define('MSG_TYPE_PLAYER'   ,   1);
-define('MSG_TYPE_ALLIANCE' ,   2);
-define('MSG_TYPE_COMBAT'   ,   3);
-define('MSG_TYPE_RECYCLE'  ,   4);
-define('MSG_TYPE_TRANSPORT',   5);
-define('MSG_TYPE_ADMIN'    ,   6);
-define('MSG_TYPE_EXPLORE'  ,  15);
-define('MSG_TYPE_QUE'      ,  99);
-define('MSG_TYPE_NEW'      , 100);
+define('MSG_TYPE_OUTBOX', -1);
+define('MSG_TYPE_SPY', 0);
+define('MSG_TYPE_PLAYER', 1);
+define('MSG_TYPE_ALLIANCE', 2);
+define('MSG_TYPE_COMBAT', 3);
+define('MSG_TYPE_RECYCLE', 4);
+define('MSG_TYPE_TRANSPORT', 5);
+define('MSG_TYPE_ADMIN', 6);
+define('MSG_TYPE_EXPLORE', 15);
+define('MSG_TYPE_QUE', 99);
+define('MSG_TYPE_NEW', 100);
 
 // Attack verification statuses
-define('FLIGHT_ALLOWED'           ,  0);
-define('FLIGHT_VECTOR_NO_TARGET'         ,  1);
-define('FLIGHT_PLAYER_OWN'               ,  2);
-define('FLIGHT_MISSION_IMPOSSIBLE'     ,  3);
-define('FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT'   ,  4);
-define('FLIGHT_MISSION_RECYCLE_NO_DEBRIS'         ,  5);
-define('FLIGHT_PLAYER_VACATION'          ,  6);
-define('FLIGHT_PLAYER_SAME_IP'           ,  7);
-define('FLIGHT_PLAYER_BUFFING'           ,  8);
-define('FLIGHT_PLAYER_ADMIN'             ,  9);
-define('FLIGHT_PLAYER_NOOB'              , 10);
-define('FLIGHT_PLAYER_VACATION_OWN'      , 11);
-define('FLIGHT_MISSION_MISSILE_NO_SILO'           , 12);
-define('FLIGHT_MISSION_MISSILE_NO_MISSILES'        , 13);
-define('FLIGHT_SHIPS_NO_SHIPS'          , 14);
-define('FLIGHT_FLEET_NO_SLOTS'          , 15);
-define('FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES'          , 16);
-define('FLIGHT_SHIPS_NO_RECYCLERS'      , 17);
-define('FLIGHT_MISSION_SPY_NO_SPIES'          , 18);
-define('FLIGHT_SHIPS_NO_COLONIZER'      , 19);
-define('FLIGHT_MISSION_MISSILE_TOO_FAR'   , 20);
-define('FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE'   , 21);
-define('FLIGHT_RESOURCES_FUEL_NOT_ENOUGH'           , 22);
-define('FLIGHT_RESOURCES_NOT_ENOUGH'      , 23);
-define('FLIGHT_MISSION_ACS_NOT_EXISTS'            , 24);
-define('FLIGHT_MISSION_ACS_MISSTARGET'    , 25);
-define('FLIGHT_FLEET_SPEED_WRONG'       , 26);
-define('FLIGHT_MISSION_ACS_TOO_LATE'      , 27);
-define('FLIGHT_MISSION_ATTACK_BASHING'           , 28);
-define('FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY' , 29);
-define('FLIGHT_MISSION_ACS_WRONG_TARGET'  , 30);
-define('FLIGHT_VECTOR_SAME_SOURCE'              , 31);
+define('FLIGHT_ALLOWED', 0);
+define('FLIGHT_VECTOR_NO_TARGET', 1);
+define('FLIGHT_PLAYER_OWN', 2);
+define('FLIGHT_MISSION_IMPOSSIBLE', 3);
+define('FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT', 4);
+define('FLIGHT_MISSION_RECYCLE_NO_DEBRIS', 5);
+define('FLIGHT_PLAYER_VACATION', 6);
+define('FLIGHT_PLAYER_SAME_IP', 7);
+define('FLIGHT_PLAYER_BUFFING', 8);
+define('FLIGHT_PLAYER_ADMIN', 9);
+define('FLIGHT_PLAYER_NOOB', 10);
+define('FLIGHT_PLAYER_VACATION_OWN', 11);
+define('FLIGHT_MISSION_MISSILE_NO_SILO', 12);
+define('FLIGHT_MISSION_MISSILE_NO_MISSILES', 13);
+define('FLIGHT_SHIPS_NO_SHIPS', 14);
+define('FLIGHT_FLEET_NO_SLOTS', 15);
+define('FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES', 16);
+define('FLIGHT_SHIPS_NO_RECYCLERS', 17);
+define('FLIGHT_MISSION_SPY_NO_SPIES', 18);
+define('FLIGHT_SHIPS_NO_COLONIZER', 19);
+define('FLIGHT_MISSION_MISSILE_TOO_FAR', 20);
+define('FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE', 21);
+define('FLIGHT_RESOURCES_FUEL_NOT_ENOUGH', 22);
+define('FLIGHT_RESOURCES_NOT_ENOUGH', 23);
+define('FLIGHT_MISSION_ACS_NOT_EXISTS', 24);
+define('FLIGHT_MISSION_ACS_MISSTARGET', 25);
+define('FLIGHT_FLEET_SPEED_WRONG', 26);
+define('FLIGHT_MISSION_ACS_TOO_LATE', 27);
+define('FLIGHT_MISSION_ATTACK_BASHING', 28);
+define('FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY', 29);
+define('FLIGHT_MISSION_ACS_WRONG_TARGET', 30);
+define('FLIGHT_VECTOR_SAME_SOURCE', 31);
 define('FLIGHT_RESOURCES_FORBIDDEN', 32);
-define('FLIGHT_RESOURCES_EMPTY'   , 33);
-define('FLIGHT_SHIPS_NOT_ONLY_SPIES'       , 34);
-define('FLIGHT_FLEET_TOO_FAR'           , 35);
-define('FLIGHT_FLEET_OVERLOAD'        , 36);
-define('FLIGHT_MISSION_UNKNOWN'    , 37);
-define('FLIGHT_SHIPS_UNIT_WRONG'        , 38);
-define('FLIGHT_SHIPS_UNMOVABLE'        , 39);
-define('FLIGHT_SHIPS_NEGATIVE'  , 40);
+define('FLIGHT_RESOURCES_EMPTY', 33);
+define('FLIGHT_SHIPS_NOT_ONLY_SPIES', 34);
+define('FLIGHT_FLEET_TOO_FAR', 35);
+define('FLIGHT_FLEET_OVERLOAD', 36);
+define('FLIGHT_MISSION_UNKNOWN', 37);
+define('FLIGHT_SHIPS_UNIT_WRONG', 38);
+define('FLIGHT_SHIPS_UNMOVABLE', 39);
+define('FLIGHT_SHIPS_NEGATIVE', 40);
 define('FLIGHT_RESOURCES_NEGATIVE', 41);
 define('FLIGHT_MISSION_MORATORIUM', 42);
 define('FLIGHT_PLAYER_CHILD_PROTECTION', 43);
@@ -681,12 +681,12 @@ 
 
 
 // *** Races - Homeworlds
-define('RACE_NONE'    , 0);
-define('RACE_EARTH'   , 1);
-define('RACE_MOON'    , 2);
-define('RACE_MERCURY' , 3);
-define('RACE_VENUS'   , 4);
-define('RACE_MARS'    , 5);
+define('RACE_NONE', 0);
+define('RACE_EARTH', 1);
+define('RACE_MOON', 2);
+define('RACE_MERCURY', 3);
+define('RACE_VENUS', 4);
+define('RACE_MARS', 5);
 define('RACE_ASTEROID', 6);
 // define('MARKET_INFO'         , 7);
 
@@ -694,114 +694,114 @@ 
 
 // *** Market variables
 // === Market blocks
-define('MARKET_ENTRY'        , 0);
-define('MARKET_RESOURCES'    , 1);
-define('MARKET_SCRAPPER'     , 2);
-define('MARKET_STOCKMAN'     , 3);
-define('MARKET_EXCHANGE'     , 4);
-define('MARKET_BANKER'       , 5);
-define('MARKET_PAWNSHOP'     , 6);
-define('MARKET_INFO'         , 7);
+define('MARKET_ENTRY', 0);
+define('MARKET_RESOURCES', 1);
+define('MARKET_SCRAPPER', 2);
+define('MARKET_STOCKMAN', 3);
+define('MARKET_EXCHANGE', 4);
+define('MARKET_BANKER', 5);
+define('MARKET_PAWNSHOP', 6);
+define('MARKET_INFO', 7);
 
 // === Market error statuses
-define('MARKET_NOTHING'              ,  0);
-define('MARKET_DEAL'                 ,  1);
-define('MARKET_DEAL_TRADE'           ,  2);
-define('MARKET_NO_DM'                ,  3);
-define('MARKET_NO_RESOURCES'         ,  4);
-define('MARKET_ZERO_DEAL'            ,  5);
-define('MARKET_NO_SHIPS'             ,  6);
-define('MARKET_NOT_A_SHIP'           ,  7);
-define('MARKET_NO_STOCK'             ,  8);
-define('MARKET_ZERO_RES_STOCK'       ,  9);
-define('MARKET_NEGATIVE_SHIPS'       , 10);
-
-define('MARKET_INFO_PLAYER'          , 12);
-define('MARKET_INFO_WRONG'           , 11);
+define('MARKET_NOTHING', 0);
+define('MARKET_DEAL', 1);
+define('MARKET_DEAL_TRADE', 2);
+define('MARKET_NO_DM', 3);
+define('MARKET_NO_RESOURCES', 4);
+define('MARKET_ZERO_DEAL', 5);
+define('MARKET_NO_SHIPS', 6);
+define('MARKET_NOT_A_SHIP', 7);
+define('MARKET_NO_STOCK', 8);
+define('MARKET_ZERO_RES_STOCK', 9);
+define('MARKET_NEGATIVE_SHIPS', 10);
+
+define('MARKET_INFO_PLAYER', 12);
+define('MARKET_INFO_WRONG', 11);
 define('MARKET_INFO_PLAYER_NOT_FOUND', 13);
-define('MARKET_INFO_PLAYER_WRONG'    , 14);
-define('MARKET_INFO_PLAYER_SAME'     , 15);
+define('MARKET_INFO_PLAYER_WRONG', 14);
+define('MARKET_INFO_PLAYER_SAME', 15);
 
 
 
 
 // *** Mercenary/talent bonus types
-define('BONUS_NONE'    ,            0);  // No bonus
-define('BONUS_PERCENT' ,            1);  // Percent on base value
-define('BONUS_ADD'     ,            2);  // Add
-define('BONUS_ABILITY' ,            3);  // Some ability
-define('BONUS_MULTIPLY',            4);  // Multiply by value
-define('BONUS_PERCENT_CUMULATIVE' , 5);  // Cumulative percent on base value
-define('BONUS_PERCENT_DEGRADED' ,   6);  // Bonus amount degraded with increase as pow(bonus, level) (?)
-define('BONUS_SPEED',               7);  // Speed bonus
+define('BONUS_NONE', 0); // No bonus
+define('BONUS_PERCENT', 1); // Percent on base value
+define('BONUS_ADD', 2); // Add
+define('BONUS_ABILITY', 3); // Some ability
+define('BONUS_MULTIPLY', 4); // Multiply by value
+define('BONUS_PERCENT_CUMULATIVE', 5); // Cumulative percent on base value
+define('BONUS_PERCENT_DEGRADED', 6); // Bonus amount degraded with increase as pow(bonus, level) (?)
+define('BONUS_SPEED', 7); // Speed bonus
 
 // *** Action constant (build should be replaced with ACTION)
-define('BUILD_CREATE' ,  1);
+define('BUILD_CREATE', 1);
 define('BUILD_DESTROY', -1);
 define('BUILD_AUTOCONVERT', 2);
 
-define('ACTION_SELL'       , -1);
-define('ACTION_NOTHING'    ,  0);
-define('ACTION_BUY'        ,  1);
-define('ACTION_USE'        ,  2);
-define('ACTION_DELETE'     ,  3);
+define('ACTION_SELL', -1);
+define('ACTION_NOTHING', 0);
+define('ACTION_BUY', 1);
+define('ACTION_USE', 2);
+define('ACTION_DELETE', 3);
 
 // *** Check unit availability codes
-define('BUILD_ALLOWED'         , 0); // HARDCODED! DO NOT CHANGE!
+define('BUILD_ALLOWED', 0); // HARDCODED! DO NOT CHANGE!
 define('BUILD_REQUIRE_NOT_MEET', 1);
-define('BUILD_AMOUNT_WRONG'    , 2);
-define('BUILD_QUE_WRONG'       , 3);
-define('BUILD_QUE_UNIT_WRONG'  , 4);
-define('BUILD_INDESTRUCTABLE'  , 5);
-define('BUILD_NO_RESOURCES'    , 6);
-define('BUILD_NO_UNITS'        , 7);
-define('BUILD_UNIT_BUSY'       , 8);
-define('BUILD_QUE_FULL'        , 9);
-define('BUILD_SILO_FULL'       ,10);
-define('BUILD_MAX_REACHED'     ,11);
-define('BUILD_SECTORS_NONE'    ,12);
+define('BUILD_AMOUNT_WRONG', 2);
+define('BUILD_QUE_WRONG', 3);
+define('BUILD_QUE_UNIT_WRONG', 4);
+define('BUILD_INDESTRUCTABLE', 5);
+define('BUILD_NO_RESOURCES', 6);
+define('BUILD_NO_UNITS', 7);
+define('BUILD_UNIT_BUSY', 8);
+define('BUILD_QUE_FULL', 9);
+define('BUILD_SILO_FULL', 10);
+define('BUILD_MAX_REACHED', 11);
+define('BUILD_SECTORS_NONE', 12);
 define('BUILD_AUTOCONVERT_AVAILABLE', 13);
 
 
 // *** Que types
 define('QUE_STRUCTURES', 1);
-define('QUE_HANGAR'    , 4);
-define('QUE_RESEARCH'  , 7);
-define('QUE_MERCENARY' , 600); // UNIT_MERCENARIES
+define('QUE_HANGAR', 4);
+define('QUE_RESEARCH', 7);
+define('QUE_MERCENARY', 600); // UNIT_MERCENARIES
 // *** Subque types
-define('SUBQUE_PLANET'  , 1);
-define('SUBQUE_MOON'    , 3);
-define('SUBQUE_FLEET'   , 4);
-define('SUBQUE_DEFENSE' , 6);
+define('SUBQUE_PLANET', 1);
+define('SUBQUE_MOON', 3);
+define('SUBQUE_FLEET', 4);
+define('SUBQUE_DEFENSE', 6);
 define('SUBQUE_RESEARCH', 7);
 
 // *** Que items
-define('QI_UNIT_ID'   , 0);
-define('QI_AMOUNT'    , 1);
-define('QI_TIME'      , 2);
-define('QI_MODE'      , 3);
-define('QI_QUE_ID'    , 4);
-define('QI_QUE_TYPE'  , 4);
-define('QI_PLANET_ID' , 5);
+define('QI_UNIT_ID', 0);
+define('QI_AMOUNT', 1);
+define('QI_TIME', 2);
+define('QI_MODE', 3);
+define('QI_QUE_ID', 4);
+define('QI_QUE_TYPE', 4);
+define('QI_PLANET_ID', 5);
 
 
 // *** Units
 
 // *** Sort options
-define('SORT_ASCENDING' , 0);
+define('SORT_ASCENDING', 0);
 define('SORT_DESCENDING', 1);
 
-define('SORT_ID'             , 0);
-define('SORT_LOCATION'       , 1);
-define('SORT_NAME'           , 2);
-define('SORT_SIZE'           , 3);
-define('SORT_EMAIL'          , 4);
-define('SORT_IP'             , 5);
+define('SORT_ID', 0);
+define('SORT_LOCATION', 1);
+define('SORT_NAME', 2);
+define('SORT_SIZE', 3);
+define('SORT_EMAIL', 4);
+define('SORT_IP', 5);
 define('SORT_TIME_REGISTERED', 6);
 define('SORT_TIME_LAST_VISIT', 7);
-define('SORT_TIME_BAN_UNTIL' , 8);
-define('SORT_REFERRAL_COUNT' , 9);
-define('SORT_REFERRAL_DM'    , 10);
+define('SORT_TIME_BAN_UNTIL', 8);
+define('SORT_REFERRAL_COUNT', 9);
+define('SORT_REFERRAL_DM', 10);
 
 
 define('HULL_SIZE_TINY', 1);
@@ -944,10 +944,10 @@ 
 
 // === Artifacts
 define('UNIT_ARTIFACTS', 1000);
-define('ART_LHC', 1001);      // Additional moon chance
-define('ART_RCD_SMALL', 1002);   // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
-define('ART_RCD_MEDIUM', 1003);  // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
-define('ART_RCD_LARGE', 1004);   // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
+define('ART_LHC', 1001); // Additional moon chance
+define('ART_RCD_SMALL', 1002); // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
+define('ART_RCD_MEDIUM', 1003); // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
+define('ART_RCD_LARGE', 1004); // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
 define('ART_HEURISTIC_CHIP', 1005); // Speed up research
 define('ART_NANO_BUILDER', 1006); // Speed up building
 define('ART_NANO_CONSTRUCTOR', 1007); // RESERVED Speed up hangar constructions
@@ -1018,18 +1018,18 @@ 
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE1', 2201); // Блиц-сервер, участник 0-го раунда, 1-е место
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE2', 2202); // Блиц-сервер, участник 0-го раунда, 2-е место
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE3', 2203); // Блиц-сервер, участник 0-го раунда, 3-е место
-define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
+define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
 
 define('UNIT_AWARD_MEMORY', 2300); // Памятные знаки за существование и участие - например "4 года в игре". "Был онлайн в новогоднюю ночь 2013". итд
-define('UNIT_AWARD_MEMORY_IMMORTAL', 2301);  // Бессмертный
-define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
+define('UNIT_AWARD_MEMORY_IMMORTAL', 2301); // Бессмертный
+define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
 define('UNIT_AWARD_MEMORY_BLITZ_R0', 2303); // Блиц-сервер, участник 0-го раунда
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SIMPLE', 2304); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_BRONZE', 2305); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SILVER', 2306); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_GOLD', 2307); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_PLATINUM', 2308); // День Рождения СН
-define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
+define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
 
 define('UNIT_AWARD_PENNANT', 2400); // Переходящий вымпел - индикация статуса на сервере: "Топ-1", "Топ", "Сабтоп", "Самый большой флот" итд
 define('UNIT_AWARD_BADGE', 2600); // Бейджики/значки за ачивки - например, "Построил 1000 кораблей"
@@ -1126,7 +1126,7 @@ 
 
 define('UNIT_NEXT', 4000); // !!! Next unit start on 4000 !!!
 
-define('GROUP_PART',         800000);
+define('GROUP_PART', 800000);
 // Зарезервировано для запчастей: 800.001 - 899.999
 // define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
 // define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
@@ -1383,32 +1383,32 @@ 
 
 
 // define('NICK_ID',               -1);
-define('NICK_HTML',              0);
-
-define('NICK_FIRST',             1);
-define('NICK_RACE',           1000);
-define('NICK_GENDER',         2000);
-define('NICK_AWARD',          3000);
-define('NICK_VACATION',       3500);
-define('NICK_BIRTHSDAY',      4000);
-define('NICK_PREMIUM',        5000);
-define('NICK_AUTH_LEVEL',     6000);
-
-define('NICK_HIGHLIGHT',      6300);
-define('NICK_CLASS',          6450);
-
-define('NICK_NICK_CLASS',     6600);
-define('NICK_NICK',           7000);
+define('NICK_HTML', 0);
+
+define('NICK_FIRST', 1);
+define('NICK_RACE', 1000);
+define('NICK_GENDER', 2000);
+define('NICK_AWARD', 3000);
+define('NICK_VACATION', 3500);
+define('NICK_BIRTHSDAY', 4000);
+define('NICK_PREMIUM', 5000);
+define('NICK_AUTH_LEVEL', 6000);
+
+define('NICK_HIGHLIGHT', 6300);
+define('NICK_CLASS', 6450);
+
+define('NICK_NICK_CLASS', 6600);
+define('NICK_NICK', 7000);
 define('NICK_NICK_CLASS_END', 7300);
 
-define('NICK_ALLY_CLASS',     7600);
-define('NICK_ALLY',           8000);
+define('NICK_ALLY_CLASS', 7600);
+define('NICK_ALLY', 8000);
 define('NICK_ALLY_CLASS_END', 8300);
 
-define('NICK_CLASS_END',      8450);
-define('NICK_HIGHLIGHT_END',  8600);
+define('NICK_CLASS_END', 8450);
+define('NICK_HIGHLIGHT_END', 8600);
 
-define('NICK_LAST',           9999);
+define('NICK_LAST', 9999);
 
 // Настройки игрока
 define('PLAYER_OPTION_MENU_SORT', 1);
@@ -1501,8 +1501,8 @@ 
 define('LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10', 1);
 
 define('BLITZ_REGISTER_DISABLED', 0);
-define('BLITZ_REGISTER_OPEN'    , 1);
-define('BLITZ_REGISTER_CLOSED'  , 2);
+define('BLITZ_REGISTER_OPEN', 1);
+define('BLITZ_REGISTER_CLOSED', 2);
 define('BLITZ_REGISTER_SHOW_LOGIN', 3);
 define('BLITZ_REGISTER_DISCLOSURE_NAMES', 4);