supernova-ws / SuperNova

includes/functions/tpl_helpers.php

Spacing +31 added lines, -31 removed lines

@@ -3,9 +3,9 @@ 
 // Compare function to sort fleet in time order
 function tpl_assign_fleet_compare($a, $b)
 {
-  if($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET'])
+  if ($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET'])
   {
-    if($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT'])
+    if ($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT'])
     {
       return 0;
     }
@@ -19,20 +19,20 @@ 
 
 function tpl_assign_fleet(&$template, $fleets, $js_name = 'fleets')
 {
-  if(!$fleets)
+  if (!$fleets)
   {
     return;
   }
 
   usort($fleets, 'tpl_assign_fleet_compare');
 
-  foreach($fleets as $fleet_data)
+  foreach ($fleets as $fleet_data)
   {
     $template->assign_block_vars($js_name, $fleet_data['fleet']);
 
-    if($fleet_data['ships'])
+    if ($fleet_data['ships'])
     {
-      foreach($fleet_data['ships'] as $ship_data)
+      foreach ($fleet_data['ships'] as $ship_data)
       {
         $template->assign_block_vars("{$js_name}.ships", $ship_data);
       }
@@ -57,7 +57,7 @@ 
 
   foreach ($fleet as $ship_id => $ship_amount)
   {
-    if(in_array($ship_id, sn_get_groups('fleet')))
+    if (in_array($ship_id, sn_get_groups('fleet')))
     {
       $single_ship_data = get_ship_data($ship_id, $user_data);
       $return['ships'][$ship_id] = array(
@@ -81,7 +81,7 @@ 
  *
  * @return mixed
  */
-function tpl_parse_fleet_db($fleet, $index, $user_data = false){return sn_function_call('tpl_parse_fleet_db', array($fleet, $index, $user_data, &$result));}
+function tpl_parse_fleet_db($fleet, $index, $user_data = false) {return sn_function_call('tpl_parse_fleet_db', array($fleet, $index, $user_data, &$result)); }
 /**
  * @param array      $fleet
  * @param int        $index
@@ -93,11 +93,11 @@ 
 function sn_tpl_parse_fleet_db($fleet, $index, $user_data = false, &$result) {
   global $lang, $user;
 
-  if(!$user_data) {
+  if (!$user_data) {
     $user_data = $user;
   }
 
-  if($fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] == MT_AKS) {
+  if ($fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] == MT_AKS) {
     $aks = doquery("SELECT * FROM {{aks}} WHERE id={$fleet['fleet_group']} LIMIT 1;", true);
   }
 
@@ -148,11 +148,11 @@ 
   $ship_list = explode(';', $fleet['fleet_array']);
 
   $ship_id = 0;
-  if($spy_level >= 6) {
-    foreach($ship_list as $ship_record) {
-      if($ship_record) {
+  if ($spy_level >= 6) {
+    foreach ($ship_list as $ship_record) {
+      if ($ship_record) {
         $ship_data = explode(',', $ship_record);
-        if($spy_level >= 10) {
+        if ($spy_level >= 10) {
           $single_ship_data = get_ship_data($ship_data[0], $user_data);
           $result['ships'][$ship_data[0]] = array(
             'ID'          => $ship_data[0],
@@ -186,9 +186,9 @@ 
 {
   $hangar_que = array();
   $que_hangar = $que['ques'][$que_id][$planet['id_owner']][$planet['id']];
-  if(!empty($que_hangar))
+  if (!empty($que_hangar))
   {
-    foreach($que_hangar as $que_item)
+    foreach ($que_hangar as $que_item)
     {
       $hangar_que['que'][] = array('id' => $que_item['que_unit_id'], 'count' => $que_item['que_unit_amount']);
       $hangar_que[$que_item['que_unit_id']] += $que_item['que_unit_amount'];
@@ -255,11 +255,11 @@ 
     $fleets[$planet['id']] = tpl_parse_fleet_sn($fleet_list['own']['total'], $result['PLANET_FLEET_ID']);
   }
 
-  if(!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']]))
+  if (!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']]))
   {
     $result['building_que'] = array();
     $building_que = &$que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']];
-    foreach($building_que as $que_element)
+    foreach ($building_que as $que_element)
     {
       $result['building_que'][] = que_tpl_parse_element($que_element);
     }
@@ -270,23 +270,23 @@ 
 
 function flt_get_fleets_to_planet($planet, $fleet_db_list = 0)
 {
-  if(!($planet && $planet['id']) && !$fleet_db_list)
+  if (!($planet && $planet['id']) && !$fleet_db_list)
   {
     return $planet;
   }
 
   global $user;
 
-  if($fleet_db_list === 0)
+  if ($fleet_db_list === 0)
   {
     $fleet_db_list = fleet_and_missiles_list_by_coordinates($planet);
   }
 
-  foreach($fleet_db_list as $fleet)
+  foreach ($fleet_db_list as $fleet)
   {
-    if($fleet['fleet_owner'] == $user['id'])
+    if ($fleet['fleet_owner'] == $user['id'])
     {
-      if($fleet['fleet_mission'] == MT_MISSILE)
+      if ($fleet['fleet_mission'] == MT_MISSILE)
       {
         continue;
       }
@@ -294,7 +294,7 @@ 
     }
     else
     {
-      switch($fleet['fleet_mission'])
+      switch ($fleet['fleet_mission'])
       {
         case MT_ATTACK:
         case MT_AKS:
@@ -312,13 +312,13 @@ 
 
     $fleet_list[$fleet_ownage]['fleets'][$fleet['fleet_id']] = $fleet;
 
-    if($fleet['fleet_mess'] == 1 || ($fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] == MT_RELOCATE) || ($fleet['fleet_target_owner'] != $user['id']))
+    if ($fleet['fleet_mess'] == 1 || ($fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] == MT_RELOCATE) || ($fleet['fleet_target_owner'] != $user['id']))
     {
 //      $fleet_sn = flt_expand($fleet);
       $fleet_sn = sys_unit_str2arr($fleet['fleet_array']);
-      foreach($fleet_sn as $ship_id => $ship_amount)
+      foreach ($fleet_sn as $ship_id => $ship_amount)
       {
-        if(in_array($ship_id, sn_get_groups('fleet')))
+        if (in_array($ship_id, sn_get_groups('fleet')))
         {
           $fleet_list[$fleet_ownage]['total'][$ship_id] += $ship_amount;
         }
@@ -352,14 +352,14 @@ 
     'ENERGY_MAX_NUMBER_TEXT_NO_COLOR' => HelperString::numberFloorAndFormat($planetrow['energy_max']),
     'ENERGY_MAX_NUMBER_TEXT' => Tools::numberPercentSpan($planetrow['energy_max'], $planetrow['energy_used']),
     'ENERGY_MAX' => prettyNumberStyledCompare($planetrow['energy_max'], -$planetrow['energy_used']),
-    'ENERGY_FILL' => round(($planetrow["energy_used"]/($planetrow["energy_max"]+1))*100,0),
+    'ENERGY_FILL' => round(($planetrow["energy_used"] / ($planetrow["energy_max"] + 1)) * 100, 0),
 
     'PLANET_METAL' => floor($planetrow["metal"]),
     'PLANET_METAL_TEXT' => prettyNumberStyledCompare($planetrow["metal"], $planetrow["metal_max"]),
     'PLANET_METAL_MAX' => floor($planetrow["metal_max"]),
     'PLANET_METAL_MAX_TEXT' => Tools::numberPercentSpan($planetrow["metal_max"], $planetrow["metal"]),
     'PLANET_METAL_MAX_NO_COLOR' => HelperString::numberFloorAndFormat($planetrow["metal_max"]),
-    'PLANET_METAL_FILL' => round(($planetrow["metal"]/($planetrow["metal_max"]+1))*100,0),
+    'PLANET_METAL_FILL' => round(($planetrow["metal"] / ($planetrow["metal_max"] + 1)) * 100, 0),
     'PLANET_METAL_PERHOUR' => round($planetrow["metal_perhour"], 5),
     'PLANET_METAL_FLEET_TEXT' => prettyNumberStyledDefault($fleets_to_planet[$planetrow['id']]['fleet']['METAL']),
 
@@ -368,7 +368,7 @@ 
     'PLANET_CRYSTAL_MAX' => floor($planetrow["crystal_max"]),
     'PLANET_CRYSTAL_MAX_TEXT' => Tools::numberPercentSpan($planetrow["crystal_max"], $planetrow["crystal"]),
     'PLANET_CRYSTAL_MAX_NO_COLOR' => HelperString::numberFloorAndFormat($planetrow["crystal_max"]),
-    'PLANET_CRYSTAL_FILL' => round(($planetrow["crystal"]/($planetrow["crystal_max"]+1))*100,0),
+    'PLANET_CRYSTAL_FILL' => round(($planetrow["crystal"] / ($planetrow["crystal_max"] + 1)) * 100, 0),
     'PLANET_CRYSTAL_PERHOUR' => round($planetrow["crystal_perhour"], 5),
     'PLANET_CRYSTAL_FLEET_TEXT' => prettyNumberStyledDefault($fleets_to_planet[$planetrow['id']]['fleet']['CRYSTAL']),
 
@@ -377,7 +377,7 @@ 
     'PLANET_DEUTERIUM_MAX' => floor($planetrow["deuterium_max"]),
     'PLANET_DEUTERIUM_MAX_TEXT' => Tools::numberPercentSpan($planetrow["deuterium_max"], $planetrow["deuterium"]),
     'PLANET_DEUTERIUM_MAX_NO_COLOR' => HelperString::numberFloorAndFormat($planetrow["deuterium_max"]),
-    'PLANET_DEUTERIUM_FILL' => round(($planetrow["deuterium"]/($planetrow["deuterium_max"]+1))*100,0),
+    'PLANET_DEUTERIUM_FILL' => round(($planetrow["deuterium"] / ($planetrow["deuterium_max"] + 1)) * 100, 0),
     'PLANET_DEUTERIUM_PERHOUR' => round($planetrow["deuterium_perhour"], 5),
     'PLANET_DEUTERIUM_FLEET_TEXT' => prettyNumberStyledDefault($fleets_to_planet[$planetrow['id']]['fleet']['DEUTERIUM']),
   ));

includes/pages/imperator.php

Spacing +21 added lines, -21 removed lines

@@ -47,7 +47,7 @@ 
 //    $same_user = false;
 //  }
 
-  if(!$user_data) {
+  if (!$user_data) {
     messageBox($lang['imp_imperator_none'], $lang['sys_error'], 'index.php', 10);
     die();
   }
@@ -58,8 +58,8 @@ 
   $stat_array = array();
   $query = doquery("SELECT * FROM {{statpoints}} WHERE `stat_type` = 1 AND `id_owner` = {$user_id} ORDER BY `stat_code` DESC;");
   $stat_count = classSupernova::$db->db_affected_rows();
-  while($row = db_fetch($query)) {
-    foreach($stat_fields as $field_db_name => $field_template_name) {
+  while ($row = db_fetch($query)) {
+    foreach ($stat_fields as $field_db_name => $field_template_name) {
       // $stat_count - $row['stat_code'] - для реверсирования ID статы в JS
       $stat_array[$field_template_name]['DATA'][$stat_count - $row['stat_code']] = $row[$field_db_name];
     }
@@ -67,7 +67,7 @@ 
 
   $stat_array_date = $stat_array['STAT_DATE'];
   empty($stat_array_date['DATA']) ? $stat_array_date['DATA'] = array() : false;
-  foreach($stat_array_date['DATA'] as $key => $value) {
+  foreach ($stat_array_date['DATA'] as $key => $value) {
     $template->assign_block_vars('stat_date', array(
       'ID' => $key,
       'VALUE' => $value,
@@ -77,21 +77,21 @@ 
 
   unset($stat_array['STAT_DATE']);
   $template_data = array();
-  foreach($stat_array as $stat_type => &$stat_type_data) {
+  foreach ($stat_array as $stat_type => &$stat_type_data) {
     $reverse_min_max = strpos($stat_type, '_RANK') !== false;
     $stat_type_data['MIN'] = $reverse_min_max ? max($stat_type_data['DATA']) : min($stat_type_data['DATA']);
     $stat_type_data['MAX'] = $reverse_min_max ? min($stat_type_data['DATA']) : max($stat_type_data['DATA']);
     $stat_type_data['AVG'] = average($stat_type_data['DATA']);
-    foreach($stat_type_data['DATA'] as $key => $value) {
+    foreach ($stat_type_data['DATA'] as $key => $value) {
       $stat_type_data['PERCENT'][$key] = ($stat_type_data['MAX'] - $value ? ($value - $stat_type_data['MIN']) / ($stat_type_data['MAX'] - $stat_type_data['MIN']) : 1) * 100;
       $template_data[$stat_type][$key]['ID'] = $key;
       $template_data[$stat_type][$key]['VALUE'] = $value;
-      $template_data[$stat_type][$key]['DELTA'] = ($reverse_min_max ? $stat_type_data['MIN']  - $value : $value - $stat_type_data['MAX']);
+      $template_data[$stat_type][$key]['DELTA'] = ($reverse_min_max ? $stat_type_data['MIN'] - $value : $value - $stat_type_data['MAX']);
       $template_data[$stat_type][$key]['PERCENT'] = $stat_type_data['PERCENT'][$key];
     }
   }
 
-  foreach($template_data as $stat_type => $stat_type_data) {
+  foreach ($template_data as $stat_type => $stat_type_data) {
     $template->assign_block_vars('stat', array(
       'TYPE' => $stat_type,
       'TEXT' => $lang['imp_stat_types'][$stat_type],
@@ -99,13 +99,13 @@ 
       'MAX' => $stat_array[$stat_type]['MAX'],
       'AVG' => $stat_array[$stat_type]['AVG'],
     ));
-    foreach($stat_type_data as $stat_entry) {
+    foreach ($stat_type_data as $stat_entry) {
       $template->assign_block_vars('stat.entry', $stat_entry);
     }
   }
 
 
-  if($same_user) {
+  if ($same_user) {
     rpg_level_up($user, RPG_STRUCTURE);
     rpg_level_up($user, RPG_RAID);
     rpg_level_up($user, RPG_TECH);
@@ -139,29 +139,29 @@ 
     'builder_xp'           => HelperString::numberFloorAndFormat($user_data['xpminier']),
     'builder_lvl'          => HelperString::numberFloorAndFormat($user_data['lvl_minier']),
     'builder_lvl_st'       => HelperString::numberFloorAndFormat(rpg_get_miner_xp($user_data['lvl_minier'])),
-    'builder_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_miner_xp($user_data['lvl_minier']+1)),
+    'builder_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_miner_xp($user_data['lvl_minier'] + 1)),
     'raid_xp'              => HelperString::numberFloorAndFormat($user_data['xpraid']),
     'raid_lvl'             => HelperString::numberFloorAndFormat($user_data['lvl_raid']),
-    'raid_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_raider_xp($user_data['lvl_raid']+1)),
+    'raid_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_raider_xp($user_data['lvl_raid'] + 1)),
     'raids'                => HelperString::numberFloorAndFormat($user_data['raids']),
     'raidswin'             => HelperString::numberFloorAndFormat($user_data['raidswin']),
     'raidsloose'           => HelperString::numberFloorAndFormat($user_data['raidsloose']),
     'tech_xp'              => HelperString::numberFloorAndFormat($user_data['player_rpg_tech_xp']),
     'tech_lvl'             => HelperString::numberFloorAndFormat($user_data['player_rpg_tech_level']),
     'tech_lvl_st'          => HelperString::numberFloorAndFormat(rpg_get_tech_xp($user_data['player_rpg_tech_level'])),
-    'tech_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_tech_xp($user_data['player_rpg_tech_level']+1)),
+    'tech_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_tech_xp($user_data['player_rpg_tech_level'] + 1)),
 
     'explore_xp'           => HelperString::numberFloorAndFormat($user_data['player_rpg_explore_xp']),
     'explore_lvl'          => HelperString::numberFloorAndFormat($user_data['player_rpg_explore_level']),
     'explore_lvl_st'       => HelperString::numberFloorAndFormat(rpg_get_explore_xp($user_data['player_rpg_explore_level'])),
-    'explore_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_explore_xp($user_data['player_rpg_explore_level']+1)),
-
-    'build_points'         => HelperString::numberFloorAndFormat( $StatRecord['build_points'] ),
-    'tech_points'          => HelperString::numberFloorAndFormat( $StatRecord['tech_points'] ),
-    'fleet_points'         => HelperString::numberFloorAndFormat( $StatRecord['fleet_points'] ),
-    'defs_points'          => HelperString::numberFloorAndFormat( $StatRecord['defs_points'] ),
-    'res_points'           => HelperString::numberFloorAndFormat( $StatRecord['res_points'] ),
-    'total_points'         => HelperString::numberFloorAndFormat( $StatRecord['total_points'] ),
+    'explore_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_explore_xp($user_data['player_rpg_explore_level'] + 1)),
+
+    'build_points'         => HelperString::numberFloorAndFormat($StatRecord['build_points']),
+    'tech_points'          => HelperString::numberFloorAndFormat($StatRecord['tech_points']),
+    'fleet_points'         => HelperString::numberFloorAndFormat($StatRecord['fleet_points']),
+    'defs_points'          => HelperString::numberFloorAndFormat($StatRecord['defs_points']),
+    'res_points'           => HelperString::numberFloorAndFormat($StatRecord['res_points']),
+    'total_points'         => HelperString::numberFloorAndFormat($StatRecord['total_points']),
     'user_rank'            => $StatRecord['total_rank'],
     'RANK_DIFF'            => $StatRecord['total_old_rank'] - $StatRecord['total_rank'],
 

stat.php

Spacing +5 added lines, -5 removed lines

@@ -11,8 +11,8 @@ 
   global $who, $lang;
 
   // $sn_group_stat_common = sn_get_groups('STAT_COMMON');
-  foreach($array as $key => $value) {
-    if($array_name == 'type' && $who == 2 && !in_array($key, $sn_group_stat_common)) {
+  foreach ($array as $key => $value) {
+    if ($array_name == 'type' && $who == 2 && !in_array($key, $sn_group_stat_common)) {
       continue;
     }
 
@@ -44,7 +44,7 @@ 
 $subject_list = array(
   1 => array('header' => $lang['stat_player']),
 );
-if(!$source) {
+if (!$source) {
   $subject_list[2] = array('header' => $lang['stat_allys']);
 }
 stat_tpl_assign($template, $who, 'subject', $subject_list, $sn_group_stat_common);
@@ -111,7 +111,7 @@ 
 
 $page_count = floor($record_count / 100);
 $pages = array();
-for($i = 0; $i <= $page_count; $i++) {
+for ($i = 0; $i <= $page_count; $i++) {
   $first_element = $i * 100 + 1;
   $last_element = $first_element + 99;
   $pages[$first_element] = array(
@@ -130,7 +130,7 @@ 
     'POINTS' => HelperString::numberFloorAndFormat($row['points']),
   );
 
-  if($who == 1) {
+  if ($who == 1) {
     $row_stat['ALLY_NAME'] = $row['ally_name'];
     $row_stat['ALLY_ID'] = $row['ally_id'];
     empty($row['username']) ? $row['username'] = $row['name'] : false;

overview.php

Spacing +1 added lines, -1 removed lines

@@ -436,7 +436,7 @@
       'SECTOR_COST'      => $sector_cost,
       'SECTOR_COST_TEXT' => HelperString::numberFloorAndFormat($sector_cost),
 
-      'PAGE_HEADER' => classSupernova::$lang['ov_overview']. " - " . classSupernova::$lang['sys_planet_type'][$planetrow['planet_type']] . " {$planetrow['name']} [{$planetrow['galaxy']}:{$planetrow['system']}:{$planetrow['planet']}]",
+      'PAGE_HEADER' => classSupernova::$lang['ov_overview'] . " - " . classSupernova::$lang['sys_planet_type'][$planetrow['planet_type']] . " {$planetrow['name']} [{$planetrow['galaxy']}:{$planetrow['system']}:{$planetrow['planet']}]",
     ));
     tpl_set_resource_info($template, $planetrow, $fleets_to_planet);
 

classes/classCache.php

Spacing +3 added lines, -3 removed lines

@@ -150,7 +150,7 @@ 
 
   public function unset_by_prefix($prefix_unset = '') {
     static $array_clear;
-    !$array_clear ? $array_clear = function (&$v, $k, $p) {
+    !$array_clear ? $array_clear = function(&$v, $k, $p) {
       strpos($k, $p) === 0 ? $v = null : false;
     } : false;
 
@@ -205,7 +205,7 @@ 
     if ($this->$name[0] === null) {
       for ($i = count($name) - 1; $i > 0; $i--) {
         $cName = "{$name[$i]}_COUNT";
-        $cName1 = "{$name[$i-1]}_COUNT";
+        $cName1 = "{$name[$i - 1]}_COUNT";
         if ($this->$cName1 == null || $i == 1) {
           $this->$cName++;
         }
@@ -251,7 +251,7 @@ 
     $count = count($name);
     for ($i = 1; $i < $count; $i++) {
       $cName = "{$name[$i]}_COUNT";
-      $cName1 = "{$name[$i-1]}_COUNT";
+      $cName1 = "{$name[$i - 1]}_COUNT";
 
       if ($i == 1 || $this->$cName1 === null) {
         $this->$cName--;

includes/includes/ube_report.php

Spacing +47 added lines, -47 removed lines

@@ -109,33 +109,33 @@ 
       `ube_report_time_combat` = '" . date(FMT_DATE_TIME_SQL, $combat_data[UBE_TIME]) . "',
       `ube_report_time_spent` = {$combat_data[UBE_TIME_SPENT]},
 
-      `ube_report_combat_admin` = " . (int)$combat_data[UBE_OPTIONS][UBE_COMBAT_ADMIN] . ",
+      `ube_report_combat_admin` = " . (int) $combat_data[UBE_OPTIONS][UBE_COMBAT_ADMIN] . ",
       `ube_report_mission_type` = {$combat_data[UBE_OPTIONS][UBE_MISSION_TYPE]},
 
       `ube_report_combat_result` = {$outcome[UBE_COMBAT_RESULT]},
-      `ube_report_combat_sfr` = " . (int)$outcome[UBE_SFR] . ",
+      `ube_report_combat_sfr` = " . (int) $outcome[UBE_SFR] . ",
 
-      `ube_report_debris_metal` = " . (float)$outcome[UBE_DEBRIS][RES_METAL] . ",
-      `ube_report_debris_crystal` = " . (float)$outcome[UBE_DEBRIS][RES_CRYSTAL] . ",
+      `ube_report_debris_metal` = " . (float) $outcome[UBE_DEBRIS][RES_METAL] . ",
+      `ube_report_debris_crystal` = " . (float) $outcome[UBE_DEBRIS][RES_CRYSTAL] . ",
       `ube_report_debris_total_in_metal` = " . $ube_report_debris_total_in_metal . ",
 
-      `ube_report_planet_id`          = " . (int)$outcome[UBE_PLANET][PLANET_ID] . ",
+      `ube_report_planet_id`          = " . (int) $outcome[UBE_PLANET][PLANET_ID] . ",
       `ube_report_planet_name`        = '" . db_escape($outcome[UBE_PLANET][PLANET_NAME]) . "',
-      `ube_report_planet_size`        = " . (int)$outcome[UBE_PLANET][PLANET_SIZE] . ",
-      `ube_report_planet_galaxy`      = " . (int)$outcome[UBE_PLANET][PLANET_GALAXY] . ",
-      `ube_report_planet_system`      = " . (int)$outcome[UBE_PLANET][PLANET_SYSTEM] . ",
-      `ube_report_planet_planet`      = " . (int)$outcome[UBE_PLANET][PLANET_PLANET] . ",
-      `ube_report_planet_planet_type` = " . (int)$outcome[UBE_PLANET][PLANET_TYPE] . ",
+      `ube_report_planet_size`        = " . (int) $outcome[UBE_PLANET][PLANET_SIZE] . ",
+      `ube_report_planet_galaxy`      = " . (int) $outcome[UBE_PLANET][PLANET_GALAXY] . ",
+      `ube_report_planet_system`      = " . (int) $outcome[UBE_PLANET][PLANET_SYSTEM] . ",
+      `ube_report_planet_planet`      = " . (int) $outcome[UBE_PLANET][PLANET_PLANET] . ",
+      `ube_report_planet_planet_type` = " . (int) $outcome[UBE_PLANET][PLANET_TYPE] . ",
 
-      `ube_report_moon` = " . (int)$outcome[UBE_MOON] . ",
-      `ube_report_moon_chance` = " . (int)$outcome[UBE_MOON_CHANCE] . ",
-      `ube_report_moon_size` = " . (float)$outcome[UBE_MOON_SIZE] . ",
+      `ube_report_moon` = " . (int) $outcome[UBE_MOON] . ",
+      `ube_report_moon_chance` = " . (int) $outcome[UBE_MOON_CHANCE] . ",
+      `ube_report_moon_size` = " . (float) $outcome[UBE_MOON_SIZE] . ",
 
-      `ube_report_moon_reapers` = " . (int)$outcome[UBE_MOON_REAPERS] . ",
-      `ube_report_moon_destroy_chance` = " . (int)$outcome[UBE_MOON_DESTROY_CHANCE] . ",
-      `ube_report_moon_reapers_die_chance` = " . (int)$outcome[UBE_MOON_REAPERS_DIE_CHANCE] . ",
+      `ube_report_moon_reapers` = " . (int) $outcome[UBE_MOON_REAPERS] . ",
+      `ube_report_moon_destroy_chance` = " . (int) $outcome[UBE_MOON_DESTROY_CHANCE] . ",
+      `ube_report_moon_reapers_die_chance` = " . (int) $outcome[UBE_MOON_REAPERS_DIE_CHANCE] . ",
 
-      `ube_report_capture_result` = " . (int)$outcome[UBE_CAPTURE_RESULT] . "
+      `ube_report_capture_result` = " . (int) $outcome[UBE_CAPTURE_RESULT] . "
   ");
   $ube_report_id = $combat_data[UBE_REPORT_ID] = db_insert_id();
 
@@ -146,11 +146,11 @@ 
       $player_id,
 
       "'" . db_escape($player_info[UBE_NAME]) . "'",
-      (int)$player_info[UBE_ATTACKER],
+      (int) $player_info[UBE_ATTACKER],
 
-      (float)$player_info[UBE_BONUSES][UBE_ATTACK],
-      (float)$player_info[UBE_BONUSES][UBE_SHIELD],
-      (float)$player_info[UBE_BONUSES][UBE_ARMOR],
+      (float) $player_info[UBE_BONUSES][UBE_ATTACK],
+      (float) $player_info[UBE_BONUSES][UBE_SHIELD],
+      (float) $player_info[UBE_BONUSES][UBE_ARMOR],
     );
   }
 
@@ -163,20 +163,20 @@ 
       $fleet_info[UBE_OWNER],
       $fleet_id,
 
-      (float)$fleet_info[UBE_PLANET][PLANET_ID],
+      (float) $fleet_info[UBE_PLANET][PLANET_ID],
       "'" . db_escape($fleet_info[UBE_PLANET][PLANET_NAME]) . "'",
-      (int)$fleet_info[UBE_PLANET][PLANET_GALAXY],
-      (int)$fleet_info[UBE_PLANET][PLANET_SYSTEM],
-      (int)$fleet_info[UBE_PLANET][PLANET_PLANET],
-      (int)$fleet_info[UBE_PLANET][PLANET_TYPE],
-
-      (float)$fleet_info[UBE_RESOURCES][RES_METAL],
-      (float)$fleet_info[UBE_RESOURCES][RES_CRYSTAL],
-      (float)$fleet_info[UBE_RESOURCES][RES_DEUTERIUM],
-
-      (float)$fleet_info[UBE_BONUSES][UBE_ATTACK],
-      (float)$fleet_info[UBE_BONUSES][UBE_SHIELD],
-      (float)$fleet_info[UBE_BONUSES][UBE_ARMOR],
+      (int) $fleet_info[UBE_PLANET][PLANET_GALAXY],
+      (int) $fleet_info[UBE_PLANET][PLANET_SYSTEM],
+      (int) $fleet_info[UBE_PLANET][PLANET_PLANET],
+      (int) $fleet_info[UBE_PLANET][PLANET_TYPE],
+
+      (float) $fleet_info[UBE_RESOURCES][RES_METAL],
+      (float) $fleet_info[UBE_RESOURCES][RES_CRYSTAL],
+      (float) $fleet_info[UBE_RESOURCES][RES_DEUTERIUM],
+
+      (float) $fleet_info[UBE_BONUSES][UBE_ATTACK],
+      (float) $fleet_info[UBE_BONUSES][UBE_SHIELD],
+      (float) $fleet_info[UBE_BONUSES][UBE_ARMOR],
     );
 
     // Сохраняем итоговую информацию по ресурсам флота - потеряно, выброшено, увезено
@@ -185,19 +185,19 @@ 
       $ube_report_id,
       $fleet_id,
 
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST][RES_METAL],
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST][RES_CRYSTAL],
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST][RES_DEUTERIUM],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST][RES_METAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST][RES_CRYSTAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST][RES_DEUTERIUM],
 
-      (float)$fleet_outcome_data[UBE_CARGO_DROPPED][RES_METAL],
-      (float)$fleet_outcome_data[UBE_CARGO_DROPPED][RES_CRYSTAL],
-      (float)$fleet_outcome_data[UBE_CARGO_DROPPED][RES_DEUTERIUM],
+      (float) $fleet_outcome_data[UBE_CARGO_DROPPED][RES_METAL],
+      (float) $fleet_outcome_data[UBE_CARGO_DROPPED][RES_CRYSTAL],
+      (float) $fleet_outcome_data[UBE_CARGO_DROPPED][RES_DEUTERIUM],
 
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_METAL],
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_CRYSTAL],
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_DEUTERIUM],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_METAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_CRYSTAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_DEUTERIUM],
 
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST_IN_METAL][RES_METAL],
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST_IN_METAL][RES_METAL],
     );
 
     // Сохраняем результаты по юнитам - потеряно и восстановлено
@@ -209,8 +209,8 @@ 
           $fleet_id,
 
           $unit_id,
-          (float)$fleet_outcome_data[UBE_DEFENCE_RESTORE][$unit_id],
-          (float)$fleet_outcome_data[UBE_UNITS_LOST][$unit_id],
+          (float) $fleet_outcome_data[UBE_DEFENCE_RESTORE][$unit_id],
+          (float) $fleet_outcome_data[UBE_UNITS_LOST][$unit_id],
 
           $unit_sort_order,
         );
@@ -233,7 +233,7 @@ 
 
           $unit_id,
           $unit_count,
-          (int)$fleet_data[UBE_UNITS_BOOM][$unit_id],
+          (int) $fleet_data[UBE_UNITS_BOOM][$unit_id],
 
           $fleet_data[UBE_ATTACK][$unit_id],
           $fleet_data[UBE_SHIELD][$unit_id],

classes/FleetDispatcher.php

Spacing +5 added lines, -9 removed lines

@@ -209,7 +209,7 @@ 
       MT_EXPLORE   => 'flt_mission_explore',
     );
     foreach ($missions_used as $mission_id => $cork) {
-      if(empty($mission_files[$mission_id])) {
+      if (empty($mission_files[$mission_id])) {
         continue;
       }
 
@@ -474,15 +474,11 @@ 
   protected function flt_flyingFleetsSort($a, $b) {
     return
       // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
-      $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
-        // Если время - одинаковое, сравниваем события флотов
+      $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 : // Если время - одинаковое, сравниваем события флотов
         // Если события - одинаковые, то флоты равны
-        ($a['fleet_event'] == $b['fleet_event'] ? 0 :
-          // Если события разные - первыми считаем прибывающие флоты
-          ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 :
-            // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
-            ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 :
-              // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
+        ($a['fleet_event'] == $b['fleet_event'] ? 0 : // Если события разные - первыми считаем прибывающие флоты
+          ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
+            ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
               // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
               (
               0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий

resources.php

Spacing +9 added lines, -9 removed lines

@@ -50,11 +50,11 @@ 
   ]);
 };
 
-$ValidList['percent'] = array (  0,  10,  20,  30,  40,  50,  60,  70,  80,  90, 100 );
+$ValidList['percent'] = array(0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100);
 $template = gettemplate('resources', true);
 
 $transmutation_result = sn_sys_planet_core_transmute($user, $planetrow);
-if(!empty($transmutation_result))
+if (!empty($transmutation_result))
 {
   $template->assign_block_vars('result', $transmutation_result); // array('STATUS' => $transmutation_result['STATUS'], 'MESSAGE' => $transmutation_result['MESSAGE']));
 }
@@ -63,20 +63,20 @@ 
 $production = $_POST['production'];
 //$SubQry     = '';
 $SubQry     = array();
-if(is_array($production)) {
-  foreach($production as $prod_id => $percent) {
-    if($percent > 100 || $percent < 0) {
+if (is_array($production)) {
+  foreach ($production as $prod_id => $percent) {
+    if ($percent > 100 || $percent < 0) {
       $debug->warning('Supplying wrong production percent (less then 0 or greater then 100)', 'Hack attempt', 302, array('base_dump' => true));
       die();
     }
 
     $prod_id = intval($prod_id);
-    if(in_array($prod_id, $sn_group_factories) && get_unit_param($prod_id, P_MINING_IS_MANAGED)) {
+    if (in_array($prod_id, $sn_group_factories) && get_unit_param($prod_id, P_MINING_IS_MANAGED)) {
       $field_name              = pname_factory_production_field_name($prod_id);
       $percent                 = floor($percent / 10);
       $planetrow[$field_name]  = $percent;
       //$SubQry                 .= "`{$field_name}` = '{$percent}',";
-      $SubQry[]                 = "`{$field_name}` = '{$percent}'";
+      $SubQry[] = "`{$field_name}` = '{$percent}'";
     } else {
       $debug->warning('Supplying wrong ID in production array - attempt to change some field - ID' . $prod_id, 'Resource Page', 301);
       continue;
@@ -113,9 +113,9 @@ 
   'ENERGY_TYPE'    => prettyNumberStyledDefault($capsObj->productionCurrentMatrix[RES_ENERGY][0]),
 ));
 
-foreach($sn_group_factories as $unit_id)
+foreach ($sn_group_factories as $unit_id)
 {
-  if(mrc_get_level($user, $planetrow, $unit_id) > 0 && get_unit_param($unit_id))
+  if (mrc_get_level($user, $planetrow, $unit_id) > 0 && get_unit_param($unit_id))
   {
     $level_plain = mrc_get_level($user, $planetrow, $unit_id, false, true);
     $template->assign_block_vars('production', array(

classes/Fleet/MissionEspionage.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
       $this->target_message = "{$lang['sys_mess_spy_enemy_fleet']} {$this->src_planet['name']} " . uni_render_coordinates_href($this->src_planet, '', 3);
       $this->target_message .= " {$lang['sys_mess_spy_seen_at']} {$this->dst_planet['name']} " . uni_render_coordinates($this->dst_planet);
-      if($this->missionReport->isSpyDetected()) {
+      if ($this->missionReport->isSpyDetected()) {
         $this->target_message .= "<br />{$lang['sys_mess_spy_destroyed_enemy']}";
       }