supernova-ws / SuperNova

includes/includes/flt_page3.inc

Spacing +41 added lines, -42 removed lines

@@ -3,7 +3,7 @@ 
 // @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);
 }
 
@@ -22,7 +22,7 @@ 
     $errorlist .= $lang['fl_limit_galaxy'];
   if (!$system || $system > $config->game_maxSystem || $system < 1)
     $errorlist .= $lang['fl_limit_system'];
-  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE ))
+  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE))
     $errorlist .= $lang['fl_limit_planet'];
   if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type)
     $errorlist .= $lang['fl_ownpl_err'];
@@ -49,35 +49,35 @@ 
   $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
 
   if ($target_mission == MT_EXPLORE) {
-    if ($MaxExpeditions == 0 ) {
+    if ($MaxExpeditions == 0) {
       $errorlist .= $lang['fl_expe_notech'];
-    } elseif ($FlyingExpeditions >= $MaxExpeditions ) {
+    } elseif ($FlyingExpeditions >= $MaxExpeditions) {
       $errorlist .= $lang['fl_expe_max'];
     }
   } else {
-    if ($TargetPlanet['id_owner']){
+    if ($TargetPlanet['id_owner']) {
       if ($target_mission == MT_COLONIZE)
         $errorlist .= $lang['fl_colonized'];
 
-      if ($TargetPlanet['id_owner'] == $planetrow['id_owner']){
+      if ($TargetPlanet['id_owner'] == $planetrow['id_owner']) {
         if ($target_mission == MT_ATTACK)
           $errorlist .= $lang['fl_no_self_attack'];
 
         if ($target_mission == MT_SPY)
           $errorlist .= $lang['fl_no_self_spy'];
-      }else{
+      } else {
         if ($target_mission == MT_RELOCATE)
           $errorlist .= $lang['fl_only_stay_at_home'];
       }
-    }else{
-      if ($target_mission < MT_COLONIZE){
+    } else {
+      if ($target_mission < MT_COLONIZE) {
         $errorlist .= $lang['fl_unknow_target'];
-      }else{
+      } else {
         if ($target_mission == MT_DESTROY)
           $errorlist .= $lang['fl_nomoon'];
 
-        if ($target_mission == MT_RECYCLE){
-          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0)
+        if ($target_mission == MT_RECYCLE) {
+          if ($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0)
             $errorlist .= $lang['fl_nodebris'];
         }
       }
@@ -85,13 +85,13 @@ 
   }
 
 
-  if($sn_module['unit_captain']->manifest['active'] && $captain_id = sys_get_param_id('captain_id')) {
+  if ($sn_module['unit_captain']->manifest['active'] && $captain_id = sys_get_param_id('captain_id')) {
     $captain = $sn_module['unit_captain']->unit_captain_get($planetrow['id']);
 //      mrc_get_level($user, $planetrow, UNIT_CAPTAIN, true);
-    if(!$captain) {
+    if (!$captain) {
       $errorlist .= $lang['module_unit_captain_error_no_captain'];
-    } elseif($captain['unit_location_type'] == LOC_PLANET) {
-      if($target_mission == MT_RELOCATE && ($arriving_captain = mrc_get_level($user, $TargetPlanet, UNIT_CAPTAIN, true))) {
+    } elseif ($captain['unit_location_type'] == LOC_PLANET) {
+      if ($target_mission == MT_RELOCATE && ($arriving_captain = mrc_get_level($user, $TargetPlanet, UNIT_CAPTAIN, true))) {
         $errorlist .= $lang['module_unit_captain_error_captain_already_bound'];
       }
     } else {
@@ -101,13 +101,13 @@ 
 
   if ($errorlist) {
     sn_db_transaction_rollback();
-    messageBox ("<span class='error'><ul>{$errorlist}</ul></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, false);
+    messageBox("<span class='error'><ul>{$errorlist}</ul></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, false);
   }
 
   // On verifie s'il y a assez de vaisseaux sur la planete !
   foreach ($fleetarray as $Ship => $Count) {
     if ($Count > mrc_get_level($user, $planetrow, $Ship)) {
-      messageBox ("<span class='error'><b>{$lang['fl_fleet_err']}</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
+      messageBox("<span class='error'><b>{$lang['fl_fleet_err']}</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
     }
   }
 
@@ -115,13 +115,13 @@ 
   $fleet_group = max(0, intval($_POST['fleet_group']));
   //But is it acs??
   //Well all acs fleets must have a fleet code.
-  if($fleet_group) {
+  if ($fleet_group) {
     //Also it must be mission type 2
     $target_mission = MT_AKS;
 
     //The co-ords must be the same as where the acs fleet is going.
     $target = "g{$galaxy}s{$system}p{$planet}t{$planet_type}";
-    if($_POST['acs_target_mr'] == $target) {
+    if ($_POST['acs_target_mr'] == $target) {
       //ACS attack must exist (if acs fleet has arrived this will also return false (2 checks in 1!!!)
       $aks = doquery("SELECT * FROM {{aks}} WHERE id = '{$fleet_group}' LIMIT 1;", true);
       if (!$aks) {
@@ -137,7 +137,7 @@ 
     }
   }
   //Check that a failed acs attack isn't being sent, if it is, make it an attack fleet.
-  if(!$fleet_group && $target_mission == MT_AKS) {
+  if (!$fleet_group && $target_mission == MT_AKS) {
     $target_mission = MT_ATTACK;
   }
 
@@ -147,22 +147,21 @@ 
   $options = array('fleet_speed_percent' => $speed_percent, 'fleet_group' => $fleet_group, 'resources' => $StorageNeeded);
   $cant_attack = flt_can_attack($planetrow, $TargetPlanet, $fleetarray, $target_mission, $options);
 
-  if($cant_attack !== ATTACK_ALLOWED) {
+  if ($cant_attack !== ATTACK_ALLOWED) {
     messageBox("<span class='error'><b>{$lang['fl_attack_error'][$cant_attack]}</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 99);
   }
 
   $speed_possible = array(10, 9, 8, 7, 6, 5, 4, 3, 2, 1);
   if (!in_array($speed_percent, $speed_possible)) {
-    messageBox ("<span class='error'><b>". $lang['fl_cheat_speed'] ."</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
+    messageBox("<span class='error'><b>" . $lang['fl_cheat_speed'] . "</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
 
   $fleet['start_time'] = $duration + SN_TIME_NOW;
 
-  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) :
-    ($target_mission == MT_HOLD ? 12 : 0);
-  if($max_duration) {
+  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) : ($target_mission == MT_HOLD ? 12 : 0);
+  if ($max_duration) {
     $StayDuration = sys_get_param_id('missiontime');
-    if($StayDuration > $max_duration || $StayDuration < 1) {
+    if ($StayDuration > $max_duration || $StayDuration < 1) {
       $debug->warning('Supplying wrong mission time', 'Hack attempt', 302, array('base_dump' => true));
       die();
     }
@@ -172,11 +171,11 @@ 
     $StayDuration = 0;
     $StayTime     = 0;
   }
-  $fleet['end_time']   = $StayDuration + (2 * $duration) + SN_TIME_NOW;
+  $fleet['end_time'] = $StayDuration + (2 * $duration) + SN_TIME_NOW;
 
-  if($aks && $target_mission == MT_AKS) {
-    if ($fleet['start_time']>$aks['ankunft']) {
-      messageBox ($lang['fl_aks_too_slow'] . 'Fleet arrival: ' . date(FMT_DATE_TIME,$fleet['start_time']) . " AKS arrival: " .date(FMT_DATE_TIME,$aks['ankunft']), $lang['fl_error']);
+  if ($aks && $target_mission == MT_AKS) {
+    if ($fleet['start_time'] > $aks['ankunft']) {
+      messageBox($lang['fl_aks_too_slow'] . 'Fleet arrival: ' . date(FMT_DATE_TIME, $fleet['start_time']) . " AKS arrival: " . date(FMT_DATE_TIME, $aks['ankunft']), $lang['fl_error']);
     }
     $fleet['start_time'] = $aks['ankunft'];
     $fleet['end_time'] = $aks['ankunft'] + $duration;
@@ -186,21 +185,21 @@ 
   $FleetShipCount      = 0;
   $db_changeset = array();
   foreach ($fleetarray as $Ship => $Count) {
-    $FleetStorage    += get_unit_param($Ship, P_CAPACITY) * $Count;
+    $FleetStorage += get_unit_param($Ship, P_CAPACITY) * $Count;
     $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($Ship, -$Count, $user, $planetrow['id']);
   }
   $fleet_array = sys_unit_arr2str($fleetarray);
-  $FleetShipCount  += array_sum($fleetarray);
-  $FleetStorage        -= $consumption;
+  $FleetShipCount += array_sum($fleetarray);
+  $FleetStorage -= $consumption;
 
-  if ( $StorageNeeded > $FleetStorage) {
-    messageBox ("<span class='error'><b>". $lang['fl_nostoragespa'] . HelperString::numberFloorAndFormat($StorageNeeded - $FleetStorage) ."</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
+  if ($StorageNeeded > $FleetStorage) {
+    messageBox("<span class='error'><b>" . $lang['fl_nostoragespa'] . HelperString::numberFloorAndFormat($StorageNeeded - $FleetStorage) . "</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
   if ($planetrow['deuterium'] < $TransDeuterium + $consumption) {
-    messageBox ("<font color=\"red\"><b>". $lang['fl_no_deuterium'] . HelperString::numberFloorAndFormat($TransDeuterium + $consumption - $planetrow['deuterium']) ."</b></font>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
+    messageBox("<font color=\"red\"><b>" . $lang['fl_no_deuterium'] . HelperString::numberFloorAndFormat($TransDeuterium + $consumption - $planetrow['deuterium']) . "</b></font>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
   if (($planetrow['metal'] < $TransMetal) || ($planetrow['crystal'] < $TransCrystal)) {
-    messageBox ("<font color=\"red\"><b>". $lang['fl_no_resources'] ."</b></font>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
+    messageBox("<font color=\"red\"><b>" . $lang['fl_no_resources'] . "</b></font>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
 
   $fleet_set = array(
@@ -242,7 +241,7 @@ 
 //    ));
 //  }
 
-  if(is_array($captain)) {
+  if (is_array($captain)) {
     DBStaticUnit::db_unit_set_by_id($captain['unit_id'], "`unit_location_type` = " . LOC_FLEET . ", `unit_location_id` = {$fleet_id}");
   }
 
@@ -255,7 +254,7 @@ 
     'START_LEFT'         => floor($fleet['end_time'] + 1 - SN_TIME_NOW),
   );
 
-  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),
@@ -268,8 +267,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,

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;

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 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий

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

classes/Pm/DecodeEspionage.php

Spacing +4 added lines, -4 removed lines

@@ -25,8 +25,8 @@ 
       $groups[get_unit_param($unitId, P_UNIT_TYPE)][$unitId] = $unitAmount;
     }
 
-    foreach(static::ALLOWED_UNITS as $groupId) {
-      if(empty($groups[$groupId])) {
+    foreach (static::ALLOWED_UNITS as $groupId) {
+      if (empty($groups[$groupId])) {
         continue;
       }
 
@@ -35,8 +35,8 @@ 
         'NAME' => $lang['tech'][$groupId],
       ]);
 
-      foreach($general->getGroupsById($groupId) as $unitId) {
-        if((!isset($groups[$groupId][$unitId]) || floor($groups[$groupId][$unitId]) < 1) && $unitId != RES_ENERGY) {
+      foreach ($general->getGroupsById($groupId) as $unitId) {
+        if ((!isset($groups[$groupId][$unitId]) || floor($groups[$groupId][$unitId]) < 1) && $unitId != RES_ENERGY) {
           continue;
         }
 

includes/functions/msg_send_simple_message.php

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
     "ally_id = '{$ally_id}'" . ($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
     false, 'id, username');
   // while ($u = db_fetch($query))
-  foreach($query as $u)
+  foreach ($query as $u)
   {
     $sendList[] = $u['id'];
     $list .= "<br>{$u['username']} ";
@@ -53,19 +53,19 @@ 
 {
   global $config, $user, $sn_message_class_list;
 
-  if(!$owners)
+  if (!$owners)
   {
     return;
   }
 
   $timestamp = $timestamp ? $timestamp : SN_TIME_NOW;
   $sender = intval($sender);
-  if(!is_array($owners))
+  if (!is_array($owners))
   {
     $owners = array($owners);
   }
 
-  if($escaped == STRING_NEED_ESCAPING)
+  if ($escaped == STRING_NEED_ESCAPING)
   {
     $from = db_escape($from);
     $subject = db_escape($subject);
@@ -81,9 +81,9 @@ 
 
   $message_class_name_total = $sn_message_class_list[MSG_TYPE_NEW]['name'];
 
-  if($owners[0] == '*')
+  if ($owners[0] == '*')
   {
-    if($user['authlevel'] < 3)
+    if ($user['authlevel'] < 3)
     {
       return false;
     }
@@ -99,7 +99,7 @@ 
 
     foreach ($owners as $owner)
     {
-      if($user['id'] != $owner)
+      if ($user['id'] != $owner)
       {
         $owner_row = db_user_by_id($owner);
       }
@@ -109,14 +109,14 @@ 
       }
       sys_user_options_unpack($owner_row);
 
-      if($force || !$message_class_switchable || $owner_row["opt_{$message_class_name}"])
+      if ($force || !$message_class_switchable || $owner_row["opt_{$message_class_name}"])
       {
         $insert_values[] = sprintf($insert_template, $owner);
       }
 
-      if($message_class_email && $config->game_email_pm && $owner_row["opt_email_{$message_class_name}"])
+      if ($message_class_email && $config->game_email_pm && $owner_row["opt_email_{$message_class_name}"])
       {
-        if($message_type == MSG_TYPE_SPY) {
+        if ($message_type == MSG_TYPE_SPY) {
           @$result = mymail($owner_row['email'], $subject, classSupernova::$lang['sys_spy_activity'], '', true);
         } else {
           @$result = mymail($owner_row['email'], $subject, $text_unescaped, '', true);
@@ -124,7 +124,7 @@ 
       }
     }
 
-    if(empty($insert_values))
+    if (empty($insert_values))
     {
       return;
     }
@@ -134,7 +134,7 @@ 
   }
   db_user_list_set_mass_mail($owners, "`{$message_class_name}` = `{$message_class_name}` + 1, `{$message_class_name_total}` = `{$message_class_name_total}` + 1");
 
-  if(in_array($user['id'], $owners) || $owners[0] == '*')
+  if (in_array($user['id'], $owners) || $owners[0] == '*')
   {
     $user[$message_class_name]++;
     $user[$message_class_name_total]++;