supernova-ws / SuperNova

includes/includes/flt_mission_attack.php

Doc Comments +1 added lines, -2 removed lines

@@ -10,9 +10,8 @@
 
 /**
  * @param Mission $objMission
- * @param array   $mission_data
  *
- * @return array|null
+ * @return null|boolean
  */
 function flt_mission_attack($objMission) {
   $objFleet = $objMission->fleet;

Spacing +2 added lines, -2 removed lines

@@ -17,14 +17,14 @@
 function flt_mission_attack($objMission) {
   $objFleet = $objMission->fleet;
 
-  if($objFleet->getShipCount() <= 0) {
+  if ($objFleet->getShipCount() <= 0) {
     return null;
   }
 
   $destination_user = $objMission->dst_user;
   $destination_planet = $objMission->dst_planet;
 
-  if(
+  if (
     // Нет данных о планете назначения или её владельце
     empty($destination_user) || empty($destination_planet) || !is_array($destination_user) || !is_array($destination_planet)
     ||

includes/includes/flt_mission_explore.php

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 /**
  * Fleet mission "Relocate"
  *
- * @param $mission_data Mission
+ * @param Mission $mission_data Mission
  *
  * @return int
  *

Spacing +34 added lines, -35 removed lines

@@ -6,11 +6,11 @@ 
 
   $fleet_left = 1 - mt_rand(1, 3) * mt_rand(200000, 300000) / 1000000;
   $fleet_lost = array();
-  foreach($fleet as $unit_id => &$unit_amount) {
+  foreach ($fleet as $unit_id => &$unit_amount) {
     $ships_left = floor($unit_amount * $fleet_left);
     $fleet_lost[$unit_id] = $unit_amount - $ships_left;
     $unit_amount = $ships_left;
-    if(!$unit_amount) {
+    if (!$unit_amount) {
       unset($fleet[$unit_id]);
     }
   }
@@ -41,7 +41,7 @@ 
   global $lang, $config;
   static $ship_data, $rates;
 
-  if(empty($mission_data->fleet_event) || $mission_data->fleet_event != EVENT_FLT_ACOMPLISH) {
+  if (empty($mission_data->fleet_event) || $mission_data->fleet_event != EVENT_FLT_ACOMPLISH) {
     return CACHE_NONE;
   }
 
@@ -70,10 +70,10 @@ 
   $outcome_list = &$result['$outcome_list'];
   $fleet_metal_points = &$result['$fleet_metal_points'];
 
-  if(!$ship_data) {
-    foreach(sn_get_groups('fleet') as $unit_id) {
+  if (!$ship_data) {
+    foreach (sn_get_groups('fleet') as $unit_id) {
       $unit_info = get_unit_param($unit_id);
-      if($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
+      if ($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
         continue;
       }
       $ship_data[$unit_id][P_COST_METAL] = get_unit_cost_in($unit_info[P_COST]);
@@ -86,7 +86,7 @@ 
   $fleet_metal_points = 0;
 
   $fleet_real_array = $objFleet->get_unit_list();
-  foreach($fleet_real_array as $ship_id => $ship_amount) {
+  foreach ($fleet_real_array as $ship_id => $ship_amount) {
     $unit_info = get_unit_param($ship_id);
     $fleet_capacity += $ship_amount * $unit_info[P_CAPACITY];
     $fleet_metal_points += $ship_amount * $ship_data[$ship_id][P_COST_METAL];
@@ -99,8 +99,8 @@ 
   $outcome_list[FLT_EXPEDITION_OUTCOME_NONE]['chance'] = ceil(200 / pow($flt_stay_hours, 1 / 1.7));
 
   $chance_max = 0;
-  foreach($outcome_list as $key => &$value) {
-    if(!$value['chance']) {
+  foreach ($outcome_list as $key => &$value) {
+    if (!$value['chance']) {
       unset($outcome_list[$key]);
       continue;
     }
@@ -108,13 +108,13 @@ 
   }
   $outcome_value = mt_rand(0, $chance_max);
   $outcome_description = &$outcome_list[$mission_outcome = FLT_EXPEDITION_OUTCOME_NONE];
-  foreach($outcome_list as $key => &$value) {
-    if(!$value['chance']) {
+  foreach ($outcome_list as $key => &$value) {
+    if (!$value['chance']) {
       continue;
     }
     $mission_outcome = $key;
     $outcome_description = $value;
-    if($outcome_value <= $outcome_description['value']) {
+    if ($outcome_value <= $outcome_description['value']) {
       break;
     }
   }
@@ -131,7 +131,7 @@ 
 //  $outcome_mission_sub = -1;
 
   $fleet_found = array();
-  switch($mission_outcome) {
+  switch ($mission_outcome) {
     case FLT_EXPEDITION_OUTCOME_LOST_FLEET:
       flt_mission_explore_outcome_lost_fleet($result);
     break;
@@ -152,14 +152,14 @@ 
 
       // Рассчитываем стоимость самого дорого корабля в металле
       $max_metal_cost = 0;
-      foreach($fleet_real_array as $ship_id => $ship_amount) {
+      foreach ($fleet_real_array as $ship_id => $ship_amount) {
         $max_metal_cost = max($max_metal_cost, $ship_data[$ship_id]['metal_cost']);
       }
 
       // Ограничиваем корабли только теми, чья стоимость в металле меньше или равно стоимости самого дорогого корабля
       $can_be_found = array();
-      foreach($ship_data as $ship_id => $ship_info) {
-        if($ship_info['metal_cost'] < $max_metal_cost) {
+      foreach ($ship_data as $ship_id => $ship_info) {
+        if ($ship_info['metal_cost'] < $max_metal_cost) {
           $can_be_found[$ship_id] = $ship_info['metal_cost'];
         }
       }
@@ -167,13 +167,13 @@ 
       unset($can_be_found[SHIP_COLONIZER]);
       unset($can_be_found[SHIP_SPY]);
 
-      while(count($can_be_found) && $found_in_metal >= max($can_be_found)) {
+      while (count($can_be_found) && $found_in_metal >= max($can_be_found)) {
         $found_index = mt_rand(1, count($can_be_found)) - 1;
         $found_ship = array_slice($can_be_found, $found_index, 1, true);
         $found_ship_cost = reset($found_ship);
         $found_ship_id = key($found_ship);
 
-        if($found_ship_cost > $found_in_metal) {
+        if ($found_ship_cost > $found_in_metal) {
           unset($can_be_found[$found_ship_id]);
         } else {
           $found_ship_count = mt_rand(1, floor($found_in_metal / $found_ship_cost));
@@ -182,10 +182,10 @@ 
         }
       }
 
-      if(empty($fleet_found)) {
+      if (empty($fleet_found)) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       } else {
-        foreach($fleet_found as $unit_id => $unit_amount) {
+        foreach ($fleet_found as $unit_id => $unit_amount) {
           $fleet_real_array[$unit_id] += $unit_amount;
         }
       }
@@ -209,7 +209,7 @@ 
 
       $objFleet->update_resources($resources_found);
 
-      if(array_sum($resources_found) == 0) {
+      if (array_sum($resources_found) == 0) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       }
     break;
@@ -220,7 +220,7 @@ 
       // Рассчитываем количество найденной ТМ
       $found_dark_matter = floor(min($outcome_percent * $fleet_metal_points / $rates[RES_DARK_MATTER], 10000) * mt_rand(750000, 1000000) / 1000000);
 
-      if(!$found_dark_matter) {
+      if (!$found_dark_matter) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       }
     break;
@@ -234,40 +234,39 @@ 
 
   mission_expedition_result_adjust($result);
 
-  if($found_dark_matter) {
+  if ($found_dark_matter) {
     rpg_points_change($objFleet->playerOwnerId, RPG_EXPEDITION, $found_dark_matter, 'Expedition Bonus');
     $msg_text_addon = sprintf($lang['flt_mission_expedition']['found_dark_matter'], $found_dark_matter);
   }
 
-  if(!empty($fleet_lost)) {
+  if (!empty($fleet_lost)) {
     $msg_text_addon = $lang['flt_mission_expedition']['lost_fleet'];
-    foreach($fleet_lost as $ship_id => $ship_amount) {
+    foreach ($fleet_lost as $ship_id => $ship_amount) {
       $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
     }
   }
 
-  if(!empty($fleet_found)) {
+  if (!empty($fleet_found)) {
     $msg_text_addon = $lang['flt_mission_expedition']['found_fleet'];
-    foreach($fleet_found as $ship_id => $ship_amount) {
+    foreach ($fleet_found as $ship_id => $ship_amount) {
       $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
     }
   }
 
-  if(!empty($resources_found) && array_sum($resources_found) > 0) {
+  if (!empty($resources_found) && array_sum($resources_found) > 0) {
     $msg_text_addon = $lang['flt_mission_expedition']['found_resources'];
-    foreach($resources_found as $resource_id => $resource_amount) {
+    foreach ($resources_found as $resource_id => $resource_amount) {
       $msg_text_addon .= $lang['tech'][$resource_id] . ' - ' . $resource_amount . "\r\n";
     }
   }
 
-  if(!$msg_text) {
+  if (!$msg_text) {
     $messages = &$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['messages'];
-    if($outcome_mission_sub >= 0 && is_array($messages)) {
+    if ($outcome_mission_sub >= 0 && is_array($messages)) {
       $messages = &$messages[$outcome_mission_sub];
     }
 
-    $msg_text = is_string($messages) ? $messages :
-      (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
+    $msg_text = is_string($messages) ? $messages : (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
   }
 
   $fleet_row_end_coordinates_without_type = $objFleet->target_coordinates_without_type();
@@ -279,14 +278,14 @@ 
 
   db_user_set_by_id($objFleet->playerOwnerId, "`player_rpg_explore_xp` = `player_rpg_explore_xp` + 1");
 
-  if(!empty($fleet_real_array) && $objFleet->getShipCount() >= 1) {
+  if (!empty($fleet_real_array) && $objFleet->getShipCount() >= 1) {
     // ПОКА НЕ НУЖНО - мы уже выше посчитали суммарные ресурсы (те, что были до отправку в экспу плюс найденное) и обновили $fleet_row
     // НО МОЖЕТ ПРИГОДИТЬСЯ, когда будем работать напрямую с $objFleet
 //    if(!empty($resources_found) && array_sum($resources_found) > 0) {
 //      $objFleet->update_resources($resources_found); // TODO - проверить, что бы не терялись ресурсы в трюме
 //    }
 
-    if(!empty($fleet_lost) || !empty($fleet_found)) {
+    if (!empty($fleet_lost) || !empty($fleet_found)) {
       $objFleet->replace_ships($fleet_real_array);
     }
     $objFleet->mark_fleet_as_returned();

includes/template.php

Doc Comments +5 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
  * @param string    $title
  * @param string    $dest
  * @param int       $time
- * @param bool|true $show_header
+ * @param boolean $show_header
  */
 function message($mes, $title = 'Error', $dest = '', $time = 5, $show_header = true) {
   $template = gettemplate('message_body', true);
@@ -195,7 +195,7 @@ 
  * @param bool|true       $isDisplayTopNav
  * @param string          $metatags
  * @param bool|false      $AdminPage
- * @param bool|true       $isDisplayMenu
+ * @param boolean       $isDisplayMenu
  *
  * @return mixed
  */
@@ -208,7 +208,6 @@ 
  * @param string          $title
  * @param bool|true       $isDisplayTopNav
  * @param string          $metatags
- * @param bool|false      $AdminPage
  * @param bool|true       $isDisplayMenu
  * @param bool|int|string $exitStatus - Код или сообщение выхода
  */
@@ -385,10 +384,10 @@ 
 
 /**
  * @param       $time
- * @param       $event
+ * @param       integer $event
  * @param       $msg
  * @param       $coordinates
- * @param       $is_decrease
+ * @param       boolean $is_decrease
  * @param Fleet $objFleet
  * @param       $fleet_flying_sorter
  * @param       $fleet_flying_events
@@ -708,7 +707,7 @@ 
 }
 
 /**
- * @param array|string  $files
+ * @param string  $files
  * @param template|bool $template
  * @param string|bool   $template_path
  *

Spacing +70 added lines, -70 removed lines

@@ -10,7 +10,7 @@ 
 function gettemplatename($u_dpath) {
   static $template_names = array();
 
-  if(!isset($template_names[$u_dpath])) {
+  if (!isset($template_names[$u_dpath])) {
     $template_names[$u_dpath] = file_exists(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') ? sys_file_read(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') : TEMPLATE_NAME;
   }
 
@@ -52,12 +52,12 @@ 
  * @param $sn_menu_extra
  */
 function tpl_menu_merge_extra(&$sn_menu, &$sn_menu_extra) {
-  if(empty($sn_menu) || empty($sn_menu_extra)) {
+  if (empty($sn_menu) || empty($sn_menu_extra)) {
     return;
   }
 
-  foreach($sn_menu_extra as $menu_item_id => $menu_item) {
-    if(empty($menu_item['LOCATION'])) {
+  foreach ($sn_menu_extra as $menu_item_id => $menu_item) {
+    if (empty($menu_item['LOCATION'])) {
       $sn_menu[$menu_item_id] = $menu_item;
       continue;
     }
@@ -66,16 +66,16 @@ 
     unset($menu_item['LOCATION']);
 
     $is_positioned = $item_location[0];
-    if($is_positioned == '+' || $is_positioned == '-') {
+    if ($is_positioned == '+' || $is_positioned == '-') {
       $item_location = substr($item_location, 1);
     } else {
       $is_positioned = '';
     }
 
-    if($item_location) {
+    if ($item_location) {
       $menu_keys = array_keys($sn_menu);
       $insert_position = array_search($item_location, $menu_keys);
-      if($insert_position === false) {
+      if ($insert_position === false) {
         $insert_position = count($sn_menu) - 1;
         $is_positioned = '+';
         $item_location = '';
@@ -88,7 +88,7 @@ 
     $spliced = array_splice($sn_menu, $insert_position, count($sn_menu) - $insert_position);
     $sn_menu[$menu_item_id] = $menu_item;
 
-    if(!$is_positioned && $item_location) {
+    if (!$is_positioned && $item_location) {
       unset($spliced[$item_location]);
     }
     $sn_menu = array_merge($sn_menu, $spliced);
@@ -104,24 +104,24 @@ 
 function tpl_menu_assign_to_template(&$sn_menu, &$template) {
   global $lang;
 
-  if(empty($sn_menu) || !is_array($sn_menu)) {
+  if (empty($sn_menu) || !is_array($sn_menu)) {
     return;
   }
 
-  foreach($sn_menu as $menu_item_id => $menu_item) {
-    if(!$menu_item) {
+  foreach ($sn_menu as $menu_item_id => $menu_item) {
+    if (!$menu_item) {
       continue;
     }
 
-    if(is_string($menu_item_id)) {
+    if (is_string($menu_item_id)) {
       $menu_item['ID'] = $menu_item_id;
     }
 
-    if($menu_item['TYPE'] == 'lang') {
+    if ($menu_item['TYPE'] == 'lang') {
       $lang_string = &$lang;
-      if(preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) {
-        for($i = 1; $i < count($matches); $i++) {
-          if(defined($matches[$i])) {
+      if (preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) {
+        for ($i = 1; $i < count($matches); $i++) {
+          if (defined($matches[$i])) {
             $matches[$i] = constant($matches[$i]);
           }
           $lang_string = &$lang_string[$matches[$i]];
@@ -133,8 +133,8 @@ 
     $menu_item['ALT'] = htmlentities($menu_item['ALT']);
     $menu_item['TITLE'] = htmlentities($menu_item['TITLE']);
 
-    if(!empty($menu_item['ICON'])) {
-      if(is_string($menu_item['ICON'])) {
+    if (!empty($menu_item['ICON'])) {
+      if (is_string($menu_item['ICON'])) {
         $menu_item['ICON_PATH'] = $menu_item['ICON'];
       } else {
         $menu_item['ICON'] = $menu_item_id;
@@ -164,7 +164,7 @@ 
     'MENU_START_HIDE'     => !empty($_COOKIE[SN_COOKIE . '_menu_hidden']) || defined('SN_GOOGLE'),
   ));
 
-  if(isset($template_result['MENU_CUSTOMIZE'])) {
+  if (isset($template_result['MENU_CUSTOMIZE'])) {
     $template->assign_vars(array(
       'PLAYER_OPTION_MENU_SHOW_ON_BUTTON'   => classSupernova::$user_options[PLAYER_OPTION_MENU_SHOW_ON_BUTTON],
       'PLAYER_OPTION_MENU_HIDE_ON_BUTTON'   => classSupernova::$user_options[PLAYER_OPTION_MENU_HIDE_ON_BUTTON],
@@ -178,7 +178,7 @@ 
     ));
   }
 
-  if(defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) {
+  if (defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) {
     tpl_menu_merge_extra($sn_menu_admin, $sn_menu_admin_extra);
     tpl_menu_assign_to_template($sn_menu_admin, $template);
   } else {
@@ -218,7 +218,7 @@ 
   $in_admin = defined('IN_ADMIN') && IN_ADMIN === true;
   $is_login = defined('LOGIN_LOGOUT') && LOGIN_LOGOUT === true;
 
-  if(is_object($page)) {
+  if (is_object($page)) {
     isset($page->_rootref['MENU']) ? $isDisplayMenu = $page->_rootref['MENU'] : false;
     isset($page->_rootref['NAVBAR']) ? $isDisplayTopNav = $page->_rootref['NAVBAR'] : false;
 
@@ -226,7 +226,7 @@ 
     !isset($page->_rootref['PAGE_HEADER']) && $title ? $page->assign_var('PAGE_HEADER', $title) : false;
   }
 
-  if(empty($user['id']) || !is_numeric($user['id'])) {
+  if (empty($user['id']) || !is_numeric($user['id'])) {
     $isDisplayMenu = false;
     $isDisplayTopNav = false;
   }
@@ -238,10 +238,10 @@ 
   $user_time_measured_unix = intval(isset($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) ? strtotime($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) : 0);
 
   $font_size = !empty($_COOKIE[SN_COOKIE_F]) ? $_COOKIE[SN_COOKIE_F] : classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE];
-  if(strpos($font_size, '%') !== false) {
+  if (strpos($font_size, '%') !== false) {
     // Размер шрифта в процентах
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
-  } elseif(strpos($font_size, 'px') !== false) {
+  } elseif (strpos($font_size, 'px') !== false) {
     // Размер шрифта в пикселях
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
   } else {
@@ -253,10 +253,10 @@ 
 
   $template = gettemplate('_global_header', true);
 
-  if(!empty($sn_mvc['javascript'])) {
-    foreach($sn_mvc['javascript'] as $page_name => $script_list) {
-      if(empty($page_name) || $page_name == $sn_page_name) {
-        foreach($script_list as $filename => $content) {
+  if (!empty($sn_mvc['javascript'])) {
+    foreach ($sn_mvc['javascript'] as $page_name => $script_list) {
+      if (empty($page_name) || $page_name == $sn_page_name) {
+        foreach ($script_list as $filename => $content) {
           $template_result['.']['javascript'][] = array(
             'FILE'    => $filename,
             'CONTENT' => $content,
@@ -290,9 +290,9 @@ 
   $sn_mvc['css'][''] = array_merge($standard_css, $sn_mvc['css']['']);
 
 
-  foreach($sn_mvc['css'] as $page_name => $script_list) {
-    if(empty($page_name) || $page_name == $sn_page_name) {
-      foreach($script_list as $filename => $content) {
+  foreach ($sn_mvc['css'] as $page_name => $script_list) {
+    if (empty($page_name) || $page_name == $sn_page_name) {
+      foreach ($script_list as $filename => $content) {
         $template_result['.']['css'][] = array(
           'FILE'    => $filename,
           'CONTENT' => $content,
@@ -339,12 +339,12 @@ 
   $template->assign_recursive($template_result);
   displayP(parsetemplate($template));
 
-  if(($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) {
+  if (($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) {
     // $AdminPage = $AdminPage ? $user['authlevel'] : 0;
     displayP(parsetemplate(tpl_render_menu()));
   }
 
-  if($isDisplayTopNav && !$in_admin) {
+  if ($isDisplayTopNav && !$in_admin) {
     displayP(parsetemplate(tpl_render_topnav($user, $planetrow)));
   }
 
@@ -352,8 +352,8 @@ 
 
   !is_array($page) ? $page = array($page) : false;
   $result_added = false;
-  foreach($page as $page_item) {
-    if(!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) {
+  foreach ($page as $page_item) {
+    if (!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) {
       $page_item = gettemplate('_result_message', $page_item);
       $temp = $page_item->files['_result_message'];
       unset($page_item->files['_result_message']);
@@ -376,7 +376,7 @@ 
   ));
   displayP(parsetemplate($template));
 
-  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false;;
+  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false; ;
 
   sn_db_disconnect();
 
@@ -414,7 +414,7 @@ 
  * @param string         $type
  */
 function tpl_topnav_event_build(&$template, $FleetList, $type = 'fleet') {
-  if(empty($FleetList)) {
+  if (empty($FleetList)) {
     return;
   }
 
@@ -423,19 +423,19 @@ 
   $fleet_event_count = 0;
   $fleet_flying_sorter = array();
   $fleet_flying_events = array();
-  foreach($FleetList->_container as $objFleet) {
+  foreach ($FleetList->_container as $objFleet) {
     $will_return = true;
-    if($objFleet->is_returning == 0) {
+    if ($objFleet->is_returning == 0) {
       // cut fleets on Hold and Expedition
-      if($objFleet->time_arrive_to_target >= SN_TIME_NOW) {
+      if ($objFleet->time_arrive_to_target >= SN_TIME_NOW) {
         $objFleet->mission_type == MT_RELOCATE ? $will_return = false : false;
         tpl_topnav_event_build_helper($objFleet->time_arrive_to_target, EVENT_FLEET_ARRIVE, $lang['sys_event_arrive'], $objFleet->target_coordinates_typed(), !$will_return, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
       }
-      if($objFleet->time_mission_job_complete) {
+      if ($objFleet->time_mission_job_complete) {
         tpl_topnav_event_build_helper($objFleet->time_mission_job_complete, EVENT_FLEET_STAY, $lang['sys_event_stay'], $objFleet->target_coordinates_typed(), false, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
       }
     }
-    if($will_return) {
+    if ($will_return) {
       tpl_topnav_event_build_helper($objFleet->time_return_to_source, EVENT_FLEET_RETURN, $lang['sys_event_return'], $objFleet->launch_coordinates_typed(), true, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
     }
   }
@@ -443,7 +443,7 @@ 
   asort($fleet_flying_sorter);
 
   $fleet_flying_count = $FleetList->count();
-  foreach($fleet_flying_sorter as $fleet_event_id => $fleet_time) {
+  foreach ($fleet_flying_sorter as $fleet_event_id => $fleet_time) {
     $fleet_event = &$fleet_flying_events[$fleet_event_id];
     $template->assign_block_vars("flying_{$type}s", array(
       'TIME' => max(0, $fleet_time - SN_TIME_NOW),
@@ -471,7 +471,7 @@ 
 function sn_tpl_render_topnav(&$user, $planetrow) {
   global $lang, $config, $sn_module_list, $template_result, $sn_mvc;
 
-  if(!is_array($user)) {
+  if (!is_array($user)) {
     return '';
   }
 
@@ -492,8 +492,8 @@ 
 
   $ThisUsersPlanets = db_planet_list_sorted($user);
   // while ($CurPlanet = db_fetch($ThisUsersPlanets))
-  foreach($ThisUsersPlanets as $CurPlanet) {
-    if($CurPlanet['destruyed']) {
+  foreach ($ThisUsersPlanets as $CurPlanet) {
+    if ($CurPlanet['destruyed']) {
       continue;
     }
 
@@ -517,8 +517,8 @@ 
    */
   $fleet_flying_list = array();
   $fleet_flying_list[0] = FleetList::dbGetFleetListByOwnerId($user['id']);
-  foreach($fleet_flying_list[0]->_container as $fleet_id => $objFleet) {
-    if(empty($fleet_flying_list[$objFleet->mission_type])) {
+  foreach ($fleet_flying_list[0]->_container as $fleet_id => $objFleet) {
+    if (empty($fleet_flying_list[$objFleet->mission_type])) {
       $fleet_flying_list[$objFleet->mission_type] = new FleetList();
     }
     $fleet_flying_list[$objFleet->mission_type][$fleet_id] = $objFleet;
@@ -530,8 +530,8 @@ 
   que_tpl_parse($template, QUE_RESEARCH, $user, array(), null, !classSupernova::$user_options[PLAYER_OPTION_NAVBAR_RESEARCH_WIDE]);
   que_tpl_parse($template, SUBQUE_FLEET, $user, $planetrow, null, true);
 
-  if(!empty($sn_mvc['navbar_prefix_button']) && is_array($sn_mvc['navbar_prefix_button'])) {
-    foreach($sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) {
+  if (!empty($sn_mvc['navbar_prefix_button']) && is_array($sn_mvc['navbar_prefix_button'])) {
+    foreach ($sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) {
       $template->assign_block_vars('navbar_prefix_button', array(
         'IMAGE'        => $navbar_button_image,
         'URL_RELATIVE' => $navbar_button_url,
@@ -545,13 +545,13 @@ 
   $time_now_parsed = getdate(SN_TIME_NOW);
   $time_local_parsed = getdate(defined('SN_CLIENT_TIME_LOCAL') ? SN_CLIENT_TIME_LOCAL : SN_TIME_NOW);
 
-  if($config->game_news_overview) {
+  if ($config->game_news_overview) {
     $user_last_read_safe = intval($user['news_lastread']);
     nws_render($template, "WHERE UNIX_TIMESTAMP(`tsTimeStamp`) >= {$user_last_read_safe}", $config->game_news_overview);
   }
 
   $notes_query = db_note_list_by_owner($user['id'], true);
-  while($note_row = db_fetch($notes_query)) {
+  while ($note_row = db_fetch($notes_query)) {
     note_assign($template, $note_row);
   }
 
@@ -562,7 +562,7 @@ 
     'QUE_ID'   => QUE_RESEARCH,
     'QUE_HTML' => 'topnav',
 
-    'RESEARCH_ONGOING' => (boolean)$user['que'],
+    'RESEARCH_ONGOING' => (boolean) $user['que'],
 
     'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], $lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
       $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -639,7 +639,7 @@ 
     'QUE_STRUCTURES' => QUE_STRUCTURES,
   ));
 
-  if((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) {
+  if ((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) {
     tpl_set_resource_info($template, $planetrow);
     $template->assign_vars(array(
       'SN_RENDER_NAVBAR_PLANET' => true,
@@ -654,12 +654,12 @@ 
  * @param template|string $template
  */
 function displayP($template) {
-  if(is_object($template)) {
-    if(empty($template->parsed)) {
+  if (is_object($template)) {
+    if (empty($template->parsed)) {
       parsetemplate($template);
     }
 
-    foreach($template->files as $section => $filename) {
+    foreach ($template->files as $section => $filename) {
       $template->display($section);
     }
   } else {
@@ -674,11 +674,11 @@ 
  * @return mixed
  */
 function parsetemplate($template, $array = false) {
-  if(is_object($template)) {
+  if (is_object($template)) {
     global $user;
 
-    if(!empty($array) && is_array($array)) {
-      foreach($array as $key => $data) {
+    if (!empty($array) && is_array($array)) {
+      foreach ($array as $key => $data) {
         $template->assign_var($key, $data);
       }
     }
@@ -719,7 +719,7 @@ 
 
   $template_ex = '.tpl.html';
 
-  if($template === false) {
+  if ($template === false) {
     return sys_file_read(TEMPLATE_DIR . '/' . $files . $template_ex);
   }
 
@@ -739,7 +739,7 @@ 
   !empty($sn_mvc['i18n']['']) ? lng_load_i18n($sn_mvc['i18n']['']) : false;
   $sn_page_name ? lng_load_i18n($sn_mvc['i18n'][$sn_page_name]) : false;
 
-  foreach($files as &$filename) {
+  foreach ($files as &$filename) {
     $filename = $filename . $template_ex;
   }
 
@@ -764,13 +764,13 @@ 
     'LANG'     => $language ? $language : '',
     'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
 
-    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
+    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
     'FILENAME'       => basename($_SERVER['PHP_SELF']),
   ));
 
-  foreach(lng_get_list() as $lng_id => $lng_data) {
-    if(isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) {
-      foreach($lng_data['LANG_VARIANTS'] as $lang_variant) {
+  foreach (lng_get_list() as $lng_id => $lng_data) {
+    if (isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) {
+      foreach ($lng_data['LANG_VARIANTS'] as $lang_variant) {
         $lng_data1 = $lng_data;
         $lng_data1 = array_merge($lng_data1, $lang_variant);
         $template->assign_block_vars('language', $lng_data1);
@@ -793,8 +793,8 @@ 
   $que = $que['ques'][$que_type][$planet['id_owner']][$planet['id']];
 
   $que_length = 0;
-  if(!empty($que)) {
-    foreach($que as $que_item) {
+  if (!empty($que)) {
+    foreach ($que as $que_item) {
       $template->assign_block_vars('que', que_tpl_parse_element($que_item));
     }
     $que_length = count($que);
@@ -811,7 +811,7 @@ 
 function tpl_planet_density_info(&$template, &$density_price_chart, $user_dark_matter) {
   global $lang;
 
-  foreach($density_price_chart as $density_price_index => &$density_price_data) {
+  foreach ($density_price_chart as $density_price_index => &$density_price_data) {
     $density_cost = $density_price_data;
     $density_number_style = pretty_number($density_cost, true, $user_dark_matter, false, false);
 
@@ -835,7 +835,7 @@ 
 function tpl_assign_select(&$template, $name, $values) {
   !is_array($values) ? $values = array($values => $values) : false;
 
-  foreach($values as $key => $value) {
+  foreach ($values as $key => $value) {
     $template->assign_block_vars($name, array(
       'KEY'   => htmlentities($key, ENT_COMPAT, 'UTF-8'),
       'VALUE' => htmlentities($value, ENT_COMPAT, 'UTF-8'),

search.php

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($config->game_mode == GAME_BLITZ) {
+if ($config->game_mode == GAME_BLITZ) {
   message($lang['sys_blitz_page_disabled'], $lang['sys_error'], 'overview.php', 10);
   die();
 }
@@ -25,8 +25,8 @@ 
 
 $template = gettemplate('search', true);
 
-if($searchtext && $type) {
-  switch($type) {
+if ($searchtext && $type) {
+  switch ($type) {
     case "planetname":
       // $search = db_planet_list_search($searchtext);
     break;
@@ -41,8 +41,8 @@ 
     break;
   }
 
-  while($row = db_fetch($search)) {
-    if($type == 'playername' || $type == 'planetname') {
+  while ($row = db_fetch($search)) {
+    if ($type == 'playername' || $type == 'planetname') {
       $template->assign_block_vars('search_result', array(
         'PLAYER_ID'       => $row['uid'],
         'PLAYER_NAME'     => htmlentities($row['username'], ENT_COMPAT, 'UTF-8'),
@@ -57,7 +57,7 @@ 
         'ALLY_NAME'       => htmlentities($row['ally_name'], ENT_COMPAT, 'UTF-8'),
         'ALLY_TAG'        => htmlentities($row['ally_tag'], ENT_COMPAT, 'UTF-8'),
       ));
-    } elseif($type == 'ally') {
+    } elseif ($type == 'ally') {
       $template->assign_block_vars('search_result', array(
         'ALLY_NAME'     => htmlentities($row['ally_name'], ENT_COMPAT, 'UTF-8'),
         'ALLY_TAG'      => htmlentities($row['ally_tag'], ENT_COMPAT, 'UTF-8'),
@@ -75,7 +75,7 @@ 
   'ally'       => 'sys_alliance',
 );
 
-foreach($search_type as $type_id => $type_lang) {
+foreach ($search_type as $type_id => $type_lang) {
   $template->assign_block_vars('type', array(
     'ID'       => $type_id,
     'TEXT'     => $lang[$type_lang],

common.php

Spacing +6 added lines, -6 removed lines

@@ -12,25 +12,25 @@ 
 global $debug, $sn_mvc, $template_result, $user;
 
 // Напоминание для Администрации, что игра отключена
-if($template_result[F_GAME_DISABLE]) {
+if ($template_result[F_GAME_DISABLE]) {
   // $disable_reason = sys_bbcodeParse($config->game_disable_reason); // Должна быть инициализирована выше по коду - в init.php
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
 }
 unset($disable_reason);
 
 
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
   lng_include('admin');
-} elseif($sys_user_logged_in) {
+} elseif ($sys_user_logged_in) {
   sys_user_vacation($user);
 
   $planet_id = SetSelectedPlanet($user);
 
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
-  if($user['ally_id']) {
+  if ($user['ally_id']) {
     sn_db_transaction_start();
     sn_ali_fill_user_ally($user);
-    if(!$user['ally']['player']['id']) {
+    if (!$user['ally']['player']['id']) {
       // sn_sys_logout(false, true);
       // core_auth::logout(false);
       classSupernova::$auth->logout(false);
@@ -49,7 +49,7 @@ 
   sn_db_transaction_commit();
 
   $planetrow = $global_data['planet'];
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false);
     classSupernova::$auth->logout(false);

fleet.php

Switch Indentation +121 added lines, -121 removed lines

@@ -69,121 +69,121 @@ 
 }
 
 switch ($fleet_page) {
-  case 3:
+    case 3:
 
-  case 2:
-    $fleet_group_mr = sys_get_param_id('fleet_group');
-    $fleetarray     = unserialize(base64_decode(str_rot13(sys_get_param('usedfleet'))));
-    $fleetarray = is_array($fleetarray) ? $fleetarray : array();
+    case 2:
+      $fleet_group_mr = sys_get_param_id('fleet_group');
+      $fleetarray     = unserialize(base64_decode(str_rot13(sys_get_param('usedfleet'))));
+      $fleetarray = is_array($fleetarray) ? $fleetarray : array();
 
-    foreach($fleetarray as $ship_id => &$ship_amount) {
-      if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
-        $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
-        die();
-      }
-      $ship_amount = floatval($ship_amount);
-    }
-
-    $UsedPlanet = false;
-    $YourPlanet = false;
-    $missiontype = array();
-    if ($planet > $config->game_maxPlanet) {
-      $target_mission = MT_EXPLORE;
-      $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE];
-    } elseif ($galaxy && $system && $planet) {
-      $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
-
-      $TargetPlanet = db_planet_by_gspt($galaxy, $system, $planet, $check_type);
-
-      if ($TargetPlanet['id_owner']) {
-        $UsedPlanet = true;
-        if ($TargetPlanet['id_owner'] == $user['id']) {
-          $YourPlanet = true;
+      foreach($fleetarray as $ship_id => &$ship_amount) {
+        if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
+          $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
+          die();
         }
+        $ship_amount = floatval($ship_amount);
       }
 
-      if (!$UsedPlanet) {
-        if ($fleetarray[SHIP_COLONIZER]) {
-          $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE];
-          $target_mission = MT_COLONIZE;
-          $planet_type = PT_PLANET;
-        } else {
-          message ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
-        }
-      } else {
-        $recyclers = 0;
-        foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
-          $recyclers += $fleetarray[$recycler_id];
+      $UsedPlanet = false;
+      $YourPlanet = false;
+      $missiontype = array();
+      if ($planet > $config->game_maxPlanet) {
+        $target_mission = MT_EXPLORE;
+        $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE];
+      } elseif ($galaxy && $system && $planet) {
+        $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
+
+        $TargetPlanet = db_planet_by_gspt($galaxy, $system, $planet, $check_type);
+
+        if ($TargetPlanet['id_owner']) {
+          $UsedPlanet = true;
+          if ($TargetPlanet['id_owner'] == $user['id']) {
+            $YourPlanet = true;
+          }
         }
-        if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
-          $target_mission = MT_RECYCLE;
-          $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE];
-        } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
-          if ($YourPlanet) {
-            $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE];
-            $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
+
+        if (!$UsedPlanet) {
+          if ($fleetarray[SHIP_COLONIZER]) {
+            $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE];
+            $target_mission = MT_COLONIZE;
+            $planet_type = PT_PLANET;
           } else {
-            // Not Your Planet
-            if ($fleetarray[SHIP_SPY]) {
-              // Only spy missions if any spy
-              $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY];
+            message ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
+          }
+        } else {
+          $recyclers = 0;
+          foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+            $recyclers += $fleetarray[$recycler_id];
+          }
+          if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
+            $target_mission = MT_RECYCLE;
+            $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE];
+          } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
+            if ($YourPlanet) {
+              $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE];
+              $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
             } else {
-              // If no spies...
-              if ($fleet_group_mr) {
-                $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS];
+              // Not Your Planet
+              if ($fleetarray[SHIP_SPY]) {
+                // Only spy missions if any spy
+                $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY];
               } else {
-                $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK];
-                $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
-
-                $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
-
-                if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
-                  $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
+                // If no spies...
+                if ($fleet_group_mr) {
+                  $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS];
+                } else {
+                  $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK];
+                  $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
+
+                  $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
+
+                  if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
+                    $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
+                  }
                 }
               }
             }
           }
         }
       }
-    }
-
-    if (!$target_mission && is_array($missiontype)) {
-      $target_mission = MT_ATTACK;
-    }
-
-//    $sn_group_missions = sn_get_groups('missions');
-//    foreach($sn_group_missions as $mission_id => $cork) {
-//      $missiontype[$mission_id] = $lang['type_mission'][$mission_id];
-//    }
-//
-//
-    ksort($missiontype);
-
-    $speed_percent = sys_get_param_int('speed', 10);
-    $travel_data   = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent);
-
-//    $fleet_speed   = flt_fleet_speed($user, $fleetarray);
-    $fleet_speed   = $travel_data['fleet_speed'];
-    $distance      = $travel_data['distance'];
-    $duration      = $travel_data['duration'];
-    $consumption   = $travel_data['consumption'];
-  // No Break
-
-  case 1:
-    if ($galaxy && $system && $planet) {
-      $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
-
-      $TargetPlanet = db_planet_by_gspt($galaxy, $system, $planet, $check_type);
-    }
-
-  case 0:
-    $template_result += array(
-      'thisgalaxy'      => $planetrow['galaxy'],
-      'thissystem'      => $planetrow['system'],
-      'thisplanet'      => $planetrow['planet'],
-      'thisplanet_type' => $planetrow['planet_type'],
-    );
-  // no break
+
+      if (!$target_mission && is_array($missiontype)) {
+        $target_mission = MT_ATTACK;
+      }
+
+  //    $sn_group_missions = sn_get_groups('missions');
+  //    foreach($sn_group_missions as $mission_id => $cork) {
+  //      $missiontype[$mission_id] = $lang['type_mission'][$mission_id];
+  //    }
+  //
+  //
+      ksort($missiontype);
+
+      $speed_percent = sys_get_param_int('speed', 10);
+      $travel_data   = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent);
+
+  //    $fleet_speed   = flt_fleet_speed($user, $fleetarray);
+      $fleet_speed   = $travel_data['fleet_speed'];
+      $distance      = $travel_data['distance'];
+      $duration      = $travel_data['duration'];
+      $consumption   = $travel_data['consumption'];
+    // No Break
+
+    case 1:
+      if ($galaxy && $system && $planet) {
+        $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
+
+        $TargetPlanet = db_planet_by_gspt($galaxy, $system, $planet, $check_type);
+      }
+
+    case 0:
+      $template_result += array(
+        'thisgalaxy'      => $planetrow['galaxy'],
+        'thissystem'      => $planetrow['system'],
+        'thisplanet'      => $planetrow['planet'],
+        'thisplanet_type' => $planetrow['planet_type'],
+      );
+    // no break
 
 }
 
@@ -205,31 +205,31 @@ 
 }
 
 switch($fleet_page) {
-  case 1:
-    require('includes/includes/flt_page1.inc');
-  break;
+    case 1:
+      require('includes/includes/flt_page1.inc');
+    break;
 
-  case 2:
-    require_once('includes/includes/flt_page2.inc');
-    sn_fleet_page2();
-  break;
+    case 2:
+      require_once('includes/includes/flt_page2.inc');
+      sn_fleet_page2();
+    break;
 
-  case 3:
-    require_once('includes/includes/flt_page3.inc');
-    sn_fleet_page3($duration);
-  break;
+    case 3:
+      require_once('includes/includes/flt_page3.inc');
+      sn_fleet_page3($duration);
+    break;
 
-  case 4:
-    require('includes/includes/flt_page4.inc');
-  break;
+    case 4:
+      require('includes/includes/flt_page4.inc');
+    break;
 
-  case 5:
-    require('includes/includes/flt_page5.inc');
-  break;
+    case 5:
+      require('includes/includes/flt_page5.inc');
+    break;
 
-  default:
-    define('SN_RENDER_NAVBAR_PLANET', true);
+    default:
+      define('SN_RENDER_NAVBAR_PLANET', true);
 
-    require('includes/includes/flt_page0.inc');
-  break;
+      require('includes/includes/flt_page0.inc');
+    break;
 }

Spacing +14 added lines, -14 removed lines

@@ -39,11 +39,11 @@ 
 $planet = sys_get_param_int('planet', $planetrow['planet']);
 
 $target_mission = sys_get_param_int('target_mission');
-if($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
+if ($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
   $planet_type = PT_PLANET;
-} elseif($target_mission == MT_RECYCLE) {
+} elseif ($target_mission == MT_RECYCLE) {
   $planet_type = PT_DEBRIS;
-} elseif($target_mission == MT_DESTROY) {
+} elseif ($target_mission == MT_DESTROY) {
   $planet_type = PT_MOON;
 } else {
   $planet_type = sys_get_param_int('planet_type');
@@ -57,13 +57,13 @@ 
 
 $MaxFleets = GetMaxFleets($user);
 $FlyingFleets = FleetList::fleet_count_flying($user['id']);
-if($MaxFleets <= $FlyingFleets && $fleet_page && $fleet_page != 4) {
+if ($MaxFleets <= $FlyingFleets && $fleet_page && $fleet_page != 4) {
   message($lang['fl_noslotfree'], $lang['fl_error'], "fleet." . PHP_EX, 5);
 }
 
 $MaxExpeditions = get_player_max_expeditons($user);
-if($MaxExpeditions) {
-  $FlyingExpeditions  = FleetList::fleet_count_flying($user['id'], MT_EXPLORE);
+if ($MaxExpeditions) {
+  $FlyingExpeditions = FleetList::fleet_count_flying($user['id'], MT_EXPLORE);
 } else {
   $FlyingExpeditions = 0;
 }
@@ -76,8 +76,8 @@ 
     $fleetarray     = unserialize(base64_decode(str_rot13(sys_get_param('usedfleet'))));
     $fleetarray = is_array($fleetarray) ? $fleetarray : array();
 
-    foreach($fleetarray as $ship_id => &$ship_amount) {
-      if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
+    foreach ($fleetarray as $ship_id => &$ship_amount) {
+      if (!in_array($ship_id, sn_get_groups('fleet')) || (string) floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
         $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
         die();
       }
@@ -108,11 +108,11 @@ 
           $target_mission = MT_COLONIZE;
           $planet_type = PT_PLANET;
         } else {
-          message ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
+          message("<font color=\"red\"><b>" . $lang['fl_no_planet_type'] . "</b></font>", $lang['fl_error']);
         }
       } else {
         $recyclers = 0;
-        foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+        foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
           $recyclers += $fleetarray[$recycler_id];
         }
         if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
@@ -137,7 +137,7 @@ 
 
                 $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
 
-                if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
+                if ($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
                   $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
                 }
               }
@@ -197,14 +197,14 @@ 
 );
 
 $is_transport_missions = false;
-if($missiontype) {
+if ($missiontype) {
   $sn_group_missions = sn_get_groups('missions');
-  foreach($missiontype as $mission_data_id => $mission_data) {
+  foreach ($missiontype as $mission_data_id => $mission_data) {
     $is_transport_missions = $is_transport_missions || (isset($sn_group_missions[$mission_data_id]['transport']) && $sn_group_missions[$mission_data_id]['transport']);
   }
 }
 
-switch($fleet_page) {
+switch ($fleet_page) {
   case 1:
     require('includes/includes/flt_page1.inc');
   break;

banned.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 $query = db_banned_list_select();
 $i = 0;
-while($ban_row = db_fetch($query)) {
+while ($ban_row = db_fetch($query)) {
   $template->assign_block_vars('banlist', array(
     'USER_NAME'   => $ban_row['ban_user_name'],
     'REASON'      => $ban_row['ban_reason'],

messages.php

Switch Indentation +122 added lines, -122 removed lines

@@ -48,106 +48,106 @@ 
 }
 
 switch($mode) {
-  case 'write':
-    $error_list = array();
-    $template = gettemplate('msg_message_compose', true);
+    case 'write':
+      $error_list = array();
+      $template = gettemplate('msg_message_compose', true);
 
-    $recipient_name = sys_get_param_str_unsafe('recipient_name');
-    if($recipient_name) {
-      $recipient_row = db_user_by_username($recipient_name);
-    }
+      $recipient_name = sys_get_param_str_unsafe('recipient_name');
+      if($recipient_name) {
+        $recipient_row = db_user_by_username($recipient_name);
+      }
 
-    if(!$recipient_row) {
-      $recipient_id = sys_get_param_id('id');
-      $recipient_row = db_user_by_id($recipient_id);
       if(!$recipient_row) {
-        $recipient_id = 0;
+        $recipient_id = sys_get_param_id('id');
+        $recipient_row = db_user_by_id($recipient_id);
+        if(!$recipient_row) {
+          $recipient_id = 0;
+        }
       }
-    }
-
-    if($recipient_row) {
-      $recipient_id = $recipient_row['id'];
-      $recipient_name = $recipient_row['username'];
-    }
-
-    if($recipient_id == $user['id']) {
-      $error_list[] = array('MESSAGE' => $lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
-    }
-
-    $re = 0;
-    $subject = sys_get_param_str('subject');
-    while(strpos($subject, $lang['msg_answer_prefix']) !== false) {
-      $subject = substr($subject, strlen($lang['msg_answer_prefix']));
-      $re++;
-    }
-    $re ? $subject = $lang['msg_answer_prefix'] . $subject : false;
 
-    if(sys_get_param_str('msg_send')) {
-      $subject = $subject ? $subject : $lang['msg_subject_default'];
+      if($recipient_row) {
+        $recipient_id = $recipient_row['id'];
+        $recipient_name = $recipient_row['username'];
+      }
 
-      if(!$recipient_id) {
-        $error_list[] = array('MESSAGE' => $lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
+      if($recipient_id == $user['id']) {
+        $error_list[] = array('MESSAGE' => $lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
       }
 
-      $text = sys_get_param_str('text');
-      if(!$text) {
-        $error_list[] = array('MESSAGE' => $lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
+      $re = 0;
+      $subject = sys_get_param_str('subject');
+      while(strpos($subject, $lang['msg_answer_prefix']) !== false) {
+        $subject = substr($subject, strlen($lang['msg_answer_prefix']));
+        $re++;
       }
+      $re ? $subject = $lang['msg_answer_prefix'] . $subject : false;
 
-      if(empty($error_list)) {
-        $error_list[] = array('MESSAGE' => $lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
+      if(sys_get_param_str('msg_send')) {
+        $subject = $subject ? $subject : $lang['msg_subject_default'];
 
-        $user_safe_name = db_escape($user['username']);
-        $recipient_name = db_escape($recipient_name);
-        msg_send_simple_message($recipient_id, $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, "{$user_safe_name} [{$user['galaxy']}:{$user['system']}:{$user['planet']}]", $subject, $text, true);
+        if(!$recipient_id) {
+          $error_list[] = array('MESSAGE' => $lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
+        }
 
-        //$recipient_id = 0;
-        //$recipient_name = '';
-        //$subject = '';
-        $text = '';
+        $text = sys_get_param_str('text');
+        if(!$text) {
+          $error_list[] = array('MESSAGE' => $lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
+        }
 
-        $msg_sent = true;
-      } else {
-        $subject = sys_get_param_str_unsafe('subject');
-        $text = sys_get_param_str_unsafe('text');
-      }
-      $recipient_name = sys_get_param_str_unsafe('recipient_name');
-    }
+        if(empty($error_list)) {
+          $error_list[] = array('MESSAGE' => $lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
 
-    $subject = $subject ? $subject : $lang['msg_subject_default'];
+          $user_safe_name = db_escape($user['username']);
+          $recipient_name = db_escape($recipient_name);
+          msg_send_simple_message($recipient_id, $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, "{$user_safe_name} [{$user['galaxy']}:{$user['system']}:{$user['planet']}]", $subject, $text, true);
 
-    $template->assign_vars(array(
-      'RECIPIENT_ID'   => $recipient_id,
-      'RECIPIENT_NAME' => htmlspecialchars($recipient_name),
-      'SUBJECT'        => htmlspecialchars($subject),
-      'TEXT'           => htmlspecialchars($text),
-    ));
+          //$recipient_id = 0;
+          //$recipient_name = '';
+          //$subject = '';
+          $text = '';
 
-    foreach($error_list as $error_message) {
-      $template->assign_block_vars('result', $error_message);
-    }
+          $msg_sent = true;
+        } else {
+          $subject = sys_get_param_str_unsafe('subject');
+          $text = sys_get_param_str_unsafe('text');
+        }
+        $recipient_name = sys_get_param_str_unsafe('recipient_name');
+      }
 
-    $message_query = db_message_list_get_last_20($user, $recipient_id);
-    while($message_row = db_fetch($message_query)) {
-      $template->assign_block_vars('messages', array(
-        'ID'   => $message_row['message_id'],
-        'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
-        'FROM' => htmlspecialchars($message_row['message_from']),
-        'SUBJ' => htmlspecialchars($message_row['message_subject']),
-        'TEXT' => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
+      $subject = $subject ? $subject : $lang['msg_subject_default'];
 
-        'FROM_ID' => $message_row['message_sender'],
+      $template->assign_vars(array(
+        'RECIPIENT_ID'   => $recipient_id,
+        'RECIPIENT_NAME' => htmlspecialchars($recipient_name),
+        'SUBJECT'        => htmlspecialchars($subject),
+        'TEXT'           => htmlspecialchars($text),
       ));
-    }
 
-  break;
+      foreach($error_list as $error_message) {
+        $template->assign_block_vars('result', $error_message);
+      }
+
+      $message_query = db_message_list_get_last_20($user, $recipient_id);
+      while($message_row = db_fetch($message_query)) {
+        $template->assign_block_vars('messages', array(
+          'ID'   => $message_row['message_id'],
+          'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
+          'FROM' => htmlspecialchars($message_row['message_from']),
+          'SUBJ' => htmlspecialchars($message_row['message_subject']),
+          'TEXT' => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
+
+          'FROM_ID' => $message_row['message_sender'],
+        ));
+      }
 
-  case 'delete':
-    $query_add = '';
+    break;
 
-    $message_range = sys_get_param_str('message_range');
+    case 'delete':
+      $query_add = '';
 
-    switch($message_range) {
+      $message_range = sys_get_param_str('message_range');
+
+      switch($message_range) {
       case 'unchecked':
       case 'checked':
         $marked_message_list = sys_get_param('mark', array());
@@ -171,65 +171,65 @@ 
       case 'all':
         $query_add = $query_add ? $query_add : true;
       break;
-    }
+      }
 
     if($query_add) {
       $query_add = $query_add === true ? '' : $query_add;
       db_message_list_delete($user, $query_add);
     }
 
-  case 'show':
-    if($current_class == MSG_TYPE_OUTBOX) {
-      $message_query = db_message_list_outbox_by_user_id($user['id']);
-    } else {
-      if($current_class == MSG_TYPE_NEW) {
-        $SubUpdateQry = array();
-        foreach($sn_message_class_list as $message_class_id => $message_class) {
-          if($message_class_id != MSG_TYPE_OUTBOX) {
-            $SubUpdateQry[] = "`{$message_class['name']}` = '0'";
-            $user[$message_class['name']] = 0;
+    case 'show':
+      if($current_class == MSG_TYPE_OUTBOX) {
+        $message_query = db_message_list_outbox_by_user_id($user['id']);
+      } else {
+        if($current_class == MSG_TYPE_NEW) {
+          $SubUpdateQry = array();
+          foreach($sn_message_class_list as $message_class_id => $message_class) {
+            if($message_class_id != MSG_TYPE_OUTBOX) {
+              $SubUpdateQry[] = "`{$message_class['name']}` = '0'";
+              $user[$message_class['name']] = 0;
+            }
           }
+          $SubUpdateQry = implode(',', $SubUpdateQry);
+        } else {
+          $SubUpdateQry = "`{$sn_message_class_list[$current_class]['name']}` = '0', `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` = `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` - '{$user[$sn_message_class_list[$current_class]['name']]}'";
+          $SubSelectQry = "AND `message_type` = '{$current_class}'";
+
+          $user[$sn_message_class_list[MSG_TYPE_NEW]['name']] -= $user[$sn_message_class_list[$current_class]['name']];
+          $user[$sn_message_class_list[$current_class]['name']] = 0;
         }
-        $SubUpdateQry = implode(',', $SubUpdateQry);
-      } else {
-        $SubUpdateQry = "`{$sn_message_class_list[$current_class]['name']}` = '0', `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` = `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` - '{$user[$sn_message_class_list[$current_class]['name']]}'";
-        $SubSelectQry = "AND `message_type` = '{$current_class}'";
 
-        $user[$sn_message_class_list[MSG_TYPE_NEW]['name']] -= $user[$sn_message_class_list[$current_class]['name']];
-        $user[$sn_message_class_list[$current_class]['name']] = 0;
+        db_user_set_by_id($user['id'], $SubUpdateQry);
+        $message_query = db_message_list_by_owner_and_string($user, $SubSelectQry);
       }
 
-      db_user_set_by_id($user['id'], $SubUpdateQry);
-      $message_query = db_message_list_by_owner_and_string($user, $SubSelectQry);
-    }
-
-    if(sys_get_param_int('return')) {
-      header('Location: messages.php');
-      die();
-    }
+      if(sys_get_param_int('return')) {
+        header('Location: messages.php');
+        die();
+      }
 
-    $template = gettemplate('msg_message_list', true);
-    while($message_row = db_fetch($message_query)) {
-      $template->assign_block_vars('messages', array(
-        'ID'   => $message_row['message_id'],
-        'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
-        'FROM' => htmlspecialchars($message_row['message_from']),
-        'SUBJ' => htmlspecialchars($message_row['message_subject']),
-        'TEXT' => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
-
-        'FROM_ID'        => $message_row['message_sender'],
-        'SUBJ_SANITIZED' => htmlspecialchars($message_row['message_subject']),
-        'STYLE'          => $current_class == MSG_TYPE_OUTBOX ? $sn_message_class_list[MSG_TYPE_OUTBOX]['name'] : $sn_message_class_list[$message_row['message_type']]['name'],
-      ));
-    }
+      $template = gettemplate('msg_message_list', true);
+      while($message_row = db_fetch($message_query)) {
+        $template->assign_block_vars('messages', array(
+          'ID'   => $message_row['message_id'],
+          'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
+          'FROM' => htmlspecialchars($message_row['message_from']),
+          'SUBJ' => htmlspecialchars($message_row['message_subject']),
+          'TEXT' => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
+
+          'FROM_ID'        => $message_row['message_sender'],
+          'SUBJ_SANITIZED' => htmlspecialchars($message_row['message_subject']),
+          'STYLE'          => $current_class == MSG_TYPE_OUTBOX ? $sn_message_class_list[MSG_TYPE_OUTBOX]['name'] : $sn_message_class_list[$message_row['message_type']]['name'],
+        ));
+      }
 
-    $current_class_text = $lang['msg_class'][$current_class];
+      $current_class_text = $lang['msg_class'][$current_class];
 
-    $template->assign_vars(array(
-      "MESSAGE_CLASS"      => $current_class,
-      "MESSAGE_CLASS_TEXT" => $current_class_text,
-    ));
-  break;
+      $template->assign_vars(array(
+        "MESSAGE_CLASS"      => $current_class,
+        "MESSAGE_CLASS_TEXT" => $current_class_text,
+      ));
+    break;
 }
 
 if(!$template) {

Spacing +29 added lines, -29 removed lines

@@ -42,59 +42,59 @@ 
 
 $mode = sys_get_param_str('msg_delete') ? 'delete' : sys_get_param_str('mode');
 $current_class = sys_get_param_int('message_class');
-if(!isset($sn_message_class_list[$current_class])) {
+if (!isset($sn_message_class_list[$current_class])) {
   $current_class = 0;
   $mode = '';
 }
 
-switch($mode) {
+switch ($mode) {
   case 'write':
     $error_list = array();
     $template = gettemplate('msg_message_compose', true);
 
     $recipient_name = sys_get_param_str_unsafe('recipient_name');
-    if($recipient_name) {
+    if ($recipient_name) {
       $recipient_row = db_user_by_username($recipient_name);
     }
 
-    if(!$recipient_row) {
+    if (!$recipient_row) {
       $recipient_id = sys_get_param_id('id');
       $recipient_row = db_user_by_id($recipient_id);
-      if(!$recipient_row) {
+      if (!$recipient_row) {
         $recipient_id = 0;
       }
     }
 
-    if($recipient_row) {
+    if ($recipient_row) {
       $recipient_id = $recipient_row['id'];
       $recipient_name = $recipient_row['username'];
     }
 
-    if($recipient_id == $user['id']) {
+    if ($recipient_id == $user['id']) {
       $error_list[] = array('MESSAGE' => $lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
     }
 
     $re = 0;
     $subject = sys_get_param_str('subject');
-    while(strpos($subject, $lang['msg_answer_prefix']) !== false) {
+    while (strpos($subject, $lang['msg_answer_prefix']) !== false) {
       $subject = substr($subject, strlen($lang['msg_answer_prefix']));
       $re++;
     }
     $re ? $subject = $lang['msg_answer_prefix'] . $subject : false;
 
-    if(sys_get_param_str('msg_send')) {
+    if (sys_get_param_str('msg_send')) {
       $subject = $subject ? $subject : $lang['msg_subject_default'];
 
-      if(!$recipient_id) {
+      if (!$recipient_id) {
         $error_list[] = array('MESSAGE' => $lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
       }
 
       $text = sys_get_param_str('text');
-      if(!$text) {
+      if (!$text) {
         $error_list[] = array('MESSAGE' => $lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
       }
 
-      if(empty($error_list)) {
+      if (empty($error_list)) {
         $error_list[] = array('MESSAGE' => $lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
 
         $user_safe_name = db_escape($user['username']);
@@ -123,12 +123,12 @@ 
       'TEXT'           => htmlspecialchars($text),
     ));
 
-    foreach($error_list as $error_message) {
+    foreach ($error_list as $error_message) {
       $template->assign_block_vars('result', $error_message);
     }
 
     $message_query = db_message_list_get_last_20($user, $recipient_id);
-    while($message_row = db_fetch($message_query)) {
+    while ($message_row = db_fetch($message_query)) {
       $template->assign_block_vars('messages', array(
         'ID'   => $message_row['message_id'],
         'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
@@ -147,25 +147,25 @@ 
 
     $message_range = sys_get_param_str('message_range');
 
-    switch($message_range) {
+    switch ($message_range) {
       case 'unchecked':
       case 'checked':
         $marked_message_list = sys_get_param('mark', array());
-        if($message_range == 'checked' && empty($marked_message_list)) {
+        if ($message_range == 'checked' && empty($marked_message_list)) {
           break;
         }
 
         $query_add = implode(',', $marked_message_list);
-        if($query_add) {
+        if ($query_add) {
           $query_add = "IN ({$query_add})";
-          if($message_range == 'unchecked') {
+          if ($message_range == 'unchecked') {
             $query_add = "NOT {$query_add}";
           }
           $query_add = " AND `message_id` {$query_add}";
         }
 
       case 'class':
-        if($current_class != MSG_TYPE_OUTBOX && $current_class != MSG_TYPE_NEW) {
+        if ($current_class != MSG_TYPE_OUTBOX && $current_class != MSG_TYPE_NEW) {
           $query_add .= " AND `message_type` = {$current_class}";
         }
       case 'all':
@@ -173,19 +173,19 @@ 
       break;
     }
 
-    if($query_add) {
+    if ($query_add) {
       $query_add = $query_add === true ? '' : $query_add;
       db_message_list_delete($user, $query_add);
     }
 
   case 'show':
-    if($current_class == MSG_TYPE_OUTBOX) {
+    if ($current_class == MSG_TYPE_OUTBOX) {
       $message_query = db_message_list_outbox_by_user_id($user['id']);
     } else {
-      if($current_class == MSG_TYPE_NEW) {
+      if ($current_class == MSG_TYPE_NEW) {
         $SubUpdateQry = array();
-        foreach($sn_message_class_list as $message_class_id => $message_class) {
-          if($message_class_id != MSG_TYPE_OUTBOX) {
+        foreach ($sn_message_class_list as $message_class_id => $message_class) {
+          if ($message_class_id != MSG_TYPE_OUTBOX) {
             $SubUpdateQry[] = "`{$message_class['name']}` = '0'";
             $user[$message_class['name']] = 0;
           }
@@ -203,13 +203,13 @@ 
       $message_query = db_message_list_by_owner_and_string($user, $SubSelectQry);
     }
 
-    if(sys_get_param_int('return')) {
+    if (sys_get_param_int('return')) {
       header('Location: messages.php');
       die();
     }
 
     $template = gettemplate('msg_message_list', true);
-    while($message_row = db_fetch($message_query)) {
+    while ($message_row = db_fetch($message_query)) {
       $template->assign_block_vars('messages', array(
         'ID'   => $message_row['message_id'],
         'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
@@ -232,18 +232,18 @@ 
   break;
 }
 
-if(!$template) {
+if (!$template) {
   $template = gettemplate('msg_message_class', true);
 
   $query = db_message_count_by_owner_and_type($user);
-  while($message_row = db_fetch($query)) {
+  while ($message_row = db_fetch($query)) {
     $messages_total[$message_row['message_type']] = $message_row['message_count'];
     $messages_total[MSG_TYPE_NEW] += $message_row['message_count'];
   }
 
   $messages_total[MSG_TYPE_OUTBOX] = db_message_count_outbox($user);
 
-  foreach($sn_message_class_list as $message_class_id => $message_class) {
+  foreach ($sn_message_class_list as $message_class_id => $message_class) {
     $template->assign_block_vars('message_class', array(
       'ID'     => $message_class_id,
       'STYLE'  => $message_class['name'],

galaxy.php

Spacing +30 added lines, -30 removed lines

@@ -18,7 +18,7 @@ 
 $uni_system = sys_get_param_int('system', $planetrow['system']);
 $planet = sys_get_param_int('planet', $planetrow['planet']);
 
-if($mode == 'name') {
+if ($mode == 'name') {
   require_once('includes/includes/uni_rename.php');
 }
 
@@ -39,8 +39,8 @@ 
 
 $flying_fleet_count = FleetList::fleet_count_flying($user['id']);
 
-if($mode == 1) {
-} elseif($mode == 2 || $mode == 3) {
+if ($mode == 1) {
+} elseif ($mode == 2 || $mode == 3) {
   $planet = $planetrow['planet'];
 } else {
   $uni_galaxy = $planetrow['galaxy'];
@@ -66,8 +66,8 @@ 
 $PhalanxRange = GetPhalanxRange($HavePhalanx);
 
 $planet_precache_query = db_planet_list_in_system($uni_galaxy, $uni_system);
-if(!empty($planet_precache_query)) {
-  foreach($planet_precache_query as $planet_row) {
+if (!empty($planet_precache_query)) {
+  foreach ($planet_precache_query as $planet_row) {
     $planet_list[$planet_row['planet']][$planet_row['planet_type']] = $planet_row;
   }
 }
@@ -85,8 +85,8 @@ 
  * @var Fleet[][][] $fleet_list
  */
 $fleet_list = array();
-foreach($system_fleet_list->_container as $objFleetSystem) {
-  if($objFleetSystem->is_returning == 0) {
+foreach ($system_fleet_list->_container as $objFleetSystem) {
+  if ($objFleetSystem->is_returning == 0) {
     $fleet_planet = $objFleetSystem->fleet_end_planet;
     $fleet_type = $objFleetSystem->fleet_end_type;
   } else {
@@ -101,7 +101,7 @@ 
 $recycler_info = array();
 $planet_recyclers_orbiting = 0;
 $recyclers_fleet = array();
-foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
   $recycler_info[$recycler_id] = get_ship_data($recycler_id, $user);
   $recyclers_fleet[$recycler_id] = mrc_get_level($user, $planetrow, $recycler_id);
   $planet_recyclers_orbiting += $recyclers_fleet[$recycler_id];
@@ -111,7 +111,7 @@ 
 $fleet_id = 1;
 $fleets = array();
 $config_game_max_planet = $config->game_maxPlanet + 1;
-for($Planet = 1; $Planet < $config_game_max_planet; $Planet++) {
+for ($Planet = 1; $Planet < $config_game_max_planet; $Planet++) {
   unset($uni_galaxyRowPlanet);
   unset($uni_galaxyRowMoon);
   unset($uni_galaxyRowUser);
@@ -121,27 +121,27 @@ 
   $uni_galaxyRowPlanet = $planet_list[$Planet][PT_PLANET];
 
   $planet_fleet_id = 0;
-  if($uni_galaxyRowPlanet['destruyed']) {
+  if ($uni_galaxyRowPlanet['destruyed']) {
     CheckAbandonPlanetState($uni_galaxyRowPlanet);
-  } elseif($uni_galaxyRowPlanet['id']) {
-    if($cached['users'][$uni_galaxyRowPlanet['id_owner']]) {
+  } elseif ($uni_galaxyRowPlanet['id']) {
+    if ($cached['users'][$uni_galaxyRowPlanet['id_owner']]) {
       $uni_galaxyRowUser = $cached['users'][$uni_galaxyRowPlanet['id_owner']];
     } else {
       $uni_galaxyRowUser = db_user_by_id($uni_galaxyRowPlanet['id_owner']);
       $cached['users'][$uni_galaxyRowUser['id']] = $uni_galaxyRowUser;
     }
 
-    if(!$uni_galaxyRowUser['id']) {
+    if (!$uni_galaxyRowUser['id']) {
       $debug->warning("Planet '{$uni_galaxyRowPlanet['name']}' [{$uni_galaxy}:{$uni_system}:{$Planet}] has no owner!", 'Userless planet', 503);
       $uni_galaxyRowPlanet['destruyed'] = SN_TIME_NOW + 60 * 60 * 24;
       $uni_galaxyRowPlanet['id_owner'] = 0;
       db_planet_set_by_id($uni_galaxyRowPlanet['id'], "id_owner = 0, destruyed = {$uni_galaxyRowPlanet['destruyed']}");
     }
 
-    if($uni_galaxyRowUser['id']) {
+    if ($uni_galaxyRowUser['id']) {
       $planetcount++;
-      if($uni_galaxyRowUser['ally_id']) {
-        if($cached['allies'][$uni_galaxyRowUser['ally_id']]) {
+      if ($uni_galaxyRowUser['ally_id']) {
+        if ($cached['allies'][$uni_galaxyRowUser['ally_id']]) {
           $allyquery = $cached['allies'][$uni_galaxyRowUser['ally_id']];
         } else {
           $allyquery = db_ally_get_by_id($uni_galaxyRowUser['ally_id']);
@@ -150,19 +150,19 @@ 
       }
 
       $fleets_to_planet = flt_get_fleets_to_planet_by_array_of_Fleet($fleet_list[$Planet][PT_PLANET]);
-      if(!empty($fleets_to_planet['own']['count'])) {
+      if (!empty($fleets_to_planet['own']['count'])) {
         $planet_fleet_id = $fleet_id;
         $fleets[] = tpl_parse_fleet_sn($fleets_to_planet['own']['total'], $fleet_id);
         $fleet_id++;
       }
 
       $uni_galaxyRowMoon = $planet_list[$Planet][PT_MOON];
-      if($uni_galaxyRowMoon['destruyed']) {
+      if ($uni_galaxyRowMoon['destruyed']) {
         CheckAbandonPlanetState($uni_galaxyRowMoon);
       } else {
         $moon_fleet_id = 0;
         $fleets_to_planet = flt_get_fleets_to_planet_by_array_of_Fleet($fleet_list[$Planet][PT_MOON]);
-        if(!empty($fleets_to_planet['own']['count'])) {
+        if (!empty($fleets_to_planet['own']['count'])) {
           $moon_fleet_id = $fleet_id;
           $fleets[] = tpl_parse_fleet_sn($fleets_to_planet['own']['total'], $fleet_id);
           $fleet_id++;
@@ -173,10 +173,10 @@ 
 
   $recyclers_incoming_capacity = 0;
   $uni_galaxyRowPlanet['debris'] = $uni_galaxyRowPlanet['debris_metal'] + $uni_galaxyRowPlanet['debris_crystal'];
-  if($uni_galaxyRowPlanet['debris']) {
-    if(!empty($fleet_list[$Planet][PT_DEBRIS])) {
-      foreach($fleet_list[$Planet][PT_DEBRIS] as $objFleetToDebris) {
-        if($objFleetToDebris->playerOwnerId == $user['id']) {
+  if ($uni_galaxyRowPlanet['debris']) {
+    if (!empty($fleet_list[$Planet][PT_DEBRIS])) {
+      foreach ($fleet_list[$Planet][PT_DEBRIS] as $objFleetToDebris) {
+        if ($objFleetToDebris->playerOwnerId == $user['id']) {
           $recyclers_incoming_capacity += $objFleetToDebris->fleet_recyclers_capacity($recycler_info);
         }
       }
@@ -253,21 +253,21 @@ 
 
 tpl_assign_fleet($template, $fleets);
 
-foreach(sn_get_groups('defense_active') as $unit_id) {
+foreach (sn_get_groups('defense_active') as $unit_id) {
   $template->assign_block_vars('defense_active', array(
     'ID'   => $unit_id,
     'NAME' => $lang['tech'][$unit_id],
   ));
 }
 
-foreach($cached['users'] as $PlanetUser) {
-  if(!$PlanetUser) {
+foreach ($cached['users'] as $PlanetUser) {
+  if (!$PlanetUser) {
     continue;
   }
 
   $user_ally = $cached['allies'][$PlanetUser['ally_id']];
-  if(isset($user_ally)) {
-    if($PlanetUser['id'] == $user_ally['ally_owner']) {
+  if (isset($user_ally)) {
+    if ($PlanetUser['id'] == $user_ally['ally_owner']) {
       $user_rank_title = $user_ally['ally_owner_range'];
     } else {
       $ally_ranks = explode(';', $user_ally['ranklist']);
@@ -290,8 +290,8 @@ 
   ));
 }
 
-foreach($cached['allies'] as $PlanetAlly) {
-  if($PlanetAlly) {
+foreach ($cached['allies'] as $PlanetAlly) {
+  if ($PlanetAlly) {
     $template->assign_block_vars('alliances', array(
       'ID'      => $PlanetAlly['id'],
       'NAME_JS' => js_safe_string($PlanetAlly['ally_name']),