supernova-ws / SuperNova

includes/alliance/ali_external_search.inc

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }

includes/alliance/ali_internal_members.inc

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -10,11 +10,11 @@ 
 */
 // Changing rank for single user
 $id_user = sys_get_param_id('id_user');
-if(isset($_GET['id_rank']))
+if (isset($_GET['id_rank']))
 {
   $id_rank = sys_get_param_int('id_rank');
 }
-if($id_user && isset($id_rank) && $user_admin){
+if ($id_user && isset($id_rank) && $user_admin) {
   db_user_set_by_id($id_user, "`ally_rank_id` = {$id_rank}");
 }
 
@@ -42,7 +42,7 @@ 
 }
 
 $sort1 = sys_get_param_int('sort1');
-if($sort1>5 || $sort1<0) $sort1 = 0;
+if ($sort1 > 5 || $sort1 < 0) $sort1 = 0;
 $sort1s = array(
   0 => '`ally_rank_id` %1$s;',
   1 => '`username` %1$s;',
@@ -58,7 +58,7 @@ 
   'id, username, galaxy, system, planet, onlinetime, ally_rank_id, ally_register_time, total_points');
 
 // while ($userRow = db_fetch($userList))
-foreach($userList as $userRow)
+foreach ($userList as $userRow)
 {
   $i++;
   if (!isset($ranks[$userRow['ally_rank_id']]))
@@ -68,17 +68,17 @@ 
 
   if ($ally['ally_owner'] == $userRow['id'])
   {
-    $ally_range = ($ally['ally_owner_range'])?$ally['ally_owner_range']:$lang['Founder'];
+    $ally_range = ($ally['ally_owner_range']) ? $ally['ally_owner_range'] : $lang['Founder'];
   }
   else
   {
-    if($user_admin)
+    if ($user_admin)
     {
       $ally_range = '<select onchange="window.location=\'alliance.php?mode=admin&edit=members&id_user=' . $userRow['id'] . '&id_rank=\' + this.value">';
 
-      foreach($ranks as $rankID => $rankArray){
+      foreach ($ranks as $rankID => $rankArray) {
         $ally_range .= '<option value="' . $rankID . '"';
-        if($rankID == $userRow['ally_rank_id'])
+        if ($rankID == $userRow['ally_rank_id'])
           $ally_range .= " selected";
         $ally_range .= '>' . $rankArray['name'];
         $ally_range .= '</option>';
@@ -92,9 +92,9 @@ 
   }
 
   $last_active = time() - $userRow["onlinetime"];
-  if($user_admin)
+  if ($user_admin)
   {
-    if ( $last_active < 60 )
+    if ($last_active < 60)
     {
       $tmp = "lime>{$lang['On']}";
     }
@@ -105,12 +105,12 @@ 
     }
     elseif ($last_active < 60 * 60 * 24)
     {
-      $last_active = round( $last_active / (60 * 60));
+      $last_active = round($last_active / (60 * 60));
       $tmp = "green>{$last_active} {$lang['sys_hrs_short']}";
     }
     else
     {
-      $last_active = round( $last_active / (60 * 60 * 24));
+      $last_active = round($last_active / (60 * 60 * 24));
       if ($last_active < 7)
       {
         $tmp = "yellow";
@@ -128,9 +128,9 @@ 
   }
   else
   {
-    if($user_onlinestatus)
+    if ($user_onlinestatus)
     {
-      if ( $last_active < 60 * 5 )
+      if ($last_active < 60 * 5)
       {
         $tmp = "lime>{$lang['On']}";
       }

Braces +18 added lines, -27 removed lines

@@ -34,15 +34,16 @@ 
 {
   $sort2s = "DESC";
   $sort2 = 0;
-}
-else
+} else
 {
   $sort2s = "ASC";
   $sort2 = 1;
 }
 
 $sort1 = sys_get_param_int('sort1');
-if($sort1>5 || $sort1<0) $sort1 = 0;
+if($sort1>5 || $sort1<0) {
+  $sort1 = 0;
+}
 $sort1s = array(
   0 => '`ally_rank_id` %1$s;',
   1 => '`username` %1$s;',
@@ -69,8 +70,7 @@ 
   if ($ally['ally_owner'] == $userRow['id'])
   {
     $ally_range = ($ally['ally_owner_range'])?$ally['ally_owner_range']:$lang['Founder'];
-  }
-  else
+  } else
   {
     if($user_admin)
     {
@@ -78,14 +78,14 @@ 
 
       foreach($ranks as $rankID => $rankArray){
         $ally_range .= '<option value="' . $rankID . '"';
-        if($rankID == $userRow['ally_rank_id'])
-          $ally_range .= " selected";
+        if($rankID == $userRow['ally_rank_id']) {
+                  $ally_range .= " selected";
+        }
         $ally_range .= '>' . $rankArray['name'];
         $ally_range .= '</option>';
       }
       $ally_range .= '</select>';
-    }
-    else
+    } else
     {
       $ally_range = $ranks[$userRow['ally_rank_id']]['name'];
     }
@@ -97,53 +97,44 @@ 
     if ( $last_active < 60 )
     {
       $tmp = "lime>{$lang['On']}";
-    }
-    elseif ($last_active < 60 * 60)
+    } elseif ($last_active < 60 * 60)
     {
       $last_active = round($last_active / 60);
       $tmp = "lime>{$last_active} {$lang['sys_min_short']}";
-    }
-    elseif ($last_active < 60 * 60 * 24)
+    } elseif ($last_active < 60 * 60 * 24)
     {
       $last_active = round( $last_active / (60 * 60));
       $tmp = "green>{$last_active} {$lang['sys_hrs_short']}";
-    }
-    else
+    } else
     {
       $last_active = round( $last_active / (60 * 60 * 24));
       if ($last_active < 7)
       {
         $tmp = "yellow";
-      }
-      elseif ($last_active < 30)
+      } elseif ($last_active < 30)
       {
         $tmp = "orange";
-      }
-      else
+      } else
       {
         $tmp = "red";
       }
       $tmp .= ">{$last_active} {$lang['sys_day_short']}";
     }
-  }
-  else
+  } else
   {
     if($user_onlinestatus)
     {
       if ( $last_active < 60 * 5 )
       {
         $tmp = "lime>{$lang['On']}";
-      }
-      elseif ($last_active < 60 * 15)
+      } elseif ($last_active < 60 * 15)
       {
         $tmp = "yellow>{$lang['ali_lessThen15min']}";
-      }
-      else
+      } else
       {
         $tmp = "red>{$lang['Off']}";
       }
-    }
-    else
+    } else
     {
       $sort1 = max($sort1, 4);
       $tmp = "orange>-";

includes/alliance/ali_external_request.inc

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
   if($user_request['request_denied'])
   {
     $lang['request_text'] = sprintf($lang['ali_req_deny_msg'], $ally['ally_tag'], $user_request['request_text']);
-  }
-  else
+  } else
   {
     $lang['request_text'] = sprintf($lang['ali_req_waiting'], $ally['ally_tag']);
   }

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -20,7 +20,7 @@ 
     sys_redirect('alliance.php');
   }
 
-  if($user_request['request_denied'])
+  if ($user_request['request_denied'])
   {
     $lang['request_text'] = sprintf($lang['ali_req_deny_msg'], $ally['ally_tag'], $user_request['request_text']);
   }
@@ -43,12 +43,12 @@ 
 
 $ally = doquery("SELECT * FROM {{alliance}} WHERE `id` ='{$id_ally}'", true);
 
-if(!$ally)
+if (!$ally)
 {
   messageBox($lang['ali_sys_notFound'], $lang['ali_req_title']);
 }
 
-if($ally['ally_request_notallow'])
+if ($ally['ally_request_notallow'])
 {
   messageBox($lang['ali_req_not_allowed'], $lang['ali_req_title']);
 }

includes/includes/uni_rename.php

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
       sn_db_transaction_commit();
       sys_redirect("galaxy.php?mode=name&galaxy={$uni_galaxy}&system={$uni_system}");
     }
-  }
-  catch (exception $e)
+  } catch (exception $e)
   {
     sn_db_transaction_rollback();
     $template->assign_block_vars('result', array(

Spacing +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@ 
     $uni_galaxy = sys_get_param_int('galaxy', $planetrow['galaxy']);
     $uni_system = sys_get_param_int('system');
 
-    if($uni_galaxy < 1 || $uni_galaxy > $config->game_maxGalaxy)
+    if ($uni_galaxy < 1 || $uni_galaxy > $config->game_maxGalaxy)
     {
       throw new exception($lang['uni_msg_error_wrong_galaxy'], ERR_ERROR);
     }
 
-    if($uni_system < 0 || $uni_system > $config->game_maxSystem)
+    if ($uni_system < 0 || $uni_system > $config->game_maxSystem)
     {
       throw new exception($lang['uni_msg_error_wrong_system'], ERR_ERROR);
     }
@@ -20,12 +20,12 @@ 
     $uni_row['universe_price'] += $uni_system ? $config->uni_price_system : $config->uni_price_galaxy;
     $uni_row['universe_name'] = strip_tags($uni_row['universe_name'] ? $uni_row['universe_name'] : ($uni_system ? "{$lang['sys_system']} [{$uni_galaxy}:{$uni_system}]" : "{$lang['sys_galaxy']} {$uni_galaxy}"));
 
-    if(sys_get_param_str('uni_name_submit'))
+    if (sys_get_param_str('uni_name_submit'))
     {
       $uni_row['universe_name'] = strip_tags(sys_get_param_str('uni_name'));
 
       $uni_price = sys_get_param_float('uni_price');
-      if($uni_price < $uni_row['universe_price'])
+      if ($uni_price < $uni_row['universe_price'])
       {
         throw new exception($lang['uni_msg_error_low_price'], ERR_ERROR);
       }
@@ -34,12 +34,12 @@ 
       sn_db_transaction_start();
       $user = db_user_by_id($user['id'], true);
       // if($user[get_unit_param(RES_DARK_MATTER, P_NAME)] < $uni_price)
-      if(mrc_get_level($user, null, RES_DARK_MATTER) < $uni_price)
+      if (mrc_get_level($user, null, RES_DARK_MATTER) < $uni_price)
       {
         throw new exception($lang['uni_msg_error_no_dm'], ERR_ERROR);
       }
 
-      if(!rpg_points_change($user['id'], RPG_RENAME, -$uni_price, "Renaming [{$uni_galaxy}:{$uni_system}] to " . sys_get_param_str_unsafe('uni_name')))
+      if (!rpg_points_change($user['id'], RPG_RENAME, -$uni_price, "Renaming [{$uni_galaxy}:{$uni_system}] to " . sys_get_param_str_unsafe('uni_name')))
       {
         throw new exception($lang['sys_msg_err_update_dm'], ERR_ERROR);
       }

includes/includes/flt_page3.inc

Braces +41 added lines, -30 removed lines

@@ -18,18 +18,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'];
   }
@@ -56,29 +62,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'];
+          }
         }
       }
     }
@@ -126,8 +138,7 @@ 
       $aks = doquery("SELECT * FROM {{aks}} WHERE id = '{$fleet_group}' LIMIT 1;", true);
       if (!$aks) {
         $fleet_group = 0;
-      }
-      else
+      } else
       {
         $galaxy = $aks['galaxy'];
         $system = $aks['system'];

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 = doquery("SELECT * FROM {{aks}} WHERE id = '{$fleet_group}' LIMIT 1;", true);
       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,

includes/includes/market_info.inc

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 
     sn_db_transaction_commit();
     throw new Exception($info_action, ERR_NONE);
-  }
-  catch (Exception $e)
+  } catch (Exception $e)
   {
     sn_db_transaction_rollback();
 

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_MARKET') || SN_IN_MARKET !== true)
+if (!defined('SN_IN_MARKET') || SN_IN_MARKET !== true)
 {
   $debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
@@ -15,50 +15,50 @@ 
 ));
 
 $info_action = sys_get_param_int('action');
-if($info_action)
+if ($info_action)
 {
   try
   {
     sn_db_transaction_start();
 
     $user = db_user_by_id($user['id'], true);
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < $config->rpg_cost_info)
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < $config->rpg_cost_info)
     {
       throw new Exception(MARKET_NO_DM, ERR_ERROR);
     }
 
-    switch($info_action)
+    switch ($info_action)
     {
       case MARKET_INFO_PLAYER:
         $user_info_name_unsafe = sys_get_param_str_unsafe('user_info_name');
-        if(!$user_info_name_unsafe)
+        if (!$user_info_name_unsafe)
         {
           throw new Exception(MARKET_INFO_PLAYER_WRONG, ERR_ERROR);
         }
 
-        if(is_id($user_info_name_unsafe))
+        if (is_id($user_info_name_unsafe))
         {
           $user_info = db_user_by_id($user_info_name_unsafe, true, '`id`, `username`', true);
         }
-        if(!is_array($user_info))
+        if (!is_array($user_info))
         {
           $user_info = db_user_by_username($user_info_name_unsafe, true);
         }
-        if(!is_array($user_info))
+        if (!is_array($user_info))
         {
           throw new Exception(MARKET_INFO_PLAYER_NOT_FOUND, ERR_ERROR);
         }
-        if($user_info['id'] == $user['id'])
+        if ($user_info['id'] == $user['id'])
         {
           throw new Exception(MARKET_INFO_PLAYER_SAME, ERR_ERROR);
         }
 
         $msg_text = array();
-        foreach(sn_get_groups('mercenaries') as $mercenary_id)
+        foreach (sn_get_groups('mercenaries') as $mercenary_id)
         {
           $msg_text[] = "{$lang['tech'][$mercenary_id]} - " . (($mercenary_level = mrc_get_level($user_info, false, $mercenary_id)) ? "{$lang['sys_level']} {$mercenary_level}" : $lang['eco_mrk_info_not_hired']);
         }
-        if($mercenary_level = mrc_get_level($user_info, false, UNIT_PREMIUM))
+        if ($mercenary_level = mrc_get_level($user_info, false, UNIT_PREMIUM))
         {
           $msg_text[] = "{$lang['tech'][UNIT_PREMIUM]} - {$mercenary_level} {$lang['sys_level']}";
         }
@@ -72,7 +72,7 @@ 
       break;
     }
 
-    if(!rpg_points_change($user['id'], RPG_MARKET_INFO_MERCENARY, -$config->rpg_cost_info, "Using Black Market page {$lang['eco_mrk_info']} - getting info about user ID {$user_info['id']}"))
+    if (!rpg_points_change($user['id'], RPG_MARKET_INFO_MERCENARY, -$config->rpg_cost_info, "Using Black Market page {$lang['eco_mrk_info']} - getting info about user ID {$user_info['id']}"))
     {
       // TODO: throw new Exception(MARKET_INFO_PLAYER_SAME, ERR_ERROR);
     }

includes/includes/market_trader.inc

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if((!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) && (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)) {
+if ((!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) && (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)) {
   $debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
 
@@ -27,12 +27,12 @@ 
 
   // $dm_db_name = pname_resource_name(RES_DARK_MATTER);
   $exchangeTo = in_array($exchangeTo = sys_get_param_int('exchangeTo'), sn_get_groups('resources_trader')) ? $exchangeTo : 0;
-  if($exchangeTo && is_array($tradeList = $_POST['spend'])) {
+  if ($exchangeTo && is_array($tradeList = $_POST['spend'])) {
     $value = 0;
     $qry = array();
 
     sn_db_transaction_start();
-    if($planetrow['id_owner']) {
+    if ($planetrow['id_owner']) {
       $global_data = sys_o_get_updated($user, $planetrow, SN_TIME_NOW);
       $planetrow = $global_data['planet'];
     }
@@ -41,27 +41,27 @@ 
       $user = db_user_by_id($user['id'], true);
     }
 
-    foreach(sn_get_groups('resources_trader') as $resource_id) {
+    foreach (sn_get_groups('resources_trader') as $resource_id) {
       $amount = floatval($tradeList[$resource_id]);
-      if($amount < 0) {
+      if ($amount < 0) {
         $debug->error('Trying to supply negative resource amount on Black Market Page', 'Hack Attempt', 305);
       }
 
-      if($resource_id == RES_DARK_MATTER && $exchangeTo == RES_DARK_MATTER) {
+      if ($resource_id == RES_DARK_MATTER && $exchangeTo == RES_DARK_MATTER) {
         continue;
       }
 
       $resource_db_name = pname_resource_name($resource_id);
-      if($exchangeTo == RES_DARK_MATTER) {
+      if ($exchangeTo == RES_DARK_MATTER) {
         $sign = '+';
         $amount = floor($tradeList[RES_DARK_MATTER] / 3 * $rates[RES_DARK_MATTER] / $rates[$resource_id]);
         $value += $amount;
       } else {
         $value += floor($amount * $rates[$resource_id] / $rates[$exchangeTo]);
-        if($resource_id == RES_DARK_MATTER) {
+        if ($resource_id == RES_DARK_MATTER) {
           $amount = 0;
         } else {
-          if(mrc_get_level($user, $planetrow, $resource_id, true) < $amount) {
+          if (mrc_get_level($user, $planetrow, $resource_id, true) < $amount) {
             $intError = MARKET_NO_RESOURCES;
             break;
           }
@@ -70,12 +70,12 @@ 
         }
       }
 
-      if($amount) {
+      if ($amount) {
         $qry[] = "`{$resource_db_name}` = `{$resource_db_name}` {$sign} {$amount}";
       }
     }
 
-    if($exchangeTo != RES_DARK_MATTER) {
+    if ($exchangeTo != RES_DARK_MATTER) {
       $amount = floor($value);
       $exchange_to_db_name = pname_resource_name($exchangeTo);
       $qry[] = "`{$exchange_to_db_name}` = `{$exchange_to_db_name}` + {$amount}";
@@ -86,7 +86,7 @@ 
     $intError = $value <= 0 ? MARKET_ZERO_DEAL : $intError;
     $intError = mrc_get_level($user, null, RES_DARK_MATTER) < $operation_cost ? MARKET_NO_DM : $intError;
 
-    if($intError == MARKET_DEAL) {
+    if ($intError == MARKET_DEAL) {
       $qry = implode(', ', $qry);
       $table = $planetrow['id_owner'] ? 'planets' : 'users';
 
@@ -111,8 +111,8 @@ 
     'EXCHANGE_TO_RESOURCE_ID' => $exchangeTo,
   ));
 
-  foreach(sn_get_groups('resources_trader') as $resource_id) {
-    if($resource_id == RES_DARK_MATTER) {
+  foreach (sn_get_groups('resources_trader') as $resource_id) {
+    if ($resource_id == RES_DARK_MATTER) {
       $amount = floor(mrc_get_level($user, null, RES_DARK_MATTER) - $config->rpg_cost_trader);
     } else {
       $amount = floor(mrc_get_level($user, $planetrow, $resource_id));

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
     if($planetrow['id_owner']) {
       $global_data = sys_o_get_updated($user, $planetrow, SN_TIME_NOW);
       $planetrow = $global_data['planet'];
-    }
-    else {
+    } else {
       // Locking user record
       $user = db_user_by_id($user['id'], true);
     }

includes/includes/user_birthday_celebrate.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
   $query = db_user_list_to_celebrate($config->user_birthday_range);
 
-  while($row = db_fetch($query))
+  while ($row = db_fetch($query))
   {
     $row['username'] = db_escape($row['username']);
     rpg_points_change($row['id'], RPG_BIRTHDAY, $config->user_birthday_gift, "Birthday gift for user {$row['username']} ID {$row['id']} on his birthday on {$row['user_birthday']}. Gift last gaved at {$row['user_birthday_celebrated']}");

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 
-function sn_user_birthday_celebrate()
-{
+function sn_user_birthday_celebrate() {
   global $config, $lang;
 
   sn_db_transaction_start();

includes/includes/flt_mission_colonize.php

Spacing +4 added lines, -4 removed lines

@@ -17,12 +17,12 @@ 
 
   global $lang;
 
-  $TargetAdress = sprintf ($lang['sys_adress_planet'], $fleet_row['fleet_end_galaxy'], $fleet_row['fleet_end_system'], $fleet_row['fleet_end_planet']);
+  $TargetAdress = sprintf($lang['sys_adress_planet'], $fleet_row['fleet_end_galaxy'], $fleet_row['fleet_end_system'], $fleet_row['fleet_end_planet']);
 
   $fleet_array = sys_unit_str2arr($fleet_row['fleet_array']);
 
   $TheMessage = $lang['sys_colo_no_colonizer'];
-  if($fleet_array[SHIP_COLONIZER] >= 1)
+  if ($fleet_array[SHIP_COLONIZER] >= 1)
   {
     $TheMessage = $lang['sys_colo_notfree'];
     if (!$mission_data['dst_planet'] || empty($mission_data['dst_planet']))
@@ -31,7 +31,7 @@ 
 
       // Can we colonize more planets?
       $TheMessage = $lang['sys_colo_maxcolo'];
-      if($iPlanetCount < get_player_max_colonies($src_user_row))
+      if ($iPlanetCount < get_player_max_colonies($src_user_row))
       {
         // Yes, we can colonize
         $TheMessage = $lang['sys_colo_badpos'];
@@ -42,7 +42,7 @@ 
         if ($NewOwnerPlanet)
         {
           $TheMessage = $lang['sys_colo_arrival'] . $TargetAdress . $lang['sys_colo_allisok'];
-          msg_send_simple_message ( $fleet_row['fleet_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_SPY, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
+          msg_send_simple_message($fleet_row['fleet_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_SPY, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
 
           $fleet_array[SHIP_COLONIZER]--;
           $fleet_row['fleet_amount']--;

Braces +1 added lines, -2 removed lines

@@ -10,8 +10,7 @@
 // ----------------------------------------------------------------------------------------------------------------
 // Mission Case 9: -> Coloniser
 //
-function flt_mission_colonize(&$mission_data)
-{
+function flt_mission_colonize(&$mission_data) {
   $fleet_row          = &$mission_data['fleet'];
   $src_user_row       = &$mission_data['src_user'];