supernova-ws / SuperNova

classes/classConfig.php

Spacing +24 added lines, -24 removed lines

@@ -170,9 +170,9 @@ 
     'advGoogleLeftMenuCode'        => '(Place here code for banner)',
 
     // Alliance bonus calculations
-    'ali_bonus_algorithm'          => 0,  // Bonus calculation algorithm
+    'ali_bonus_algorithm'          => 0, // Bonus calculation algorithm
     'ali_bonus_brackets'           => 10, // Brackets count for ALI_BONUS_BY_RANK
-    'ali_bonus_brackets_divisor'   => 10,// Bonus divisor for ALI_BONUS_BY_RANK
+    'ali_bonus_brackets_divisor'   => 10, // Bonus divisor for ALI_BONUS_BY_RANK
     'ali_bonus_divisor'            => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS
     'ali_bonus_members'            => 10, // Minimum alliance size to start using bonus
 
@@ -214,7 +214,7 @@ 
 
     'eco_scale_storage'            => 1,
     'eco_stockman_fleet'           => '', // Black Market - Starting amount of s/h ship merchant to sell
-    'eco_stockman_fleet_populate'  => 1,  // Populate empty Stockman fleet with ships or not
+    'eco_stockman_fleet_populate'  => 1, // Populate empty Stockman fleet with ships or not
     'empire_mercenary_base_period' => PERIOD_MONTH, // Base
     'empire_mercenary_temporary'   => 0, // Temporary empire-wide mercenaries
 
@@ -225,11 +225,11 @@ 
     'energy_basic_income'          => 0,
 
     // Bashing protection settings
-    'fleet_bashing_attacks'        => 3,      // Max amount of attack per wave - 3 by default
-    'fleet_bashing_interval'       => 1800,   // Maximum interval between attacks when they still count as one wave - 30m by default
-    'fleet_bashing_scope'          => 86400,  // Interval on which bashing waves counts - 24h by default
-    'fleet_bashing_war_delay'      => 43200,  // Delay before start bashing after declaring war to alliance - 12h by default
-    'fleet_bashing_waves'          => 3,      // Max amount of waves per day - 3 by default
+    'fleet_bashing_attacks'        => 3, // Max amount of attack per wave - 3 by default
+    'fleet_bashing_interval'       => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default
+    'fleet_bashing_scope'          => 86400, // Interval on which bashing waves counts - 24h by default
+    'fleet_bashing_war_delay'      => 43200, // Delay before start bashing after declaring war to alliance - 12h by default
+    'fleet_bashing_waves'          => 3, // Max amount of waves per day - 3 by default
 
     'Fleet_Cdr'   => 30,
     'fleet_speed' => 1,
@@ -237,8 +237,8 @@ 
     'fleet_update_interval' => 4,
     'fleet_update_lock'     => '', // SQL time when lock was acquired
 
-    'game_adminEmail'       => 'root@localhost',    // Admin's email to show to users
-    'game_counter'          => 0,  // Does built-in page hit counter is on?
+    'game_adminEmail'       => 'root@localhost', // Admin's email to show to users
+    'game_counter'          => 0, // Does built-in page hit counter is on?
     // Defaults
     'game_default_language' => 'ru',
     'game_default_skin'     => 'skins/EpicBlue/',
@@ -252,14 +252,14 @@ 
     'game_maxSystem'      => 199,
     'game_maxPlanet'      => 15,
     // Game global settings
-    'game_mode'           => 0,           // 0 - SuperNova, 1 - oGame
+    'game_mode'           => 0, // 0 - SuperNova, 1 - oGame
     'game_name'           => 'SuperNova', // Server name (would be on banners and on top of left menu)
 
     'game_news_actual'        => PERIOD_DAY_3, // How long announcement would be marked as "New". In seconds. Default - 3 days
-    'game_news_overview'      => 3,    // How much last news to show in Overview page
-    'game_news_overview_show' => PERIOD_WEEK_2,    // How long news will be shown in Overview page in seconds. Default - 2 weeks
+    'game_news_overview'      => 3, // How much last news to show in Overview page
+    'game_news_overview_show' => PERIOD_WEEK_2, // How long news will be shown in Overview page in seconds. Default - 2 weeks
     // Noob protection
-    'game_noob_factor'        => 5,    // Multiplier to divide "stronger" and "weaker" users
+    'game_noob_factor'        => 5, // Multiplier to divide "stronger" and "weaker" users
     'game_noob_points'        => 5000, // Below this point user threated as noob. 0 to disable
 
     'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccounts)
@@ -313,12 +313,12 @@ 
     'payment_currency_exchange_wmu' => 30,
     'payment_currency_exchange_wmz' => 1,
 
-    'payment_lot_price' => 1,     // Lot price in default currency
-    'payment_lot_size'  => 2500,  // Lot size. Also service as minimum amount of DM that could be bought with one transaction
+    'payment_lot_price' => 1, // Lot price in default currency
+    'payment_lot_size'  => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction
 
     'planet_capital_cost'          => 25000, // Cost in DM to move Capital to current planet
-    'planet_capital_mining_rate'   => 2.0,   // Capital Mining rates
-    'planet_capital_building_rate' => 2.0,   // Capital Building rates
+    'planet_capital_mining_rate'   => 2.0, // Capital Mining rates
+    'planet_capital_building_rate' => 2.0, // Capital Building rates
     'planet_teleport_cost'         => 50000, // Cost of planet teleportation
     'planet_teleport_timeout'      => 86400, // Timeout for next teleportation
 
@@ -340,7 +340,7 @@ 
     'resource_multiplier'     => 1,
 
     //Roleplay system
-    'rpg_bonus_divisor'       => 10,    // Amount of DM referral shoud get for partner have 1 DM bonus
+    'rpg_bonus_divisor'       => 10, // Amount of DM referral shoud get for partner have 1 DM bonus
     'rpg_bonus_minimum'       => 10000, // Minimum DM ammount for starting paying bonuses to affiliate
 
     // Black Market - General
@@ -405,12 +405,12 @@ 
     'url_purchase_metamatter' => '',
     'url_rules'               => '',
 
-    'users_amount'              => 1,                // Total users count
+    'users_amount'              => 1, // Total users count
     'game_users_online_timeout' => PERIOD_MINUTE_15, // Seconds, How long user should considered ONLINE for online counter
-    'game_users_update_online'  => 30,               // How often user online should be refreshed (seconds)
-    'var_online_user_time'      => 0,                // When last time user online was refreshed
-    'var_online_user_count'     => 0,                // Last calculated online user count
-    'server_log_online'         => 0,                // Log online user count
+    'game_users_update_online'  => 30, // How often user online should be refreshed (seconds)
+    'var_online_user_time'      => 0, // When last time user online was refreshed
+    'var_online_user_count'     => 0, // Last calculated online user count
+    'server_log_online'         => 0, // Log online user count
 
     'user_birthday_celebrate' => 0, // When last time celebrations (i.e. giftgiving) was made
     'user_birthday_gift'      => 0, // User birthday gift

includes/init.php

Spacing +23 added lines, -23 removed lines

@@ -4,7 +4,7 @@ 
 use Player\playerTimeDiff;
 
 // Защита от двойного инита
-if(defined('INIT')) {
+if (defined('INIT')) {
   return;
 }
 
@@ -124,48 +124,48 @@ 
 // Но нужно, пока у нас есть не 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) {
   \Common\Tools\VersionCheckerDeprecated::performCheckVersion();
 }
 
-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) {
     doquery("INSERT IGNORE INTO `{{log_users_online}}` SET online_count = " . SN::$config->var_online_user_count . ";");
   }
 }
@@ -188,7 +188,7 @@ 
 
 $template_result[F_ACCOUNT_IS_AUTHORIZED] = $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']);
 }
 
@@ -201,7 +201,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));
@@ -209,7 +209,7 @@ 
 }
 
 
-if(defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
+if (defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
   pdump('Отключи отладку перед продакшном!');
 }
 
@@ -223,17 +223,17 @@ 
 
 StatUpdateLauncher::unlock();
 
-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
       : $lang['sys_game_disable_reason'][SN::$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'))
@@ -248,8 +248,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;
   }
 
@@ -263,10 +263,10 @@ 
 $allow_anonymous = $allow_anonymous || (isset($sn_page_data['allow_anonymous']) && $sn_page_data['allow_anonymous']);
 
 
-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(!$allow_anonymous && !$sys_user_logged_in) {
+} elseif ($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
+} elseif (!$allow_anonymous && !$sys_user_logged_in) {
   sys_redirect(SN_ROOT_VIRTUAL . 'login.php');
 }
 
@@ -289,7 +289,7 @@ 
   'fleet_update_last',
   SN::$config->fleet_update_interval,
   // Promise
-  function () {SN::$gc->fleetDispatcher->dispatch();},
+  function() {SN::$gc->fleetDispatcher->dispatch(); },
   WATCHDOG_TIME_SQL,
   false
 );

includes/functions/sys_user.php

Spacing +8 added lines, -8 removed lines

@@ -12,7 +12,7 @@ 
 function sys_user_vacation($user) {
   global $config;
 
-  if(sys_get_param_str('vacation') == 'leave') {
+  if (sys_get_param_str('vacation') == 'leave') {
     if ($user['vacation'] < SN_TIME_NOW) {
       $user['vacation'] = 0;
       $user['vacation_next'] = SN_TIME_NOW + $config->player_vacation_timeout;
@@ -20,7 +20,7 @@ 
     }
   }
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false, true);
 
@@ -163,7 +163,7 @@ 
   \DBAL\DbQuery::build()->setTable('users')->setValues($field_set)->doInsert();
   $user_new = db_user_by_id(db_insert_id());
 
-  if(!($options['galaxy'] && $options['system'] && $options['planet'])) {
+  if (!($options['galaxy'] && $options['system'] && $options['planet'])) {
     $options['galaxy'] = SN::$config->LastSettedGalaxyPos;
     $options['system'] = SN::$config->LastSettedSystemPos;
     $segment_size = floor(SN::$config->game_maxPlanet / 3);
@@ -171,19 +171,19 @@ 
     $segment++;
     $options['planet'] = mt_rand(1 + $segment * $segment_size, ($segment + 1) * $segment_size);
 
-    while(true) {
-      if($options['planet'] > SN::$config->game_maxPlanet) {
+    while (true) {
+      if ($options['planet'] > SN::$config->game_maxPlanet) {
         $options['planet'] = mt_rand(0, $segment_size - 1) + 1;
         $options['system']++;
       }
-      if($options['system'] > SN::$config->game_maxSystem) {
+      if ($options['system'] > SN::$config->game_maxSystem) {
         $options['system'] = 1;
         $options['galaxy']++;
       }
       $options['galaxy'] > SN::$config->game_maxGalaxy ? $options['galaxy'] = 1 : false;
 
       $galaxy_row = DBStaticPlanet::db_planet_by_gspt($options['galaxy'], $options['system'], $options['planet'], PT_PLANET, true, 'id');
-      if(!$galaxy_row['id']) {
+      if (!$galaxy_row['id']) {
         SN::$config->db_saveItem(array(
           'LastSettedGalaxyPos' => $options['galaxy'],
           'LastSettedSystemPos' => $options['system'],
@@ -204,7 +204,7 @@ 
   $username_safe = db_escape($username_unsafe);
   doquery("REPLACE INTO `{{player_name_history}}` SET `player_id` = {$user_new['id']}, `player_name` = '{$username_safe}'");
 
-  if(!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) {
+  if (!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) {
     doquery("INSERT INTO `{{referrals}}` SET `id` = {$user_new['id']}, `id_partner` = {$options['partner_id']}");
   }