supernova-ws / SuperNova

includes/includes/market_info.inc

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 
     sn_db_transaction_commit();
     throw new Exception($info_action, ERR_NONE);
-  }
-  catch (Exception $e)
+  } catch (Exception $e)
   {
     sn_db_transaction_rollback();
 

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);
     }

includes/includes/market_trader.inc

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if((!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) && (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)) {
+if ((!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) && (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)) {
   $debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
 
@@ -27,12 +27,12 @@ 
 
   // $dm_db_name = pname_resource_name(RES_DARK_MATTER);
   $exchangeTo = in_array($exchangeTo = sys_get_param_int('exchangeTo'), sn_get_groups('resources_trader')) ? $exchangeTo : 0;
-  if($exchangeTo && is_array($tradeList = $_POST['spend'])) {
+  if ($exchangeTo && is_array($tradeList = $_POST['spend'])) {
     $value = 0;
     $qry = array();
 
     sn_db_transaction_start();
-    if($planetrow['id_owner']) {
+    if ($planetrow['id_owner']) {
       $global_data = sys_o_get_updated($user, $planetrow, SN_TIME_NOW);
       $planetrow = $global_data['planet'];
     }
@@ -41,27 +41,27 @@ 
       $user = db_user_by_id($user['id'], true);
     }
 
-    foreach(sn_get_groups('resources_trader') as $resource_id) {
+    foreach (sn_get_groups('resources_trader') as $resource_id) {
       $amount = floatval($tradeList[$resource_id]);
-      if($amount < 0) {
+      if ($amount < 0) {
         $debug->error('Trying to supply negative resource amount on Black Market Page', 'Hack Attempt', 305);
       }
 
-      if($resource_id == RES_DARK_MATTER && $exchangeTo == RES_DARK_MATTER) {
+      if ($resource_id == RES_DARK_MATTER && $exchangeTo == RES_DARK_MATTER) {
         continue;
       }
 
       $resource_db_name = pname_resource_name($resource_id);
-      if($exchangeTo == RES_DARK_MATTER) {
+      if ($exchangeTo == RES_DARK_MATTER) {
         $sign = '+';
         $amount = floor($tradeList[RES_DARK_MATTER] / 3 * $rates[RES_DARK_MATTER] / $rates[$resource_id]);
         $value += $amount;
       } else {
         $value += floor($amount * $rates[$resource_id] / $rates[$exchangeTo]);
-        if($resource_id == RES_DARK_MATTER) {
+        if ($resource_id == RES_DARK_MATTER) {
           $amount = 0;
         } else {
-          if(mrc_get_level($user, $planetrow, $resource_id, true) < $amount) {
+          if (mrc_get_level($user, $planetrow, $resource_id, true) < $amount) {
             $intError = MARKET_NO_RESOURCES;
             break;
           }
@@ -70,12 +70,12 @@ 
         }
       }
 
-      if($amount) {
+      if ($amount) {
         $qry[] = "`{$resource_db_name}` = `{$resource_db_name}` {$sign} {$amount}";
       }
     }
 
-    if($exchangeTo != RES_DARK_MATTER) {
+    if ($exchangeTo != RES_DARK_MATTER) {
       $amount = floor($value);
       $exchange_to_db_name = pname_resource_name($exchangeTo);
       $qry[] = "`{$exchange_to_db_name}` = `{$exchange_to_db_name}` + {$amount}";
@@ -86,7 +86,7 @@ 
     $intError = $value <= 0 ? MARKET_ZERO_DEAL : $intError;
     $intError = mrc_get_level($user, null, RES_DARK_MATTER) < $operation_cost ? MARKET_NO_DM : $intError;
 
-    if($intError == MARKET_DEAL) {
+    if ($intError == MARKET_DEAL) {
       $qry = implode(', ', $qry);
       $table = $planetrow['id_owner'] ? 'planets' : 'users';
 
@@ -111,8 +111,8 @@ 
     'EXCHANGE_TO_RESOURCE_ID' => $exchangeTo,
   ));
 
-  foreach(sn_get_groups('resources_trader') as $resource_id) {
-    if($resource_id == RES_DARK_MATTER) {
+  foreach (sn_get_groups('resources_trader') as $resource_id) {
+    if ($resource_id == RES_DARK_MATTER) {
       $amount = floor(mrc_get_level($user, null, RES_DARK_MATTER) - $config->rpg_cost_trader);
     } else {
       $amount = floor(mrc_get_level($user, $planetrow, $resource_id));

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
     if($planetrow['id_owner']) {
       $global_data = sys_o_get_updated($user, $planetrow, SN_TIME_NOW);
       $planetrow = $global_data['planet'];
-    }
-    else {
+    } else {
       // Locking user record
       $user = db_user_by_id($user['id'], true);
     }

includes/includes/user_birthday_celebrate.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
   $query = db_user_list_to_celebrate($config->user_birthday_range);
 
-  while($row = db_fetch($query))
+  while ($row = db_fetch($query))
   {
     $row['username'] = db_escape($row['username']);
     rpg_points_change($row['id'], RPG_BIRTHDAY, $config->user_birthday_gift, "Birthday gift for user {$row['username']} ID {$row['id']} on his birthday on {$row['user_birthday']}. Gift last gaved at {$row['user_birthday_celebrated']}");

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 
-function sn_user_birthday_celebrate()
-{
+function sn_user_birthday_celebrate() {
   global $config, $lang;
 
   sn_db_transaction_start();

includes/includes/coe_simulator_helpers.php

Spacing +20 added lines, -20 removed lines

@@ -4,9 +4,9 @@ 
 {
   $strPacked = "{$type}!";
 
-  foreach($combat as $fleetID => $fleetCompress)
+  foreach ($combat as $fleetID => $fleetCompress)
   {
-    foreach($fleetCompress as $key => $value)
+    foreach ($fleetCompress as $key => $value)
     {
       $value = intval($value);
       $strPacked .= "{$key},{$value};";
@@ -22,29 +22,29 @@ 
   $fleet_id = 0;
 
   $arr_data_unpacked = explode('!', $str_data);
-  foreach($arr_data_unpacked as $data_piece)
+  foreach ($arr_data_unpacked as $data_piece)
   {
-    if(!$data_piece)
+    if (!$data_piece)
     {
       continue;
     }
 
-    if($data_piece == 'A' || $data_piece == 'D')
+    if ($data_piece == 'A' || $data_piece == 'D')
     {
       $fleet_type = $data_piece;
       continue;
     }
 
     $arr_unit_strings = explode(';', $data_piece);
-    foreach($arr_unit_strings as $str_unit_string)
+    foreach ($arr_unit_strings as $str_unit_string)
     {
-      if(!$str_unit_string)
+      if (!$str_unit_string)
       {
         continue;
       }
 
       $arr_unit_data = explode(',', $str_unit_string);
-      if($arr_unit_data[1])
+      if ($arr_unit_data[1])
       {
         $unpacked[$fleet_type][$fleet_id][$arr_unit_data[0]] = intval($arr_unit_data[1]);
       }
@@ -64,48 +64,48 @@ 
 
   $player_id = $player_id == -1 ? count($combat_data[UBE_PLAYERS]) : $player_id;
 
-  foreach($side_info as $fleet_data)
+  foreach ($side_info as $fleet_data)
   {
     $combat_data[UBE_PLAYERS][$player_id][UBE_NAME] = $attacker ? 'Attacker' : 'Defender';
     $combat_data[UBE_PLAYERS][$player_id][UBE_ATTACKER] = $attacker;
 
     $combat_data[UBE_FLEETS][$player_id][UBE_OWNER] = $player_id;
-    foreach($fleet_data as $unit_id => $unit_count)
+    foreach ($fleet_data as $unit_id => $unit_count)
     {
-      if(!$unit_count)
+      if (!$unit_count)
       {
         continue;
       }
 
       $unit_type = get_unit_param($unit_id, P_UNIT_TYPE);
 
-      if($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE)
+      if ($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE)
       {
         $combat_data[UBE_FLEETS][$player_id][UBE_COUNT][$unit_id] = $unit_count;
       }
-      elseif($unit_type == UNIT_RESOURCES)
+      elseif ($unit_type == UNIT_RESOURCES)
       {
         $combat_data[UBE_FLEETS][$player_id][UBE_RESOURCES][$unit_id] = $unit_count;
       }
-      elseif($unit_type == UNIT_TECHNOLOGIES)
+      elseif ($unit_type == UNIT_TECHNOLOGIES)
       {
         $combat_data[UBE_PLAYERS][$player_id][UBE_BONUSES][$ube_convert_techs[$unit_id]] += $unit_count * get_unit_param($unit_id, P_BONUS_VALUE) / 100;
       }
-      elseif($unit_type == UNIT_GOVERNORS)
+      elseif ($unit_type == UNIT_GOVERNORS)
       {
-        if($unit_id == MRC_FORTIFIER)
+        if ($unit_id == MRC_FORTIFIER)
         {
-          foreach($ube_convert_techs as $ube_id)
+          foreach ($ube_convert_techs as $ube_id)
           {
             $combat_data[UBE_FLEETS][$player_id][UBE_BONUSES][$ube_id] += $unit_count * get_unit_param($unit_id, P_BONUS_VALUE) / 100;
           }
         }
       }
-      elseif($unit_type == UNIT_MERCENARIES)
+      elseif ($unit_type == UNIT_MERCENARIES)
       {
-        if($unit_id == MRC_ADMIRAL)
+        if ($unit_id == MRC_ADMIRAL)
         {
-          foreach($ube_convert_techs as $ube_id)
+          foreach ($ube_convert_techs as $ube_id)
           {
             $combat_data[UBE_PLAYERS][$player_id][UBE_BONUSES][$ube_id] += $unit_count * get_unit_param($unit_id, P_BONUS_VALUE) / 100;
           }

Braces +8 added lines, -16 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function sn_ube_simulator_encode_replay($combat, $type)
-{
+function sn_ube_simulator_encode_replay($combat, $type) {
   $strPacked = "{$type}!";
 
   foreach($combat as $fleetID => $fleetCompress)
@@ -17,8 +16,7 @@ 
   return $strPacked;
 }
 
-function sn_ube_simulator_decode_replay($str_data)
-{
+function sn_ube_simulator_decode_replay($str_data) {
   $fleet_id = 0;
 
   $arr_data_unpacked = explode('!', $str_data);
@@ -58,8 +56,7 @@ 
 
 // ------------------------------------------------------------------------------------------------
 // Преобразовывает данные симулятора в данные для расчета боя
-function sn_ube_simulator_fill_side(&$combat_data, $side_info, $attacker, $player_id = -1)
-{
+function sn_ube_simulator_fill_side(&$combat_data, $side_info, $attacker, $player_id = -1) {
   global $ube_convert_techs;
 
   $player_id = $player_id == -1 ? count($combat_data[UBE_PLAYERS]) : $player_id;
@@ -82,16 +79,13 @@ 
       if($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE)
       {
         $combat_data[UBE_FLEETS][$player_id][UBE_COUNT][$unit_id] = $unit_count;
-      }
-      elseif($unit_type == UNIT_RESOURCES)
+      } elseif($unit_type == UNIT_RESOURCES)
       {
         $combat_data[UBE_FLEETS][$player_id][UBE_RESOURCES][$unit_id] = $unit_count;
-      }
-      elseif($unit_type == UNIT_TECHNOLOGIES)
+      } elseif($unit_type == UNIT_TECHNOLOGIES)
       {
         $combat_data[UBE_PLAYERS][$player_id][UBE_BONUSES][$ube_convert_techs[$unit_id]] += $unit_count * get_unit_param($unit_id, P_BONUS_VALUE) / 100;
-      }
-      elseif($unit_type == UNIT_GOVERNORS)
+      } elseif($unit_type == UNIT_GOVERNORS)
       {
         if($unit_id == MRC_FORTIFIER)
         {
@@ -100,8 +94,7 @@ 
             $combat_data[UBE_FLEETS][$player_id][UBE_BONUSES][$ube_id] += $unit_count * get_unit_param($unit_id, P_BONUS_VALUE) / 100;
           }
         }
-      }
-      elseif($unit_type == UNIT_MERCENARIES)
+      } elseif($unit_type == UNIT_MERCENARIES)
       {
         if($unit_id == MRC_ADMIRAL)
         {
@@ -115,8 +108,7 @@ 
   }
 }
 
-function sn_ube_simulator_fleet_converter($sym_attacker, $sym_defender)
-{
+function sn_ube_simulator_fleet_converter($sym_attacker, $sym_defender) {
   $combat_data = array(
     UBE_OPTIONS => array(
       UBE_SIMULATOR => sys_get_param_int('simulator'),

includes/includes/flt_mission_colonize.php

Spacing +4 added lines, -4 removed lines

@@ -17,12 +17,12 @@ 
 
   global $lang;
 
-  $TargetAdress = sprintf ($lang['sys_adress_planet'], $fleet_row['fleet_end_galaxy'], $fleet_row['fleet_end_system'], $fleet_row['fleet_end_planet']);
+  $TargetAdress = sprintf($lang['sys_adress_planet'], $fleet_row['fleet_end_galaxy'], $fleet_row['fleet_end_system'], $fleet_row['fleet_end_planet']);
 
   $fleet_array = sys_unit_str2arr($fleet_row['fleet_array']);
 
   $TheMessage = $lang['sys_colo_no_colonizer'];
-  if($fleet_array[SHIP_COLONIZER] >= 1)
+  if ($fleet_array[SHIP_COLONIZER] >= 1)
   {
     $TheMessage = $lang['sys_colo_notfree'];
     if (!$mission_data['dst_planet'] || empty($mission_data['dst_planet']))
@@ -31,7 +31,7 @@ 
 
       // Can we colonize more planets?
       $TheMessage = $lang['sys_colo_maxcolo'];
-      if($iPlanetCount < get_player_max_colonies($src_user_row))
+      if ($iPlanetCount < get_player_max_colonies($src_user_row))
       {
         // Yes, we can colonize
         $TheMessage = $lang['sys_colo_badpos'];
@@ -42,7 +42,7 @@ 
         if ($NewOwnerPlanet)
         {
           $TheMessage = $lang['sys_colo_arrival'] . $TargetAdress . $lang['sys_colo_allisok'];
-          msg_send_simple_message ( $fleet_row['fleet_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_SPY, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
+          msg_send_simple_message($fleet_row['fleet_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_SPY, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
 
           $fleet_array[SHIP_COLONIZER]--;
           $fleet_row['fleet_amount']--;

Braces +1 added lines, -2 removed lines

@@ -10,8 +10,7 @@
 // ----------------------------------------------------------------------------------------------------------------
 // Mission Case 9: -> Coloniser
 //
-function flt_mission_colonize(&$mission_data)
-{
+function flt_mission_colonize(&$mission_data) {
   $fleet_row          = &$mission_data['fleet'];
   $src_user_row       = &$mission_data['src_user'];
 

includes/includes/flt_mission_attack.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 */
 
 
-function flt_planet_capture(&$fleet_row, &$combat_data) {return sn_function_call('flt_planet_capture', array(&$fleet_row, &$combat_data, &$result));}
+function flt_planet_capture(&$fleet_row, &$combat_data) {return sn_function_call('flt_planet_capture', array(&$fleet_row, &$combat_data, &$result)); }
 function sn_flt_planet_capture(&$fleet_row, &$combat_data, &$result) {
   return $result;
 }
@@ -17,11 +17,11 @@ 
   $destination_user = $mission_data['dst_user'];
   $destination_planet = $mission_data['dst_planet'];
 
-  if(!$fleet_row) {
+  if (!$fleet_row) {
     return null;
   }
 
-  if(
+  if (
     // Нет данных о планете назначения или её владельце
     empty($destination_user) || empty($destination_planet) || !is_array($destination_user) || !is_array($destination_planet)
     ||

includes/pages/battle_report.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 
   $combat_data = sn_ube_report_load(sys_get_param_str('cypher'));
 
-  if($combat_data != UBE_REPORT_NOT_FOUND) {
+  if ($combat_data != UBE_REPORT_NOT_FOUND) {
     sn_ube_report_generate($combat_data, $template_result);
     $template = gettemplate('ube_combat_report', $template);
     $template->assign_vars(array(

includes/pages/techtree.php

Spacing +2 added lines, -2 removed lines

@@ -14,14 +14,14 @@
   global $lang, $user, $planetrow;
 
   $tech_tree = array();
-  foreach(get_unit_param('techtree') as $unit_group_id => $unit_list)
+  foreach (get_unit_param('techtree') as $unit_group_id => $unit_list)
   {
     $tech_tree[] = array(
       'NAME' => $lang['tech'][$unit_group_id],
       'GROUP_ID' => $unit_group_id,
     );
 
-    foreach($unit_list as $unit_id)
+    foreach ($unit_list as $unit_id)
     {
       $sn_data_unit = get_unit_param($unit_id);
       $level_basic = $sn_data_unit[P_STACKABLE] ? 0 : mrc_get_level($user, $planetrow, $unit_id, false, true);

Braces +1 added lines, -2 removed lines

@@ -6,8 +6,7 @@
  * version 2.0 copyright (c) 2012 by Gorlum for http://supernova.ws
  */
 
-function sn_techtree_view($template = null)
-{
+function sn_techtree_view($template = null) {
   global $lang, $user, $planetrow;
 
   $tech_tree = array();

includes/functions/geoip.php

Spacing +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <?php
 
-function geoip_status(){return sn_function_call('geoip_status', array(&$result));}
+function geoip_status() {return sn_function_call('geoip_status', array(&$result)); }
 function sn_geoip_status(&$result) {
   return $result = false;
 }
 
-function geoip_ip_info($ip){return sn_function_call('geoip_ip_info', array($ip, &$result));}
+function geoip_ip_info($ip) {return sn_function_call('geoip_ip_info', array($ip, &$result)); }
 function sn_geoip_ip_info($ip, &$result) {
   return $result = false;
 }