supernova-ws / SuperNova

includes/init.php

Spacing +32 added lines, -33 removed lines

@@ -9,7 +9,7 @@ 
 use Player\playerTimeDiff;
 
 // Защита от двойного инита
-if(defined('INIT')) {
+if (defined('INIT')) {
   return;
 }
 
@@ -24,13 +24,13 @@ 
 !defined('INSTALL') && define('INSTALL', false);
 !defined('IN_PHPBB') && define('IN_PHPBB', true);
 
-call_user_func(function () {
+call_user_func(function() {
   if (file_exists($fileName = realpath(__DIR__ . '/../.env.ini'))) {
     define('SN_ENV_PROD', 'production');
     define('SN_ENV_DEV', 'development');
 
     if (($ini = @parse_ini_file($fileName)) !== false) {
-      if (!empty($ini['SN_ENV']) && in_array($envName = $ini['SN_ENV'], [SN_ENV_DEV, SN_ENV_PROD,])) {
+      if (!empty($ini['SN_ENV']) && in_array($envName = $ini['SN_ENV'], [SN_ENV_DEV, SN_ENV_PROD, ])) {
         define('SN_ENV', $envName);
       } else {
         define('SN_ENV', SN_ENV_PROD);
@@ -62,8 +62,7 @@ 
 
 // Detecting if we are under Google's eye - domain is prefixed with `google.`
 $_server_server_name =
-  isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] :
-    (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '');
+  isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '');
 if (substr(strtolower($_server_server_name), 0, 7) === 'google.') {
   define('SN_GOOGLE', true);
 } else {
@@ -73,7 +72,7 @@ 
 // Instancing
 // If server name contains port - replacing : with _ - servers on different ports are different instances
 $instanceName = str_replace(':', '_', $_server_server_name);
-if(SN_GOOGLE) {
+if (SN_GOOGLE) {
   $instanceName = substr($instanceName, 7);
 }
 $instancePath = 'servers/' . $instanceName . '/';
@@ -214,40 +213,40 @@ 
 // Но нужно, пока у нас есть не MVC-страницы
 $sn_page_data      = $sn_mvc['pages'][$sn_page_name];
 $sn_page_name_file = 'includes/pages/' . $sn_page_data['filename'] . DOT_PHP_EX;
-if($sn_page_name) {
+if ($sn_page_name) {
   // Merging page options to global option pull
-  if(is_array($sn_page_data['options'])) {
+  if (is_array($sn_page_data['options'])) {
     SN::$options = array_merge(SN::$options, $sn_page_data['options']);
   }
 
-  if(isset($sn_page_data) && file_exists($sn_page_name_file)) {
+  if (isset($sn_page_data) && file_exists($sn_page_name_file)) {
     require_once($sn_page_name_file);
   }
 }
 
-if((defined('IN_AJAX') && IN_AJAX === true) || (defined('IN_ADMIN') && IN_ADMIN === true) || (!empty(SN::$options[PAGE_OPTION_ADMIN]))) {
+if ((defined('IN_AJAX') && IN_AJAX === true) || (defined('IN_ADMIN') && IN_ADMIN === true) || (!empty(SN::$options[PAGE_OPTION_ADMIN]))) {
   SN::$options[PAGE_OPTION_FLEET_UPDATE_SKIP] = true;
 }
 
 
 // А теперь проверяем - поддерживают ли у нас загруженный код такую страницу
 // TODO - костыль, что бы работали старые модули. Убрать!
-if(is_array($sn_data['pages'])) {
+if (is_array($sn_data['pages'])) {
   $sn_mvc['pages'] = array_merge($sn_mvc['pages'], $sn_data['pages']);
 }
-if(!isset($sn_mvc['pages'][$sn_page_name])) {
+if (!isset($sn_mvc['pages'][$sn_page_name])) {
   $sn_page_name = '';
 }
 
 $lang->lng_switch(sys_get_param_str('lang'));
 
 
-if(SN::$config->server_updater_check_auto && SN::$config->server_updater_check_last + SN::$config->server_updater_check_period <= SN_TIME_NOW) {
+if (SN::$config->server_updater_check_auto && SN::$config->server_updater_check_last + SN::$config->server_updater_check_period <= SN_TIME_NOW) {
   VersionCheckerDeprecated::performCheckVersion();
 }
 
 SN::$gc->watchdog->register(new TaskDispatchFleets(), TaskDispatchFleets::class);
-SN::$gc->worker->registerWorker('dispatchFleets', function () {
+SN::$gc->worker->registerWorker('dispatchFleets', function() {
   \Core\Worker::detachIncomingRequest();
 
   $result = SN::$gc->fleetDispatcher->flt_flying_fleet_handler();
@@ -270,16 +269,16 @@ 
   die(json_encode($result));
 }
 
-if(SN::$config->user_birthday_gift && SN_TIME_NOW - SN::$config->user_birthday_celebrate > PERIOD_DAY) {
+if (SN::$config->user_birthday_gift && SN_TIME_NOW - SN::$config->user_birthday_celebrate > PERIOD_DAY) {
   require_once(SN_ROOT_PHYSICAL . 'includes/includes/user_birthday_celebrate.php');
   sn_user_birthday_celebrate();
 }
 
-if(!SN::$config->var_online_user_count || SN::$config->var_online_user_time + SN::$config->game_users_update_online < SN_TIME_NOW) {
+if (!SN::$config->var_online_user_count || SN::$config->var_online_user_time + SN::$config->game_users_update_online < SN_TIME_NOW) {
   dbUpdateUsersCount(db_user_count());
   dbUpdateUsersOnline(db_user_count(true));
   SN::$config->pass()->var_online_user_time = SN_TIME_NOW;
-  if(SN::$config->server_log_online) {
+  if (SN::$config->server_log_online) {
     /** @noinspection SqlResolve */
     doquery("INSERT IGNORE INTO `{{log_users_online}}` SET online_count = " . SN::$config->var_online_user_count . ";");
   }
@@ -303,7 +302,7 @@ 
 
 $template_result[F_ACCOUNT_IS_AUTHORIZED] = SN::$sys_user_logged_in = !empty($user) && isset($user['id']) && $user['id'];
 
-if(!empty($user['id'])) {
+if (!empty($user['id'])) {
   SN::$user_options->user_change($user['id']);
 }
 
@@ -316,7 +315,7 @@ 
         : false
       );
 
-if($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
+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));
@@ -324,7 +323,7 @@ 
 }
 
 
-if(defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
+if (defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
   pdump('Отключи отладку перед продакшном!');
 }
 
@@ -339,11 +338,11 @@ 
 // TODO - to scheduler
 StatUpdateLauncher::unlock();
 
-if(!empty($_GET['admin_http_key']) && $_GET['admin_http_key'] == $config->admin_http_key) {
+if (!empty($_GET['admin_http_key']) && $_GET['admin_http_key'] == $config->admin_http_key) {
   define('IN_API', true);
 }
 
-if($template_result[F_GAME_DISABLE] = SN::$config->game_disable) {
+if ($template_result[F_GAME_DISABLE] = SN::$config->game_disable) {
   $template_result[F_GAME_DISABLE_REASON] = HelperString::nl2br(
     SN::$config->game_disable == GAME_DISABLE_REASON
       ? SN::$config->game_disable_reason
@@ -352,33 +351,33 @@ 
 
   // For API - just skipping all checks
   // TODO: That is ideologically wrong and should be redone
-  if(defined('IN_API')) {
+  if (defined('IN_API')) {
     return;
   }
 
   // Actions for install mode
-  if(defined('INSTALL_MODE') && INSTALL_MODE) {
+  if (defined('INSTALL_MODE') && INSTALL_MODE) {
     // Handling log out - should work even in install mode
-    if(strtolower(INITIAL_PAGE) === 'logout') {
+    if (strtolower(INITIAL_PAGE) === 'logout') {
       SN::$auth->logout(true);
       die();
     }
 
     // If user not logged in AND we are not on login page - redirect user there
-    if(!SN::$sys_user_logged_in && !defined('LOGIN_LOGOUT')) {
+    if (!SN::$sys_user_logged_in && !defined('LOGIN_LOGOUT')) {
       header('Location: login.php');
       die();
     }
 
     // If user is type of admin AND in user pages - redirecting him to admin interface
     // You really shouldn't mess in user interface until game not configured!
-    if($user['authlevel'] >= 1 && !defined('IN_ADMIN')) {
+    if ($user['authlevel'] >= 1 && !defined('IN_ADMIN')) {
       header('Location: ' . SN_ROOT_VIRTUAL_PARENT . 'admin/overview.php');
       die();
     }
   }
 
-  if(
+  if (
     ($user['authlevel'] < 1 || !(defined('IN_ADMIN') && IN_ADMIN))
     &&
     !(defined('INSTALL_MODE') && defined('LOGIN_LOGOUT'))
@@ -394,8 +393,8 @@ 
 // TODO ban
 // TODO $skip_ban_check
 global $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;
   }
 
@@ -410,10 +409,10 @@ 
 $allow_anonymous = $allow_anonymous || (isset($sn_page_data['allow_anonymous']) && $sn_page_data['allow_anonymous']);
 
 
-if(SN::$sys_user_logged_in && INITIAL_PAGE == 'login') {
+if (SN::$sys_user_logged_in && INITIAL_PAGE == 'login') {
   sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
-} elseif($account_logged_in && !SN::$sys_user_logged_in) { // empty(core_auth::$user['id'])
-} elseif(!$allow_anonymous && !SN::$sys_user_logged_in && !defined('IN_API')) {
+} elseif ($account_logged_in && !SN::$sys_user_logged_in) { // empty(core_auth::$user['id'])
+} elseif (!$allow_anonymous && !SN::$sys_user_logged_in && !defined('IN_API')) {
   sys_redirect(SN_ROOT_VIRTUAL . 'login.php');
 }
 

includes/vars.php

Spacing +34 added lines, -34 removed lines

@@ -35,9 +35,9 @@ 
 //    'chat'     => ['sn_chat_model'],
 //    'chat_add' => ['sn_chat_add_model'],
     /** @see Chat::chatModel() */
-    'chat'     => [Chat::class  . '::' . 'chatModel'],
+    'chat'     => [Chat::class . '::' . 'chatModel'],
     /** @see Chat::chatAddModel() */
-    'chat_add' => [Chat::class  . '::' . 'chatAddModel'],
+    'chat_add' => [Chat::class . '::' . 'chatAddModel'],
 
     /** @see PageImperium::modelStatic() */
     'imperium' => [PageImperium::class . '::' . 'modelStatic'],
@@ -55,11 +55,11 @@ 
 //    'chat'          => ['sn_chat_view'],
 //    'chat_msg'      => ['sn_chat_msg_view'],
     /** @see Chat::chatView() */
-    'chat'          => [Chat::class  . '::' . 'chatView'],
+    'chat'          => [Chat::class . '::' . 'chatView'],
     /** @see Chat::chatMsgView() */
-    'chat_msg'      => [Chat::class  . '::' . 'chatMsgView'],
+    'chat_msg'      => [Chat::class . '::' . 'chatMsgView'],
     /** @see Chat::chatFrameView() */
-    'chat_frame'      => [Chat::class  . '::' . 'chatFrameView'],
+    'chat_frame'      => [Chat::class . '::' . 'chatFrameView'],
 
     'battle_report' => ['sn_battle_report_view'],
     'contact'       => ['sn_contact_view'],
@@ -617,29 +617,29 @@ 
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_FLEET,
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
         P_CHANCE                               => 200,
-        'percent'                              => [0 => 0.1, 1 => 0.02, 2 => 0.01,],
+        'percent'                              => [0 => 0.1, 1 => 0.02, 2 => 0.01, ],
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
-          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2,],
-          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1,],
-          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0,],
+          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2, ],
+          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1, ],
+          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0, ],
         ],
       ],
       FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES => [
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES,
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
         P_CHANCE                               => 300,
-        'percent'                              => [0 => 0.1, 1 => 0.050, 2 => 0.025,],
+        'percent'                              => [0 => 0.1, 1 => 0.050, 2 => 0.025, ],
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
-          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2,],
-          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1,],
-          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0,],
+          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2, ],
+          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1, ],
+          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0, ],
         ],
       ],
       FLT_EXPEDITION_OUTCOME_FOUND_DM        => [
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_DM,
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
         P_CHANCE                               => 100,
-        'percent'                              => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010,],
+        'percent'                              => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010, ],
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
           [P_CHANCE => 90, P_MULTIPLIER => 0.0010, /*P_MESSAGE_ID => 2,*/],
           [P_CHANCE => 9, P_MULTIPLIER => 0.0040, /*P_MESSAGE_ID => 1,*/],
@@ -674,14 +674,14 @@ 
     ],
 
     'planet_generator' => [
-      0  => [ // HomeWorld
+      0  => [// HomeWorld
         't_max_min'     => 40, // Tmax 40
         't_max_max'     => 40,
         't_delta_min'   => 40, // Tmin 0
         't_delta_max'   => 40,
         'size_min'      => $config->initial_fields,
         'size_max'      => $config->initial_fields,
-        'core_types'    => [PLANET_DENSITY_STANDARD,],
+        'core_types'    => [PLANET_DENSITY_STANDARD, ],
         'planet_images' => ['normaltemp'],
       ],
       1  => [
@@ -911,7 +911,7 @@ 
         ],
         'planet_images' => ['eis'],
       ],
-      16 => [ // Random planet - stranger; -35 avg
+      16 => [// Random planet - stranger; -35 avg
         't_max_min'     => -90,
         't_max_max'     => +40,
         't_delta_min'   => 2,
@@ -931,7 +931,7 @@ 
           PLANET_DENSITY_METAL_PERIDOT,
           PLANET_DENSITY_METAL_RAW,
         ],
-        'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis',],
+        'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis', ],
       ],
     ],
 
@@ -954,7 +954,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_HYDROGEN,
         UNIT_PLANET_DENSITY_RARITY        => 30, // 1, // 40.00, // * 1/121 0,82645
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES                    => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ],
@@ -963,7 +963,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_METHANE,
         UNIT_PLANET_DENSITY_RARITY        => 130, // 6, // 6.67, // * 6,0	4,95868
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES                    => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ],
@@ -972,7 +972,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_WATER,
         UNIT_PLANET_DENSITY_RARITY        => 450, //20, // 2.00, // * 20,0	16,52893
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES                    => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -982,7 +982,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_RAW,
         UNIT_PLANET_DENSITY_RARITY        => 20, // 1, // 40.00, // *1,0	0,82645
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES                    => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ],
@@ -991,7 +991,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_SILICATE,
         UNIT_PLANET_DENSITY_RARITY        => 140, // 5.71, // * 7,0	5,78512
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES                    => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ],
@@ -1000,7 +1000,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_STONE,
         UNIT_PLANET_DENSITY_RARITY        => 500, // 1.90, // * 21,0	17,35537
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES                    => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -1010,7 +1010,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_STANDARD,
         UNIT_PLANET_DENSITY_RARITY        => 1000, // 1.0, // * 40,0	33,05785
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_NORMAL,
-        UNIT_RESOURCES                    => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00,],
+        UNIT_RESOURCES                    => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -1020,7 +1020,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_ORE,
         UNIT_PLANET_DENSITY_RARITY        => 550, // 2.11, // * 19,0	15,70248
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES                    => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80,],
+        UNIT_RESOURCES                    => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -1029,7 +1029,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_PERIDOT,
         UNIT_PLANET_DENSITY_RARITY        => 120, // 8.00, // * 5,0	4,13223
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES                    => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55,],
+        UNIT_RESOURCES                    => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ],
@@ -1038,7 +1038,7 @@ 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_RAW,
         UNIT_PLANET_DENSITY_RARITY        => 25, // 40.00, // * 1,0	0,82645
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES                    => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25,],
+        UNIT_RESOURCES                    => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ],
@@ -1215,7 +1215,7 @@ 
     ],
 
     // Missiles list
-    UNIT_DEF_MISSILES_STR => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,],
+    UNIT_DEF_MISSILES_STR => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET, ],
 
     // Combat units list
     'combat'             => [
@@ -1264,7 +1264,7 @@ 
     // Resource list
     UNIT_RESOURCES_STR      => [0 => 'metal', 1 => 'crystal', 2 => 'deuterium', 3 => 'dark_matter'],
     // Resources all
-    'resources_all'         => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER,],
+    'resources_all'         => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER, ],
     // Resources can be produced on planet
     'resources_planet'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY],
     // Resources can be looted from planet
@@ -1283,13 +1283,13 @@ 
     ],
 
     // Resources that can be tradeable in market trader AND be a quest_rewards
-    'quest_rewards'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER,],
+    'quest_rewards'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER, ],
 
 //      // Ques list
 //      'ques' => array(QUE_STRUCTURES, QUE_HANGAR, QUE_RESEARCH),
 
-    'STAT_COMMON' => [STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE,],
-    'STAT_PLAYER' => [STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID,],
+    'STAT_COMMON' => [STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE, ],
+    'STAT_PLAYER' => [STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID, ],
 
     GROUP_GROUP_ID_TO_NAMES => [
       UNIT_STRUCTURES   => 'structures',
@@ -1303,7 +1303,7 @@ 
       UNIT_PLANS        => 'plans',
     ],
 
-    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet',],
+    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet', ],
 
     GROUP_UNIT_COMBAT_SORT_ORDER => [
       SHIP_SPY,

flotenajax.php

Spacing +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
 //$ships_sent_js = array();
 $ships_sent_js = 0;
 foreach ($fleet_array as $unit_id => $unit_count) {
-  $ships_sent[]  = "{$unit_count} {$lang['tech'][$unit_id]}";
+  $ships_sent[] = "{$unit_count} {$lang['tech'][$unit_id]}";
   $ships_sent_js += mrc_get_level($user, $planetrow, $unit_id, false, true);
 }
 $ships_sent = implode(', ', $ships_sent);

classes/StatUpdateLauncher.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
         $config->pass()->game_disable = GAME_DISABLE_STAT;
 
         $statMinimalInterval = intval($config->pass()->stats_minimal_interval);
-        $config->pass()->var_stat_update_end= date(FMT_DATE_TIME_SQL, SN_TIME_NOW + ($statMinimalInterval ? $statMinimalInterval : STATS_RUN_INTERVAL_MINIMUM));
+        $config->pass()->var_stat_update_end = date(FMT_DATE_TIME_SQL, SN_TIME_NOW + ($statMinimalInterval ? $statMinimalInterval : STATS_RUN_INTERVAL_MINIMUM));
         $config->pass()->var_stat_update_msg = 'Update started';
         db_mysql::db_transaction_commit();
 

classes/RequestInfo.php

Spacing +3 added lines, -3 removed lines

@@ -124,15 +124,15 @@
     db_mysql::db_transaction_commit();
 
     $this->user_agent = !empty($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
-    $this->browser_id = db_get_set_unique_id_value('security_browser', 'browser_id', ['browser_user_agent' => $this->user_agent,]);
+    $this->browser_id = db_get_set_unique_id_value('security_browser', 'browser_id', ['browser_user_agent' => $this->user_agent, ]);
 
     $this->page_address    = substr($_SERVER['PHP_SELF'], strlen(SN_ROOT_RELATIVE));
-    $this->page_address_id = db_get_set_unique_id_value('security_url', 'url_id', ['url_string' => $this->page_address,]);
+    $this->page_address_id = db_get_set_unique_id_value('security_url', 'url_id', ['url_string' => $this->page_address, ]);
 
     // Not a simulator - because it can have loooooong string
     if (strpos($_SERVER['REQUEST_URI'], '/simulator.php') !== 0 && !$skip_log_query) {
       $this->queryString = !empty($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
-      $this->queryStringId = db_get_set_unique_id_value('security_query_strings', 'id', ['query_string' => $this->queryString,]);
+      $this->queryStringId = db_get_set_unique_id_value('security_query_strings', 'id', ['query_string' => $this->queryString, ]);
     }
 
     $ip                      = sec_player_ip();

classes/core_auth.php

Spacing +3 added lines, -3 removed lines

@@ -161,7 +161,7 @@ 
     self::$db = SN::$db;
 
     self::$device             = new RequestInfo();
-    $this->is_player_register = (bool)sys_get_param('player_register');
+    $this->is_player_register = (bool) sys_get_param('player_register');
     $this->partner_id         = sys_get_param_int('id_ref', sys_get_param_int('partner_id'));
     $this->server_name        = sys_get_param_str_unsafe('server_name', SN_ROOT_VIRTUAL);
 
@@ -239,7 +239,7 @@ 
       );
 
     if ($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
-      $prohibited_characters                      = array_map(function ($value) {
+      $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);
@@ -700,7 +700,7 @@ 
       }
 
       /** @noinspection SpellCheckingInspection */
-      $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'];

classes/debug.php

Spacing +8 added lines, -12 removed lines

@@ -156,7 +156,7 @@ 
       $filtered = array_slice($filtered, -$onlyLastX);
     }
 
-    return [$raw, $filtered,];
+    return [$raw, $filtered, ];
   }
 
   /**
@@ -235,8 +235,7 @@ 
       foreach ($error_backtrace['cSN_data'] as &$location) {
         foreach ($location as $location_id => &$location_data) //          $location_data = $location_id;
         {
-          $location_data = isset($location_data['username']) ? $location_data['username'] :
-            (isset($location_data['name']) ? $location_data['name'] : $location_id);
+          $location_data = isset($location_data['username']) ? $location_data['username'] : (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
       }
     }
@@ -405,16 +404,16 @@ 
     $dumper = mt_rand(10, 99) . '|' . $varname;
   }
 
-  $type   = gettype($value);
+  $type = gettype($value);
   $dumper .= $type;
 
   if ($type == 'string') {
     $dumper .= '(' . strlen($value) . ')';
-    $value  = dump($value, '', -1);
+    $value = dump($value, '', -1);
   } elseif ($type == 'boolean') {
     $value = ($value ? 'true' : 'false');
   } elseif ($type == 'object') {
-    $props  = get_class_vars(get_class($value));
+    $props = get_class_vars(get_class($value));
     $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
     foreach ($props as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
@@ -524,12 +523,9 @@ 
     foreach (func_get_args() ?: [] as $var) {
       print "<pre>";
       print_r(
-        $var === null ? 'null' :
-          (($type = gettype($var)) == 'object' || $type == 'array'
-            ? $var :
-            ($type === 'string'
-              ? $type . '(' . strlen($var) . ') `' . $var . '`' :
-              ($type == 'boolean'
+        $var === null ? 'null' : (($type = gettype($var)) == 'object' || $type == 'array'
+            ? $var : ($type === 'string'
+              ? $type . '(' . strlen($var) . ') `' . $var . '`' : ($type == 'boolean'
                 ? ($var ? 'true' : 'false')
                 : $type . ' ' . print_r($var, true)
               )

Braces +3 added lines, -1 removed lines

@@ -233,11 +233,13 @@
     if ($deadlock && ($q = SN::$db->mysql_get_innodb_status())) {
       $error_backtrace['deadlock'] = explode("\n", $q['Status']);
       foreach ($error_backtrace['cSN_data'] as &$location) {
-        foreach ($location as $location_id => &$location_data) //          $location_data = $location_id;
+        foreach ($location as $location_id => &$location_data) {
+          //          $location_data = $location_id;
         {
           $location_data = isset($location_data['username']) ? $location_data['username'] :
             (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
+        }
       }
     }
 

classes/Player/PlayerStatic.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 
     if (!empty($TheUser['ally_id'])) {
       /** @noinspection SqlResolve */
-      $TheAlly                 = doquery("SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';", '', true);
+      $TheAlly = doquery("SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';", '', true);
       $TheAlly['ally_members'] -= 1;
       /** @noinspection SqlResolve */
       doquery("UPDATE `{{alliance}}` SET `ally_members` = '" . $TheAlly['ally_members'] . "' WHERE `id` = '" . $TheAlly['id'] . "';");

classes/BanHammer.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
    * @return array[]|object[]
    */
   public static function getByIpV4($ipV4, $isExpired = self::EXPIRED_NOT) {
-    $ipV4 = !is_numeric($ipV4) ? ip2long($ipV4) : (integer)$ipV4;
+    $ipV4 = !is_numeric($ipV4) ? ip2long($ipV4) : (integer) $ipV4;
 
     $sqlArray = [
       "SELECT *, INET_NTOA(`ipv4_from`) as ipv4_from_string, INET_NTOA(`ipv4_to`) as ipv4_to_string