supernova-ws / SuperNova

classes/Fleet/MissionExplore.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
    *
    * @var int[] $shipsToRemove
    */
-  protected $shipsToRemove = [SHIP_COLONIZER, SHIP_SPY,];
+  protected $shipsToRemove = [SHIP_COLONIZER, SHIP_SPY, ];
 
   // -------------------------------------------------------------------------------------------------------------------
   /**

includes/update.php

Spacing +1 added lines, -1 removed lines

@@ -359,7 +359,7 @@
       );
     }
 
-    updPatchApply(1, function () {
+    updPatchApply(1, function() {
       $q = upd_do_query("SELECT `messageid`, `user` FROM `{{chat}}`", true);
       while ($row = db_fetch($q)) {
         if (strpos($row['user'], 'a:') !== 0) {

admin/userlist.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 
   $template->assign_block_vars('user', array(
       'ID'              => $user_row['id'],
-      'NAME'            => $renderedNick = player_nick_render_to_html($user_row, ['player_rank' => true, 'vacancy' => true, 'birthday' => true, 'award' => true, NICK_RANK_NO_TEXT => true,]),
+      'NAME'            => $renderedNick = player_nick_render_to_html($user_row, ['player_rank' => true, 'vacancy' => true, 'birthday' => true, 'award' => true, NICK_RANK_NO_TEXT => true, ]),
       'NAME_HTML'       => htmlentities($user_row['username'], ENT_QUOTES, 'UTF-8'),
       'IP'              => $user_row['user_lastip'],
       'IP_MULTI'        => intval($multi_ip[$user_row['user_lastip']]),

galaxy.php

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
     ||
     (!empty($uni_galaxyRowPlanet['destruyed']) && CheckAbandonPlanetState($uni_galaxyRowPlanet))
   ) {
-    $template->assign_block_vars('galaxyrow', ['PLANET_NUM' => $Planet,]);
+    $template->assign_block_vars('galaxyrow', ['PLANET_NUM' => $Planet, ]);
     continue;
   }
 
@@ -242,7 +242,7 @@ 
     'IS_CAPITAL'      => $uni_galaxyRowUser['id_planet'] == $uni_galaxyRowPlanet['id'],
 
     'USER_ID'         => $uni_galaxyRowUser['id'],
-    'USER_NAME'       => $renderedNick = player_nick_render_to_html($uni_galaxyRowUser, ['icons' => true,]),
+    'USER_NAME'       => $renderedNick = player_nick_render_to_html($uni_galaxyRowUser, ['icons' => true, ]),
     'USER_NAME_JS'    => js_safe_string($renderedNick),
     'USER_RANK'       => in_array($uni_galaxyRowUser['id'], $user_skip_list) ? '-' : $uni_galaxyRowUser['total_rank'],
     'USER_BANNED'     => $uni_galaxyRowUser['banaday'],

time_probe.php

Spacing +4 added lines, -4 removed lines

@@ -10,11 +10,11 @@ 
 $time_server = $time_local  - $time_diff
 */
 
-if($font_size = sys_get_param_str('font_size')) {
-  if(strpos($font_size, '%') !== false) {
+if ($font_size = sys_get_param_str('font_size')) {
+  if (strpos($font_size, '%') !== false) {
     // Размер шрифта в процентах
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
-  } elseif(strpos($font_size, 'px') !== false) {
+  } elseif (strpos($font_size, 'px') !== false) {
     // Размер шрифта в пикселях
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
   } else {
@@ -26,7 +26,7 @@ 
   SN::$user_options[PLAYER_OPTION_BASE_FONT_SIZE] = $font_size;
 } else {
   $user_time_diff = playerTimeDiff::user_time_diff_get();
-  if($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
+  if ($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
     $time_diff = intval($user_time_diff[PLAYER_OPTION_TIME_DIFF]);
   } else {
     $user_time_diff = playerTimeDiff::user_time_diff_probe();

search.php

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(SN::$config->game_mode == GAME_BLITZ) {
+if (SN::$config->game_mode == GAME_BLITZ) {
   messageBox($lang['sys_blitz_page_disabled'], $lang['sys_error'], 'overview.php', 10);
   die();
 }
@@ -25,9 +25,9 @@ 
 
 $template = gettemplate('search', true);
 
-if($searchtext && $type)
+if ($searchtext && $type)
 {
-  switch($type)
+  switch ($type)
   {
     case "planetname":
       // $search = db_planet_list_search($searchtext);
@@ -43,9 +43,9 @@ 
     break;
   }
 
-  while($row = db_fetch($search))
+  while ($row = db_fetch($search))
   {
-    if($type=='playername' || $type=='planetname')
+    if ($type == 'playername' || $type == 'planetname')
     {
       $template->assign_block_vars('search_result', array(
         'PLAYER_ID' => $row['uid'],
@@ -62,7 +62,7 @@ 
         'ALLY_TAG' => htmlentities($row['ally_tag'], ENT_COMPAT, 'UTF-8'),
       ));
     }
-    elseif($type=='ally')
+    elseif ($type == 'ally')
     {
       $template->assign_block_vars('search_result', array(
         'ALLY_NAME' => htmlentities($row['ally_name'], ENT_COMPAT, 'UTF-8'),
@@ -81,7 +81,7 @@ 
   'ally' => 'sys_alliance',
 );
 
-foreach($search_type as $type_id => $type_lang)
+foreach ($search_type as $type_id => $type_lang)
 {
   $template->assign_block_vars('type', array(
     'ID' => $type_id,

admin/admin_analyze_matter.php

Spacing +8 added lines, -9 removed lines

@@ -15,8 +15,8 @@ 
 
 $constants = get_defined_constants(true);
 $rpgConstants = array();
-foreach($constants['user'] as $constantName => $constantValue) {
-  if(substr($constantName, 0, 4) == 'RPG_') {
+foreach ($constants['user'] as $constantName => $constantValue) {
+  if (substr($constantName, 0, 4) == 'RPG_') {
     $rpgConstants[$constantValue] = $constantName;
   }
 }
@@ -33,7 +33,7 @@ 
 GROUP BY log_dark_matter_reason, IF(sign((log_dark_matter_amount)) > 0, 1, -1) ORDER BY sum(log_dark_matter_amount) DESC;
 ");
 
-while($row = SN::$db->db_fetch($result)) {
+while ($row = SN::$db->db_fetch($result)) {
   $row['CONSTANT'] = $rpgConstants[$row['REASON']];
 
   $row['DM_AMOUNT_TEXT'] = HelperString::numberFloorAndFormat($row['DM_AMOUNT']);
@@ -55,8 +55,8 @@ 
 GROUP BY reason, if(sign((amount)) > 0, 1, -1) ORDER BY sum(amount) DESC;
 ");
 
-while($row = SN::$db->db_fetch($result)) {
-  if(empty($spent[$row['BALANCE']])) {
+while ($row = SN::$db->db_fetch($result)) {
+  if (empty($spent[$row['BALANCE']])) {
     $spent[$row['BALANCE']] = array();
   }
 
@@ -66,16 +66,15 @@ 
   $spent[$row['BALANCE']] = array_merge_recursive_numeric($spent[$row['BALANCE']], $row);
 }
 
-foreach($spent as &$row) {
+foreach ($spent as &$row) {
   @$row['TOTAL_COUNT'] = $row['MM_COUNT'] + $row['DM_COUNT'];
   @$row['TOTAL_AMOUNT'] = $row['MM_AMOUNT'] + $row['DM_AMOUNT'];
   @$row['TOTAL_AMOUNT_TEXT'] = HelperString::numberFloorAndFormat($row['TOTAL_AMOUNT']);
   @$row['TOTAL_COUNT_TEXT'] = HelperString::numberFloorAndFormat($row['TOTAL_COUNT']);
 }
 
-usort($spent, function ($a, $b) {
-  return $a['TOTAL_AMOUNT'] < $b['TOTAL_AMOUNT'] ? -1 :
-    ($a['TOTAL_AMOUNT'] > $b['TOTAL_AMOUNT'] ? 1 : 0);
+usort($spent, function($a, $b) {
+  return $a['TOTAL_AMOUNT'] < $b['TOTAL_AMOUNT'] ? -1 : ($a['TOTAL_AMOUNT'] > $b['TOTAL_AMOUNT'] ? 1 : 0);
 });
 
 

classes/PlayerToAccountTranslate.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
   protected static $is_init = false;
 
   protected static function init() {
-    if(!empty(static::$db)) {
+    if (!empty(static::$db)) {
       return;
     }
     static::$db = SN::$db;
@@ -66,12 +66,12 @@ 
     $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;
       }
     }
@@ -97,7 +97,7 @@ 
       "SELECT * FROM {{account_translate}} WHERE `user_id` = {$user_id_safe} " .
       ($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/classLocale.php

Spacing +43 added lines, -43 removed lines

@@ -28,13 +28,13 @@ 
 
     $this->container = array();
 
-    if(SN::$cache->getMode() != classCache::CACHER_NO_CACHE && !SN::$config->locale_cache_disable) {
+    if (SN::$cache->getMode() != classCache::CACHER_NO_CACHE && !SN::$config->locale_cache_disable) {
       $this->cache = SN::$cache;
       SN::log_file('locale.__constructor: Cache is present');
 //$this->cache->unset_by_prefix($this->cache_prefix); // TODO - remove? 'cause debug!
     }
 
-    if($enable_stat_usage && empty($this->stat_usage)) {
+    if ($enable_stat_usage && empty($this->stat_usage)) {
       $this->enable_stat_usage = $enable_stat_usage;
       $this->usage_stat_load();
       // TODO shutdown function
@@ -60,9 +60,9 @@ 
     unset($fallback[$this->active]);
 
     // Проходим по оставшимся локалям
-    foreach($fallback as $try_language) {
+    foreach ($fallback as $try_language) {
       // Если нет такой строки - пытаемся вытащить из кэша
-      if(!isset($this->container[$try_language][$offset]) && $this->cache) {
+      if (!isset($this->container[$try_language][$offset]) && $this->cache) {
         $this->container[$try_language][$offset] = $this->cache->__get($this->cache_prefix . $try_language . '_' . $offset);
 // Записываем результат работы кэша
 $locale_cache_statistic['queries']++;
@@ -71,7 +71,7 @@ 
       }
 
       // Если мы как-то где-то нашли строку...
-      if(isset($this->container[$try_language][$offset])) {
+      if (isset($this->container[$try_language][$offset])) {
         // ...значит она получена в результате фоллбэка и записываем её в кэш и контейнер
         $this[$offset] = $this->container[$try_language][$offset];
         $locale_cache_statistic['fallbacks']++;
@@ -85,15 +85,15 @@ 
       $this->container[$this->active][] = $value;
     } else {
       $this->container[$this->active][$offset] = $value;
-      if($this->cache) {
+      if ($this->cache) {
         $this->cache->__set($this->cache_prefix_lang . $offset, $value);
       }
     }
   }
   public function offsetExists($offset) {
     // Шорткат если у нас уже есть строка в памяти PHP
-    if(!isset($this->container[$this->active][$offset])) {
-      if(!$this->cache || !($this->container[$this->active][$offset] = $this->cache->__get($this->cache_prefix_lang . $offset))) {
+    if (!isset($this->container[$this->active][$offset])) {
+      if (!$this->cache || !($this->container[$this->active][$offset] = $this->cache->__get($this->cache_prefix_lang . $offset))) {
         // Если нету такой строки - делаем фоллбэк
         $this->locale_string_fallback($offset);
       }
@@ -107,7 +107,7 @@ 
   }
   public function offsetGet($offset) {
     $value = $this->offsetExists($offset) ? $this->container[$this->active][$offset] : null;
-    if($this->enable_stat_usage) {
+    if ($this->enable_stat_usage) {
       $this->usage_stat_log($offset, $value);
     }
     return $value;
@@ -124,24 +124,24 @@ 
   public function usage_stat_load() {
     global $sn_cache;
 
-    $this->stat_usage = $sn_cache->lng_stat_usage  = array(); // TODO for debug
-    if(empty($this->stat_usage)) {
+    $this->stat_usage = $sn_cache->lng_stat_usage = array(); // TODO for debug
+    if (empty($this->stat_usage)) {
       $query = doquery("SELECT * FROM {{lng_usage_stat}}");
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $this->stat_usage[$row['lang_code'] . ':' . $row['string_id'] . ':' . $row['file'] . ':' . $row['line']] = $row['is_empty'];
       }
     }
   }
   public function usage_stat_save() {
-    if(!empty($this->stat_usage_new)) {
+    if (!empty($this->stat_usage_new)) {
       global $sn_cache;
       $sn_cache->lng_stat_usage = $this->stat_usage;
       doquery("SELECT 1 FROM {{lng_usage_stat}} LIMIT 1");
-      foreach($this->stat_usage_new as &$value) {
-        foreach($value as &$value2) {
+      foreach ($this->stat_usage_new as &$value) {
+        foreach ($value as &$value2) {
           $value2 = '"' . db_escape($value2) . '"';
         }
-        $value = '(' . implode(',', $value) .')';
+        $value = '(' . implode(',', $value) . ')';
       }
       doquery("REPLACE INTO {{lng_usage_stat}} (lang_code,string_id,`file`,line,is_empty,locale) VALUES " . implode(',', $this->stat_usage_new));
     }
@@ -154,7 +154,7 @@ 
     $file = str_replace('\\', '/', substr($trace[1]['file'], strlen(SN_ROOT_PHYSICAL) - 1));
 
     $string_id = $this->active . ':' . $offset . ':' . $file . ':' . $trace[1]['line'];
-    if(!isset($this->stat_usage[$string_id]) || $this->stat_usage[$string_id] != $empty) {
+    if (!isset($this->stat_usage[$string_id]) || $this->stat_usage[$string_id] != $empty) {
       $this->stat_usage[$string_id] = empty($value);
       $this->stat_usage_new[] = array(
         'lang_code' => $this->active,
@@ -194,11 +194,11 @@ 
     $cache_file_key = $this->cache_prefix_lang . '__' . $filename;
 
     // Подключен ли внешний кэш?
-    if($this->cache) {
+    if ($this->cache) {
       // Загружен ли уже данный файл?
       $cache_file_status = $this->cache->__get($cache_file_key);
       SN::log_file("locale.include: Cache - '{$filename}' has key '{$cache_file_key}' and is " . ($cache_file_status ? 'already loaded - EXIT' : 'EMPTY'), $cache_file_status ? -1 : 0);
-      if($cache_file_status) {
+      if ($cache_file_status) {
         // Если да - повторять загрузку нет смысла
         return null;
       }
@@ -212,35 +212,35 @@ 
     $this->make_fallback($language);
 
     $file_path = '';
-    foreach($this->fallback as $lang_try) {
-      if(!$lang_try /* || isset($language_tried[$lang_try]) */) {
+    foreach ($this->fallback as $lang_try) {
+      if (!$lang_try /* || isset($language_tried[$lang_try]) */) {
         continue;
       }
 
-      if($file_path = $this->lng_try_filepath($path, "language/{$lang_try}/{$filename_ext}")) {
+      if ($file_path = $this->lng_try_filepath($path, "language/{$lang_try}/{$filename_ext}")) {
         break;
       }
 
-      if($file_path = $this->lng_try_filepath($path, "language/{$filename}_{$lang_try}{$ext}")) {
+      if ($file_path = $this->lng_try_filepath($path, "language/{$filename}_{$lang_try}{$ext}")) {
         break;
       }
 
       $file_path = '';
     }
 
-    if($file_path) {
+    if ($file_path) {
       include($file_path);
 
-      if(!empty($a_lang_array)) {
+      if (!empty($a_lang_array)) {
         $this->merge($a_lang_array);
 
         // Загрузка данных из файла в кэш
-        if($this->cache) {
+        if ($this->cache) {
           SN::log_file("Locale: loading '{$filename}' into cache");
-          foreach($a_lang_array as $key => $value) {
+          foreach ($a_lang_array as $key => $value) {
             $value_cache_key = $this->cache_prefix_lang . $key;
-            if($this->cache->__isset($value_cache_key)) {
-              if(is_array($value)) {
+            if ($this->cache->__isset($value_cache_key)) {
+              if (is_array($value)) {
                 $alt_value = $this->cache->__get($value_cache_key);
                 $value = array_replace_recursive($alt_value, $value);
               }
@@ -250,7 +250,7 @@ 
         }
       }
 
-      if($this->cache) {
+      if ($this->cache) {
         $this->cache->__set($cache_file_key, true);
       }
 
@@ -263,14 +263,14 @@ 
   }
 
   public function lng_load_i18n($i18n) {
-    if(!isset($i18n)) {
+    if (!isset($i18n)) {
       return;
     }
 
-    foreach($i18n as $i18n_data) {
-      if(is_string($i18n_data)) {
+    foreach ($i18n as $i18n_data) {
+      if (is_string($i18n_data)) {
         $this->lng_include($i18n_data);
-      } elseif(is_array($i18n_data)) {
+      } elseif (is_array($i18n_data)) {
         $this->lng_include($i18n_data['file'], $i18n_data['path']);
       }
     }
@@ -288,7 +288,7 @@ 
 
     SN::log_file("locale.switch: Trying to switch language to '{$language_new}'");
 
-    if($language_new == $this->active) {
+    if ($language_new == $this->active) {
       SN::log_file("locale.switch: New language '{$language_new}' is equal to current language '{$this->active}' - EXIT", -1);
       return false;
     }
@@ -299,10 +299,10 @@ 
     $this['LANG_INFO'] = $this->lng_get_info($this->active);
     $this->make_fallback($this->active);
 
-    if($this->cache) {
+    if ($this->cache) {
       $cache_lang_init_status = $this->cache->__get($this->cache_prefix_lang . '__INIT');
       SN::log_file("locale.switch: Cache for '{$this->active}' prefixed '{$this->cache_prefix_lang}' is " . ($cache_lang_init_status ? 'already loaded. Doing nothing - EXIT' : 'EMPTY'), $cache_lang_init_status ? -1 : 0);
-      if($cache_lang_init_status) {
+      if ($cache_lang_init_status) {
         return false;
       }
 
@@ -318,7 +318,7 @@ 
     // Loading global language files
     $this->lng_load_i18n($sn_mvc['i18n']['']);
 
-    if($this->cache) {
+    if ($this->cache) {
       SN::log_file("locale.switch: Cache - setting flag " . $this->cache_prefix_lang . '__INIT');
       $this->cache->__set($this->cache_prefix_lang . '__INIT', true);
     }
@@ -332,7 +332,7 @@ 
   public function lng_get_info($entry) {
     $file_name = SN_ROOT_PHYSICAL . 'language/' . $entry . '/language.mo.php';
     $lang_info = array();
-    if(file_exists($file_name)) {
+    if (file_exists($file_name)) {
       include($file_name);
     }
 
@@ -340,15 +340,15 @@ 
   }
 
   public function lng_get_list() {
-    if(empty($this->lang_list)) {
+    if (empty($this->lang_list)) {
       $this->lang_list = array();
 
       $path = SN_ROOT_PHYSICAL . 'language/';
       $dir = dir($path);
-      while(false !== ($entry = $dir->read())) {
-        if(is_dir($path . $entry) && $entry[0] != '.') {
+      while (false !== ($entry = $dir->read())) {
+        if (is_dir($path . $entry) && $entry[0] != '.') {
           $lang_info = $this->lng_get_info($entry);
-          if($lang_info['LANG_NAME_ISO2'] == $entry) {
+          if ($lang_info['LANG_NAME_ISO2'] == $entry) {
             $this->lang_list[$lang_info['LANG_NAME_ISO2']] = $lang_info;
           }
         }