supernova-ws / SuperNova

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, '`id`, `username`', true, 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);
     }

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

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']}");

includes/includes/flt_page1.inc

Spacing +14 added lines, -14 removed lines

@@ -4,18 +4,18 @@ 
 // @version 1.0
 // @copyright 2008 by Chlorel for XNova
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   $debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
 }
 
 $template = gettemplate('fleet1', true);
 
 $ships = sys_get_param('ships', array());
-if(!is_array($ships)) {
+if (!is_array($ships)) {
   $ships = array();
 }
 
-foreach(array(PT_PLANET, PT_DEBRIS, PT_MOON) as $possible_planet_type_id) {
+foreach (array(PT_PLANET, PT_DEBRIS, PT_MOON) as $possible_planet_type_id) {
   $template->assign_block_vars('possible_planet_type_id', array(
     'ID' => $possible_planet_type_id,
     'NAME' => $lang['sys_planet_type_sh'][$possible_planet_type_id],
@@ -28,7 +28,7 @@ 
   'START_NAME'         => $planetrow['name'],
 );
 
-if(!empty($TargetPlanet)) {
+if (!empty($TargetPlanet)) {
   $template_route += array(
     'END_TYPE_TEXT_SH' => $lang['sys_planet_type_sh'][$TargetPlanet['planet_type']],
     'END_COORDS'       => uni_render_coordinates($TargetPlanet),
@@ -39,10 +39,10 @@ 
 $template->assign_block_vars('fleets', $template_route);
 
 $sn_groups_fleet = sn_get_groups('fleet');
-foreach($ships as $ship_id => $ship_count) {
-  if(in_array($ship_id, $sn_groups_fleet) && $ship_count) {
+foreach ($ships as $ship_id => $ship_count) {
+  if (in_array($ship_id, $sn_groups_fleet) && $ship_count) {
     $ship_info = get_unit_param($ship_id);
-    if($ship_count > mrc_get_level($user, $planetrow, $ship_id, false, true)) {
+    if ($ship_count > mrc_get_level($user, $planetrow, $ship_id, false, true)) {
       $page .= $lang['fl_noenought'];
     } else {
       $fleet['fleetarray'][$ship_id]  = $ship_count;
@@ -61,13 +61,13 @@ 
   }
 }
 
-if(empty($fleet['fleetarray'])) {
+if (empty($fleet['fleetarray'])) {
   message($lang['fl_err_no_ships'], $lang['fl_error'], 'fleet' . DOT_PHP_EX, 5);
 }
 
 // Building list of shortcuts
 $query = doquery("SELECT * FROM {{notes}} WHERE `owner` = {$user['id']} AND `galaxy` <> 0 AND `system` <> 0 AND `planet` <> 0 ORDER BY `priority` DESC, `galaxy`, `system`, `planet`, `planet_type`;");
-while($shortcut = db_fetch($query)) {
+while ($shortcut = db_fetch($query)) {
   $template->assign_block_vars('shortcut', array(
     'NAME'       => $shortcut['title'],
     'GALAXY'     => $shortcut['galaxy'],
@@ -81,10 +81,10 @@ 
 }
 
 // Building list of own planets & moons
-$colonies = db_planet_list_sorted ( $user );
-if(count($colonies) > 1) {
+$colonies = db_planet_list_sorted($user);
+if (count($colonies) > 1) {
   // while($row = db_fetch($colonies))
-  foreach($colonies as $row) {
+  foreach ($colonies as $row) {
     $template->assign_block_vars('colonies', array(
       'NAME'       => $row['name'],
       'GALAXY'     => $row['galaxy'],
@@ -99,9 +99,9 @@ 
 //ACS Start
 //Need to look for acs attacks.
 $aks_madnessred = doquery('SELECT * FROM {{aks}};');
-while($row = db_fetch($aks_madnessred)) {
+while ($row = db_fetch($aks_madnessred)) {
   $members = explode(',', $row['eingeladen']);
-  foreach($members as $a => $b) {
+  foreach ($members as $a => $b) {
     if ($b == $user['id']) {
       $template->assign_block_vars('acss', array(
         'ID'         => $row['id'],

includes/includes/ube_zi_helpers.php

Spacing +4 added lines, -4 removed lines

@@ -27,9 +27,9 @@ 
   print($round);
   print('<table border=1>');
   print('<tr align="left">');
-  foreach($header as $key => $value)
+  foreach ($header as $key => $value)
   {
-    if(is_array($value))
+    if (is_array($value))
     {
       continue;
     }
@@ -61,9 +61,9 @@ 
   );
 
   print('<tr align="right">');
-  foreach($debug_unit_crossfire_result as $key => $value)
+  foreach ($debug_unit_crossfire_result as $key => $value)
   {
-    if(is_array($value))
+    if (is_array($value))
     {
       continue;
     }

includes/includes/flt_page2.inc

Spacing +10 added lines, -11 removed lines

@@ -27,7 +27,7 @@ 
     'START_NAME'         => $planetrow['name'],
   );
 
-  if(!empty($TargetPlanet)) {
+  if (!empty($TargetPlanet)) {
     $template_route += array(
       'END_TYPE_TEXT_SH' => $lang['sys_planet_type_sh'][$TargetPlanet['planet_type']],
       'END_COORDS'       => uni_render_coordinates($TargetPlanet),
@@ -38,8 +38,8 @@ 
   $template->assign_block_vars('fleets', $template_route);
 
   $sn_groups_fleet = sn_get_groups('fleet');
-  foreach($fleetarray as $ship_id => $ship_count) {
-    if(in_array($ship_id, $sn_groups_fleet) && $ship_count) {
+  foreach ($fleetarray as $ship_id => $ship_count) {
+    if (in_array($ship_id, $sn_groups_fleet) && $ship_count) {
 //      $ship_base_data = get_ship_data($ship_id, $user);
       $template->assign_block_vars('fleets.ships', array(
         'ID'          => $ship_id,
@@ -57,11 +57,10 @@ 
     $fleet_capacity += get_unit_param($Ship, P_CAPACITY) * $Count;
   }
 
-  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) :
-    (isset($missiontype[MT_HOLD]) ? 12 : 0);
-  if($max_duration) {
+  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) : (isset($missiontype[MT_HOLD]) ? 12 : 0);
+  if ($max_duration) {
     $config_game_speed_expedition = ($target_mission == MT_EXPLORE && $config->game_speed_expedition ? $config->game_speed_expedition : 1);
-    for($i = 1; $i <= $max_duration; $i++) {
+    for ($i = 1; $i <= $max_duration; $i++) {
       $template->assign_block_vars('duration', array(
         'ID' => $i,
         'TIME' => pretty_time(ceil($i * 3600 / $config_game_speed_expedition)),
@@ -80,7 +79,7 @@ 
   // $TableTitle = uni_render_planet_full($planetrow) . '&nbsp;=&gt;&nbsp;' . uni_render_planet_full($temp);
 
   $sn_group_resources = sn_get_groups('resources');
-  for($i = 0; $i<3; $i++) {
+  for ($i = 0; $i < 3; $i++) {
     $amount = $planetrow[$sn_group_resources[$i]] - ($i == 2 ? $consumption : 0);
     $template->assign_block_vars('resources', array(
       'ID' => $i,
@@ -90,7 +89,7 @@ 
     ));
   }
 
-  if($sn_module['unit_captain']->manifest['active'] && ($captain = $sn_module['unit_captain']->unit_captain_get($planetrow['id'])) && $captain['unit_location_type'] == LOC_PLANET) {
+  if ($sn_module['unit_captain']->manifest['active'] && ($captain = $sn_module['unit_captain']->unit_captain_get($planetrow['id'])) && $captain['unit_location_type'] == LOC_PLANET) {
     $template->assign_vars(array(
       'CAPTAIN_ID' => $captain['unit_id'],
       'CAPTAIN_LEVEL' => $captain['captain_level'],
@@ -111,9 +110,9 @@ 
     // 'TableTitle' => $TableTitle,
 
     'speedallsmin' => sys_get_param_float('speedallsmin'),
-    'speed' => sys_get_param_int('speed') ,
+    'speed' => sys_get_param_int('speed'),
 
-    'fleet_group' => sys_get_param_id('fleet_group') ,
+    'fleet_group' => sys_get_param_id('fleet_group'),
     'acs_target_mr' => sys_get_param_str('acs_target_mr'),
 
     'MAX_DURATION' => $max_duration,

includes/includes/eco_bld_structures.php

Spacing +34 added lines, -34 removed lines

@@ -18,10 +18,10 @@ 
 function sn_eco_build($que_type, &$auser, &$planet) {
   global $lang, $config, $template_result;
 
-  if($ally_id = sys_get_param_id('ally_id')) {
+  if ($ally_id = sys_get_param_id('ally_id')) {
     define('SN_IN_ALLY', true);
     $ranks = ally_get_ranks($auser['ally']);
-    if($ranks[$auser['ally_rank_id']]['admin'] || $auser['ally']['ally_owner'] == $auser['id']) {
+    if ($ranks[$auser['ally_rank_id']]['admin'] || $auser['ally']['ally_owner'] == $auser['id']) {
       $user = &$auser['ally']['player'];
       $planet = array(
         'metal'     => $user['metal'],
@@ -31,11 +31,11 @@ 
     }
   }
 
-  if(!$user) {
+  if (!$user) {
     $user = &$auser;
   }
 
-  switch($action = sys_get_param_escaped('action')) {
+  switch ($action = sys_get_param_escaped('action')) {
     case 'create': // Add unit to que for build
     case 'create_autoconvert': // Add unit to que for build
     case 'destroy': // Add unit to que for remove
@@ -52,23 +52,23 @@ 
 
   $group_missile = sn_get_groups('missile');
   $silo_capacity_free = 0;
-  if($que_type == QUE_STRUCTURES) {
+  if ($que_type == QUE_STRUCTURES) {
     $build_unit_list = sn_get_groups('build_allow');
     $build_unit_list = $build_unit_list[$planet['planet_type']];
     $artifact_id = ART_NANO_BUILDER;
     $page_header = $lang['tech'][UNIT_STRUCTURES];
-  } elseif($que_type == QUE_RESEARCH) {
-    if(!mrc_get_level($user, $planet, STRUC_LABORATORY)) {
+  } elseif ($que_type == QUE_RESEARCH) {
+    if (!mrc_get_level($user, $planet, STRUC_LABORATORY)) {
       message($lang['no_laboratory'], $lang['tech'][UNIT_TECHNOLOGIES]);
     }
 
-    if(eco_unit_busy($user, $planet, UNIT_TECHNOLOGIES)) {
+    if (eco_unit_busy($user, $planet, UNIT_TECHNOLOGIES)) {
       message($lang['eco_bld_msg_err_laboratory_upgrading'], $lang['tech'][UNIT_TECHNOLOGIES]);
     }
     $build_unit_list = sn_get_groups('tech');
     $artifact_id = ART_HEURISTIC_CHIP;
     $page_header = $lang['tech'][UNIT_TECHNOLOGIES] . ($user['user_as_ally'] ? " {$lang['sys_of_ally']} {$user['username']}" : '');
-  } elseif($que_type == QUE_MERCENARY) {
+  } elseif ($que_type == QUE_MERCENARY) {
 //    if(!mrc_get_level($user, $planet, STRUC_LABORATORY)) {
 //      message($lang['no_laboratory'], $lang['tech'][UNIT_TECHNOLOGIES]);
 //    }
@@ -80,7 +80,7 @@ 
     $artifact_id = 0;
     $page_header = $lang['tech'][UNIT_MERCENARIES] . ($user['user_as_ally'] ? " {$lang['sys_of_ally']} {$user['username']}" : '');
   } else {
-    if(mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) == 0) {
+    if (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) == 0) {
       message($lang['need_hangar'], $lang['tech'][STRUC_FACTORY_HANGAR]);
     }
 
@@ -89,7 +89,7 @@ 
     $artifact_id = 0;
 
     $silo_capacity_free = mrc_get_level($user, $planet, STRUC_SILO) * get_unit_param(STRUC_SILO, P_CAPACITY);
-    foreach($group_missile as $unit_id) {
+    foreach ($group_missile as $unit_id) {
       $silo_capacity_free -= (mrc_get_level($user, $planet, $unit_id, false, true) + (isset($in_que[$unit_id]) && $in_que[$unit_id] ? $in_que[$unit_id] : 0)) * get_unit_param($unit_id, P_UNIT_SIZE);
     }
     $silo_capacity_free = max(0, $silo_capacity_free);
@@ -106,7 +106,7 @@ 
   */
 
   $template = gettemplate('buildings_builds', true);
-  if(!empty($operation_result)) {
+  if (!empty($operation_result)) {
     $template_result['.']['result'][] = $operation_result;
   }
 
@@ -136,7 +136,7 @@ 
 
   $record_index = 0;
 
-  foreach($build_unit_list as $unit_id) {
+  foreach ($build_unit_list as $unit_id) {
     $level_base = mrc_get_level($user, $planet, $unit_id, false, true);
     $level_effective = mrc_get_level($user, $planet, $unit_id);
     $level_in_que = $in_que[$unit_id];
@@ -159,12 +159,12 @@ 
     $can_build = $unit_info[P_MAX_STACK] ? max(0, $unit_info[P_MAX_STACK] - $level_in_que - $level_effective) : $build_data['CAN'][BUILD_CREATE];
     // Restricting $can_build by free silo capacity
     $can_build = ($unit_is_missile = in_array($unit_id, $group_missile)) ? min($can_build, floor($silo_capacity_free / $unit_info[P_UNIT_SIZE])) : $can_build;
-    if(!$can_build) {
-      if(!$build_data['CAN'][BUILD_CREATE]) {
+    if (!$can_build) {
+      if (!$build_data['CAN'][BUILD_CREATE]) {
         $build_data['RESULT'][BUILD_CREATE] = BUILD_NO_RESOURCES;
-      } elseif($unit_is_missile && $silo_capacity_free < $unit_info[P_UNIT_SIZE]) {
+      } elseif ($unit_is_missile && $silo_capacity_free < $unit_info[P_UNIT_SIZE]) {
         $build_data['RESULT'][BUILD_CREATE] = BUILD_SILO_FULL;
-      } elseif($unit_info[P_MAX_STACK]) {
+      } elseif ($unit_info[P_MAX_STACK]) {
         $build_data['RESULT'][BUILD_CREATE] = BUILD_MAX_REACHED;
       }
     }
@@ -231,14 +231,14 @@ 
       'MAP_IS_RESOURCE' => !empty($unit_info[P_UNIT_PRODUCTION]),
     );
 
-    if($unit_stackable) {
+    if ($unit_stackable) {
       $level_production_base = array(
         'ACTUAL_SHIELD' => pretty_number(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_SHIELD), $unit_info['shield'])),
         'ACTUAL_ARMOR'  => pretty_number(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_ARMOR), $unit_info['armor'])),
         'ACTUAL_WEAPON' => pretty_number(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_WEAPON), $unit_info['attack'])),
       );
 
-      if($unit_info[P_UNIT_TYPE] == UNIT_SHIPS) {
+      if ($unit_info[P_UNIT_TYPE] == UNIT_SHIPS) {
         $ship_data = get_ship_data($unit_id, $user);
 
         $level_production_base += array(
@@ -248,9 +248,9 @@ 
         );
       }
 
-      if($unit_info[P_UNIT_PRODUCTION]) {
-        foreach($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
-          if($resource_income =
+      if ($unit_info[P_UNIT_PRODUCTION]) {
+        foreach ($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
+          if ($resource_income =
             floor(mrc_modify_value($user, $planet, $sn_modifiers_resource, $resource_calc(1, 10, $user, $planet)
               * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
               * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
@@ -260,11 +260,11 @@ 
         }
       }
       $production['.']['resource'][] = $level_production_base;
-    } elseif($unit_info[P_UNIT_PRODUCTION]) {
+    } elseif ($unit_info[P_UNIT_PRODUCTION]) {
       $level_production_base = array();
       $element_level_start = $level_effective + $in_que[$unit_id];
-      foreach($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
-        if($resource_income =
+      foreach ($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
+        if ($resource_income =
           floor(mrc_modify_value($user, $planet, $sn_modifiers_resource, $resource_calc($element_level_start, 10, $user, $planet)
             * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
             * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
@@ -274,10 +274,10 @@ 
       }
 
       $level_start = $level_base_and_que > 1 ? $level_effective + $level_in_que - 1 : 1;
-      for($i = 0; $i < 6; $i++) {
+      for ($i = 0; $i < 6; $i++) {
         $level_production = array('LEVEL' => $level_start + $i);
-        foreach($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
-          if(
+        foreach ($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
+          if (
           $resource_income = floor(mrc_modify_value($user, $planet, $sn_modifiers_resource, $resource_calc($level_start + $i, 10, $user, $planet)
             * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
             * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
@@ -288,7 +288,7 @@ 
         }
         $production['.']['resource'][] = $level_production;
       }
-    } elseif($unit_id == TECH_ASTROTECH) {
+    } elseif ($unit_id == TECH_ASTROTECH) {
       $element_level_start = $level_effective + $in_que[$unit_id];
       $level_production_base = array(
         UNIT_PLAYER_EXPEDITIONS_MAX => get_player_max_expeditons($user, $element_level_start),
@@ -296,7 +296,7 @@ 
       );
 
       $level_start = $level_base_and_que > 1 ? $level_effective + $level_in_que - 1 : 1;
-      for($i = 0; $i < 6; $i++) {
+      for ($i = 0; $i < 6; $i++) {
         $level_production = array('LEVEL' => $level_start + $i);
         $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] = get_player_max_expeditons($user, $level_start + $i);
         $level_production['D' . UNIT_PLAYER_EXPEDITIONS_MAX] = $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] - $level_production_base[UNIT_PLAYER_EXPEDITIONS_MAX];
@@ -317,7 +317,7 @@ 
     $template_result['.']['production'][] = $production;
   }
 
-  foreach($lang['player_option_building_sort'] as $sort_id => $sort_text) {
+  foreach ($lang['player_option_building_sort'] as $sort_id => $sort_text) {
     $template->assign_block_vars('sort_values', array(
       'VALUE' => $sort_id,
       'TEXT'  => $sort_text,
@@ -326,8 +326,8 @@ 
 
   $sort_option = classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT, $que_type)];
   $sort_option_inverse = classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT_INVERSE, $que_type)];
-  if($sort_option || $sort_option_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
-    switch($sort_option) {
+  if ($sort_option || $sort_option_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
+    switch ($sort_option) {
       case PLAYER_OPTION_SORT_NAME:
         $sort_option_field = 'NAME';
       break;
@@ -342,7 +342,7 @@ 
       break;
     }
     $sort_option_inverse_closure = $sort_option_inverse ? -1 : 1;
-    usort($template_result['.']['production'], function ($a, $b) use ($sort_option_field, $sort_option_inverse_closure) {
+    usort($template_result['.']['production'], function($a, $b) use ($sort_option_field, $sort_option_inverse_closure) {
       return $a[$sort_option_field] < $b[$sort_option_field] ? -1 * $sort_option_inverse_closure : (
       $a[$sort_option_field] > $b[$sort_option_field] ? 1 * $sort_option_inverse_closure : 0
       );

includes/includes/sys_avatar.php

Spacing +9 added lines, -9 removed lines

@@ -9,28 +9,28 @@ 
     $avatar_filename = $fullsize_filename = SN_ROOT_PHYSICAL . 'images/avatar/' . $prefix . '_' . $subject_id;
     $avatar_filename .= '.png';
     $fullsize_filename .= '_full.png';
-    if(sys_get_param_int('avatar_remove'))
+    if (sys_get_param_int('avatar_remove'))
     {
-      if(file_exists($avatar_filename) && !unlink($avatar_filename))
+      if (file_exists($avatar_filename) && !unlink($avatar_filename))
       {
         throw new Exception($lang['opt_msg_avatar_error_delete'], ERR_ERROR);
       }
       $avatar_field = 0;
       throw new Exception($lang['opt_msg_avatar_removed'], ERR_NONE);
     }
-    elseif($_FILES['avatar']['size'])
+    elseif ($_FILES['avatar']['size'])
     {
-      if(!in_array($_FILES['avatar']['type'], array('image/gif', 'image/jpeg', 'image/jpg', 'image/pjpeg', 'image/png')) || $_FILES['avatar']['size'] > 204800)
+      if (!in_array($_FILES['avatar']['type'], array('image/gif', 'image/jpeg', 'image/jpg', 'image/pjpeg', 'image/png')) || $_FILES['avatar']['size'] > 204800)
       {
         throw new Exception($lang['opt_msg_avatar_error_unsupported'], ERR_WARNING);
       }
 
-      if($_FILES['avatar']['error'])
+      if ($_FILES['avatar']['error'])
       {
         throw new Exception(sprintf($lang['opt_msg_avatar_error_upload'], $_FILES['avatar']['error']), ERR_ERROR);
       }
 
-      if(!($avatar_image = imagecreatefromstring(file_get_contents($_FILES['avatar']['tmp_name']))))
+      if (!($avatar_image = imagecreatefromstring(file_get_contents($_FILES['avatar']['tmp_name']))))
       {
         throw new Exception($lang['opt_msg_avatar_error_unsupported'], ERR_WARNING);
       }
@@ -38,7 +38,7 @@ 
       $avatar_size = getimagesize($_FILES['avatar']['tmp_name']);
       $avatar_max_width  = $config-> avatar_max_width;
       $avatar_max_height = $config-> avatar_max_height;
-      if($avatar_size[0] > $avatar_max_width || $avatar_size[1] > $avatar_max_height)
+      if ($avatar_size[0] > $avatar_max_width || $avatar_size[1] > $avatar_max_height)
       {
         $aspect_ratio = min($avatar_max_width / $avatar_size[0], $avatar_max_height / $avatar_size[1]);
         $avatar_image_new = imagecreatetruecolor($avatar_size[0] * $aspect_ratio, $avatar_size[0] * $aspect_ratio);
@@ -47,12 +47,12 @@ 
         $avatar_image = $avatar_image_new;
       }
 
-      if(file_exists($avatar_filename) && !unlink($avatar_filename))
+      if (file_exists($avatar_filename) && !unlink($avatar_filename))
       {
         throw new Exception($lang['opt_msg_avatar_error_delete'], ERR_ERROR);
       }
 
-      if(!imagepng($avatar_image, $avatar_filename, 9))
+      if (!imagepng($avatar_image, $avatar_filename, 9))
       {
         throw new Exception($lang['opt_msg_avatar_error_writing'], ERR_ERROR);
       }

Braces +2 added lines, -4 removed lines

@@ -17,8 +17,7 @@ 
       }
       $avatar_field = 0;
       throw new Exception($lang['opt_msg_avatar_removed'], ERR_NONE);
-    }
-    elseif($_FILES['avatar']['size'])
+    } elseif($_FILES['avatar']['size'])
     {
       if(!in_array($_FILES['avatar']['type'], array('image/gif', 'image/jpeg', 'image/jpg', 'image/pjpeg', 'image/png')) || $_FILES['avatar']['size'] > 204800)
       {
@@ -61,8 +60,7 @@ 
       imagedestroy($avatar_image);
       throw new Exception($lang['opt_msg_avatar_uploaded'], ERR_NONE);
     }
-  }
-  catch (Exception $e)
+  } catch (Exception $e)
   {
     return array(
       'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,

includes/classes/RequestInfo.php

Spacing +9 added lines, -9 removed lines

@@ -89,15 +89,15 @@ 
     // Инфа об устройстве и браузере - общая для всех
     sn_db_transaction_start();
     $this->device_cypher = $_COOKIE[SN_COOKIE_D];
-    if($this->device_cypher) {
+    if ($this->device_cypher) {
       $cypher_safe = db_escape($this->device_cypher);
       $device_id = doquery("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE", true);
-      if(!empty($device_id['device_id'])) {
+      if (!empty($device_id['device_id'])) {
         $this->device_id = $device_id['device_id'];
       }
     }
 
-    if($this->device_id <= 0) {
+    if ($this->device_id <= 0) {
       do {
         $cypher_safe = db_escape($this->device_cypher = sys_random_string());
         $row = doquery("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE", true);
@@ -118,10 +118,10 @@ 
     $this->page_address_id = db_get_set_unique_id_value($this->page_address, 'url_id', 'security_url', 'url_string');
     sn_db_transaction_commit();
 
-    if($this->write_full_url) {
+    if ($this->write_full_url) {
       sn_db_transaction_start();
       $this->page_url = substr($_SERVER['REQUEST_URI'], strlen(SN_ROOT_RELATIVE));
-      if(strpos($_SERVER['REQUEST_URI'], '/simulator.php') === 0) {
+      if (strpos($_SERVER['REQUEST_URI'], '/simulator.php') === 0) {
         $this->page_url = '/simulator.php';
       }
       $this->page_url_id = db_get_set_unique_id_value($this->page_url, 'url_id', 'security_url', 'url_string');
@@ -144,7 +144,7 @@ 
    */
   public function db_security_entry_insert($user_id_unsafe) {
     // TODO $user_id = !empty(self::$user['id']) ? self::$user['id'] : 'NULL';
-    if(empty($user_id_unsafe)) {
+    if (empty($user_id_unsafe)) {
       // self::flog('Нет ИД пользователя');
       return true;
     }
@@ -167,7 +167,7 @@ 
   public function db_counter_insert($user_id_unsafe) {
     global $config, $sys_stop_log_hit, $is_watching;
 
-    if($sys_stop_log_hit || !$config->game_counter) {
+    if ($sys_stop_log_hit || !$config->game_counter) {
       return;
     }
 
@@ -183,14 +183,14 @@ 
 //      $this->ip_v4_int . ", '{$proxy_safe}', " . $this->page_address_id . ", " . $this->page_url_id . ");");
     doquery(
       "INSERT INTO {{counter}} SET
-        `visit_time` = '" . SN_TIME_SQL. "',
+        `visit_time` = '" . SN_TIME_SQL . "',
         `user_id` = {$user_id_safe},
         `device_id` = {$this->device_id},
         `browser_id` = {$this->browser_id},
         `user_ip` = {$this->ip_v4_int},
         `user_proxy` = '{$proxy_safe}',
         `page_url_id` = {$this->page_address_id}" .
-        ($this->write_full_url ? ", `plain_url_id` = {$this->page_url_id}" : '' ).
+        ($this->write_full_url ? ", `plain_url_id` = {$this->page_url_id}" : '') .
       ";");
 
     $is_watching = false;