supernova-ws / SuperNova

includes/includes/sys_stat.php

Spacing +30 added lines, -30 removed lines

@@ -39,23 +39,23 @@ 
 
   $sta_update_msg = db_escape($sta_update_msg);
 
-  if($next_step) {
+  if ($next_step) {
     $sta_update_step++;
   }
   $sta_update_msg = "Update in progress. Step {$sta_update_step}/14: {$sta_update_msg}.";
 
   classSupernova::$config->db_saveItem('var_stat_update_msg', $sta_update_msg);
-  if($next_step) {
+  if ($next_step) {
     classSupernova::$debug->warning($sta_update_msg, 'Stat update', LOG_INFO_STAT_PROCESS);
   }
 }
 
 function sys_stat_calculate_flush(&$data, $force = false) {
-  if(count($data) < 25 && !$force) {
+  if (count($data) < 25 && !$force) {
     return;
   }
 
-  if(!empty($data)) {
+  if (!empty($data)) {
     doquery('REPLACE INTO {{statpoints}}
       (`id_owner`, `id_ally`, `stat_type`, `stat_code`, `tech_points`, `tech_count`, `build_points`, `build_count`,
        `defs_points`, `defs_count`, `fleet_points`, `fleet_count`, `res_points`, `res_count`, `total_points`,
@@ -95,11 +95,11 @@ 
   $user_list = DBStaticUser::db_user_list('', true, 'id, dark_matter, metal, crystal, deuterium, user_as_ally, ally_id');
   $row_num = count($user_list);
   // while($player = db_fetch($query))
-  foreach($user_list as $player) {
-    if($i++ % 100 == 0) {
+  foreach ($user_list as $player) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating players stats (player {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $player['id'], $user_skip_list)) {
+    if (array_key_exists($user_id = $player['id'], $user_skip_list)) {
       continue;
     }
 
@@ -109,7 +109,7 @@ 
     // $points[$user_id][UNIT_RESOURCES] += $resources;
 
     // А здесь мы фильтруем пользователей по $user_skip_list - далее не нужно этого делать, потому что
-    if(!isset($user_skip_list[$user_id])) {
+    if (!isset($user_skip_list[$user_id])) {
       $user_allies[$user_id] = $player['ally_id'];
     }
   }
@@ -123,11 +123,11 @@ 
   $i = 0;
   $query = DBStaticPlanet::db_planet_list_resources_by_owner();
   $row_num = db_num_rows($query);
-  while($planet = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($planet = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating planets stats (planet {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $planet['id_owner'], $user_skip_list)) {
+    if (array_key_exists($user_id = $planet['id_owner'], $user_skip_list)) {
       continue;
     }
 
@@ -142,8 +142,8 @@ 
   $i = 0;
   $query = FleetList::dbQueryAllId();
   $row_num = db_num_rows($query);
-  while($fleet_row = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($fleet_row = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating flying fleets stats (fleet {$i}/{$row_num})", false);
     }
     $objFleet = new Fleet();
@@ -151,14 +151,14 @@ 
     // К тому же при включённом кэшировании это быстро забъёт кэш холодными данными
     // $objFleet->_reset();
     $objFleet->dbRowParse($fleet_row);
-    if(array_key_exists($user_id = $objFleet->playerOwnerId, $user_skip_list)) {
+    if (array_key_exists($user_id = $objFleet->playerOwnerId, $user_skip_list)) {
       continue;
     }
 
-    foreach($objFleet->shipsIterator() as $unit_id => $unit) {
+    foreach ($objFleet->shipsIterator() as $unit_id => $unit) {
       $counts[$user_id][UNIT_SHIPS] += $unit->count;
 
-      if(!isset($unit_cost_cache[$unit_id][0])) {
+      if (!isset($unit_cost_cache[$unit_id][0])) {
         $unit_cost_cache[$unit_id][0] = get_unit_param($unit_id, P_COST);
       }
       $unit_cost_data = &$unit_cost_cache[$unit_id][0];
@@ -178,11 +178,11 @@ 
   $i = 0;
   $query = DBStaticUnit::db_unit_list_stat_calculate();
   $row_num = db_num_rows($query);
-  while($unit = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($unit = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating unit stats (unit {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $unit['unit_player_id'], $user_skip_list)) {
+    if (array_key_exists($user_id = $unit['unit_player_id'], $user_skip_list)) {
       continue;
     }
 
@@ -196,11 +196,11 @@ 
   $i = 0;
   $query = DBStaticQue::db_que_list_stat();
   $row_num = db_num_rows($query);
-  while($que_item = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($que_item = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating ques stats (que item {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $que_item['que_player_id'], $user_skip_list)) {
+    if (array_key_exists($user_id = $que_item['que_player_id'], $user_skip_list)) {
       continue;
     }
     $que_unit_amount = $que_item['que_unit_amount'];
@@ -219,7 +219,7 @@ 
 
   sta_set_time_limit('posting new user stats to DB');
   $data = array();
-  foreach($user_allies as $user_id => $ally_id) {
+  foreach ($user_allies as $user_id => $ally_id) {
     // $counts[UNIT_RESOURCES] дублирует $points[UNIT_RESOURCES], поэтому $points не заполняем, а берем $counts и делим на 1000
     $points[$user_id][UNIT_RESOURCES] = $counts[$user_id][UNIT_RESOURCES] / 1000;
     $points[$user_id] = array_map('floor', $points[$user_id]);
@@ -231,10 +231,10 @@ 
     $user_points = array_sum($points[$user_id]);
     $user_counts = array_sum($counts[$user_id]);
 
-    $data[] = $q = "({$user_id},{$ally_id},1,1,'{$points[$user_id][UNIT_TECHNOLOGIES]}','{$counts[$user_id][UNIT_TECHNOLOGIES]}'," .
-      "'{$points[$user_id][UNIT_STRUCTURES]}','{$counts[$user_id][UNIT_STRUCTURES]}','{$user_defence_points}','{$user_defence_counts}'," .
-      "'{$points[$user_id][UNIT_SHIPS]}','{$counts[$user_id][UNIT_SHIPS]}','{$points[$user_id][UNIT_RESOURCES]}','{$counts[$user_id][UNIT_RESOURCES]}'," .
-      "{$user_points},{$user_counts}," . SN_TIME_NOW . ")";
+    $data[] = $q = "({$user_id},{$ally_id},1,1,'{$points[$user_id][UNIT_TECHNOLOGIES]}','{$counts[$user_id][UNIT_TECHNOLOGIES]}',".
+      "'{$points[$user_id][UNIT_STRUCTURES]}','{$counts[$user_id][UNIT_STRUCTURES]}','{$user_defence_points}','{$user_defence_counts}',".
+      "'{$points[$user_id][UNIT_SHIPS]}','{$counts[$user_id][UNIT_SHIPS]}','{$points[$user_id][UNIT_RESOURCES]}','{$counts[$user_id][UNIT_RESOURCES]}',".
+      "{$user_points},{$user_counts},".SN_TIME_NOW.")";
 
     sys_stat_calculate_flush($data);
   }
@@ -254,7 +254,7 @@ 
         SUM(u.`tech_points`)+aus.`tech_points`, SUM(u.`tech_count`)+aus.`tech_count`, SUM(u.`build_points`)+aus.`build_points`, SUM(u.`build_count`)+aus.`build_count`,
         SUM(u.`defs_points`)+aus.`defs_points`, SUM(u.`defs_count`)+aus.`defs_count`, SUM(u.`fleet_points`)+aus.`fleet_points`, SUM(u.`fleet_count`)+aus.`fleet_count`,
         SUM(u.`res_points`)+aus.`res_points`, SUM(u.`res_count`)+aus.`res_count`, SUM(u.`total_points`)+aus.`total_points`, SUM(u.`total_count`)+aus.`total_count`,
-        " . SN_TIME_NOW . ", NULL, u.`id_ally`, 2, 1,
+        " . SN_TIME_NOW.", NULL, u.`id_ally`, 2, 1,
         a.tech_rank, a.build_rank, a.defs_rank, a.fleet_rank, a.res_rank, a.total_rank
       FROM {{statpoints}} AS u
         JOIN {{alliance}} AS al ON al.id = u.id_ally
@@ -275,7 +275,7 @@ 
 
   // Updating player's ranks
   sta_set_time_limit("updating ranks for players");
-  foreach($rankNames as $rankName) {
+  foreach ($rankNames as $rankName) {
     sta_set_time_limit("updating player rank '{$rankName}'", false);
     doquery($qryResetRowNum);
     doquery(sprintf($qryFormat, $rankName, 1));
@@ -283,7 +283,7 @@ 
 
   sta_set_time_limit("updating ranks for Alliances");
   // --- Updating Allie's ranks
-  foreach($rankNames as $rankName) {
+  foreach ($rankNames as $rankName) {
     sta_set_time_limit("updating Alliances rank '{$rankName}'", false);
     doquery($qryResetRowNum);
     doquery(sprintf($qryFormat, $rankName, 2));

galaxy.php

Spacing +32 added lines, -32 removed lines

@@ -6,7 +6,7 @@ 
  * Galaxy view
  */
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 lng_include('universe');
 lng_include('stat');
@@ -16,7 +16,7 @@ 
 $uni_system = sys_get_param_int('system', $planetrow['system']);
 $planet = sys_get_param_int('planet', $planetrow['planet']);
 
-if($mode == 'name') {
+if ($mode == 'name') {
   require_once('includes/includes/uni_rename.php');
 }
 
@@ -37,8 +37,8 @@ 
 
 $flying_fleet_count = FleetList::fleet_count_flying($user['id']);
 
-if($mode == 1) {
-} elseif($mode == 2 || $mode == 3) {
+if ($mode == 1) {
+} elseif ($mode == 2 || $mode == 3) {
   $planet = $planetrow['planet'];
 } else {
   $uni_galaxy = $planetrow['galaxy'];
@@ -46,7 +46,7 @@ 
   $planet = $planetrow['planet'];
 }
 
-$uni_galaxy = $uni_galaxy < 1 ? 1 : ($uni_galaxy > Vector::$knownGalaxies? Vector::$knownGalaxies: $uni_galaxy);
+$uni_galaxy = $uni_galaxy < 1 ? 1 : ($uni_galaxy > Vector::$knownGalaxies ? Vector::$knownGalaxies : $uni_galaxy);
 $uni_system = $uni_system < 1 ? 1 : ($uni_system > Vector::$knownSystems ? Vector::$knownSystems : $uni_system);
 $planet = $planet < 1 ? 1 : ($planet > Vector::$knownPlanets + 1 ? Vector::$knownPlanets + 1 : $planet);
 
@@ -64,8 +64,8 @@ 
 $PhalanxRange = GetPhalanxRange($HavePhalanx);
 
 $planet_precache_query = DBStaticPlanet::db_planet_list_in_system($uni_galaxy, $uni_system);
-if(!empty($planet_precache_query)) {
-  foreach($planet_precache_query as $planet_row) {
+if (!empty($planet_precache_query)) {
+  foreach ($planet_precache_query as $planet_row) {
     $planet_list[$planet_row['planet']][$planet_row['planet_type']] = $planet_row;
   }
 }
@@ -83,8 +83,8 @@ 
  * @var Fleet[][][] $fleet_list
  */
 $fleet_list = array();
-foreach($system_fleet_list->_container as $objFleetSystem) {
-  if(!$objFleetSystem->isReturning()) {
+foreach ($system_fleet_list->_container as $objFleetSystem) {
+  if (!$objFleetSystem->isReturning()) {
     $fleet_planet = $objFleetSystem->fleet_end_planet;
     $fleet_type = $objFleetSystem->fleet_end_type;
   } else {
@@ -99,7 +99,7 @@ 
 $recycler_info = array();
 $planet_recyclers_orbiting = 0;
 $recyclers_fleet = array();
-foreach(Fleet::$snGroupRecyclers as $recycler_id) {
+foreach (Fleet::$snGroupRecyclers as $recycler_id) {
   $recycler_info[$recycler_id] = get_ship_data($recycler_id, $user);
   $recyclers_fleet[$recycler_id] = mrc_get_level($user, $planetrow, $recycler_id);
   $planet_recyclers_orbiting += $recyclers_fleet[$recycler_id];
@@ -109,7 +109,7 @@ 
 $fleet_id = 1;
 $fleets = array();
 $config_game_max_planet = Vector::$knownPlanets + 1;
-for($Planet = 1; $Planet < $config_game_max_planet; $Planet++) {
+for ($Planet = 1; $Planet < $config_game_max_planet; $Planet++) {
   unset($uni_galaxyRowPlanet);
   unset($uni_galaxyRowMoon);
   unset($uni_galaxyRowUser);
@@ -119,27 +119,27 @@ 
   $uni_galaxyRowPlanet = $planet_list[$Planet][PT_PLANET];
 
   $planet_fleet_id = 0;
-  if($uni_galaxyRowPlanet['destruyed']) {
+  if ($uni_galaxyRowPlanet['destruyed']) {
     CheckAbandonPlanetState($uni_galaxyRowPlanet);
-  } elseif($uni_galaxyRowPlanet['id']) {
-    if($cached['users'][$uni_galaxyRowPlanet['id_owner']]) {
+  } elseif ($uni_galaxyRowPlanet['id']) {
+    if ($cached['users'][$uni_galaxyRowPlanet['id_owner']]) {
       $uni_galaxyRowUser = $cached['users'][$uni_galaxyRowPlanet['id_owner']];
     } else {
       $uni_galaxyRowUser = DBStaticUser::db_user_by_id($uni_galaxyRowPlanet['id_owner']);
       $cached['users'][$uni_galaxyRowUser['id']] = $uni_galaxyRowUser;
     }
 
-    if(!$uni_galaxyRowUser['id']) {
+    if (!$uni_galaxyRowUser['id']) {
       classSupernova::$debug->warning("Planet '{$uni_galaxyRowPlanet['name']}' [{$uni_galaxy}:{$uni_system}:{$Planet}] has no owner!", 'Userless planet', 503);
       $uni_galaxyRowPlanet['destruyed'] = SN_TIME_NOW + 60 * 60 * 24;
       $uni_galaxyRowPlanet['id_owner'] = 0;
       DBStaticPlanet::db_planet_set_by_id($uni_galaxyRowPlanet['id'], "id_owner = 0, destruyed = {$uni_galaxyRowPlanet['destruyed']}");
     }
 
-    if($uni_galaxyRowUser['id']) {
+    if ($uni_galaxyRowUser['id']) {
       $planetcount++;
-      if($uni_galaxyRowUser['ally_id']) {
-        if($cached['allies'][$uni_galaxyRowUser['ally_id']]) {
+      if ($uni_galaxyRowUser['ally_id']) {
+        if ($cached['allies'][$uni_galaxyRowUser['ally_id']]) {
           $allyquery = $cached['allies'][$uni_galaxyRowUser['ally_id']];
         } else {
           $allyquery = DBStaticAlly::db_ally_get_by_id($uni_galaxyRowUser['ally_id']);
@@ -148,19 +148,19 @@ 
       }
 
       $fleets_to_planet = flt_get_fleets_to_planet_by_array_of_Fleet($fleet_list[$Planet][PT_PLANET]);
-      if(!empty($fleets_to_planet['own']['count'])) {
+      if (!empty($fleets_to_planet['own']['count'])) {
         $planet_fleet_id = $fleet_id;
         $fleets[] = tpl_parse_fleet_sn($fleets_to_planet['own']['total'], $fleet_id);
         $fleet_id++;
       }
 
       $uni_galaxyRowMoon = $planet_list[$Planet][PT_MOON];
-      if($uni_galaxyRowMoon['destruyed']) {
+      if ($uni_galaxyRowMoon['destruyed']) {
         CheckAbandonPlanetState($uni_galaxyRowMoon);
       } else {
         $moon_fleet_id = 0;
         $fleets_to_planet = flt_get_fleets_to_planet_by_array_of_Fleet($fleet_list[$Planet][PT_MOON]);
-        if(!empty($fleets_to_planet['own']['count'])) {
+        if (!empty($fleets_to_planet['own']['count'])) {
           $moon_fleet_id = $fleet_id;
           $fleets[] = tpl_parse_fleet_sn($fleets_to_planet['own']['total'], $fleet_id);
           $fleet_id++;
@@ -171,10 +171,10 @@ 
 
   $recyclers_incoming_capacity = 0;
   $uni_galaxyRowPlanet['debris'] = $uni_galaxyRowPlanet['debris_metal'] + $uni_galaxyRowPlanet['debris_crystal'];
-  if($uni_galaxyRowPlanet['debris']) {
-    if(!empty($fleet_list[$Planet][PT_DEBRIS])) {
-      foreach($fleet_list[$Planet][PT_DEBRIS] as $objFleetToDebris) {
-        if($objFleetToDebris->playerOwnerId == $user['id']) {
+  if ($uni_galaxyRowPlanet['debris']) {
+    if (!empty($fleet_list[$Planet][PT_DEBRIS])) {
+      foreach ($fleet_list[$Planet][PT_DEBRIS] as $objFleetToDebris) {
+        if ($objFleetToDebris->playerOwnerId == $user['id']) {
           $recyclers_incoming_capacity += $objFleetToDebris->shipsGetCapacityRecyclers($recycler_info);
         }
       }
@@ -251,21 +251,21 @@ 
 
 tpl_assign_fleet($template, $fleets);
 
-foreach(sn_get_groups('defense_active') as $unit_id) {
+foreach (sn_get_groups('defense_active') as $unit_id) {
   $template->assign_block_vars('defense_active', array(
     'ID'   => $unit_id,
     'NAME' => classLocale::$lang['tech'][$unit_id],
   ));
 }
 
-foreach($cached['users'] as $PlanetUser) {
-  if(!$PlanetUser) {
+foreach ($cached['users'] as $PlanetUser) {
+  if (!$PlanetUser) {
     continue;
   }
 
   $user_ally = $cached['allies'][$PlanetUser['ally_id']];
-  if(isset($user_ally)) {
-    if($PlanetUser['id'] == $user_ally['ally_owner']) {
+  if (isset($user_ally)) {
+    if ($PlanetUser['id'] == $user_ally['ally_owner']) {
       $user_rank_title = $user_ally['ally_owner_range'];
     } else {
       $ally_ranks = explode(';', $user_ally['ranklist']);
@@ -288,8 +288,8 @@ 
   ));
 }
 
-foreach($cached['allies'] as $PlanetAlly) {
-  if($PlanetAlly) {
+foreach ($cached['allies'] as $PlanetAlly) {
+  if ($PlanetAlly) {
     $template->assign_block_vars('alliances', array(
       'ID'      => $PlanetAlly['id'],
       'NAME_JS' => js_safe_string($PlanetAlly['ally_name']),

overview.php

Spacing +38 added lines, -38 removed lines

@@ -30,7 +30,7 @@ 
 
 //define('SN_RENDER_NAVBAR_PLANET', false);
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 //
 ////$player = new Player();
@@ -78,7 +78,7 @@ 
 
 $result = array();
 
-switch($mode = sys_get_param_str('mode')) {
+switch ($mode = sys_get_param_str('mode')) {
   case 'manage':
     sn_sys_sector_buy('overview.php?mode=manage');
 
@@ -88,11 +88,11 @@ 
     $template  = gettemplate('planet_manage', true);
     $planet_id = sys_get_param_id('planet_id');
 
-    if(sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
+    if (sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
       $planetrow['name'] = $new_name;
 //      $new_name = db_escape($new_name);
       DBStaticPlanet::db_planet_set_by_id($planetrow['id'], "`name` = '{$new_name}'");
-    } elseif(sys_get_param_str('action') == 'make_capital') {
+    } elseif (sys_get_param_str('action') == 'make_capital') {
       try {
         sn_db_transaction_start();
         $user = DBStaticUser::db_user_by_id($user['id'], true, '*');
@@ -101,15 +101,15 @@ 
 //        $user = $global_data['user'];
 //        $planetrow = $global_data['planet'];
 
-        if($planetrow['planet_type'] != PT_PLANET) {
+        if ($planetrow['planet_type'] != PT_PLANET) {
           throw new exception(classLocale::$lang['ov_capital_err_not_a_planet'], ERR_ERROR);
         }
 
-        if($planetrow['id'] == $user['id_planet']) {
+        if ($planetrow['id'] == $user['id_planet']) {
           throw new exception(classLocale::$lang['ov_capital_err_capital_already'], ERR_ERROR);
         }
 
-        if($user_dark_matter < classSupernova::$config->planet_capital_cost) {
+        if ($user_dark_matter < classSupernova::$config->planet_capital_cost) {
           throw new exception(classLocale::$lang['ov_capital_err_no_dark_matter'], ERR_ERROR);
         }
 
@@ -126,16 +126,16 @@ 
         );
         sn_db_transaction_commit();
         sys_redirect('overview.php?mode=manage');
-      } catch(exception $e) {
+      } catch (exception $e) {
         sn_db_transaction_rollback();
         $result[] = array(
           'STATUS'  => $e->getCode(),
           'MESSAGE' => $e->getMessage(),
         );
       }
-    } elseif(sys_get_param_str('action') == 'planet_teleport') {
+    } elseif (sys_get_param_str('action') == 'planet_teleport') {
       try {
-        if(!uni_coordinates_valid($new_coordinates = array(
+        if (!uni_coordinates_valid($new_coordinates = array(
           'galaxy' => sys_get_param_int('new_galaxy'),
           'system' => sys_get_param_int('new_system'),
           'planet' => sys_get_param_int('new_planet')))
@@ -152,7 +152,7 @@ 
 //        $planetrow = $global_data['planet'];
 
         $can_teleport = uni_planet_teleport_check($user, $planetrow, $new_coordinates);
-        if($can_teleport['result'] != ERR_NONE) {
+        if ($can_teleport['result'] != ERR_NONE) {
           throw new exception($can_teleport['message'], $can_teleport['result']);
         }
 
@@ -163,7 +163,7 @@ 
         DBStaticPlanet::db_planet_set_by_gspt($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], PT_ALL,
           "galaxy = {$new_coordinates['galaxy']}, system = {$new_coordinates['system']}, planet = {$new_coordinates['planet']}, planet_teleport_next = {$planet_teleport_next}");
 
-        if($planetrow['id'] == $user['id_planet']) {
+        if ($planetrow['id'] == $user['id_planet']) {
           DBStaticUser::db_user_set_by_id($user['id'], "galaxy = {$new_coordinates['galaxy']}, system = {$new_coordinates['system']}, planet = {$new_coordinates['planet']}");
         }
 
@@ -176,17 +176,17 @@ 
           'MESSAGE' => classLocale::$lang['ov_teleport_err_none'],
         );
         sys_redirect('overview.php?mode=manage');
-      } catch(exception $e) {
+      } catch (exception $e) {
         sn_db_transaction_rollback();
         $result[] = array(
           'STATUS'  => $e->getCode(),
           'MESSAGE' => $e->getMessage(),
         );
       }
-    } elseif(sys_get_param_str('action') == 'planet_abandon') {
+    } elseif (sys_get_param_str('action') == 'planet_abandon') {
       // if(sec_password_check($user['id'], sys_get_param('abandon_confirm'))) {
-      if(classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
-        if($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
+      if (classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
+        if ($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
           $destroyed = SN_TIME_NOW + 60 * 60 * 24;
           DBStaticPlanet::db_planet_set_by_id($user['current_planet'], "`destruyed`='{$destroyed}', `id_owner`=0");
           DBStaticPlanet::db_planet_set_by_parent($user['current_planet'], "`destruyed`='{$destroyed}', `id_owner`=0");
@@ -196,9 +196,9 @@ 
           message(classLocale::$lang['ov_delete_wrong_planet'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
         }
       } else {
-        message(classLocale::$lang['ov_delete_wrong_pass'] , classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
+        message(classLocale::$lang['ov_delete_wrong_pass'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
       }
-    } elseif(
+    } elseif (
       ($hire = sys_get_param_int('hire')) && in_array($hire, sn_get_groups('governors'))
       && (
         !get_unit_param($hire, P_MAX_STACK) ||
@@ -213,8 +213,8 @@ 
       $user = DBStaticUser::db_user_by_id($user['id'], true);
       $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
       $build_data = eco_get_build_data($user, $planetrow, $hire, $planetrow['PLANET_GOVERNOR_ID'] == $hire ? $planetrow['PLANET_GOVERNOR_LEVEL'] : 0);
-      if($build_data['CAN'][BUILD_CREATE]) {
-        if($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
+      if ($build_data['CAN'][BUILD_CREATE]) {
+        if ($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
           $planetrow['PLANET_GOVERNOR_LEVEL']++;
           $query = '`PLANET_GOVERNOR_LEVEL` + 1';
         } else {
@@ -240,8 +240,8 @@ 
 
     lng_include('mrc_mercenary');
     int_planet_pretemplate($planetrow, $template);
-    foreach(sn_get_groups('governors') as $governor_id) {
-      if($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
+    foreach (sn_get_groups('governors') as $governor_id) {
+      if ($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
         continue;
       }
 
@@ -293,7 +293,7 @@ 
       'PAGE_HINT'   => classLocale::$lang['ov_manage_page_hint'],
     ));
 
-    foreach($result as &$a_result) {
+    foreach ($result as &$a_result) {
       $template->assign_block_vars('result', $a_result);
     }
 
@@ -303,7 +303,7 @@ 
   default:
     sn_sys_sector_buy();
 
-    if(sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
+    if (sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
       $planetrow['name'] = $new_name;
       $new_name_safe = db_escape($new_name);
       DBStaticPlanet::db_planet_set_by_id($planetrow['id'], "`name` = '{$new_name_safe}'");
@@ -333,7 +333,7 @@ 
 
     $planet_count = 0;
     $planets_query = DBStaticPlanet::db_planet_list_sorted($user, false, '*');
-    foreach($planets_query as $an_id => $UserPlanet) {
+    foreach ($planets_query as $an_id => $UserPlanet) {
       sn_db_transaction_start();
       $UserPlanet = sys_o_get_updated($user, $UserPlanet['id'], SN_TIME_NOW, false, true);
       sn_db_transaction_commit();
@@ -344,16 +344,16 @@ 
 
       $planet_fleet_id = 0;
       $fleet_list = $template_planet['fleet_list'];
-      if($fleet_list['own']['count']) {
+      if ($fleet_list['own']['count']) {
         $planet_fleet_id = "p{$UserPlanet['id']}";
         $fleets_to_planet[$UserPlanet['id']] = tpl_parse_fleet_sn($fleet_list['own']['total'], $planet_fleet_id);
 //        $fleet_id++;tpl_parse_fleet_sn
       }
-      if($UserPlanet['planet_type'] == PT_MOON) {
+      if ($UserPlanet['planet_type'] == PT_MOON) {
         continue;
       }
       $moon = DBStaticPlanet::db_planet_by_parent($UserPlanet['id']);
-      if($moon) {
+      if ($moon) {
         $moon_fill = min(100, floor($moon['field_current'] / eco_planet_fields_max($moon) * 100));
       } else {
         $moon_fill = 0;
@@ -393,7 +393,7 @@ 
     tpl_assign_fleet($template, $fleets);
 
     $lune = $planetrow['planet_type'] == PT_PLANET ? DBStaticPlanet::db_planet_by_parent($planetrow['id']) : DBStaticPlanet::db_planet_by_id($planetrow['parent_planet']);
-    if($lune) {
+    if ($lune) {
       $template->assign_vars(array(
         'MOON_ID' => $lune['id'],
         'MOON_IMG' => $lune['image'],
@@ -405,15 +405,15 @@ 
     $planet_fill = $planet_fill > 100 ? 100 : $planet_fill;
 
     $planet_recyclers_orbiting = 0;
-    foreach(Fleet::$snGroupRecyclers as $recycler_id) {
+    foreach (Fleet::$snGroupRecyclers as $recycler_id) {
       $planet_recyclers_orbiting += mrc_get_level($user, $planetrow, $recycler_id);
     }
 
     int_planet_pretemplate($planetrow, $template);
 
     $sn_group_ques = sn_get_groups('ques');
-    if(!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
-      foreach(array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
+    if (!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
+      foreach (array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
         $this_que = $que['ques'][$que_id][$user['id']][$planetrow['id']];
         $template->assign_block_vars('ques', array(
           'ID'     => $que_id,
@@ -421,8 +421,8 @@ 
           'LENGTH' => empty($this_que) ? 0 : count($this_que),
         ));
 
-        if(!empty($this_que)) {
-          foreach($this_que as $que_item) {
+        if (!empty($this_que)) {
+          foreach ($this_que as $que_item) {
             $template->assign_block_vars('que', que_tpl_parse_element($que_item));
           }
         }
@@ -436,7 +436,7 @@ 
       'LENGTH' => $que_hangar_length,
     ));
 
-    if(!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
+    if (!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
       $que_hangar_length = tpl_assign_hangar($template, $planetrow, SUBQUE_DEFENSE);
       $template->assign_block_vars('ques', array(
         'ID'     => SUBQUE_DEFENSE,
@@ -448,12 +448,12 @@ 
     $overview_planet_rows = $user['opt_int_overview_planet_rows'];
     $overview_planet_columns = $user['opt_int_overview_planet_columns'];
 
-    if($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
+    if ($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
       $overview_planet_rows = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_rows'];
       $overview_planet_columns = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_columns'];
     }
 
-    if($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
+    if ($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
       $overview_planet_columns = ceil($planet_count / $overview_planet_rows);
     }
 
@@ -510,7 +510,7 @@ 
     ));
     tpl_set_resource_info($template, $planetrow, $fleets_to_planet, 2);
 
-    foreach($result as &$a_result) {
+    foreach ($result as &$a_result) {
       $template->assign_block_vars('result', $a_result);
     }
 

includes/functions/sys_bbcode.php

Spacing +7 added lines, -7 removed lines

@@ -103,23 +103,23 @@
 
   !empty(classSupernova::$config->url_faq) ? $msg = str_replace('faq://', classSupernova::$config->url_faq, $msg) : false;
 
-  foreach(classSupernova::$design['bbcodes'] as $auth_level => $replaces) {
-    if($auth_level > $author_auth) {
+  foreach (classSupernova::$design['bbcodes'] as $auth_level => $replaces) {
+    if ($auth_level > $author_auth) {
       continue;
     }
 
-    foreach($replaces as $key => $html) {
+    foreach ($replaces as $key => $html) {
       $msg = preg_replace(''.$key.'', $html, $msg);
     }
   }
 
-  foreach(classSupernova::$design['smiles'] as $auth_level => $replaces) {
-    if($auth_level > $author_auth) {
+  foreach (classSupernova::$design['smiles'] as $auth_level => $replaces) {
+    if ($auth_level > $author_auth) {
       continue;
     }
 
-    foreach($replaces as $key => $imgName) {
-      $msg = preg_replace("#" . addcslashes($key, '()[]{}') . "#isU","<img src=\"design/images/smileys/".$imgName.".gif\" align=\"absmiddle\" title=\"".$key."\" alt=\"".$key."\">",$msg);
+    foreach ($replaces as $key => $imgName) {
+      $msg = preg_replace("#".addcslashes($key, '()[]{}')."#isU", "<img src=\"design/images/smileys/".$imgName.".gif\" align=\"absmiddle\" title=\"".$key."\" alt=\"".$key."\">", $msg);
     }
   }
 

includes/pages/chat.php

Spacing +13 added lines, -13 removed lines

@@ -36,7 +36,7 @@ 
   $user_auth_level = isset($user['authlevel']) ? $user['authlevel'] : AUTH_LEVEL_ANONYMOUS;
 
   $mode = sys_get_param_int('mode');
-  switch($mode) {
+  switch ($mode) {
     case CHAT_MODE_ALLY:
       $template_result['ALLY'] = intval($user['ally_id']);
       $page_title = classLocale::$lang['chat_ally'];
@@ -49,12 +49,12 @@ 
   }
 
   $template_result['.']['smiles'] = array();
-  foreach(classSupernova::$design['smiles'] as $auth_level => $replaces) {
-    if($auth_level > $user_auth_level) {
+  foreach (classSupernova::$design['smiles'] as $auth_level => $replaces) {
+    if ($auth_level > $user_auth_level) {
       continue;
     }
 
-    foreach($replaces as $bbcode => $filename) {
+    foreach ($replaces as $bbcode => $filename) {
       $template_result['.']['smiles'][] = array(
         'BBCODE'   => $bbcode,
         'FILENAME' => $filename,
@@ -77,11 +77,11 @@ 
   define('IN_AJAX', true);
   $skip_fleet_update = true;
 
-  if(classSupernova::$config->_MODE != CACHER_NO_CACHE && classSupernova::$config->chat_timeout && SN_TIME_MICRO - classSupernova::$config->array_get('users', $user['id'], 'chat_last_activity') > classSupernova::$config->chat_timeout) {
+  if (classSupernova::$config->_MODE != CACHER_NO_CACHE && classSupernova::$config->chat_timeout && SN_TIME_MICRO - classSupernova::$config->array_get('users', $user['id'], 'chat_last_activity') > classSupernova::$config->chat_timeout) {
     die();
   }
 
-  if(($message = sys_get_param_str('message')) && $user['username']) {
+  if (($message = sys_get_param_str('message')) && $user['username']) {
     $ally_id = sys_get_param('ally') && $user['ally_id'] ? $user['ally_id'] : 0;
     $nick = db_escape(player_nick_compact(player_nick_render_current_to_array($user, array('color' => true, 'icons' => true, 'ally' => !$ally_id))));
 
@@ -103,7 +103,7 @@ 
   $skip_fleet_update = true;
 
   $history = sys_get_param_str('history');
-  if(!$history) {
+  if (!$history) {
     classSupernova::$config->array_set('users', $user['id'], 'chat_last_refresh', SN_TIME_MICRO);
   }
 
@@ -111,7 +111,7 @@ 
   $last_message = '';
   $alliance = 0;
   $template_result['.']['chat'] = array();
-  if(!$history && classSupernova::$config->_MODE != CACHER_NO_CACHE && classSupernova::$config->chat_timeout && SN_TIME_MICRO - classSupernova::$config->array_get('users', $user['id'], 'chat_last_activity') > classSupernova::$config->chat_timeout) {
+  if (!$history && classSupernova::$config->_MODE != CACHER_NO_CACHE && classSupernova::$config->chat_timeout && SN_TIME_MICRO - classSupernova::$config->array_get('users', $user['id'], 'chat_last_activity') > classSupernova::$config->chat_timeout) {
     $result['disable'] = true;
     $template_result['.']['chat'][] = array(
       'TIME'    => date(FMT_DATE_TIME, htmlentities(SN_CLIENT_TIME_LOCAL, ENT_QUOTES, 'utf-8')),
@@ -124,11 +124,11 @@ 
 
     $where_add = '';
     $last_message = 0;
-    if($history) {
+    if ($history) {
       $rows = DBStaticChat::db_chat_message_count_by_ally($alliance);
       $page_count = ceil($rows['CNT'] / $page_limit);
 
-      for($i = 0; $i < $page_count; $i++) {
+      for ($i = 0; $i < $page_count; $i++) {
         $template_result['.']['page'][] = array(
           'NUMBER' => $i
         );
@@ -142,12 +142,12 @@ 
 
     $start_row = $page * $page_limit;
     $query = DBStaticChat::db_chat_message_get_page($alliance, $where_add, $start_row, $page_limit);
-    while($chat_row = db_fetch($query)) {
+    while ($chat_row = db_fetch($query)) {
       // Little magik here - to retain HTML codes from DB and stripping HTML codes from nick
       $chat_row['user'] = player_nick_render_to_html($chat_row['user']);
       $nick_stripped = htmlentities(strip_tags($chat_row['user']), ENT_QUOTES, 'utf-8');
       $nick = str_replace(strip_tags($chat_row['user']), $nick_stripped, $chat_row['user']);
-      if(!$history) {
+      if (!$history) {
         $nick = "<span style=\"cursor: pointer;\" onclick=\"addSmiley('({$nick_stripped})');\">{$nick}</span>";
       }
 
@@ -172,7 +172,7 @@ 
   $template = gettemplate('chat_messages', $template);
   $template->assign_recursive($template_result);
 
-  if($history) {
+  if ($history) {
     display($template, "{$classLocale['chat_history']} - {$classLocale[$alliance ? 'chat_ally' : 'chat_common']}", true, '', false, true);
   } else {
     $result['last_message'] = $last_message;

admin/userlist.php

Spacing +9 added lines, -9 removed lines

@@ -12,10 +12,10 @@ 
 define('INSIDE', true);
 define('INSTALL', false);
 define('IN_ADMIN', true);
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 global $user;
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
@@ -39,10 +39,10 @@ 
 $sort = sys_get_param_int('sort', SORT_ID);
 $sort = $sort_fields[$sort] ? $sort : SORT_ID;
 
-if(($action = sys_get_param_int('action')) && ($user_id = sys_get_param_id('uid'))) {
+if (($action = sys_get_param_int('action')) && ($user_id = sys_get_param_id('uid'))) {
   $user_selected = DBStaticUser::db_user_by_id($user_id, false, 'id, username, authlevel');
-  if($user_selected['authlevel'] < $user['authlevel'] && $user['authlevel'] >= 3) {
-    switch($action) {
+  if ($user_selected['authlevel'] < $user['authlevel'] && $user['authlevel'] >= 3) {
+    switch ($action) {
       case ACTION_DELETE:
         DeleteSelectedUser($user_id);
         sys_redirect("{$_SERVER['SCRIPT_NAME']}?sort={$sort}");
@@ -62,20 +62,20 @@ 
 $template = gettemplate('admin/userlist', true);
 
 $multi_ip = array();
-foreach(DBStaticUser::db_user_list_admin_multiaccounts() as $ip) {
+foreach (DBStaticUser::db_user_list_admin_multiaccounts() as $ip) {
   $multi_ip[$ip['user_lastip']] = $ip['ip_count'];
 }
 
 $geoip = geoip_status();
 $count = 0;
-foreach(DBStaticUser::db_user_list_admin_sorted($sort_fields[$sort], $is_players_online_page) as $user_row ) {
+foreach (DBStaticUser::db_user_list_admin_sorted($sort_fields[$sort], $is_players_online_page) as $user_row) {
   $count++;
-  if($user_row['banaday']) {
+  if ($user_row['banaday']) {
     $ban_details = db_ban_list_get_details($user_row);
   }
 
   $geoip_info = $geoip ? geoip_ip_info(ip2longu($user_row['user_lastip'])) : array();
-  foreach($geoip_info as $key => $value) {
+  foreach ($geoip_info as $key => $value) {
     $geoip_info[strtoupper($key)] = $value;
     unset($geoip_info[$key]);
   }

includes/classes/Vector/Vector.php

Spacing +6 added lines, -6 removed lines

@@ -116,12 +116,12 @@
    * @return static
    */
   public static function convertToVector($coordinates, $prefix = '') {
-    $galaxy = !empty($coordinates[$prefix . 'galaxy']) ? intval($coordinates[$prefix . 'galaxy']) : 0;
-    $system = !empty($coordinates[$prefix . 'system']) ? intval($coordinates[$prefix . 'system']) : 0;
-    $planet = !empty($coordinates[$prefix . 'planet']) ? intval($coordinates[$prefix . 'planet']) : 0;
-    $type = !empty($coordinates[$prefix . 'type'])
-      ? intval($coordinates[$prefix . 'type'])
-      : (!empty($coordinates[$prefix . 'planet_type']) ? intval($coordinates[$prefix . 'planet_type']) : 0);
+    $galaxy = !empty($coordinates[$prefix.'galaxy']) ? intval($coordinates[$prefix.'galaxy']) : 0;
+    $system = !empty($coordinates[$prefix.'system']) ? intval($coordinates[$prefix.'system']) : 0;
+    $planet = !empty($coordinates[$prefix.'planet']) ? intval($coordinates[$prefix.'planet']) : 0;
+    $type = !empty($coordinates[$prefix.'type'])
+      ? intval($coordinates[$prefix.'type'])
+      : (!empty($coordinates[$prefix.'planet_type']) ? intval($coordinates[$prefix.'planet_type']) : 0);
 
     return new static($galaxy, $system, $planet, $type);
   }

includes/vars/vars_mission_checks.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
   'checkSpeedPercentOld'       => FLIGHT_FLEET_SPEED_WRONG,
   'checkTargetInUniverse'      => FLIGHT_VECTOR_BEYOND_UNIVERSE,
   'checkTargetNotSource'       => FLIGHT_VECTOR_SAME_SOURCE,
-  'checkSenderNoVacation'      => FLIGHT_PLAYER_VACATION_OWN,  // tODO
+  'checkSenderNoVacation'      => FLIGHT_PLAYER_VACATION_OWN, // tODO
   'checkTargetNoVacation'      => FLIGHT_PLAYER_VACATION,
   'checkFleetNotEmpty'         => FLIGHT_SHIPS_NO_SHIPS,
   // 'checkUnitsPositive'         => FLIGHT_SHIPS_NEGATIVE, // Unused - 'cause it's not allowed to put negative units into Unit class

includes/vars/vars_structures.php

Spacing +12 added lines, -12 removed lines

@@ -15,8 +15,8 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_METAL     => function ($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_METAL     => function($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -33,8 +33,8 @@ 
       'factor' => 1.6,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_CRYSTAL   => function ($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_CRYSTAL   => function($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -51,8 +51,8 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -69,7 +69,7 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -87,8 +87,8 @@ 
       'factor' => 1.8,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, null, TECH_ENERGY), $level) * (0.1 * $production_factor);},
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, null, TECH_ENERGY), $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -105,7 +105,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -121,7 +121,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -137,7 +137,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),