supernova-ws / SuperNova

classes/Fleet/FleetDispatcher.php

Spacing +5 added lines, -9 removed lines

@@ -170,7 +170,7 @@ 
 //      $this->log_file('Dispatch stopped: lock ' . $runLock->isLocked() .'s' );
       return self::TASK_ALREADY_LOCKED;
     }
-    register_shutdown_function(function () use ($runLock) {
+    register_shutdown_function(function() use ($runLock) {
 //      $this->log_file('Shutting down');
       $timeLock = $runLock->isLocked();
       if ($timeLock > 0 || $timeLock === 0) {
@@ -552,15 +552,11 @@ 
   protected function flt_flyingFleetsSort($a, $b) {
     return
       // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
-      $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
-        // Если время - одинаковое, сравниваем события флотов
+      $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 : // Если время - одинаковое, сравниваем события флотов
         // Если события - одинаковые, то флоты равны
-        ($a['fleet_event'] == $b['fleet_event'] ? 0 :
-          // Если события разные - первыми считаем прибывающие флоты
-          ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 :
-            // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
-            ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 :
-              // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
+        ($a['fleet_event'] == $b['fleet_event'] ? 0 : // Если события разные - первыми считаем прибывающие флоты
+          ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
+            ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
               // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
               (
               0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий

classes/Fleet/TaskDispatchFleets.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     $url = HttpUrl::spawn($this->gc)
       ->parseUrl(SN_ROOT_VIRTUAL)
       ->addPath('index.php')
-      ->addParams(['page' => 'worker', 'mode' => 'dispatchFleets',]);
+      ->addParams(['page' => 'worker', 'mode' => 'dispatchFleets', ]);
 
     sn_get_url_contents($url->urlSigned());
 

classes/AjaxController.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
 
     define('IN_AJAX', true);
 
-    if(!is_object($template)) {
+    if (!is_object($template)) {
       $template = SnTemplate::gettemplate('_ajax', true);
     }
 
@@ -51,11 +51,11 @@ 
        * @var IPage $page
        */
       $page = new $className();
-      if(method_exists($page, 'loadParams')) {
+      if (method_exists($page, 'loadParams')) {
         $page->loadParams();
       }
 
-      if(method_exists($page, $action = sys_get_param_str('action')) && $page->checkAction($action)) {
+      if (method_exists($page, $action = sys_get_param_str('action')) && $page->checkAction($action)) {
         $result = $page->$action();
         is_array($result) ? HelperArray::merge($template_result['AJAX'], $result) : false;
       }

classes/classConfig.php

Spacing +25 added lines, -25 removed lines

@@ -201,9 +201,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
 
@@ -245,7 +245,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
 
@@ -256,21 +256,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'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/',
@@ -284,14 +284,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 (multiaccounts)
@@ -346,12 +346,12 @@ 
     'payment_currency_exchange_wmz' => 1,
     'payment_currency_exchange_pln' => 3.86,
 
-    '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
 
@@ -373,7 +373,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
@@ -438,12 +438,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

classes/Core/Scheduler/TaskConditional.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
     }
 
     // Checking task lock
-    if (is_object($this->lock) && !$this->lock->attemptLock(function () {
+    if (is_object($this->lock) && !$this->lock->attemptLock(function() {
         return $this->proceedLockExpiration();
       }, SN_TIME_NOW)) {
 
@@ -152,7 +152,7 @@ 
    */
   protected function updateTaskLastRunTime($time) {
     $this->db->transactionWrap(
-      function () use ($time) {
+      function() use ($time) {
         $this->config->dateWrite($this->configName, $time, classConfig::DATE_TYPE_SQL_STRING);
       }
     );

classes/Core/GlobalContainer.php

Spacing +27 added lines, -27 removed lines

@@ -110,123 +110,123 @@
 
     // Services --------------------------------------------------------------------------------------------------------
     // Default db
-    $gc->request = function (GlobalContainer $c) {
+    $gc->request = function(GlobalContainer $c) {
       $httpRequest = new HttpRequest($c);
       $httpRequest->fillCurrent();
 
       return $httpRequest;
     };
 
-    $gc->db = function (GlobalContainer $c) {
+    $gc->db = function(GlobalContainer $c) {
       SN::$db = new db_mysql($c);
 
       return SN::$db;
     };
 
-    $gc->debug = function (/** @noinspection PhpUnusedParameterInspection */
+    $gc->debug = function(/** @noinspection PhpUnusedParameterInspection */
       GlobalContainer $c) {
       return new debug();
     };
 
-    $gc->cache = function (GlobalContainer $gc) {
+    $gc->cache = function(GlobalContainer $gc) {
       return new classCache($gc->cachePrefix);
     };
 
-    $gc->config = function (GlobalContainer $gc) {
+    $gc->config = function(GlobalContainer $gc) {
       return new classConfig($gc->cachePrefix);
     };
 
-    $gc->crypto = function (GlobalContainer $gc) {
+    $gc->crypto = function(GlobalContainer $gc) {
       return new Crypto($gc);
     };
 
-    $gc->worker = function (GlobalContainer $gc) {
+    $gc->worker = function(GlobalContainer $gc) {
       return new Worker($gc);
     };
 
-    $gc->repository = function (GlobalContainer $gc) {
+    $gc->repository = function(GlobalContainer $gc) {
       /** @noinspection PhpDeprecationInspection */
       return new Repository($gc);
     };
 
-    $gc->storage = function (GlobalContainer $gc) {
+    $gc->storage = function(GlobalContainer $gc) {
       /** @noinspection PhpDeprecationInspection */
       return new Storage($gc);
     };
 
-    $gc->repoV2 = function (GlobalContainer $gc) {
+    $gc->repoV2 = function(GlobalContainer $gc) {
       return new RepoV2($gc);
     };
 
-    $gc->storageV2 = function (GlobalContainer $gc) {
+    $gc->storageV2 = function(GlobalContainer $gc) {
       return new StorageV2($gc);
     };
 
-    $gc->storageSqlV2 = function (GlobalContainer $gc) {
+    $gc->storageSqlV2 = function(GlobalContainer $gc) {
       return new StorageSqlV2($gc);
     };
 
-    $gc->design = function (GlobalContainer $gc) {
+    $gc->design = function(GlobalContainer $gc) {
       return new Design($gc);
     };
 
-    $gc->bbCodeParser = function (GlobalContainer $gc) {
+    $gc->bbCodeParser = function(GlobalContainer $gc) {
       return new BBCodeParser($gc);
     };
 
-    $gc->fleetDispatcher = function (GlobalContainer $gc) {
+    $gc->fleetDispatcher = function(GlobalContainer $gc) {
       return new FleetDispatcher($gc);
     };
 
-    $gc->watchdog = function (GlobalContainer $gc) {
+    $gc->watchdog = function(GlobalContainer $gc) {
       return new Watchdog($gc);
     };
 
-    $gc->valueStorage = function (/** @noinspection PhpUnusedParameterInspection */ GlobalContainer $gc) {
+    $gc->valueStorage = function(/** @noinspection PhpUnusedParameterInspection */ GlobalContainer $gc) {
       return new ValueStorage([]);
     };
 
-    $gc->bonusCatalog = function (GlobalContainer $gc) {
+    $gc->bonusCatalog = function(GlobalContainer $gc) {
       return new BonusCatalog($gc);
     };
 
-    $gc->general = function (GlobalContainer $gc) {
+    $gc->general = function(GlobalContainer $gc) {
       return new General($gc);
     };
 
-    $gc->economicHelper = function (GlobalContainer $gc) {
+    $gc->economicHelper = function(GlobalContainer $gc) {
       return new EconomicHelper($gc);
     };
 
-    $gc->playerLevelHelper = function (GlobalContainer $gc) {
+    $gc->playerLevelHelper = function(GlobalContainer $gc) {
       return new PlayerLevelHelper($gc);
     };
 
-    $gc->pimp = function (GlobalContainer $gc) {
+    $gc->pimp = function(GlobalContainer $gc) {
       return new SnPimp($gc);
     };
 
-    $gc->modules = function (GlobalContainer $gc) {
+    $gc->modules = function(GlobalContainer $gc) {
       return new ModulesManager($gc);
     };
 
     // Dummy objects ---------------------------------------------------------------------------------------------------
-    $gc->theUser = function (GlobalContainer $gc) {
+    $gc->theUser = function(GlobalContainer $gc) {
       return new TheUser($gc);
     };
 
 
     // Models ----------------------------------------------------------------------------------------------------------
     $gc->skinEntityClass = SkinV2::class;
-    $gc->skinModel       = function (GlobalContainer $gc) {
+    $gc->skinModel       = function(GlobalContainer $gc) {
       return new SkinModel($gc);
     };
 
-    $gc->textModel = function (GlobalContainer $gc) {
+    $gc->textModel = function(GlobalContainer $gc) {
       return new TextModel($gc);
     };
 
-    $gc->ignores = function (GlobalContainer $gc) {
+    $gc->ignores = function(GlobalContainer $gc) {
       return new PlayerIgnore($gc);
     };
 

language/ru/chat_advanced.mo.php

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 //$lang = array_merge($lang,
 //$lang->merge(

classes/Chat/Chat.php

Spacing +5 added lines, -5 removed lines

@@ -172,7 +172,7 @@ 
         $page         = 1;
       }
 
-      $start_row = ($page - 1) * $page_limit;// OR `chat_message_recipient_id` = {$user['id']}
+      $start_row = ($page - 1) * $page_limit; // OR `chat_message_recipient_id` = {$user['id']}
       $start_row = $start_row < 0 ? 0 : $start_row;
       $query     = doquery(
         "SELECT c.*, u.authlevel
@@ -375,7 +375,7 @@ 
           switch ($chat_command_issued) {
             case 'invisible':
               //$chat_player_row = $this->sn_chat_advanced_get_chat_player_record($user['id'], '`chat_player_invisible`', true);
-              $chat_directive = strtolower($chat_command_parsed[2]) == 'on' || $chat_command_parsed[2] == 1 ? 1 : (strtolower($chat_command_parsed[2]) == 'off' || (string)$chat_command_parsed[2] === '0' ? 0 : '');
+              $chat_directive = strtolower($chat_command_parsed[2]) == 'on' || $chat_command_parsed[2] == 1 ? 1 : (strtolower($chat_command_parsed[2]) == 'off' || (string) $chat_command_parsed[2] === '0' ? 0 : '');
               if ($chat_directive !== '') {
                 doquery("UPDATE {{chat_player}} SET `chat_player_invisible` = {$chat_directive} WHERE `chat_player_player_id` = {$user['id']} LIMIT 1");
               } else {
@@ -585,10 +585,10 @@ 
 
   protected function sn_chat_advanced_get_chat_player_record($player_id, $fields = '*', $return_data = true) {
     $result = false;
-    if($player_id) {
-      if(!($result = doquery("SELECT {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1", true))) {
+    if ($player_id) {
+      if (!($result = doquery("SELECT {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1", true))) {
         doquery("INSERT INTO {{chat_player}} SET `chat_player_player_id` = {$player_id}");
-        if($return_data) {
+        if ($return_data) {
           $result = doquery("SELECT {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1", true);
         }
       }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -586,10 +586,10 @@
   protected function sn_chat_advanced_get_chat_player_record($player_id, $fields = '*', $return_data = true) {
     $result = false;
     if($player_id) {
-      if(!($result = doquery("SELECT {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1", true))) {
+      if(!($result = doquery("select {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1", true))) {
         doquery("INSERT INTO {{chat_player}} SET `chat_player_player_id` = {$player_id}");
         if($return_data) {
-          $result = doquery("SELECT {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1", true);
+          $result = doquery("select {$fields} FROM {{chat_player}} WHERE `chat_player_player_id` = {$player_id} LIMIT 1", true);
         }
       }
     }

language/en/chat_advanced.mo.php

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 //$lang = array_merge($lang,
 //$lang->merge(