supernova-ws / SuperNova

classes/Account.php

Spacing +27 added lines, -27 removed lines

@@ -92,8 +92,8 @@ 
     $this->secret_word = SN::$sn_secret_word;
 
     $snTableNames = $this->db->schema()->getSnTables();
-    foreach($this->table_check as $table_name) {
-      if(empty($snTableNames[$table_name])) {
+    foreach ($this->table_check as $table_name) {
+      if (empty($snTableNames[$table_name])) {
         die('Если вы видите это сообщение первый раз после обновления релиза - просто перегрузите страницу.<br />
               В противном случае - сообщите Администрации сервера об ошибке.<br/>
               Не хватает таблицы для работы системы авторизации: ' . $table_name);
@@ -117,7 +117,7 @@ 
    */
   // OK v4.6
   public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) {
-    if(!$this->password_check($old_password_unsafe)) {
+    if (!$this->password_check($old_password_unsafe)) {
       return false;
     }
 
@@ -138,7 +138,7 @@ 
   // OK v4.5
   public function assign_from_db_row($row) {
     $this->reset();
-    if(empty($row) || !is_array($row)) {
+    if (empty($row) || !is_array($row)) {
       return false;
     }
     $this->account_id = $row['account_id'];
@@ -203,7 +203,7 @@ 
     $this->reset();
 
     $email_safe = $this->db->db_escape($email_unsafe);
-    if($email_safe) {
+    if ($email_safe) {
       $account_row = $this->db->doQueryAndFetch("SELECT * FROM `{{account}}` WHERE LOWER(`account_email`) = LOWER('{$email_safe}') FOR UPDATE;");
 
       return $this->assign_from_db_row($account_row);
@@ -283,11 +283,11 @@ 
         `account_email` = LOWER('{$email_safe}'),
         `account_language` = '{$language_safe}'"
     );
-    if(!$result) {
+    if (!$result) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
-    if(!($account_id = $this->db->db_insert_id())) {
+    if (!($account_id = $this->db->db_insert_id())) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
@@ -317,7 +317,7 @@ 
       WHERE `account_id` = '{$account_id_safe}'"
     ) ? true : false;
 
-    if($result) {
+    if ($result) {
       $result = $this->db_get_by_id($this->account_id);
     }
 
@@ -409,7 +409,7 @@ 
   public function metamatter_change($change_type, $metamatter, $comment = false, $already_changed = false) {
     global $debug, $mm_change_legit, $config;
 
-    if(!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
+    if (!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
       $debug->error('Ошибка при попытке манипуляции с ММ');
       return false;
     }
@@ -418,7 +418,7 @@ 
 
     $mm_change_legit = true;
     // $sn_data_metamatter_db_name = pname_resource_name(RES_METAMATTER);
-    if($already_changed) {
+    if ($already_changed) {
       $metamatter_total_delta = 0;
       $result = -1;
     } else {
@@ -431,7 +431,7 @@ 
           ($metamatter_total_delta ? ", `account_immortal` = IF(`account_metamatter_total` + '{$metamatter_total_delta}' >= {$config->player_metamatter_immortal} AND `account_immortal` IS NULL, NOW(), `account_immortal`), `account_metamatter_total` = `account_metamatter_total` + '{$metamatter_total_delta}'" : '') .
         " WHERE `account_id` = {$account_id_safe}"
       );
-      if(!$result) {
+      if (!$result) {
         $debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
       }
       $result = SN::$db->db_affected_rows();
@@ -439,7 +439,7 @@ 
       $this->awardImmortal($metamatter, $config);
     }
 
-    if(empty(core_auth::$user['id'])) {
+    if (empty(core_auth::$user['id'])) {
       $user_list = PlayerToAccountTranslate::db_translate_get_users_from_account_list(core_auth::$main_provider->provider_id, $this->account_id);
       reset($user_list);
       $user_id_unsafe = key($user_list);
@@ -448,30 +448,30 @@ 
     }
     $user_id_safe = $this->db->db_escape($user_id_unsafe);
 
-    if(!$result) {
+    if (!$result) {
       $debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
     }
 
-    if(!$already_changed) {
+    if (!$already_changed) {
       $this->account_metamatter += $metamatter;
       $this->account_metamatter_total += $metamatter_total_delta;
     }
 
-    if(is_array($comment)) {
+    if (is_array($comment)) {
       $comment = call_user_func_array('sprintf', $comment);
     }
 
     $result = $this->db_mm_log_insert($comment, $change_type, $metamatter, $user_id_unsafe);
 
-    if($metamatter > 0 && !empty($user_id_safe)) {
+    if ($metamatter > 0 && !empty($user_id_safe)) {
       $old_referral = doquery("SELECT * FROM `{{referrals}}` WHERE `id` = {$user_id_safe} LIMIT 1 FOR UPDATE;", '', true);
-      if($old_referral['id']) {
+      if ($old_referral['id']) {
         $dark_matter_from_metamatter = $metamatter * AFFILIATE_MM_TO_REFERRAL_DM;
         doquery("UPDATE `{{referrals}}` SET dark_matter = dark_matter + '{$dark_matter_from_metamatter}' WHERE `id` = {$user_id_safe} LIMIT 1;");
         $new_referral = doquery("SELECT * FROM `{{referrals}}` WHERE `id` = {$user_id_safe} LIMIT 1;", '', true);
 
         $partner_bonus = floor($new_referral['dark_matter'] / $config->rpg_bonus_divisor) - ($old_referral['dark_matter'] >= $config->rpg_bonus_minimum ? floor($old_referral['dark_matter'] / $config->rpg_bonus_divisor) : 0);
-        if($partner_bonus > 0 && $new_referral['dark_matter'] >= $config->rpg_bonus_minimum) {
+        if ($partner_bonus > 0 && $new_referral['dark_matter'] >= $config->rpg_bonus_minimum) {
           rpg_points_change($new_referral['id_partner'], RPG_REFERRAL_BOUGHT_MM, $partner_bonus, "Incoming MM From Referral ID {$user_id_safe}");
         }
       }
@@ -487,7 +487,7 @@ 
    * @throws Exception
    */
   public function cookieSet($rememberMe = false, $domain = null) {
-    if(!$this->is_exists) {
+    if (!$this->is_exists) {
       throw new Exception(LOGIN_ERROR_NO_ACCOUNT_FOR_COOKIE_SET, ERR_ERROR);
     }
 
@@ -506,7 +506,7 @@ 
   // OK v4.1
   public function cookieClear($domain = null) {
     // Автоматически вообще-то - если установлена кука имперсонатора - то чистим обычную, а куку имперсонатора - копируем в неё
-    if(!empty($_COOKIE[$this->cookie_name_impersonate])) {
+    if (!empty($_COOKIE[$this->cookie_name_impersonate])) {
       sn_setcookie($this->cookie_name, $_COOKIE[$this->cookie_name_impersonate], SN_TIME_NOW + PERIOD_YEAR, $this->sn_root_path, $domain);
       sn_setcookie($this->cookie_name_impersonate, '', SN_TIME_NOW - PERIOD_WEEK, $this->sn_root_path, $domain);
     } else {
@@ -516,14 +516,14 @@ 
 
   public function cookieLogin(&$rememberMe = false) {
     // Пытаемся войти по куке
-    if(!empty($_COOKIE[$this->cookie_name])) {
-      if(count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) {
+    if (!empty($_COOKIE[$this->cookie_name])) {
+      if (count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) {
         list($account_id_unsafe, $cookie_password_hash_salted, $user_remember_me) = explode(AUTH_COOKIE_DELIMETER, $_COOKIE[$this->cookie_name]);
       } else {
         list($account_id_unsafe, $user_name, $cookie_password_hash_salted, $user_remember_me) = explode("/%/", $_COOKIE[$this->cookie_name]);
       }
 
-      if(
+      if (
         $this->db_get_by_id($account_id_unsafe)
         && ($this->password_encode_for_cookie($this->account_password) == $cookie_password_hash_salted)
       ) {
@@ -548,10 +548,10 @@ 
    * @param classConfig $config
    */
   protected function awardImmortal($metamatter, $config) {
-    if(!is_object($awardModule = moduleAward())) {
+    if (!is_object($awardModule = moduleAward())) {
       return;
     }
-    if ($this->account_metamatter + $metamatter >= $config->player_metamatter_immortal ) {
+    if ($this->account_metamatter + $metamatter >= $config->player_metamatter_immortal) {
       $account_translation = PlayerToAccountTranslate::db_translate_get_users_from_account_list(ACCOUNT_PROVIDER_LOCAL, $this->account_id);
       if (!empty($account_translation)) {
         reset($account_translation);
@@ -573,10 +573,10 @@ 
    * @return bool|mysqli_result|null
    */
   public function getMetamatterSum($where = '', $group = '') {
-    if(is_array($where) && !empty($where)) {
+    if (is_array($where) && !empty($where)) {
       $where = implode(' AND ', $where);
     }
-    if(is_array($group) && !empty($group)) {
+    if (is_array($group) && !empty($group)) {
       $group = implode(',', $group);
     }
 

classes/General/VisitMerger.php

Spacing +1 added lines, -1 removed lines

@@ -167,7 +167,7 @@
 //      $logRecord->browserId . '_' .
 //      $logRecord->ip . '_' .
 //      $logRecord->proxies;
-    return $logRecord->userId . '_'  . $logRecord->playerEntryId;
+    return $logRecord->userId . '_' . $logRecord->playerEntryId;
   }
 
   /**

classes/PlayerToAccountTranslate.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
   protected static $is_init = false;
 
   protected static function init() {
-    if(!empty(static::$db)) {
+    if (!empty(static::$db)) {
       return;
     }
     static::$db = SN::$db;
@@ -68,14 +68,14 @@ 
     $provider_id_safe = intval($provider_id_unsafe);
     !is_array($account_list) ? $account_list = array($account_list) : false;
 
-    foreach($account_list as $provider_account_id_unsafe) {
+    foreach ($account_list as $provider_account_id_unsafe) {
       $provider_account_id_safe = intval($provider_account_id_unsafe);
 
       // TODO - Здесь могут отсутствовать аккаунты - проверять провайдером
       $query = static::$db->doquery(
         "SELECT `user_id` FROM {{account_translate}} WHERE `provider_id` = {$provider_id_safe} AND `provider_account_id` = {$provider_account_id_safe} FOR UPDATE"
       );
-      while($row = static::$db->db_fetch($query)) {
+      while ($row = static::$db->db_fetch($query)) {
         $account_translation[$row['user_id']][$provider_id_unsafe][$provider_account_id_unsafe] = true;
       }
     }
@@ -102,7 +102,7 @@ 
       ($provider_id_unsafe ? "AND `provider_id` = {$provider_id_safe} " : '') .
       "ORDER BY `timestamp` FOR UPDATE"
     );
-    while($row = static::$db->db_fetch($query)) {
+    while ($row = static::$db->db_fetch($query)) {
       $account_translation[$row['user_id']][$row['provider_id']][$row['provider_account_id']] = $row;
     }
 

classes/RequestInfo.php

Spacing +3 added lines, -3 removed lines

@@ -117,15 +117,15 @@
     sn_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) {
       $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/Confirmation.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
       $query = $this->db->doQueryAndFetch(
         "SELECT `id` FROM {{confirmations}} WHERE `code` = '{$confirm_code_safe}' FOR UPDATE"
       );
-    } while($query);
+    } while ($query);
 
     $this->db->doquery(
       "REPLACE INTO {{confirmations}}

classes/Timer.php

Braces +8 added lines, -16 removed lines

@@ -3,8 +3,7 @@ 
  * Created by Gorlum 05.08.2018 8:05
  */
 
-class Timer
-{
+class Timer {
     /**
      * @var array[] $times [
      *                        'time' => (float)microtime(true),
@@ -14,8 +13,7 @@ 
      */
     private static $times = [];
 
-    public static function init()
-    {
+    public static function init() {
         if (empty(static::$times)) {
             static::$times[] = ['time' => microtime(true)];
         }
@@ -24,8 +22,7 @@ 
     /**
      * @param string $message Message to attach to timestamp
      */
-    public static function mark($message = '')
-    {
+    public static function mark($message = '') {
         static::init();
 
         foreach (debug_backtrace() as $trace) {
@@ -51,8 +48,7 @@ 
      *
      * @return string
      */
-    public static function elapsed($message = '', $fromStart = false)
-    {
+    public static function elapsed($message = '', $fromStart = false) {
         $prevTime = $fromStart ? static::first()['time'] : static::last()['time'];
 
         static::mark($message);
@@ -62,8 +58,7 @@ 
         return number_format(static::last()['time'] - $prevTime, 6) . 's';
     }
 
-    public static function msg($message, $fromStart = false)
-    {
+    public static function msg($message, $fromStart = false) {
         print
             $message .
             ($fromStart ? ' FROM START ' : ' in ') .
@@ -75,21 +70,18 @@ 
     /**
      * @return mixed
      */
-    public static function last()
-    {
+    public static function last() {
         return end(static::$times);
     }
 
     /**
      * @return mixed
      */
-    public static function first()
-    {
+    public static function first() {
         return reset(static::$times);
     }
 
-    public static function getLog()
-    {
+    public static function getLog() {
         return static::$times;
     }
 

classes/Common/AccessLoggedAbstract.php

Indentation +4 added lines, -4 removed lines

@@ -113,10 +113,10 @@
 
 
     /**
-   * Mark next set operation as delta increment
-   *
-   * @return $this
-   */
+     * Mark next set operation as delta increment
+     *
+     * @return $this
+     */
   public function inc() {
     $this->_currentOperation = self::ACCESS_DELTA_INC;
 

classes/Unit/DBStaticUnit.php

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,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} " : '') .
@@ -166,7 +166,7 @@ 
     } elseif (in_array($unitSnId, sn_get_groups(UNIT_ARTIFACTS_STR))) {
       // Add artifacts to player
       $result = self::dbAdd($playerId, 0, $unitSnId, $amount);
-    } elseif (!empty($planetId) && in_array($unitSnId, sn_get_groups([UNIT_SHIPS_STR, UNIT_DEFENCE_STR,]))) {
+    } elseif (!empty($planetId) && in_array($unitSnId, sn_get_groups([UNIT_SHIPS_STR, UNIT_DEFENCE_STR, ]))) {
       // Add fleet or defense to user's capital
       $result = self::dbAdd($playerId, $planetId, $unitSnId, $amount);
     }
@@ -190,7 +190,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,]))) {
+    if (!in_array($unitSnId, sn_get_groups([UNIT_SHIPS_STR, UNIT_DEFENCE_STR, UNIT_ARTIFACTS_STR, ]))) {
       return false;
     }
 
@@ -223,7 +223,7 @@ 
 //        'unit_level'         => $level,
 //      ]);
 
-      $fields     += [
+      $fields += [
         'unit_type'  => get_unit_param($unitSnId, P_UNIT_TYPE),
         'unit_level' => $amount,
       ];

classes/Core/GlobalContainer.php

Spacing +23 added lines, -23 removed lines

@@ -93,103 +93,103 @@
 
     // Services --------------------------------------------------------------------------------------------------------
     // Default db
-    $gc->db = function (GlobalContainer $c) {
+    $gc->db = function(GlobalContainer $c) {
       SN::$db = new \DBAL\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->repository = function (GlobalContainer $gc) {
+    $gc->repository = function(GlobalContainer $gc) {
       return new Repository($gc);
     };
 
-    $gc->storage = function (GlobalContainer $gc) {
+    $gc->storage = function(GlobalContainer $gc) {
       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 \Fleet\FleetDispatcher($gc);
     };
 
-    $gc->watchdog = function (GlobalContainer $gc) {
+    $gc->watchdog = function(GlobalContainer $gc) {
       return new Watchdog($gc);
     };
 
-    $gc->valueStorage = function (GlobalContainer $gc) {
+    $gc->valueStorage = function(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);
     };