supernova-ws / SuperNova

classes/_SnCacheInternal.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     //print("<br />CACHE CLEAR {$cache_id} " . ($hard ? 'HARD' : 'SOFT') . "<br />");
     if ($hard && !empty(_SnCacheInternal::$data[$location_type])) {
       // Здесь нельзя делать unset - надо записывать NULL, что бы это отразилось на зависимых записях
-      array_walk(_SnCacheInternal::$data[$location_type], function (&$item) { $item = null; });
+      array_walk(_SnCacheInternal::$data[$location_type], function(&$item) { $item = null; });
     }
     _SnCacheInternal::$locator[$location_type] = [];
     _SnCacheInternal::$queries[$location_type] = [];

includes/db/db_queries_users.php

Spacing +3 added lines, -3 removed lines

@@ -180,7 +180,7 @@ 
     "SELECT `id` AS `ID`, `username` AS `NAME`, `ally_name` AS `ALLY`, `total_points` AS `STAT_POINTS`,
       `onlinetime` AS `ACTIVITY`
     FROM `{{users}}`
-    WHERE `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) ." ORDER BY user_as_ally, `". $TypeSort ."` ASC;");
+    WHERE `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) . " ORDER BY user_as_ally, `" . $TypeSort . "` ASC;");
 }
 
 
@@ -195,7 +195,7 @@ 
   return doquery("SELECT u.*, COUNT(r.id) AS referral_count, SUM(r.dark_matter) AS referral_dm FROM {{users}} as u
     LEFT JOIN {{referrals}} as r on r.id_partner = u.id
     WHERE" .
-    ($online ? " `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) : ' user_as_ally IS NULL') .
+    ($online ? " `onlinetime` >= " . (SN_TIME_NOW - $config->game_users_online_timeout) : ' user_as_ally IS NULL') .
     " GROUP BY u.id
     ORDER BY user_as_ally, {$sort} ASC");
 }
@@ -211,7 +211,7 @@ 
   !is_array($user_id_list) ? $user_id_list = array($user_id_list) : false;
 
   $user_list = array();
-  foreach($user_id_list as $user_id_unsafe) {
+  foreach ($user_id_list as $user_id_unsafe) {
     $user = db_user_by_id($user_id_unsafe);
     !empty($user) ? $user_list[$user_id_unsafe] = $user : false;
   }

includes/includes/market_info.inc

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_MARKET') || SN_IN_MARKET !== true)
+if (!defined('SN_IN_MARKET') || SN_IN_MARKET !== true)
 {
   $debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
@@ -15,50 +15,50 @@ 
 ));
 
 $info_action = sys_get_param_int('action');
-if($info_action)
+if ($info_action)
 {
   try
   {
     sn_db_transaction_start();
 
     $user = db_user_by_id($user['id'], true);
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < $config->rpg_cost_info)
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < $config->rpg_cost_info)
     {
       throw new Exception(MARKET_NO_DM, ERR_ERROR);
     }
 
-    switch($info_action)
+    switch ($info_action)
     {
       case MARKET_INFO_PLAYER:
         $user_info_name_unsafe = sys_get_param_str_unsafe('user_info_name');
-        if(!$user_info_name_unsafe)
+        if (!$user_info_name_unsafe)
         {
           throw new Exception(MARKET_INFO_PLAYER_WRONG, ERR_ERROR);
         }
 
-        if(is_id($user_info_name_unsafe))
+        if (is_id($user_info_name_unsafe))
         {
           $user_info = db_user_by_id($user_info_name_unsafe, true, '`id`, `username`', true);
         }
-        if(!is_array($user_info))
+        if (!is_array($user_info))
         {
           $user_info = db_user_by_username($user_info_name_unsafe, true);
         }
-        if(!is_array($user_info))
+        if (!is_array($user_info))
         {
           throw new Exception(MARKET_INFO_PLAYER_NOT_FOUND, ERR_ERROR);
         }
-        if($user_info['id'] == $user['id'])
+        if ($user_info['id'] == $user['id'])
         {
           throw new Exception(MARKET_INFO_PLAYER_SAME, ERR_ERROR);
         }
 
         $msg_text = array();
-        foreach(sn_get_groups('mercenaries') as $mercenary_id)
+        foreach (sn_get_groups('mercenaries') as $mercenary_id)
         {
           $msg_text[] = "{$lang['tech'][$mercenary_id]} - " . (($mercenary_level = mrc_get_level($user_info, false, $mercenary_id)) ? "{$lang['sys_level']} {$mercenary_level}" : $lang['eco_mrk_info_not_hired']);
         }
-        if($mercenary_level = mrc_get_level($user_info, false, UNIT_PREMIUM))
+        if ($mercenary_level = mrc_get_level($user_info, false, UNIT_PREMIUM))
         {
           $msg_text[] = "{$lang['tech'][UNIT_PREMIUM]} - {$mercenary_level} {$lang['sys_level']}";
         }
@@ -72,7 +72,7 @@ 
       break;
     }
 
-    if(!rpg_points_change($user['id'], RPG_MARKET_INFO_MERCENARY, -$config->rpg_cost_info, "Using Black Market page {$lang['eco_mrk_info']} - getting info about user ID {$user_info['id']}"))
+    if (!rpg_points_change($user['id'], RPG_MARKET_INFO_MERCENARY, -$config->rpg_cost_info, "Using Black Market page {$lang['eco_mrk_info']} - getting info about user ID {$user_info['id']}"))
     {
       // TODO: throw new Exception(MARKET_INFO_PLAYER_SAME, ERR_ERROR);
     }

classes/Alliance/AllianceMember.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
    * @return bool
    */
   public function changeTitle(AllianceTitle $title) {
-    if(!$title instanceof AllianceTitle) {
+    if (!$title instanceof AllianceTitle) {
       return false;
     }
 

classes/Alliance/AllianceTitleList.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
         continue;
       }
 
-      $result[] = (string)$title;
+      $result[] = (string) $title;
     }
 
     return implode(';', $result);
@@ -67,7 +67,7 @@ 
    * Updates title names and access rights with current ones
    */
   public function updateTitles() {
-    $this->alliance->titleList = (string)$this;
+    $this->alliance->titleList = (string) $this;
   }
 
   protected function extractTitles() {

classes/Bonus/BonusAtom.php

Spacing +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
    * @return int
    */
   public static function calcBonusPower($unitInfo) {
-    return isset($unitInfo[P_BONUS_VALUE]) ? $unitInfo[P_BONUS_VALUE] :
-      (static::calcBonusType($unitInfo) == BONUS_ABILITY ? 1 : 0);
+    return isset($unitInfo[P_BONUS_VALUE]) ? $unitInfo[P_BONUS_VALUE] : (static::calcBonusType($unitInfo) == BONUS_ABILITY ? 1 : 0);
   }
 
   /**

includes/template.php

Spacing +3 added lines, -3 removed lines

@@ -288,7 +288,7 @@ 
     renderFooter();
   }
 
-  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false;;
+  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false; ;
 
   sn_db_disconnect();
 
@@ -670,7 +670,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']
@@ -963,7 +963,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']),
   ));
 

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/includes/flt_mission_explore.php

Spacing +37 added lines, -38 removed lines

@@ -14,11 +14,11 @@ 
 
   $fleet_left = 1 - mt_rand(1, 3) * mt_rand(200000, 300000) / 1000000;
   $fleet_lost = array();
-  foreach($fleet as $unit_id => &$unit_amount) {
+  foreach ($fleet as $unit_id => &$unit_amount) {
     $ships_left = floor($unit_amount * $fleet_left);
     $fleet_lost[$unit_id] = $unit_amount - $ships_left;
     $unit_amount = $ships_left;
-    if(!$unit_amount) {
+    if (!$unit_amount) {
       unset($fleet[$unit_id]);
     }
   }
@@ -31,14 +31,14 @@ 
 //  $fleet = array();
 }
 
-function flt_mission_explore_addon(&$result){return sn_function_call('flt_mission_explore_addon', array(&$result));}
+function flt_mission_explore_addon(&$result) {return sn_function_call('flt_mission_explore_addon', array(&$result)); }
 function sn_flt_mission_explore_addon(&$result) {
   return $result;
 }
 
 
 function flt_mission_explore(&$mission_data) {
-  if(!isset($mission_data['fleet_event']) || $mission_data['fleet_event'] != EVENT_FLT_ACOMPLISH) {
+  if (!isset($mission_data['fleet_event']) || $mission_data['fleet_event'] != EVENT_FLT_ACOMPLISH) {
     return CACHE_NONE;
   }
 
@@ -71,10 +71,10 @@ 
   $outcome_list = &$result['$outcome_list'];
   $fleet_metal_points = &$result['$fleet_metal_points'];
 
-  if(!$ship_data) {
-    foreach(sn_get_groups('fleet') as $unit_id) {
+  if (!$ship_data) {
+    foreach (sn_get_groups('fleet') as $unit_id) {
       $unit_info = get_unit_param($unit_id);
-      if($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
+      if ($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
         continue;
       }
       $ship_data[$unit_id][P_COST_METAL] = get_unit_cost_in($unit_info[P_COST]);
@@ -86,7 +86,7 @@ 
   $fleet = sys_unit_str2arr($fleet_row['fleet_array']);
   $fleet_capacity = 0;
   $fleet_metal_points = 0;
-  foreach($fleet as $ship_id => $ship_amount) {
+  foreach ($fleet as $ship_id => $ship_amount) {
     $unit_info = get_unit_param($ship_id);
     $fleet_capacity += $ship_amount * $unit_info[P_CAPACITY];
     $fleet_metal_points += $ship_amount * $ship_data[$ship_id][P_COST_METAL];
@@ -96,11 +96,11 @@ 
   $flt_stay_hours = ($fleet_row['fleet_end_stay'] - $fleet_row['fleet_start_time']) / 3600 * ($config->game_speed_expedition ? $config->game_speed_expedition : 1);
 
   $outcome_list = sn_get_groups(GROUP_MISSION_EXPLORE_OUTCOMES);
-  $outcome_list[FLT_EXPEDITION_OUTCOME_NONE]['chance'] = ceil(200 / pow($flt_stay_hours, 1/1.7));
+  $outcome_list[FLT_EXPEDITION_OUTCOME_NONE]['chance'] = ceil(200 / pow($flt_stay_hours, 1 / 1.7));
 
   $chance_max = 0;
-  foreach($outcome_list as $key => &$value) {
-    if(!$value['chance']) {
+  foreach ($outcome_list as $key => &$value) {
+    if (!$value['chance']) {
       unset($outcome_list[$key]);
       continue;
     }
@@ -109,13 +109,13 @@ 
   $outcome_value = mt_rand(0, $chance_max);
 // $outcome_value = 409;
   $outcome_description = &$outcome_list[$mission_outcome = FLT_EXPEDITION_OUTCOME_NONE];
-  foreach($outcome_list as $key => &$value) {
-    if(!$value['chance']) {
+  foreach ($outcome_list as $key => &$value) {
+    if (!$value['chance']) {
       continue;
     }
     $mission_outcome = $key;
     $outcome_description = $value;
-    if($outcome_value <= $outcome_description['value']) {
+    if ($outcome_value <= $outcome_description['value']) {
       break;
     }
   }
@@ -131,7 +131,7 @@ 
   $found_dark_matter = 0;
 //  $outcome_mission_sub = -1;
 
-  switch($mission_outcome) {
+  switch ($mission_outcome) {
 //  switch(FLT_EXPEDITION_OUTCOME_LOST_FLEET) { // TODO DEBUG!
     case FLT_EXPEDITION_OUTCOME_LOST_FLEET:
       flt_mission_explore_outcome_lost_fleet($result);
@@ -166,14 +166,14 @@ 
 
       // Рассчитываем стоимость самого дорого корабля в металле
       $max_metal_cost = 0;
-      foreach($fleet as $ship_id => $ship_amount) {
+      foreach ($fleet as $ship_id => $ship_amount) {
         $max_metal_cost = max($max_metal_cost, $ship_data[$ship_id]['metal_cost']);
       }
 
       // Ограничиваем корабли только теми, чья стоимость в металле меньше или равно стоимости самого дорогого корабля
       $can_be_found = array();
-      foreach($ship_data as $ship_id => $ship_info) {
-        if($ship_info['metal_cost'] < $max_metal_cost) {
+      foreach ($ship_data as $ship_id => $ship_info) {
+        if ($ship_info['metal_cost'] < $max_metal_cost) {
           $can_be_found[$ship_id] = $ship_info['metal_cost'];
         }
       }
@@ -182,13 +182,13 @@ 
       unset($can_be_found[SHIP_SPY]);
 
       $fleet_found = array();
-      while(count($can_be_found) && $found_in_metal >= max($can_be_found)) {
+      while (count($can_be_found) && $found_in_metal >= max($can_be_found)) {
         $found_index = mt_rand(1, count($can_be_found)) - 1;
         $found_ship = array_slice($can_be_found, $found_index, 1, true);
         $found_ship_cost = reset($found_ship);
         $found_ship_id = key($found_ship);
 
-        if($found_ship_cost > $found_in_metal) {
+        if ($found_ship_cost > $found_in_metal) {
           unset($can_be_found[$found_ship_id]);
         } else {
           $found_ship_count = mt_rand(1, floor($found_in_metal / $found_ship_cost));
@@ -197,10 +197,10 @@ 
         }
       }
 
-      if(empty($fleet_found)) {
+      if (empty($fleet_found)) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       } else {
-        foreach($fleet_found as $unit_id => $unit_amount) {
+        foreach ($fleet_found as $unit_id => $unit_amount) {
           $fleet[$unit_id] += $unit_amount;
         }
       }
@@ -226,7 +226,7 @@ 
       $fleet_row['fleet_resource_crystal'] += $resources_found[RES_CRYSTAL];
       $fleet_row['fleet_resource_deuterium'] += $resources_found[RES_DEUTERIUM];
 
-      if(array_sum($resources_found) == 0) {
+      if (array_sum($resources_found) == 0) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       }
     break;
@@ -237,7 +237,7 @@ 
       // Рассчитываем количество найденной ТМ
       $found_dark_matter = floor(min($outcome_percent * $fleet_metal_points / $rates[RES_DARK_MATTER], 10000) * mt_rand(750000, 1000000) / 1000000);
 
-      if(!$found_dark_matter) {
+      if (!$found_dark_matter) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       }
     break;
@@ -251,31 +251,31 @@ 
 
   flt_mission_explore_addon($result);
 
-  if($found_dark_matter) {
+  if ($found_dark_matter) {
     rpg_points_change($fleet_row['fleet_owner'], RPG_EXPEDITION, $found_dark_matter, 'Expedition Bonus');
     $msg_text_addon = sprintf($lang['flt_mission_expedition']['found_dark_matter'], $found_dark_matter);
   }
 
-  if(!empty($fleet_lost)) {
+  if (!empty($fleet_lost)) {
     $msg_text_addon = $lang['flt_mission_expedition']['lost_fleet'];
-    foreach($fleet_lost as $ship_id => $ship_amount) {
+    foreach ($fleet_lost as $ship_id => $ship_amount) {
       $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
     }
   }
 
   $fleet_row['fleet_amount'] = array_sum($fleet);
-  if(!empty($fleet) && $fleet_row['fleet_amount']) {
-    if(!empty($fleet_found)) {
+  if (!empty($fleet) && $fleet_row['fleet_amount']) {
+    if (!empty($fleet_found)) {
       $msg_text_addon = $lang['flt_mission_expedition']['found_fleet'];
-      foreach($fleet_found as $ship_id => $ship_amount) {
+      foreach ($fleet_found as $ship_id => $ship_amount) {
         $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
       }
     }
 
     $query_delta = array();
-    if(!empty($resources_found) && array_sum($resources_found) > 0) {
+    if (!empty($resources_found) && array_sum($resources_found) > 0) {
       $msg_text_addon = $lang['flt_mission_expedition']['found_resources'];
-      foreach($resources_found as $ship_id => $ship_amount) {
+      foreach ($resources_found as $ship_id => $ship_amount) {
         $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
       }
 
@@ -288,7 +288,7 @@ 
     }
 
     $query_data = array();
-    if(!empty($fleet_lost) || !empty($fleet_found)) {
+    if (!empty($fleet_lost) || !empty($fleet_found)) {
       $fleet_row['fleet_array'] = sys_unit_arr2str($fleet);
 
 //      $query_data[] = "`fleet_amount` = {$fleet_row['fleet_amount']}";
@@ -316,17 +316,16 @@ 
 
   db_user_set_by_id($fleet_row['fleet_owner'], "`player_rpg_explore_xp` = `player_rpg_explore_xp` + 1");
 
-  if(!$msg_text) {
+  if (!$msg_text) {
     $messages = &$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['messages'];
-    if($outcome_mission_sub >= 0 && is_array($messages)) {
+    if ($outcome_mission_sub >= 0 && is_array($messages)) {
       $messages = &$messages[$outcome_mission_sub];
     }
 
-    $msg_text = is_string($messages) ? $messages :
-      (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
+    $msg_text = is_string($messages) ? $messages : (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
   }
   $msg_text = sprintf($msg_text, $fleet_row['fleet_id'], uni_render_coordinates($fleet_row, 'fleet_end_')) .
-    ($msg_text_addon ? "\r\n" . $msg_text_addon: '');
+    ($msg_text_addon ? "\r\n" . $msg_text_addon : '');
 
   msg_send_simple_message($fleet_row['fleet_owner'], '', $fleet_row['fleet_end_stay'], MSG_TYPE_EXPLORE, $msg_sender, $msg_title, $msg_text);