supernova-ws / SuperNova

includes/includes/flt_page1.inc

Spacing +14 added lines, -14 removed lines

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

includes/includes/flt_page3.inc

Spacing +41 added lines, -42 removed lines

@@ -8,7 +8,7 @@ 
 use Planet\DBStaticPlanet;
 use Unit\DBStaticUnit;
 
-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);
 }
 
@@ -27,7 +27,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'];
@@ -54,35 +54,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'];
         }
       }
@@ -90,13 +90,13 @@ 
   }
 
 
-  if(is_object($captainModule = moduleCaptain()) && $captain_id = sys_get_param_id('captain_id')) {
+  if (is_object($captainModule = moduleCaptain()) && $captain_id = sys_get_param_id('captain_id')) {
     $captain = $captainModule->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 {
@@ -106,13 +106,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);
     }
   }
 
@@ -120,13 +120,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 = DbFleetStatic::dbAcsGetById($fleet_group);
       if (!$aks) {
@@ -142,7 +142,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;
   }
 
@@ -152,22 +152,21 @@ 
   $options = [P_FLEET_ATTACK_SPEED_PERCENT_TENTH => $speed_percent, P_FLEET_ATTACK_FLEET_GROUP => $fleet_group, P_FLEET_ATTACK_RESOURCES_SUM => $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();
     }
@@ -177,11 +176,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;
@@ -191,21 +190,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(
@@ -247,7 +246,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}");
   }
 
@@ -260,7 +259,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),
@@ -273,8 +272,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,

Braces +41 added lines, -30 removed lines

@@ -23,18 +23,24 @@ 
 
   // Test de coherance de la destination (voir si elle se trouve dans les limites de l'univers connu
   $errorlist = '';
-  if (!$galaxy || $galaxy > $config->game_maxGalaxy || $galaxy < 1)
-    $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 ))
-    $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'];
-  if (!$planet_type)
-    $errorlist .= $lang['fl_no_planettype'];
-  if ($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON)
-    $errorlist .= $lang['fl_fleet_err_pl'];
+  if (!$galaxy || $galaxy > $config->game_maxGalaxy || $galaxy < 1) {
+      $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 )) {
+      $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'];
+  }
+  if (!$planet_type) {
+      $errorlist .= $lang['fl_no_planettype'];
+  }
+  if ($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON) {
+      $errorlist .= $lang['fl_fleet_err_pl'];
+  }
   if (empty($missiontype[$target_mission])) {
     $errorlist .= $lang['fl_bad_mission'];
   }
@@ -61,29 +67,35 @@ 
     }
   } else {
     if ($TargetPlanet['id_owner']){
-      if ($target_mission == MT_COLONIZE)
-        $errorlist .= $lang['fl_colonized'];
+      if ($target_mission == MT_COLONIZE) {
+              $errorlist .= $lang['fl_colonized'];
+      }
 
       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{
-        if ($target_mission == MT_RELOCATE)
-          $errorlist .= $lang['fl_only_stay_at_home'];
+        if ($target_mission == MT_ATTACK) {
+                  $errorlist .= $lang['fl_no_self_attack'];
+        }
+
+        if ($target_mission == MT_SPY) {
+                  $errorlist .= $lang['fl_no_self_spy'];
+        }
+      } else{
+        if ($target_mission == MT_RELOCATE) {
+                  $errorlist .= $lang['fl_only_stay_at_home'];
+        }
       }
-    }else{
+    } else{
       if ($target_mission < MT_COLONIZE){
         $errorlist .= $lang['fl_unknow_target'];
-      }else{
-        if ($target_mission == MT_DESTROY)
-          $errorlist .= $lang['fl_nomoon'];
+      } else{
+        if ($target_mission == MT_DESTROY) {
+                  $errorlist .= $lang['fl_nomoon'];
+        }
 
         if ($target_mission == MT_RECYCLE){
-          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0)
-            $errorlist .= $lang['fl_nodebris'];
+          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0) {
+                      $errorlist .= $lang['fl_nodebris'];
+          }
         }
       }
     }
@@ -131,8 +143,7 @@ 
       $aks = DbFleetStatic::dbAcsGetById($fleet_group);
       if (!$aks) {
         $fleet_group = 0;
-      }
-      else
+      } else
       {
         $galaxy = $aks['galaxy'];
         $system = $aks['system'];

includes/includes/flt_functions.php

Spacing +2 added lines, -2 removed lines

@@ -364,7 +364,7 @@ 
       return $result = ATTACK_ACS_TOO_LATE;
     }
 
-    if(DbFleetStatic::acsIsAcsFull($acs['id'])) {
+    if (DbFleetStatic::acsIsAcsFull($acs['id'])) {
       return $result = ATTACK_ACS_MAX_FLEETS;
     }
   }
@@ -548,7 +548,7 @@ 
 
 
   !is_array($resources) ? $resources = [] : false;
-  if(empty($options[P_FLEET_ATTACK_RES_LIST])) {
+  if (empty($options[P_FLEET_ATTACK_RES_LIST])) {
     $options[P_FLEET_ATTACK_RES_LIST] = $resources;
   }
   $can_attack = flt_can_attack($from, $to, $fleet, $mission, $options);

includes/includes/flt_page4.inc

Spacing +9 added lines, -9 removed lines

@@ -3,18 +3,18 @@ 
 use Fleet\DbFleetStatic;
 use Planet\DBStaticPlanet;
 
-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);
 }
 
 $fleetid = sys_get_param_id('fleetid');
 
-if(!is_numeric($fleetid) || empty($fleetid)) {
+if (!is_numeric($fleetid) || empty($fleetid)) {
   sys_redirect("fleet.php");
 }
 
 $fleet = DbFleetStatic::db_fleet_get($fleetid);
-if(!$fleet) {
+if (!$fleet) {
   messageBox($lang['fl_fleet_not_exists'], $lang['fl_error']);
 }
 
@@ -22,8 +22,8 @@ 
   messageBox($lang['fl_isback'], $lang['fl_error']);
 }
 
-if($fleet['fleet_owner'] != $user['id']) {
-  $debug->warning($lang['fl_aks_hack_wrong_fleet'],'Wrong Fleet Owner',301);
+if ($fleet['fleet_owner'] != $user['id']) {
+  $debug->warning($lang['fl_aks_hack_wrong_fleet'], 'Wrong Fleet Owner', 301);
   messageBox($lang['fl_aks_hack_wrong_fleet'], $lang['fl_error']);
 }
 
@@ -57,8 +57,8 @@ 
   'MISSION_NAME' => $lang['type_mission'][MT_AKS],
 ));
 
-if($aks['eingeladen'] && is_array($members = SN::db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
-  foreach($members as $row) {
+if ($aks['eingeladen'] && is_array($members = SN::db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
+  foreach ($members as $row) {
     $template->assign_block_vars('invited', array(
       'NAME' => $row['username'],
     ));
@@ -68,7 +68,7 @@ 
 $i++;
 $fleet_row = DbFleetStatic::db_fleet_get($fleetid);
 
-if(is_array($fleet_row) && !empty($fleet_row)) {
+if (is_array($fleet_row) && !empty($fleet_row)) {
 $planet_start = DBStaticPlanet::db_planet_by_id($fleet_row['fleet_start_planet_id']);
 $fleet_row['fleet_start_name'] = !empty($planet_start['name']) ? $planet_start['name'] : '';
 $planet_end = DBStaticPlanet::db_planet_by_id($fleet_row['fleet_end_planet_id']);
@@ -76,7 +76,7 @@ 
 
 $fleet_data = tpl_parse_fleet_db($fleet_row, $i, $user);
 $template->assign_block_vars('fleets', $fleet_data['fleet']);
-foreach($fleet_data['ships'] as $ship_data) {
+foreach ($fleet_data['ships'] as $ship_data) {
   $template->assign_block_vars('fleets.ships', $ship_data);
 }
 }

includes/constants/constants_units.php

Indentation +4 added lines, -4 removed lines

@@ -361,10 +361,10 @@
 
 
 define('GROUP_PART',         800000); // Зарезервировано для запчастей: 800.001 - 899.999
- define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
- define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
- define('GROUP_PART_SHIELD',  803000); // Щиты - 1000 штук
- define('GROUP_PART_WEAPON',  810000); // Оружие - 10000 штук
+  define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
+  define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
+  define('GROUP_PART_SHIELD',  803000); // Щиты - 1000 штук
+  define('GROUP_PART_WEAPON',  810000); // Оружие - 10000 штук
 
 
 define('UNIT_GROUP', 'groups'); // 900.000 // Зарезервировано для груп юнитов: 900.001 - 999.999

Spacing +20 added lines, -20 removed lines

@@ -161,10 +161,10 @@ 
 // === Artifacts
 define('UNIT_ARTIFACTS_STR', 'artifacts');
 define('UNIT_ARTIFACTS', 1000);
-define('ART_LHC', 1001);      // Additional moon chance
-define('ART_RCD_SMALL', 1002);   // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
-define('ART_RCD_MEDIUM', 1003);  // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
-define('ART_RCD_LARGE', 1004);   // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
+define('ART_LHC', 1001); // Additional moon chance
+define('ART_RCD_SMALL', 1002); // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
+define('ART_RCD_MEDIUM', 1003); // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
+define('ART_RCD_LARGE', 1004); // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
 define('ART_HEURISTIC_CHIP', 1005); // Speed up research
 define('ART_NANO_BUILDER', 1006); // Speed up building
 define('ART_NANO_CONSTRUCTOR', 1007); // RESERVED Speed up hangar constructions
@@ -238,25 +238,25 @@ 
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE1', 2201); // Блиц-сервер, участник 0-го раунда, 1-е место
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE2', 2202); // Блиц-сервер, участник 0-го раунда, 2-е место
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE3', 2203); // Блиц-сервер, участник 0-го раунда, 3-е место
-define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
-define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_BEST', 2205);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
-define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206);  // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
+define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
+define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_BEST', 2205); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
+define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206); // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
 define('UNIT_AWARD_MEDAL_8_MARCH_BEST_CAVALIER_AMOUNT', 2207); // Медаль Лучшему Кавалеру за максимум потраченной ММ Женщине от Мужчины во время ивента 8 марта 2017 года
 define('UNIT_AWARD_MEDAL_8_MARCH_BEST_CAVALIER_COUNT', 2208); // Медаль Лучшему Кавалеру за максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
 define('UNIT_AWARD_MEDAL_8_MARCH_SPRING_QUEEN_AMOUNT', 2209); // Медаль Королевы Весны за максимум полученной ММ от Мужчины во время ивента 8 марта 2017 года
 define('UNIT_AWARD_MEDAL_8_MARCH_SPRING_QUEEN_COUNT', 2210); // Медаль Королевы Весны за максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
 
 define('UNIT_AWARD_MEMORY', 2300); // Памятные знаки за существование и участие - например "4 года в игре". "Был онлайн в новогоднюю ночь 2013". итд
-define('UNIT_AWARD_MEMORY_IMMORTAL', 2301);  // Бессмертный
-define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
+define('UNIT_AWARD_MEMORY_IMMORTAL', 2301); // Бессмертный
+define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
 define('UNIT_AWARD_MEMORY_BLITZ_R0', 2303); // Блиц-сервер, участник 0-го раунда
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SIMPLE', 2304); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_BRONZE', 2305); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SILVER', 2306); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_GOLD', 2307); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_PLATINUM', 2308); // День Рождения СН
-define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
-define('UNIT_AWARD_MEMORY_2017_WOMEN_DAY', 2310);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года
+define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
+define('UNIT_AWARD_MEMORY_2017_WOMEN_DAY', 2310); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SIMPLE', 2311); // День Рождения СН - 2017
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_BRONZE', 2312); // День Рождения СН - 2017
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SILVER', 2313); // День Рождения СН - 2017
@@ -360,19 +360,19 @@ 
 const GROUP_UNIT_OBJECTS_IN_SPACE = 790002;
 
 
-define('GROUP_PART',         800000); // Зарезервировано для запчастей: 800.001 - 899.999
- define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
- define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
- define('GROUP_PART_SHIELD',  803000); // Щиты - 1000 штук
- define('GROUP_PART_WEAPON',  810000); // Оружие - 10000 штук
+define('GROUP_PART', 800000); // Зарезервировано для запчастей: 800.001 - 899.999
+ define('GROUP_PART_HULL', 801000); // Корпуса - 1000 штук
+ define('GROUP_PART_ARMOR', 802000); // Броня - 1000 штук
+ define('GROUP_PART_SHIELD', 803000); // Щиты - 1000 штук
+ define('GROUP_PART_WEAPON', 810000); // Оружие - 10000 штук
 
 
 define('UNIT_GROUP', 'groups'); // 900.000 // Зарезервировано для груп юнитов: 900.001 - 999.999
-define('GROUP_UNIT_USER', 1000000);// Зарезервировано для пользовательских юнитов: 1.000.001 - 1.999.999
-define('GROUP_ID_RESERVED', 2000000);// Зарезервировано для прочих нужд: 2.000.000 - 1.999.999.999
+define('GROUP_UNIT_USER', 1000000); // Зарезервировано для пользовательских юнитов: 1.000.001 - 1.999.999
+define('GROUP_ID_RESERVED', 2000000); // Зарезервировано для прочих нужд: 2.000.000 - 1.999.999.999
 const UNIT_CAN_NOT_BE_BUILD = 2000001; // Юнит не может быть построен - для спецюнитов
-define('GROUP_PARAMS', 1000000000);// Зарезервировано для параметров: 1.000.000.001 - 1.999.999.999
-define('GROUP_DEVELOPERS', 2000000000);// Пространство для разработчиков: 2.000.000.001 - 2.147.483.647
+define('GROUP_PARAMS', 1000000000); // Зарезервировано для параметров: 1.000.000.001 - 1.999.999.999
+define('GROUP_DEVELOPERS', 2000000000); // Пространство для разработчиков: 2.000.000.001 - 2.147.483.647
 
 define('UNIT_PLAYER_COLONIES_CURRENT', 'COLONIES_CURRENT');
 define('UNIT_PLAYER_COLONIES_MAX', 'COLONIES_MAX');

admin/ajax_maintenance.php

Spacing +9 added lines, -9 removed lines

@@ -4,7 +4,7 @@ 
 
 require('../includes/init.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   messageBox($lang['sys_noalloaw'], $lang['sys_noaccess']);
   die();
@@ -19,9 +19,9 @@ 
 
 // [#] info_best_battles 1b0
 $best_reports = array();
-if(defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
+if (defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
   $query = doquery(MODULE_INFO_BEST_BATTLES_QUERY);
-  while($row = db_fetch($query)) {
+  while ($row = db_fetch($query)) {
     $best_reports[] = $row['ube_report_id'];
   }
 }
@@ -188,16 +188,16 @@ 
 
 function sn_maintenance_pack_user_list($user_list) {
   $user_list = explode(',', $user_list);
-  foreach($user_list as $key => $user_id) {
-    if(!is_numeric($user_id)) {
+  foreach ($user_list as $key => $user_id) {
+    if (!is_numeric($user_id)) {
       unset($user_list[$key]);
     }
   }
 
   $result = array();
-  if(!empty($user_list)) {
+  if (!empty($user_list)) {
     $query = doquery("SELECT `id` FROM `{{users}}` WHERE `id` in (" . implode(',', $user_list) . ")");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[] = $row['id'];
     }
   }
@@ -212,11 +212,11 @@ 
 $old_server_status == GAME_DISABLE_NONE ? SN::$config->pass()->game_disable = GAME_DISABLE_MAINTENANCE : false;
 sn_db_transaction_commit();
 
-foreach($ques as $que_transaction) {
+foreach ($ques as $que_transaction) {
   sn_db_transaction_start();
 
   !is_array($que_transaction) ? $que_transaction = array($que_transaction) : false;
-  foreach($que_transaction as $que) {
+  foreach ($que_transaction as $que) {
     set_time_limit(120);
     $QryResult = doquery($que);
     //$msg .= '<hr>' . $que . '<hr>';

admin/admin_analyze_matter.php

Spacing +8 added lines, -9 removed lines

@@ -15,8 +15,8 @@ 
 
 $constants = get_defined_constants(true);
 $rpgConstants = array();
-foreach($constants['user'] as $constantName => $constantValue) {
-  if(substr($constantName, 0, 4) == 'RPG_') {
+foreach ($constants['user'] as $constantName => $constantValue) {
+  if (substr($constantName, 0, 4) == 'RPG_') {
     $rpgConstants[$constantValue] = $constantName;
   }
 }
@@ -34,7 +34,7 @@ 
   GROUP BY log_dark_matter_reason, IF(sign((log_dark_matter_amount)) > 0, 1, -1) ORDER BY sum(log_dark_matter_amount) DESC;"
 );
 
-while($row = SN::$db->db_fetch($result)) {
+while ($row = SN::$db->db_fetch($result)) {
   $row['CONSTANT'] = $rpgConstants[$row['REASON']];
 
   $row['DM_AMOUNT_TEXT'] = HelperString::numberFloorAndFormat($row['DM_AMOUNT']);
@@ -57,8 +57,8 @@ 
   GROUP BY reason, if(sign((amount)) > 0, 1, -1) ORDER BY sum(amount) DESC;"
 );
 
-while($row = SN::$db->db_fetch($result)) {
-  if(empty($spent[$row['BALANCE']])) {
+while ($row = SN::$db->db_fetch($result)) {
+  if (empty($spent[$row['BALANCE']])) {
     $spent[$row['BALANCE']] = array();
   }
 
@@ -68,16 +68,15 @@ 
   $spent[$row['BALANCE']] = array_merge_recursive_numeric($spent[$row['BALANCE']], $row);
 }
 
-foreach($spent as &$row) {
+foreach ($spent as &$row) {
   @$row['TOTAL_COUNT'] = $row['MM_COUNT'] + $row['DM_COUNT'];
   @$row['TOTAL_AMOUNT'] = $row['MM_AMOUNT'] + $row['DM_AMOUNT'];
   @$row['TOTAL_AMOUNT_TEXT'] = HelperString::numberFloorAndFormat($row['TOTAL_AMOUNT']);
   @$row['TOTAL_COUNT_TEXT'] = HelperString::numberFloorAndFormat($row['TOTAL_COUNT']);
 }
 
-usort($spent, function ($a, $b) {
-  return $a['TOTAL_AMOUNT'] < $b['TOTAL_AMOUNT'] ? -1 :
-    ($a['TOTAL_AMOUNT'] > $b['TOTAL_AMOUNT'] ? 1 : 0);
+usort($spent, function($a, $b) {
+  return $a['TOTAL_AMOUNT'] < $b['TOTAL_AMOUNT'] ? -1 : ($a['TOTAL_AMOUNT'] > $b['TOTAL_AMOUNT'] ? 1 : 0);
 });
 
 

admin/admin_user_activity.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         $length          = 0;
       } else {
         $spendOnThisHour = $leftOfThisHour;
-        $length          -= $leftOfThisHour;
+        $length -= $leftOfThisHour;
       }
       $perHour[$hourStart] += $spendOnThisHour;
 

classes/RequestInfo.php

Spacing +3 added lines, -3 removed lines

@@ -120,15 +120,15 @@
     sn_db_transaction_commit();
 
     $this->user_agent = !empty($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
-    $this->browser_id = db_get_set_unique_id_value('security_browser', 'browser_id', ['browser_user_agent' => $this->user_agent,]);
+    $this->browser_id = db_get_set_unique_id_value('security_browser', 'browser_id', ['browser_user_agent' => $this->user_agent, ]);
 
     $this->page_address    = substr($_SERVER['PHP_SELF'], strlen(SN_ROOT_RELATIVE));
-    $this->page_address_id = db_get_set_unique_id_value('security_url', 'url_id', ['url_string' => $this->page_address,]);
+    $this->page_address_id = db_get_set_unique_id_value('security_url', 'url_id', ['url_string' => $this->page_address, ]);
 
     // Not a simulator - because it can have loooooong string
     if (strpos($_SERVER['REQUEST_URI'], '/simulator.php') !== 0 && !$skip_log_query) {
       $this->queryString = !empty($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
-      $this->queryStringId = db_get_set_unique_id_value('security_query_strings', 'id', ['query_string' => $this->queryString,]);
+      $this->queryStringId = db_get_set_unique_id_value('security_query_strings', 'id', ['query_string' => $this->queryString, ]);
     }
 
     $ip                      = sec_player_ip();