supernova-ws / SuperNova

includes/alliance/ali_external_request.inc

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)
 {
   SnTemplate::messageBox($lang['ali_sys_notFound'], $lang['ali_req_title']);
 }
 
-if($ally['ally_request_notallow'])
+if ($ally['ally_request_notallow'])
 {
   SnTemplate::messageBox($lang['ali_req_not_allowed'], $lang['ali_req_title']);
 }

includes/alliance/ali_internal_admin.inc

Spacing +25 added lines, -25 removed lines

@@ -3,26 +3,26 @@ 
 use Alliance\DBStaticAlly;
 use Old\Avatar;
 
-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);
 }
 
-if(!$user_admin) {
+if (!$user_admin) {
   SnTemplate::messageBox($lang['Denied_access'], $lang['ally_admin']);
 }
 
 $template = SnTemplate::gettemplate('ali_admin', $template);
 
 $text_list = array(
-  1 => array ('db_field' => 'ally_description', 'text_type' => 'Public_text_of_alliance'),
-  2 => array ('db_field' => 'ally_text', 'text_type' => 'Internal_text'),
-  3 => array ('db_field' => 'ally_request', 'text_type' => 'Show_of_request_text'),
+  1 => array('db_field' => 'ally_description', 'text_type' => 'Public_text_of_alliance'),
+  2 => array('db_field' => 'ally_text', 'text_type' => 'Internal_text'),
+  3 => array('db_field' => 'ally_request', 'text_type' => 'Show_of_request_text'),
 );
 
 $allyTextID = sys_get_param_int('t', 1);
-$allyTextID = ($allyTextID<1 || $allyTextID>3) ? 1 : $allyTextID;
+$allyTextID = ($allyTextID < 1 || $allyTextID > 3) ? 1 : $allyTextID;
 
-if(sys_get_param_str('isSaveOptions')) {
+if (sys_get_param_str('isSaveOptions')) {
   $new_image = $ally['ally_image'];
   $avatar_upload_result = Avatar::sys_avatar_upload($ally['id'], $new_image, 'ally');
   $template->assign_vars([
@@ -31,32 +31,32 @@ 
   ]);
 
   $ally_changeset = array();
-  if(($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) {
+  if (($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) {
     $new_tag_unsafe = $new_tag;
     $new_tag = db_escape($new_tag);
     $isTaggedAllyExists = DBStaticAlly::db_ally_get_by_tag($new_tag);
-    if(!empty($isTaggedAllyExists)) {
+    if (!empty($isTaggedAllyExists)) {
       SnTemplate::messageBox(sprintf($lang['ally_message_tag_exists'], $new_tag_unsafe), '', 'alliance.php?mode=admin&edit=ally');
     }
     $ally_changeset[] = "`ally_tag`='{$new_tag}'";
     db_user_set_by_id($ally['ally_user_id'], "`username`='[{$new_tag}]'");
   }
 
-  if(($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) {
+  if (($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) {
     $new_name_unsafe = $new_name;
     $new_name = db_escape($new_name);
     $isTaggedAllyExists = DBStaticAlly::db_ally_get_by_name($new_name);
-    if(!empty($isTaggedAllyExists)) {
+    if (!empty($isTaggedAllyExists)) {
       SnTemplate::messageBox(sprintf($lang['ally_message_name_exists'], $new_name_unsafe), '', 'alliance.php?mode=admin&edit=ally');
     }
     $ally_changeset[] = "`ally_name`='{$new_name}'";
   }
 
-  if(($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) {
+  if (($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) {
     $new_owner_rank = db_escape($new_owner_rank);
     $ally_changeset[] = "`ally_owner_range` = '{$new_owner_rank}'";
   }
-  if(($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) {
+  if (($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) {
     $new_web = db_escape($new_web);
     $ally_changeset[] = "`ally_web` = '{$new_web}'";
   }
@@ -65,31 +65,31 @@ 
 //  if(($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) && $new_request != $ally['ally_request_notallow']) {
 //    $ally_changeset[] = "`ally_request_notallow` = '{$new_request}'";
 //  }
-  if($new_image != $ally['ally_image']) {
+  if ($new_image != $ally['ally_image']) {
     $new_image = intval($new_image);
     $ally_changeset[] = "`ally_image` = '{$new_image}'";
   }
 
-  if(!empty($ally_changeset)) {
+  if (!empty($ally_changeset)) {
     doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;");
     sys_redirect('alliance.php?mode=admin&edit=ally');
   }
 }
-elseif(sys_get_param_str('isSaveText'))
+elseif (sys_get_param_str('isSaveText'))
 {
   $text = sys_get_param_str_both('text');
   doquery("UPDATE {{alliance}} SET `{$text_list[$allyTextID]['db_field']}`='{$text['safe']}' WHERE `id`='{$ally['id']}';");
   $ally[$text_list[$allyTextID]['db_field']] = $text['unsafe'];
 }
-elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
+elseif (sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
 {
-  if(!$isAllyOwner)
+  if (!$isAllyOwner)
   {
     SnTemplate::messageBox($lang['Denied_access'], $lang['ally_admin']);
   }
 
   $newLeader = db_user_by_id($idNewLeader, false, `ally_id`);
-  if($newLeader['ally_id'] == $user['ally_id'])
+  if ($newLeader['ally_id'] == $user['ally_id'])
   {
     sn_db_transaction_start();
     db_user_set_by_id($user['id'], "`ally_rank_id`='0'");
@@ -99,9 +99,9 @@ 
     sys_redirect('alliance.php');
   }
 }
-elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
+elseif (sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
 {
-  if(!$isAllyOwner)
+  if (!$isAllyOwner)
   {
     SnTemplate::messageBox($lang['Denied_access'], $lang['ally_admin']);
   }
@@ -124,7 +124,7 @@ 
   'ally_name' => htmlspecialchars($ally['ally_name']),
   'ally_tag' => htmlspecialchars($ally['ally_tag']),
   'ally_web' => htmlspecialchars($ally['ally_web']),
-  'ally_request_notallow_0' => (( $ally['ally_request_notallow']) ? ' SELECTED' : ''),
+  'ally_request_notallow_0' => (($ally['ally_request_notallow']) ? ' SELECTED' : ''),
   'ally_request_notallow_1' => ((!$ally['ally_request_notallow']) ? ' SELECTED' : ''),
   'ally_owner_range' => htmlspecialchars($ally['ally_owner_range']),
   'hideNotOwner' => $ally['ally_owner'] != $user['id'] ? 'display: hide;' : '',
@@ -133,7 +133,7 @@ 
 {
   $userAllyAdmins = db_user_list("`ally_id`= {$ally['id']}", false, '`id`, `username`');
   unset($tmp);
-  foreach($userAllyAdmins as $userAllyAdmin)
+  foreach ($userAllyAdmins as $userAllyAdmin)
   {
     $tmp .= "<option value={$userAllyAdmin['id']}>{$userAllyAdmin['username']}</option>";
   }
@@ -141,9 +141,9 @@ 
   $template->assign_var('adminMembers', $tmp);
 }
 
-foreach($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale)
+foreach ($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale)
 {
-  if(!$sn_ali_admin_action_locale['title'])
+  if (!$sn_ali_admin_action_locale['title'])
   {
     continue;
   }

includes/alliance/ali_internal_admin_mail.inc

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
 
 global $lang;
 
-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 @@ 
 $page = SnTemplate::gettemplate('ali_admin_mail', true);
 
 if ($ranks) {
-  foreach($ranks as $id => $array) {
+  foreach ($ranks as $id => $array) {
     $page->assign_block_vars('ranks', array(
       'NAME' => $array['name'],
       'VALUE' => $id,

includes/alliance/ali_info.inc

Spacing +12 added lines, -12 removed lines

@@ -3,14 +3,14 @@ 
 use Alliance\AllianceHelper;
 use Alliance\DBStaticAlly;
 
-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);
 }
 
 $template = SnTemplate::gettemplate('ali_info', true);
 
-if($mode == 'exit')
+if ($mode == 'exit')
 {
   if ($ally['ally_owner'] == $user['id'])
   {
@@ -27,25 +27,25 @@ 
     SnTemplate::messageBox(sprintf($lang['ali_info_leave_success'], $ally['ally_name']), $lang['sys_alliance']);
   }
 }
-elseif($mode == 'ainfo')
+elseif ($mode == 'ainfo')
 {
   $tag = sys_get_param_str('tag');
   $id_ally = sys_get_param_id('a');
-  if($tag)
+  if ($tag)
   {
     $ally = doquery("SELECT * FROM {{alliance}} WHERE ally_tag='{$tag}' LIMIT 1;", '', true);
   }
-  elseif($id_ally)
+  elseif ($id_ally)
   {
     $ally = doquery("SELECT * FROM {{alliance}} WHERE id='{$id_ally}' LIMIT 1;", '', true);
   }
 
-  if(!$ally)
+  if (!$ally)
   {
     SnTemplate::messageBox($lang['ali_sys_notFound'], $lang['Ally_info_1']);
   }
 
-  if(!$ally['ally_description'])
+  if (!$ally['ally_description'])
   {
     $ally['ally_description'] = $lang['Ally_nodescription'];
   }
@@ -54,17 +54,17 @@ 
     'EXTERNAL'     => true,
     'USER_ALLY_ID' => $user['ally_id'],
   ));
-  $page_header          = $lang['sys_alliance'];
+  $page_header = $lang['sys_alliance'];
 }
 else
 {
   $page_header = $lang['your_alliance'];
 
-  if($ally['ally_owner'] == $user['id'])
+  if ($ally['ally_owner'] == $user['id'])
   {
     $range = $ally['ally_owner_range'] ? $ally['ally_owner_range'] : $lang['Founder'];
   }
-  elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name']))
+  elseif ($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name']))
   {
     $range = $ranks[$user['ally_rank_id']]['name'];
   }
@@ -99,9 +99,9 @@ 
 ]);
 
 $relations = ali_relations($ally['id']);
-foreach($relations as $relation)
+foreach ($relations as $relation)
 {
-  if($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id'])
+  if ($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id'])
   {
     $template->assign_block_vars('relation', array(
       'NAME'     => $relation['alliance_diplomacy_contr_ally_name'],

Braces +5 added lines, -10 removed lines

@@ -26,16 +26,14 @@ 
     $lang['Go_out_welldone'] = str_replace("%s", $ally_name, $lang['Go_out_welldone']);
     SnTemplate::messageBox(sprintf($lang['ali_info_leave_success'], $ally['ally_name']), $lang['sys_alliance']);
   }
-}
-elseif($mode == 'ainfo')
+} elseif($mode == 'ainfo')
 {
   $tag = sys_get_param_str('tag');
   $id_ally = sys_get_param_id('a');
   if($tag)
   {
     $ally = doquery("SELECT * FROM {{alliance}} WHERE ally_tag='{$tag}' LIMIT 1;", '', true);
-  }
-  elseif($id_ally)
+  } elseif($id_ally)
   {
     $ally = doquery("SELECT * FROM {{alliance}} WHERE id='{$id_ally}' LIMIT 1;", '', true);
   }
@@ -55,20 +53,17 @@ 
     'USER_ALLY_ID' => $user['ally_id'],
   ));
   $page_header          = $lang['sys_alliance'];
-}
-else
+} else
 {
   $page_header = $lang['your_alliance'];
 
   if($ally['ally_owner'] == $user['id'])
   {
     $range = $ally['ally_owner_range'] ? $ally['ally_owner_range'] : $lang['Founder'];
-  }
-  elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name']))
+  } elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name']))
   {
     $range = $ranks[$user['ally_rank_id']]['name'];
-  }
-  else
+  } else
   {
     $range = $lang['member'];
   }

includes/alliance/ali_internal_admin_diplomacy.inc

Spacing +19 added lines, -19 removed lines

@@ -3,7 +3,7 @@ 
 use Alliance\DBStaticAlly;
 use \DBAL\DbQuery;
 
-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);
 }
@@ -18,28 +18,28 @@ 
 $ally_name_safe = db_escape($user['ally_name']);
 
 $autoAccept = false;
-if(sys_get_param_str('ali_dip_offer_make'))
+if (sys_get_param_str('ali_dip_offer_make'))
 {
   $alliance_negotiation_relation = sys_get_param_str('alliance_negotiation_relation');
-  if(!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list))
+  if (!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list))
   {
     SnTemplate::messageBox($lang['ali_dip_err_wrong_offer'], $page_title);
   }
 
   $alliance_negotiation_contr_ally_id = sys_get_param_id('alliance_negotiation_contr_ally_id');
-  if($alliance_negotiation_contr_ally_id == $user['ally_id'])
+  if ($alliance_negotiation_contr_ally_id == $user['ally_id'])
   {
     SnTemplate::messageBox($lang['ali_dip_err_same_ally'], $page_title);
   }
 
   $contr_ally_row = doquery("SELECT `ally_name` FROM {{alliance}} WHERE `id` = {$alliance_negotiation_contr_ally_id} LIMIT 1;", '', true);
-  if(!$contr_ally_row)
+  if (!$contr_ally_row)
   {
     SnTemplate::messageBox($lang['ali_dip_err_no_ally'], $page_title);
   }
 
   $relation_current_id = ali_relation($user['ally_id'], $alliance_negotiation_contr_ally_id);
-  if($alliance_negotiation_relation == $relation_current_id)
+  if ($alliance_negotiation_relation == $relation_current_id)
   {
     SnTemplate::messageBox(sprintf($lang['ali_dip_err_offer_same'], $lang['ali_dip_relations'][$alliance_negotiation_relation]), $page_title);
   }
@@ -51,7 +51,7 @@ 
 
   $relation_new = $sn_diplomacy_relation_list[$alliance_negotiation_relation];
   $relation_current = $sn_diplomacy_relation_list[$relation_current_id];
-  if($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1)
+  if ($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1)
   {
     DbQuery::build()
       ->setTable('alliance_negotiation')
@@ -85,39 +85,39 @@ 
 else
 {
   $offer_id = sys_get_param_id('offer_id');
-  if($offer_id)
+  if ($offer_id)
   {
     $offer_answer = sys_get_param_str('answer');
 
     $negotiation = doquery("SELECT * FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;", '', true);
-    if(!$negotiation)
+    if (!$negotiation)
     {
       SnTemplate::messageBox($lang['ali_dip_err_offer_none'], $page_title);
     }
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
+    elseif ($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
     {
       // TODO: Add log of hack attempt
       SnTemplate::messageBox($lang['ali_dip_err_offer_alien'], $page_title);
     }
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
+    elseif ($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
     {
-      if($offer_answer == 'accept')
+      if ($offer_answer == 'accept')
       {
         // TODO: Add log of hack attempt
         SnTemplate::messageBox($lang['ali_dip_err_offer_accept_own'], $page_title);
       }
-      elseif($offer_answer == 'deny')
+      elseif ($offer_answer == 'deny')
       {
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
       }
     }
     else
     {
-      if($offer_answer == 'accept')
+      if ($offer_answer == 'accept')
       {
         $accept_offer = true;
       }
-      elseif($offer_answer == 'deny')
+      elseif ($offer_answer == 'deny')
       {
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
       }
@@ -125,7 +125,7 @@ 
   }
 }
 
-if($accept_offer)
+if ($accept_offer)
 {
   sn_db_transaction_start();
 
@@ -185,7 +185,7 @@ 
   sn_db_transaction_commit();
 }
 
-foreach($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation)
+foreach ($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation)
 {
   $template->assign_block_vars('relation', array(
     'ID'   => $diplomacy_relation_id,
@@ -194,7 +194,7 @@ 
 }
 
 $query = doquery("SELECT id, ally_name, ally_tag FROM {{alliance}} WHERE `id` != {$user['ally_id']} ORDER BY ally_name;");
-while($alliance = db_fetch($query))
+while ($alliance = db_fetch($query))
 {
   $template->assign_block_vars('alliance', array(
     'ID'   => $alliance['id'],
@@ -213,7 +213,7 @@ 
   WHERE
     alliance_negotiation_ally_id = {$user['ally_id']} OR alliance_negotiation_contr_ally_id = {$user['ally_id']};"
 );
-while($offer = db_fetch($query))
+while ($offer = db_fetch($query))
 {
   $template->assign_block_vars('offer', array(
     'ID'       => $offer['alliance_negotiation_id'],

Braces +7 added lines, -14 removed lines

@@ -68,8 +68,7 @@ 
       ->doInsert();
 
     $accept_offer = false;
-  }
-  else
+  } else
   {
     $accept_offer = true;
     $autoAccept = true;
@@ -81,8 +80,7 @@ 
       'alliance_negotiation_relation' => $alliance_negotiation_relation,
     );
   }
-}
-else
+} else
 {
   $offer_id = sys_get_param_id('offer_id');
   if($offer_id)
@@ -93,31 +91,26 @@ 
     if(!$negotiation)
     {
       SnTemplate::messageBox($lang['ali_dip_err_offer_none'], $page_title);
-    }
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
+    } elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
     {
       // TODO: Add log of hack attempt
       SnTemplate::messageBox($lang['ali_dip_err_offer_alien'], $page_title);
-    }
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
+    } elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
     {
       if($offer_answer == 'accept')
       {
         // TODO: Add log of hack attempt
         SnTemplate::messageBox($lang['ali_dip_err_offer_accept_own'], $page_title);
-      }
-      elseif($offer_answer == 'deny')
+      } elseif($offer_answer == 'deny')
       {
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
       }
-    }
-    else
+    } else
     {
       if($offer_answer == 'accept')
       {
         $accept_offer = true;
-      }
-      elseif($offer_answer == 'deny')
+      } elseif($offer_answer == 'deny')
       {
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
       }

includes/includes/flt_page3.inc

Spacing +34 added lines, -35 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 {
@@ -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,7 +152,7 @@ 
   $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) {
     SnTemplate::messageBox("<span class='error'><b>{$lang['fl_attack_error'][$cant_attack]}</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 99);
   }
 
@@ -163,11 +163,10 @@ 
 
   $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,10 +176,10 @@ 
     $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']) {
+  if ($aks && $target_mission == MT_AKS) {
+    if ($fleet['start_time'] > $aks['ankunft']) {
       SnTemplate::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'];
@@ -191,14 +190,14 @@ 
   $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) {
+  if ($StorageNeeded > $FleetStorage) {
     SnTemplate::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) {
@@ -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/flt_page0.inc

Spacing +10 added lines, -10 removed lines

@@ -5,9 +5,9 @@ 
 // @version 1.0
 // @copyright 2008 by Chlorel for XNova
 
-if($fleet_ship_sort = sys_get_param_id('sort_elements')) {
+if ($fleet_ship_sort = sys_get_param_id('sort_elements')) {
   define('IN_AJAX', true);
-  if(!empty($lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
+  if (!empty($lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
     // player_save_option($user, PLAYER_OPTION_FLEET_SHIP_SORT, $fleet_ship_sort);
     // player_save_option($user, PLAYER_OPTION_FLEET_SHIP_SORT_INVERSE, sys_get_param_id('fleet_ship_sort_inverse', 0));
     SN::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT] = $fleet_ship_sort;
@@ -16,13 +16,13 @@ 
   die();
 }
 
-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);
 }
 
 lng_include('overview');
 
-if(!$planetrow) {
+if (!$planetrow) {
   SnTemplate::messageBox($lang['fl_noplanetrow'], $lang['fl_error']);
 }
 
@@ -30,9 +30,9 @@ 
 
 $record_index = 0;
 $ship_list = array();
-foreach(sn_get_groups('fleet') as $n => $unit_id) {
+foreach (sn_get_groups('fleet') as $n => $unit_id) {
   $unit_level = mrc_get_level($user, $planetrow, $unit_id, false, true);
-  if($unit_level > 0) {
+  if ($unit_level > 0) {
     $ship_data = get_ship_data($unit_id, $user);
     $ship_list[$unit_id] = array(
       '__INDEX'     => $record_index++,
@@ -52,8 +52,8 @@ 
 
 $fleet_ship_sort = SN::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT];
 $fleet_ship_sort_inverse = SN::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT_INVERSE];
-if($fleet_ship_sort || $fleet_ship_sort_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
-  switch($fleet_ship_sort) {
+if ($fleet_ship_sort || $fleet_ship_sort_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
+  switch ($fleet_ship_sort) {
     case PLAYER_OPTION_SORT_NAME: $fleet_ship_sort_field = 'NAME'; break;
     case PLAYER_OPTION_SORT_SPEED: $fleet_ship_sort_field = 'SPEED'; break;
     case PLAYER_OPTION_SORT_COUNT: $fleet_ship_sort_field = 'AMOUNT'; break;
@@ -68,11 +68,11 @@ 
   });
 }
 
-foreach($ship_list as $ship_data) {
+foreach ($ship_list as $ship_data) {
   $template->assign_block_vars('ships', $ship_data);
 }
 
-foreach($lang['player_option_fleet_ship_sort'] as $sort_id => $sort_text) {
+foreach ($lang['player_option_fleet_ship_sort'] as $sort_id => $sort_text) {
   $template->assign_block_vars('ship_sort_list', array(
     'VALUE' => $sort_id,
     'TEXT' => $sort_text,

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 = SnTemplate::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'])) {
   SnTemplate::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_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) {
   SnTemplate::messageBox($lang['fl_fleet_not_exists'], $lang['fl_error']);
 }
 
@@ -22,8 +22,8 @@ 
   SnTemplate::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);
   SnTemplate::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);
 }
 }