supernova-ws / SuperNova

blitz_register.php

Spacing +26 added lines, -26 removed lines

@@ -4,12 +4,12 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
+if ($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
   $error_message = SN::$config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : (
     !SN::$config->game_blitz_register ? 'sys_blitz_registration_disabled' : ''
   );
 
-  if($error_message) {
+  if ($error_message) {
     SnTemplate::messageBox($lang[$error_message], $lang['sys_error'], 'overview.php', 10);
     die();
   }
@@ -19,12 +19,12 @@ 
 $current_round = intval(SN::$config->db_loadItem('game_blitz_register_round'));
 $current_price = intval(SN::$config->db_loadItem('game_blitz_register_price'));
 
-if(SN::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
+if (SN::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
   SN::db_transaction_start();
   $user = db_user_by_id($user['id'], true);
   $is_registered = doquery("SELECT `id` FROM {{blitz_registrations}} WHERE `user_id` = {$user['id']} AND `round_number` = {$current_round} FOR UPDATE;", true);
-  if(sys_get_param_str('register_me')) {
-    if(empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
+  if (sys_get_param_str('register_me')) {
+    if (empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
       doquery("INSERT IGNORE INTO {{blitz_registrations}} SET `user_id` = {$user['id']}, `round_number` = {$current_round};");
       //mm_points_change($user['id'], RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
       SN::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
@@ -45,17 +45,17 @@ 
 $blitz_players = 0;
 $blitz_prize_dark_matter = 0;
 $blitz_prize_places = 0;
-if($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
-  if(sys_get_param_str('generate')) {
+if ($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
+  if (sys_get_param_str('generate')) {
     $next_id = 0;
     $query = doquery("SELECT `id` FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY RAND();");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $next_id++;
       $blitz_name = 'Игрок' . $next_id;
       $blitz_password = sys_random_string(8);
       doquery("UPDATE {{blitz_registrations}} SET blitz_name = '{$blitz_name}', blitz_password = '{$blitz_password}' WHERE `id` = {$row['id']} AND `round_number` = {$current_round};");
     }
-  } elseif(sys_get_param_str('import_generated')) {
+  } elseif (sys_get_param_str('import_generated')) {
     // ЭТО НА БЛИЦЕ!!!
     doquery("DELETE FROM {{users}} WHERE username like 'Игрок%';");
     doquery("DELETE FROM {{planets}} WHERE id_owner not in (SELECT `id` FROM {{users}});");
@@ -77,7 +77,7 @@ 
     $system = $system_step;
     $planet = round(SN::$config->game_maxPlanet / 2);
 
-    foreach($imported_string as &$string_data) {
+    foreach ($imported_string as &$string_data) {
       $string_data = explode(',', $string_data);
       $username_safe = $string_data[0];
 
@@ -91,7 +91,7 @@ 
 
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], Universe::MOON_MAX_SIZE, false);
 
-      if(($system += $system_step) >= SN::$config->game_maxSystem) {
+      if (($system += $system_step) >= SN::$config->game_maxSystem) {
         $galaxy++;
         $system = $system_step;
       }
@@ -100,13 +100,13 @@ 
 
     SN::$config->db_saveItem('users_amount', SN::$config->users_amount + $new_players);
     // generated_string
-  } elseif(sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
+  } elseif (sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
     $blitz_result = explode(';', $blitz_result_string);
     $blitz_last_update = $blitz_result[0]; // Пока не используется
     unset($blitz_result[0]);
-    foreach($blitz_result as $blitz_result_data) {
+    foreach ($blitz_result as $blitz_result_data) {
       $blitz_result_data = explode(',', $blitz_result_data);
-      if(count($blitz_result_data) == 5) {
+      if (count($blitz_result_data) == 5) {
         $blitz_result_data[1] = SN::$db->db_escape($blitz_result_data[1]);
         doquery(
           "UPDATE `{{blitz_registrations}}` SET
@@ -120,15 +120,15 @@ 
     $blitz_result = array();
   }
 
-  if(SN::$config->game_mode == GAME_BLITZ) {
+  if (SN::$config->game_mode == GAME_BLITZ) {
     $blitz_result = array(SN::$config->db_loadItem('var_stat_update'));
     $query = doquery("SELECT id, username, total_rank, total_points, onlinetime FROM {{users}} ORDER BY `id`;");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $blitz_result[] = "{$row['id']},{$row['username']},{$row['onlinetime']},{$row['total_rank']},{$row['total_points']}";
     }
   } else {
     $query = doquery("SELECT blitz_name, blitz_password, blitz_online FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY `id`;");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $blitz_generated[] = "{$row['blitz_name']},{$row['blitz_password']}";
       $row['blitz_online'] ? $blitz_prize_players_active++ : false;
       $blitz_players++;
@@ -143,13 +143,13 @@ 
     'Игрок40'
     */
 
-    if(sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
+    if (sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
       // $blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter');
       $blitz_prize_places_actual = sys_get_param_int('blitz_prize_places');
       SN::db_transaction_start();
       $query = doquery("SELECT * FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY `blitz_place` FOR UPDATE;");
-      while($row = db_fetch($query)) {
-        if(!$row['blitz_place']) {
+      while ($row = db_fetch($query)) {
+        if (!$row['blitz_place']) {
           continue;
         }
 
@@ -157,15 +157,15 @@ 
         $blitz_prize_places_actual--;
 
         $reward = $blitz_prize_dark_matter_actual - $row['blitz_reward_dark_matter'];
-pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}",$row['id']);
-        if($reward) {
+pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}", $row['id']);
+        if ($reward) {
           rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf(
             $lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name']
           ));
           doquery("UPDATE {{blitz_registrations}} SET blitz_reward_dark_matter = blitz_reward_dark_matter + ($reward) WHERE id = {$row['id']} AND `round_number` = {$current_round};");
         }
 
-        if(!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
+        if (!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
           break;
         }
       }
@@ -185,12 +185,12 @@ 
     JOIN {{users}} AS u ON u.id = br.user_id
   WHERE br.`round_number` = {$current_round}
   order by `blitz_place`, `timestamp`;");
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $tpl_player_data = array(
     'NAME' => player_nick_render_to_html($row, array('icons' => true, 'color' => true, 'ally' => true)),
   );
 
-  if(SN::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
+  if (SN::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
     // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда
     $tpl_player_data = array_merge($tpl_player_data, array(
       'ID' => $row['id'],
@@ -203,7 +203,7 @@ 
   }
 
   $template->assign_block_vars('registrations', $tpl_player_data);
-  if($row['id'] == $user['id']) {
+  if ($row['id'] == $user['id']) {
     $player_registered = $row;
   }
 }

classes/SN.php

Braces +12 added lines, -4 removed lines

@@ -452,11 +452,13 @@ 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
-    if ($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
+    if ($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) {
+      // TODO Как-то вернуть может быть LIMIT 1 ?
     {
       if (static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
         DBStaticUnit::cache_clear();
+    }
       }
     }
 
@@ -486,9 +488,11 @@ 
     $set = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
     if ($result = static::db_query_insert("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = SN::$db->db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего
@@ -508,10 +512,12 @@ 
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
     if ($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         DBStaticUnit::cache_clear();
       }
+      }
     }
 
     return $result;
@@ -525,11 +531,13 @@ 
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
     if ($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE {$condition}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         DBStaticUnit::cache_clear();
       }
+      }
     }
 
     return $result;

classes/Unit/DBStaticUnit.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 
     $unit_snid = intval($unit_snid);
 
-    $resultOld = $unit_snid ? (isset($allUnits[$unit_snid]) ? $allUnits[$unit_snid] : null ) : $allUnits;
+    $resultOld = $unit_snid ? (isset($allUnits[$unit_snid]) ? $allUnits[$unit_snid] : null) : $allUnits;
 
     return $resultOld;
   }
@@ -87,7 +87,7 @@ 
   }
 
   public static function db_unit_count_by_user_and_type_and_snid($user_id, $unit_type = 0, $unit_snid = 0) {
-    $query  = doquery(
+    $query = doquery(
       "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} " .
       ($unit_type ? "AND `unit_type` = {$unit_type} " : '') .
       ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '') .
@@ -236,7 +236,7 @@ 
    * @return bool
    */
   protected static function dbAdd($playerId, $planetId, $unitSnId, $amount) {
-    if (!in_array($unitSnId, sn_get_groups([UNIT_SHIPS_STR, UNIT_DEFENCE_STR, UNIT_ARTIFACTS_STR, UNIT_STRUCTURES_STR,]))) {
+    if (!in_array($unitSnId, sn_get_groups([UNIT_SHIPS_STR, UNIT_DEFENCE_STR, UNIT_ARTIFACTS_STR, UNIT_STRUCTURES_STR, ]))) {
       return false;
     }
 
@@ -269,7 +269,7 @@ 
 //        'unit_level'         => $level,
 //      ]);
 
-      $fields     += [
+      $fields += [
         'unit_type'  => get_unit_param($unitSnId, P_UNIT_TYPE),
         'unit_level' => $amount,
       ];

classes/classConfig.php

Spacing +25 added lines, -25 removed lines

@@ -237,9 +237,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
 
@@ -281,7 +281,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
 
@@ -292,21 +292,21 @@ 
     '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,
 
-    self::FLEET_UPDATE_MAX_RUN_TIME => 30,     // Maximum length in seconds for single fleet dispatch run
+    self::FLEET_UPDATE_MAX_RUN_TIME => 30, // Maximum length in seconds for single fleet dispatch run
     'fleet_update_interval'         => 4,
     'fleet_update_lock'             => '', // SQL time when lock was acquired
 
-    'game_adminEmail'       => 'root@localhost',    // Admin email to show to users
-    'game_counter'          => 0,  // Does built-in page hit counter is on?
+    'game_adminEmail'       => 'root@localhost', // Admin 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/',
@@ -320,14 +320,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 treated as noob. 0 to disable
 
     'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccount)
@@ -382,12 +382,12 @@ 
     'payment_currency_exchange_wmz' => 1,
     'payment_currency_exchange_pln' => 3.86,
 
-    'payment_lot_price' => 1,     // Lot's 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's 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
 
@@ -409,7 +409,7 @@ 
     'resource_multiplier'     => 1,
 
     //Role play system
-    'rpg_bonus_divisor'       => 10,    // Amount of DM referral should get for partner have 1 DM bonus
+    'rpg_bonus_divisor'       => 10, // Amount of DM referral should get for partner have 1 DM bonus
     'rpg_bonus_minimum'       => 10000, // Minimum DM amount for starting paying bonuses to affiliate
 
     // Black Market - General
@@ -474,12 +474,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 consider 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. gift-giving) was made - timestamp
     'user_birthday_gift'      => 0, // User birthday gift - Dark Matter points

classes/SnTemplate.php

Spacing +6 added lines, -6 removed lines

@@ -128,7 +128,7 @@ 
         $insert_position = $is_positioned == '-' ? 0 : count($menu);
       }
 
-      $insert_position     += $is_positioned == '+' ? 1 : 0;
+      $insert_position += $is_positioned == '+' ? 1 : 0;
       $spliced             = array_splice($menu, $insert_position, count($menu) - $insert_position);
       $menu[$menu_item_id] = $menu_item;
 
@@ -541,11 +541,11 @@ 
    * @return array
    */
   public static function addFileName($fileNames, $anArray, $ext = '.css') {
-    if(!is_array($fileNames)) {
+    if (!is_array($fileNames)) {
       $fileNames = [$fileNames];
     }
 
-    foreach($fileNames as $fileName) {
+    foreach ($fileNames as $fileName) {
       if (file_exists(SN_ROOT_PHYSICAL . $fileName . '.min' . $ext)) {
         $anArray[$fileName . '.min' . $ext] = '';
       } elseif (file_exists(SN_ROOT_PHYSICAL . $fileName . '.css' . $ext)) {
@@ -676,7 +676,7 @@ 
       'LANG'     => $language ? $language : '',
       'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
 
-      'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
+      'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
       'FILENAME'       => basename($_SERVER['PHP_SELF']),
     ));
 
@@ -909,7 +909,7 @@ 
       'QUE_ID'   => QUE_RESEARCH,
       'QUE_HTML' => 'topnav',
 
-      'RESEARCH_ONGOING' => (boolean)$user['que'],
+      'RESEARCH_ONGOING' => (boolean) $user['que'],
 
       'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], $lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
         $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -1199,7 +1199,7 @@ 
       SnTemplate::renderFooter($page, $template_result);
     }
 
-    $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false;;
+    $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false; ;
 
     SN::$db->db_disconnect();
 

tools/classes/ImageContainer.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
   }
 
   public function __get($property) {
-    if (in_array($property, ['height', 'width',]) && ($this->$property === -1)) {
+    if (in_array($property, ['height', 'width', ]) && ($this->$property === -1)) {
       if (isset($this->image)) {
         $this->width  = imagesx($this->image);
         $this->height = imagesy($this->image);

tools/classes/ImageFile.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
   }
 
   public function __get($property) {
-    if (in_array($property, ['height', 'width',])) {
+    if (in_array($property, ['height', 'width', ])) {
       return $this->getImageContainer() ? $this->getImageContainer()->$property : 0;
     }
 

includes/functions/_news.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  * @param int      $query_limit
  */
 function nws_render(&$user, &$template, $query_where = '', $query_limit = 20) {
-  if($user['authlevel'] < AUTH_LEVEL_ADMINISTRATOR) {
+  if ($user['authlevel'] < AUTH_LEVEL_ADMINISTRATOR) {
     $query_where .= (!empty($query_where) ? ' AND ' : '')
       . '`tsTimeStamp` <= (NOW())';
   }

includes/init.php

Spacing +31 added lines, -32 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 . '/';
@@ -207,40 +206,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();
@@ -263,16 +262,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 . ";");
   }
@@ -296,7 +295,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']);
 }
 
@@ -309,7 +308,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));
@@ -317,7 +316,7 @@ 
 }
 
 
-if(defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
+if (defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
   pdump('Отключи отладку перед продакшном!');
 }
 
@@ -332,7 +331,7 @@ 
 // TODO - to scheduler
 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
@@ -341,33 +340,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(!$sys_user_logged_in && !defined('LOGIN_LOGOUT')) {
+    if (!$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'))
@@ -383,8 +382,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;
   }
 
@@ -398,10 +397,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');
 }