supernova-ws / SuperNova

includes/general.php

Spacing +1 added lines, -1 removed lines

@@ -284,7 +284,7 @@
     $time_left = min(floor($time_left / PERIOD_DAY), $term_original);
     $cost_left = $term_original > 0 ? ceil($time_left / $term_original * $original_cost) : 0;
 
-    array_walk_recursive($result, function (&$value) use ($cost_left) {
+    array_walk_recursive($result, function(&$value) use ($cost_left) {
       $value -= $cost_left;
     });
   }

common.php

Spacing +7 added lines, -7 removed lines

@@ -12,24 +12,24 @@ 
 global $debug, $template_result, $user, $lang, $planetrow;
 
 // Напоминание для Администрации, что игра отключена
-if($template_result[F_GAME_DISABLE]) {
+if ($template_result[F_GAME_DISABLE]) {
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
 }
 unset($disable_reason);
 
 
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
   lng_include('admin');
-} elseif($sys_user_logged_in) {
+} elseif ($sys_user_logged_in) {
   sys_user_vacation($user);
 
   $planet_id = SetSelectedPlanet($user);
 
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
-  if($user['ally_id']) {
+  if ($user['ally_id']) {
     sn_db_transaction_start();
     \Alliance\Alliance::sn_ali_fill_user_ally($user);
-    if(!$user['ally']['player']['id']) {
+    if (!$user['ally']['player']['id']) {
       // sn_sys_logout(false, true);
       // core_auth::logout(false);
       classSupernova::$auth->logout(false);
@@ -48,7 +48,7 @@ 
   sn_db_transaction_commit();
 
   $planetrow = $global_data['planet'];
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false);
     classSupernova::$auth->logout(false);
@@ -63,7 +63,7 @@ 
 sys_user_options_unpack($user);
 
 global $sn_page_name, $sn_mvc;
-if(!empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_EARLY_HEADER])) {
+if (!empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_EARLY_HEADER])) {
   $title = !empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_TITLE]) ? $sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_TITLE] : '';
   renderHeader($page, $title, $template_result, false, $user, classSupernova::$config, $lang, $planetrow);
 }

admin/adm_metamatter.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(!sn_module::sn_module_get_active_count('payment')) {
+if (!sn_module::sn_module_get_active_count('payment')) {
   sys_redirect(SN_ROOT_VIRTUAL . 'admin/overview.php');
 }
 

dark_matter.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 include_once('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(sn_module::sn_module_get_active_count('payment') && !defined('SN_GOOGLE')) {
+if (sn_module::sn_module_get_active_count('payment') && !defined('SN_GOOGLE')) {
   sys_redirect('metamatter.php');
 }
 

classes/Fleet/RecordFleet.php

Spacing +9 added lines, -9 removed lines

@@ -76,8 +76,8 @@ 
   public function __construct(GlobalContainer $services = null) {
     parent::__construct($services);
 
-    if(empty(static::$shipInfo)) {
-      foreach(sn_get_groups('fleet') as $unit_id) {
+    if (empty(static::$shipInfo)) {
+      foreach (sn_get_groups('fleet') as $unit_id) {
         static::$shipInfo[$unit_id] = get_unit_param($unit_id);
         static::$shipInfo[$unit_id][P_COST_METAL] = get_unit_cost_in(static::$shipInfo[$unit_id][P_COST]);
       }
@@ -103,7 +103,7 @@ 
    * @inheritdoc
    */
   public function update() {
-    if($this->getShipCount() < 1) {
+    if ($this->getShipCount() < 1) {
       return $this->delete();
     }
 
@@ -127,7 +127,7 @@ 
    */
   public function getCostInMetal() {
     $result = 0;
-    foreach($this->shipList as $shipId => $amount) {
+    foreach ($this->shipList as $shipId => $amount) {
       $result += $amount * $this->getShipCostInMetal($shipId);
     }
 
@@ -148,7 +148,7 @@ 
    */
   public function getCapacity() {
     $result = 0;
-    foreach($this->shipList as $shipId => $amount) {
+    foreach ($this->shipList as $shipId => $amount) {
       $result += $amount * $this->getShipCapacity($shipId);
     }
 
@@ -165,12 +165,12 @@ 
    */
   public function changeShipCount($shipSnId, $shipCount) {
     !isset($this->shipList[$shipSnId]) ? $this->shipList[$shipSnId] = 0 : false;
-    if($this->shipList[$shipSnId] + $shipCount < 0) {
+    if ($this->shipList[$shipSnId] + $shipCount < 0) {
       throw new \Exception("Trying to deduct more ships [{$shipSnId}] '{$shipCount}' then fleet has {$this->shipList[$shipSnId]}");
     }
 
     $this->shipList[$shipSnId] += $shipCount;
-    if($this->shipList[$shipSnId] <= 0) {
+    if ($this->shipList[$shipSnId] <= 0) {
       unset($this->shipList[$shipSnId]);
     }
 
@@ -185,11 +185,11 @@ 
    * @throws \Exception
    */
   public function changeResource($resourceId, $resourceCount) {
-    if(!array_key_exists($resourceId, $this->resources)) {
+    if (!array_key_exists($resourceId, $this->resources)) {
       return;
     }
 
-    if($this->resources[$resourceId] + $resourceCount < 0) {
+    if ($this->resources[$resourceId] + $resourceCount < 0) {
       throw new \Exception("Trying to deduct more resources [{$resourceId}] '{$resourceCount}' then fleet has {$this->resources[$resourceId]}");
     }
 

classes/Fleet/MissionExplore.php

Spacing +2 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
    *
    * @var int[] $shipsToRemove
    */
-  protected $shipsToRemove = [SHIP_COLONIZER, SHIP_SPY,];
+  protected $shipsToRemove = [SHIP_COLONIZER, SHIP_SPY, ];
 
   // -------------------------------------------------------------------------------------------------------------------
   /**
@@ -278,8 +278,7 @@ 
     }
 
     // Adding outcome message to the front of other info
-    array_unshift($this->message, is_string($messages) ? $messages :
-      (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : ''));
+    array_unshift($this->message, is_string($messages) ? $messages : (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : ''));
   }
 
   /**

classes/userOptions.php

Spacing +11 added lines, -11 removed lines

@@ -133,8 +133,8 @@ 
 
     $update_cache = false;
 
-    if(!empty($this->to_write)) {
-      foreach($this->to_write as $key => $cork) {
+    if (!empty($this->to_write)) {
+      foreach ($this->to_write as $key => $cork) {
         $value = is_array($this->data[$key]) ? serialize($this->data[$key]) : $this->data[$key]; // Сериализация для массивов при сохранении в БД
         $this->to_write[$key] = "({$this->user_id}, '" . db_escape($key) . "', '" . db_escape($value) . "')";
       }
@@ -145,18 +145,18 @@ 
       $update_cache = true;
     }
 
-    if(!empty($this->to_delete)) {
-      foreach($this->to_delete as $key => &$value) {
-        $value = is_string($key) ? "'". db_escape($key) . "'" : $key;
+    if (!empty($this->to_delete)) {
+      foreach ($this->to_delete as $key => &$value) {
+        $value = is_string($key) ? "'" . db_escape($key) . "'" : $key;
       }
 
-      doquery("DELETE FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} AND `option_id` IN (". implode(',', $this->to_delete) . ") ");
+      doquery("DELETE FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} AND `option_id` IN (" . implode(',', $this->to_delete) . ") ");
 
       $this->to_delete = array();
       $update_cache = true;
     }
 
-    if($update_cache) {
+    if ($update_cache) {
       global $sn_cache;
 
       $field_name = $this->cached_name();
@@ -183,7 +183,7 @@ 
   protected function load() {
     global $sn_cache;
 
-    if($this->loaded) {
+    if ($this->loaded) {
       return;
     }
 
@@ -191,7 +191,7 @@ 
     $this->to_write = array();
     $this->to_delete = array();
 
-    if(!$this->user_id) {
+    if (!$this->user_id) {
       $this->loaded = true;
       return;
     }
@@ -199,13 +199,13 @@ 
     $field_name = $this->cached_name();
     $a_data = $sn_cache->$field_name;
 
-    if(!empty($a_data)) {
+    if (!empty($a_data)) {
       $this->data = array_replace_recursive($this->data, $a_data);
       return;
     }
 
     $query = doquery("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       // $this->data[$row['option_id']] = $row['value'];
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
     }

classes/Bonus/BonusListAtom.php

Spacing +2 added lines, -2 removed lines

@@ -58,8 +58,8 @@
   protected function bonusSort(BonusAtom $a, BonusAtom $b) {
     static $bonusOrder = [BonusAtom::class, BonusAtomAbility::class, BonusAtomAdd::class, BonusAtomPercent::class, BonusAtomMultiply::class];
 
-    $indexA = (int)array_search(get_class($a), $bonusOrder);
-    $indexB = (int)array_search(get_class($b), $bonusOrder);
+    $indexA = (int) array_search(get_class($a), $bonusOrder);
+    $indexB = (int) array_search(get_class($b), $bonusOrder);
 
     return $indexA == $indexB ? 0 : ($indexA > $indexB ? +1 : -1);
   }

includes/vars.php

Spacing +6 added lines, -6 removed lines

@@ -564,9 +564,9 @@ 
           2 => 0.01,
         ),
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => array(
-          90  => [P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2,],
-          99  => [P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1,],
-          100 => [P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0,],
+          90  => [P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2, ],
+          99  => [P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1, ],
+          100 => [P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0, ],
         ),
       ),
       FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES => array(
@@ -578,9 +578,9 @@ 
           2 => 0.025,
         ),
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => array(
-          90  => [P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2,],
-          99  => [P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1,],
-          100 => [P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0,],
+          90  => [P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2, ],
+          99  => [P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1, ],
+          100 => [P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0, ],
         ),
       ),
       FLT_EXPEDITION_OUTCOME_FOUND_DM        => array(