supernova-ws / SuperNova

includes/vars_menu.php

Spacing +12 added lines, -12 removed lines

@@ -104,21 +104,21 @@ 
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'tech[UNIT_STRUCTURES]',
-    'LINK'  => 'buildings.php?mode=' . QUE_STRUCTURES,
+    'LINK'  => 'buildings.php?mode='.QUE_STRUCTURES,
     'ICON'  => true,
   ),
   'menu_planet_shipyard'   => array(
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'Shipyard',
-    'LINK'  => 'buildings.php?mode=' . SUBQUE_FLEET,
+    'LINK'  => 'buildings.php?mode='.SUBQUE_FLEET,
     'ICON'  => true,
   ),
   'menu_planet_defense'    => array(
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'Defense',
-    'LINK'  => 'buildings.php?mode=' . SUBQUE_DEFENSE,
+    'LINK'  => 'buildings.php?mode='.SUBQUE_DEFENSE,
     'ICON'  => true,
   ),
   'menu_planet_resources'  => array(
@@ -147,7 +147,7 @@ 
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'Research',
-    'LINK'  => 'buildings.php?mode=' . QUE_RESEARCH,
+    'LINK'  => 'buildings.php?mode='.QUE_RESEARCH,
     'ICON'  => true,
   ),
   'menu_empire_techtree' => array(
@@ -233,14 +233,14 @@ 
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'tech[UNIT_MERCENARIES]',
-    'LINK'  => 'officer.php?mode=' . UNIT_MERCENARIES,
+    'LINK'  => 'officer.php?mode='.UNIT_MERCENARIES,
     'ICON'  => true,
   ),
   'menu_empire_schematics'  => array(
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'tech[UNIT_PLANS]',
-    'LINK'  => 'officer.php?mode=' . UNIT_PLANS,
+    'LINK'  => 'officer.php?mode='.UNIT_PLANS,
     'ICON'  => true,
   ),
   'menu_empire_artifacts'   => array(
@@ -270,14 +270,14 @@ 
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'Chat',
-    'LINK'  => 'index.php?page=chat&mode=' . CHAT_MODE_COMMON,
+    'LINK'  => 'index.php?page=chat&mode='.CHAT_MODE_COMMON,
     'ICON'  => true,
   ),
   'menu_ally_chat'     => array(
     'LEVEL'    => 'submenu',
     'TYPE'     => 'lang',
     'ITEM'     => 'AllyChat',
-    'LINK'     => 'index.php?page=chat&mode=' . CHAT_MODE_ALLY,
+    'LINK'     => 'index.php?page=chat&mode='.CHAT_MODE_ALLY,
     'ICON'     => true,
     'DISABLED' => classSupernova::$config->game_mode == GAME_BLITZ,
   ),
@@ -458,8 +458,8 @@ 
   ),
   'menu_admin_version_info'  => array(
     'TYPE' => 'text',
-    'ITEM' => (classSupernova::$config->server_updater_check_last ? date(FMT_DATE, classSupernova::$config->server_updater_check_last) : '') . '<div class="' .
-      $sn_version_check_class[classSupernova::$config->server_updater_check_result] . '">' . classLocale::$lang['adm_opt_ver_response_short'][classSupernova::$config->server_updater_check_result] . '</div>',
+    'ITEM' => (classSupernova::$config->server_updater_check_last ? date(FMT_DATE, classSupernova::$config->server_updater_check_last) : '').'<div class="'.
+      $sn_version_check_class[classSupernova::$config->server_updater_check_result].'">'.classLocale::$lang['adm_opt_ver_response_short'][classSupernova::$config->server_updater_check_result].'</div>',
   ),
 
   'USER_AUTHLEVEL_NAME'      => array(
@@ -547,13 +547,13 @@ 
   'menu_admin_planet_list_planets' => array(
     'TYPE'       => 'lang',
     'ITEM'       => 'adm_pltlst',
-    'LINK'       => 'admin/adm_planet_list.php?planet_type=' . PT_PLANET,
+    'LINK'       => 'admin/adm_planet_list.php?planet_type='.PT_PLANET,
     'AUTH_LEVEL' => 3,
   ),
   'menu_admin_planet_list_moons'   => array(
     'TYPE'       => 'lang',
     'ITEM'       => 'adm_moonlst',
-    'LINK'       => 'admin/adm_planet_list.php?planet_type=' . PT_MOON,
+    'LINK'       => 'admin/adm_planet_list.php?planet_type='.PT_MOON,
     'AUTH_LEVEL' => 3,
   ),
   'menu_admin_planet_moon_add'     => array(

includes/init.php

Spacing +56 added lines, -56 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Защита от двойного инита
-if(defined('INIT')) {
+if (defined('INIT')) {
   return;
 }
 
@@ -20,22 +20,22 @@ 
 version_compare(PHP_VERSION, '5.3.2') < 0 ? die('FATAL ERROR: SuperNova REQUIRE PHP version > 5.3.2') : false;
 
 // Бенчмарк
-register_shutdown_function(function () {
-  if(defined('IN_AJAX')) {
+register_shutdown_function(function() {
+  if (defined('IN_AJAX')) {
     return;
   }
 
   global $user, $locale_cache_statistic;
 
-  print('<hr><div class="benchmark">Benchmark ' . (microtime(true) - SN_TIME_MICRO) . 's, memory: ' . number_format(memory_get_usage() - SN_MEM_START) .
-    (!empty($locale_cache_statistic['misses']) ? ', LOCALE MISSED' : '') .
-    (class_exists('classSupernova') && is_object(classSupernova::$db) ? ', DB time: ' . classSupernova::$db->time_mysql_total . 'ms' : '') .
+  print('<hr><div class="benchmark">Benchmark '.(microtime(true) - SN_TIME_MICRO).'s, memory: '.number_format(memory_get_usage() - SN_MEM_START).
+    (!empty($locale_cache_statistic['misses']) ? ', LOCALE MISSED' : '').
+    (class_exists('classSupernova') && is_object(classSupernova::$db) ? ', DB time: '.classSupernova::$db->time_mysql_total.'ms' : '').
     '</div>');
-  if($user['authlevel'] >= 2 && file_exists(SN_ROOT_PHYSICAL . 'badqrys.txt') && @filesize(SN_ROOT_PHYSICAL . 'badqrys.txt') > 0) {
+  if ($user['authlevel'] >= 2 && file_exists(SN_ROOT_PHYSICAL.'badqrys.txt') && @filesize(SN_ROOT_PHYSICAL.'badqrys.txt') > 0) {
     echo '<a href="badqrys.txt" target="_blank" style="color:red">', 'HACK ALERT!', '</a>';
   }
 
-  if(!empty($locale_cache_statistic['misses'])) {
+  if (!empty($locale_cache_statistic['misses'])) {
     print('<!--');
     pdump($locale_cache_statistic);
     print('-->');
@@ -55,7 +55,7 @@ 
 
 define('SN_TIME_NOW_GMT_STRING', gmdate(DATE_ATOM, SN_TIME_NOW));
 
-if(strpos(strtolower($_SERVER['SERVER_NAME']), 'google.') !== false) {
+if (strpos(strtolower($_SERVER['SERVER_NAME']), 'google.') !== false) {
   define('SN_GOOGLE', true);
 }
 
@@ -74,12 +74,12 @@ 
 $sn_root_relative = str_replace($sn_root_relative, '', $_SERVER['SCRIPT_NAME']);
 define('SN_ROOT_RELATIVE', $sn_root_relative);
 
-define('SN_ROOT_VIRTUAL', 'http' . (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . SN_ROOT_RELATIVE);
+define('SN_ROOT_VIRTUAL', 'http'.(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 's' : '').'://'.$_SERVER['HTTP_HOST'].SN_ROOT_RELATIVE);
 define('SN_ROOT_VIRTUAL_PARENT', str_replace('//google.', '//', SN_ROOT_VIRTUAL));
 
 $phpEx = strpos($phpEx = substr(strrchr(__FILE__, '.'), 1), '/') === false ? $phpEx : '';
 define('PHP_EX', $phpEx); // PHP extension on this server
-define('DOT_PHP_EX', '.' . PHP_EX); // PHP extension on this server
+define('DOT_PHP_EX', '.'.PHP_EX); // PHP extension on this server
 
 
 require_once('constants.php');
@@ -100,22 +100,22 @@ 
 
 // required for db.php
 // Initializing global 'debug' object
-require_once(SN_ROOT_PHYSICAL . "includes/debug.class" . DOT_PHP_EX);
+require_once(SN_ROOT_PHYSICAL."includes/debug.class".DOT_PHP_EX);
 classSupernova::$debug = new debug();
 
-spl_autoload_register(function ($class) {
-  if(file_exists(SN_ROOT_PHYSICAL . 'includes/classes/' . $class . '.php')) {
-    require_once SN_ROOT_PHYSICAL . 'includes/classes/' . $class . '.php';
+spl_autoload_register(function($class) {
+  if (file_exists(SN_ROOT_PHYSICAL.'includes/classes/'.$class.'.php')) {
+    require_once SN_ROOT_PHYSICAL.'includes/classes/'.$class.'.php';
   }
 });
 
-spl_autoload_register(function ($class) {
-  if(file_exists(SN_ROOT_PHYSICAL . 'includes/classes/UBE/' . $class . '.php')) {
-    require_once SN_ROOT_PHYSICAL . 'includes/classes/UBE/' . $class . '.php';
+spl_autoload_register(function($class) {
+  if (file_exists(SN_ROOT_PHYSICAL.'includes/classes/UBE/'.$class.'.php')) {
+    require_once SN_ROOT_PHYSICAL.'includes/classes/UBE/'.$class.'.php';
   }
 });
 
-require_once(SN_ROOT_PHYSICAL . "includes/db" . DOT_PHP_EX);
+require_once(SN_ROOT_PHYSICAL."includes/db".DOT_PHP_EX);
 require_once('classes/db_mysql_v4.php');
 require_once('classes/db_mysql_v5.php');
 require_once('classes/db_mysql.php');
@@ -128,7 +128,7 @@ 
 require_once('classes/module.php');
 
 require_once('classes/user_options.php');
-require_once(SN_ROOT_PHYSICAL . "includes/init/init_functions" . DOT_PHP_EX);
+require_once(SN_ROOT_PHYSICAL."includes/init/init_functions".DOT_PHP_EX);
 
 /**
  * @var classConfig    $config
@@ -142,8 +142,8 @@ 
 // define('BE_DEBUG', true); // Отладка боевого движка
 classSupernova::init_debug_state();
 
-require_once(SN_ROOT_PHYSICAL . "includes/vars" . DOT_PHP_EX);
-require_once(SN_ROOT_PHYSICAL . "includes/general" . DOT_PHP_EX);
+require_once(SN_ROOT_PHYSICAL."includes/vars".DOT_PHP_EX);
+require_once(SN_ROOT_PHYSICAL."includes/general".DOT_PHP_EX);
 
 init_update();
 
@@ -152,34 +152,34 @@ 
   ? trim(strip_tags($_GET['page']))
   : str_replace(DOT_PHP_EX, '', str_replace(SN_ROOT_RELATIVE, '', str_replace('\\', '/', $_SERVER['SCRIPT_NAME'])));
 define('INITIAL_PAGE', $sn_page_name_original);
-define('SN_COOKIE', (classSupernova::$config->COOKIE_NAME ? classSupernova::$config->COOKIE_NAME : 'SuperNova') . (defined('SN_GOOGLE') ? '_G' : ''));
-define('SN_COOKIE_I', SN_COOKIE . AUTH_COOKIE_IMPERSONATE_SUFFIX);
-define('SN_COOKIE_D', SN_COOKIE . '_D');
-define('SN_COOKIE_T', SN_COOKIE . '_T'); // Time measure cookie
-define('SN_COOKIE_F', SN_COOKIE . '_F'); // Font size cookie
-define('SN_COOKIE_U', SN_COOKIE . '_U'); // Current user cookie aka user ID
-define('SN_COOKIE_U_I', SN_COOKIE_U . AUTH_COOKIE_IMPERSONATE_SUFFIX); // Current impersonator user cookie aka impersonator user ID
+define('SN_COOKIE', (classSupernova::$config->COOKIE_NAME ? classSupernova::$config->COOKIE_NAME : 'SuperNova').(defined('SN_GOOGLE') ? '_G' : ''));
+define('SN_COOKIE_I', SN_COOKIE.AUTH_COOKIE_IMPERSONATE_SUFFIX);
+define('SN_COOKIE_D', SN_COOKIE.'_D');
+define('SN_COOKIE_T', SN_COOKIE.'_T'); // Time measure cookie
+define('SN_COOKIE_F', SN_COOKIE.'_F'); // Font size cookie
+define('SN_COOKIE_U', SN_COOKIE.'_U'); // Current user cookie aka user ID
+define('SN_COOKIE_U_I', SN_COOKIE_U.AUTH_COOKIE_IMPERSONATE_SUFFIX); // Current impersonator user cookie aka impersonator user ID
 define('TEMPLATE_NAME', classSupernova::$config->game_default_template ? classSupernova::$config->game_default_template : 'OpenGame');
-define('TEMPLATE_PATH', 'design/templates/' . TEMPLATE_NAME);
-define('TEMPLATE_DIR', SN_ROOT_PHYSICAL . TEMPLATE_PATH);
+define('TEMPLATE_PATH', 'design/templates/'.TEMPLATE_NAME);
+define('TEMPLATE_DIR', SN_ROOT_PHYSICAL.TEMPLATE_PATH);
 define('DEFAULT_SKINPATH', classSupernova::$config->game_default_skin ? classSupernova::$config->game_default_skin : 'skins/EpicBlue/');
 define('DEFAULT_LANG', classSupernova::$config->game_default_language ? classSupernova::$config->game_default_language : 'ru');
 define('FMT_DATE', classSupernova::$config->int_format_date ? classSupernova::$config->int_format_date : 'd.m.Y');
 define('FMT_TIME', classSupernova::$config->int_format_time ? classSupernova::$config->int_format_time : 'H:i:s');
-define('FMT_DATE_TIME', FMT_DATE . ' ' . FMT_TIME);
+define('FMT_DATE_TIME', FMT_DATE.' '.FMT_TIME);
 
 $HTTP_ACCEPT_LANGUAGE = DEFAULT_LANG;
 
-require_once(SN_ROOT_PHYSICAL . "includes/template" . DOT_PHP_EX);
+require_once(SN_ROOT_PHYSICAL."includes/template".DOT_PHP_EX);
 $template_result = array('.' => array('result' => array()));
 
-sn_sys_load_php_files(SN_ROOT_PHYSICAL . "includes/functions/", PHP_EX);
+sn_sys_load_php_files(SN_ROOT_PHYSICAL."includes/functions/", PHP_EX);
 
-spl_autoload_register(function ($class) {
-  if(file_exists('includes/classes/' . $class . '.php')) {
-    require_once 'includes/classes/' . $class . '.php';
-  } elseif(file_exists('includes/classes/UBE/' . $class . '.php')) {
-    require_once 'includes/classes/UBE/' . $class . '.php';
+spl_autoload_register(function($class) {
+  if (file_exists('includes/classes/'.$class.'.php')) {
+    require_once 'includes/classes/'.$class.'.php';
+  } elseif (file_exists('includes/classes/UBE/'.$class.'.php')) {
+    require_once 'includes/classes/UBE/'.$class.'.php';
   } else {
 //    die("Can't find {$class} class");
   }
@@ -193,7 +193,7 @@ 
 // Конфиг - часть манифеста?
 classSupernova::$auth = new core_auth();
 
-sn_sys_load_php_files(SN_ROOT_PHYSICAL . "modules/", PHP_EX, true);
+sn_sys_load_php_files(SN_ROOT_PHYSICAL."modules/", PHP_EX, true);
 // Здесь - потому что core_auth модуль лежит в другом каталоге и его нужно инициализировать отдельно
 
 // Подключаем дефолтную страницу
@@ -201,10 +201,10 @@ 
 // Сейчас мы делаем это здесь только для того, что бы содержание дефолтной страницы оказалось вверху. Что не факт, что нужно всегда
 // Но нужно, пока у нас есть не MVC-страницы
 $sn_page_data = $sn_data['pages'][$sn_page_name];
-$sn_page_name_file = 'includes/pages/' . $sn_page_data['filename'] . DOT_PHP_EX;
-if($sn_page_name && isset($sn_page_data) && file_exists($sn_page_name_file)) {
+$sn_page_name_file = 'includes/pages/'.$sn_page_data['filename'].DOT_PHP_EX;
+if ($sn_page_name && isset($sn_page_data) && file_exists($sn_page_name_file)) {
   require_once($sn_page_name_file);
-  if(is_array($sn_page_data['options'])) {
+  if (is_array($sn_page_data['options'])) {
     $supernova->options = array_merge($supernova->options, $sn_page_data['options']);
   }
 }
@@ -219,10 +219,10 @@ 
 $load_order = array();
 $sn_req = array();
 
-foreach(sn_module::$sn_module as $loaded_module_name => $module_data) {
+foreach (sn_module::$sn_module as $loaded_module_name => $module_data) {
   $load_order[$loaded_module_name] = isset($module_data->manifest['load_order']) && !empty($module_data->manifest['load_order']) ? $module_data->manifest['load_order'] : 100000;
-  if(isset($module_data->manifest['require']) && !empty($module_data->manifest['require'])) {
-    foreach($module_data->manifest['require'] as $require_name) {
+  if (isset($module_data->manifest['require']) && !empty($module_data->manifest['require'])) {
+    foreach ($module_data->manifest['require'] as $require_name) {
       $sn_req[$loaded_module_name][$require_name] = 0;
     }
   }
@@ -235,10 +235,10 @@ 
 do {
   $prev_order = $load_order;
 
-  foreach($sn_req as $loaded_module_name => &$req_data) {
+  foreach ($sn_req as $loaded_module_name => &$req_data) {
     $level = 1;
-    foreach($req_data as $req_name => &$req_level) {
-      if($load_order[$req_name] == -1 || !isset($load_order[$req_name])) {
+    foreach ($req_data as $req_name => &$req_level) {
+      if ($load_order[$req_name] == -1 || !isset($load_order[$req_name])) {
         $level = $req_level = -1;
         break;
       } else {
@@ -246,20 +246,20 @@ 
       }
       $req_level = $load_order[$req_name];
     }
-    if($level > $load_order[$loaded_module_name] || $level == -1) {
+    if ($level > $load_order[$loaded_module_name] || $level == -1) {
       $load_order[$loaded_module_name] = $level;
     }
   }
-} while($prev_order != $load_order);
+} while ($prev_order != $load_order);
 
 asort($load_order);
 
 // Инициализируем модули
 // По нормальным делам это должна быть загрузка модулей и лишь затем инициализация - что бы минимизировать размер процесса в памяти
-foreach($load_order as $loaded_module_name => $load_order_order) {
-  if($load_order_order >= 0) {
+foreach ($load_order as $loaded_module_name => $load_order_order) {
+  if ($load_order_order >= 0) {
     sn_module::$sn_module[$loaded_module_name]->check_status();
-    if(!sn_module::$sn_module[$loaded_module_name]->manifest['active']) {
+    if (!sn_module::$sn_module[$loaded_module_name]->manifest['active']) {
       unset(sn_module::$sn_module[$loaded_module_name]);
       continue;
     }
@@ -276,7 +276,7 @@ 
 unset($sn_req);
 
 // А теперь проверяем - поддерживают ли у нас загруженный код такую страницу
-if(!isset($sn_data['pages'][$sn_page_name])) {
+if (!isset($sn_data['pages'][$sn_page_name])) {
   $sn_page_name = '';
 }
 
@@ -284,6 +284,6 @@ 
 classLocale::$lang = $lang = new classLocale(classSupernova::$config->server_locale_log_usage);
 classLocale::$lang->lng_switch(sys_get_param_str('lang'));
 
-if(!defined('DEBUG_INIT_SKIP_SECONDARY') || DEBUG_INIT_SKIP_SECONDARY !== true) {
+if (!defined('DEBUG_INIT_SKIP_SECONDARY') || DEBUG_INIT_SKIP_SECONDARY !== true) {
   require_once "init_secondary.php";
 }

includes/general_pname.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 function pname_factory_production_field_name($factory_unit_id)
 {
-  return get_unit_param($factory_unit_id, P_NAME) . '_porcent';
+  return get_unit_param($factory_unit_id, P_NAME).'_porcent';
 }
 
 /**

includes/includes/ube_zi_helpers.php

Spacing +4 added lines, -4 removed lines

@@ -27,9 +27,9 @@ 
   print($round);
   print('<table border=1>');
   print('<tr align="left">');
-  foreach($header as $key => $value)
+  foreach ($header as $key => $value)
   {
-    if(is_array($value))
+    if (is_array($value))
     {
       continue;
     }
@@ -61,9 +61,9 @@ 
   );
 
   print('<tr align="right">');
-  foreach($unit_crossfire_result as $key => $value)
+  foreach ($unit_crossfire_result as $key => $value)
   {
-    if(is_array($value))
+    if (is_array($value))
     {
       continue;
     }

includes/includes/flt_mission_colonize.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@ 
   $TargetAddress = sprintf(classLocale::$lang['sys_adress_planet'], $fleet_end_coordinates['galaxy'], $fleet_end_coordinates['system'], $fleet_end_coordinates['planet']);
 
   $TheMessage = classLocale::$lang['sys_colo_no_colonizer'];
-  if($objFleet->shipsGetTotalById(SHIP_COLONIZER) >= 1) {
+  if ($objFleet->shipsGetTotalById(SHIP_COLONIZER) >= 1) {
     $TheMessage = classLocale::$lang['sys_colo_notfree'];
-    if(empty($mission_data->dst_planet)) {
+    if (empty($mission_data->dst_planet)) {
       $iPlanetCount = get_player_current_colonies($src_user_row);
 
       // Can we colonize more planets?
       $TheMessage = classLocale::$lang['sys_colo_maxcolo'];
-      if($iPlanetCount < get_player_max_colonies($src_user_row)) {
+      if ($iPlanetCount < get_player_max_colonies($src_user_row)) {
         // Yes, we can colonize
         $TheMessage = classLocale::$lang['sys_colo_badpos'];
 
@@ -35,8 +35,8 @@ 
           $fleet_end_coordinates['galaxy'], $fleet_end_coordinates['system'], $fleet_end_coordinates['planet'],
           $objFleet->playerOwnerId, "{$classLocale['sys_colo_defaultname']} {$iPlanetCount}", false,
           array('user_row' => $src_user_row));
-        if($NewOwnerPlanet) {
-          $TheMessage = classLocale::$lang['sys_colo_arrival'] . $TargetAddress . classLocale::$lang['sys_colo_allisok'];
+        if ($NewOwnerPlanet) {
+          $TheMessage = classLocale::$lang['sys_colo_arrival'].$TargetAddress.classLocale::$lang['sys_colo_allisok'];
           msg_send_simple_message($objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_SPY, classLocale::$lang['sys_colo_mess_from'], classLocale::$lang['sys_colo_mess_report'], $TheMessage);
 
           $objFleet->shipAdjustCount(SHIP_COLONIZER, -1);

includes/includes/flt_page4.inc

Spacing +18 added lines, -18 removed lines

@@ -2,28 +2,28 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   classSupernova::$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)) {
   header("Location: fleet.php");
   exit();
 }
 
 $objFleet = new Fleet();
 $objFleet->dbLoad($fleetid);
-if(!$objFleet->dbId) {
+if (!$objFleet->dbId) {
   message(classLocale::$lang['fl_fleet_not_exists'], classLocale::$lang['fl_error']);
 }
 
-if($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
+if ($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
   message(classLocale::$lang['fl_isback'], classLocale::$lang['fl_error']);
 }
 
-if($objFleet->playerOwnerId != $user['id']) {
+if ($objFleet->playerOwnerId != $user['id']) {
   classSupernova::$debug->warning(classLocale::$lang['fl_aks_hack_wrong_fleet'], 'Wrong Fleet Owner', 301);
   message(classLocale::$lang['fl_aks_hack_wrong_fleet'], classLocale::$lang['fl_error']);
 }
@@ -34,19 +34,19 @@ 
 
 !$aks && !$userToAdd_unsafe ? $userToAdd_unsafe = $user['username'] : false;
 
-if($userToAdd_unsafe) {
+if ($userToAdd_unsafe) {
   $userToAdd = db_escape($userToAdd_unsafe);
   $userToAddID = db_user_by_username($userToAdd_unsafe, false, 'id', true, true);
   $userToAddID = $userToAddID['id'];
 
-  if($objFleet->target_owner_id == $userToAddID) {
+  if ($objFleet->target_owner_id == $userToAddID) {
     message(classLocale::$lang['flt_aks_player_same'], classLocale::$lang['fl_error']);
   }
 
-  if($userToAddID) {
-    if(!$aks) {
+  if ($userToAddID) {
+    if (!$aks) {
       // No AСS exists - making one
-      if(!$objFleet->group_id) {
+      if (!$objFleet->group_id) {
         db_acs_insert($fleetid, $user, $objFleet);
 
         $aks = db_acs_get_by_fleet($fleetid);
@@ -61,22 +61,22 @@ 
 
     $isUserExists = false;
     $invited_ar = explode(",", $aks['eingeladen']);
-    foreach($invited_ar as $inv) {
-      if($userToAddID == $inv) {
+    foreach ($invited_ar as $inv) {
+      if ($userToAddID == $inv) {
         $isUserExists = true;
       }
     }
 
-    if(count($invited_ar) >= 5) {
+    if (count($invited_ar) >= 5) {
       message(classLocale::$lang['flt_aks_error_too_much_players'], classLocale::$lang['fl_error']);
     }
 
-    if($isUserExists) {
+    if ($isUserExists) {
       $userToAdd_unsafe != $user['username'] ? $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited_already'], $userToAdd) : false;
     } else {
       $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited'], $userToAdd);
       !(db_acs_update($userToAddID, $fleetid)) ? die(sprintf(classLocale::$lang['fl_aks_adding_error'], db_error())) : false;
-      $aks['eingeladen'] .= ',' . $userToAddID;
+      $aks['eingeladen'] .= ','.$userToAddID;
     }
     msg_send_simple_message($userToAddID, $user['id'], SN_TIME_NOW, MSG_TYPE_COMBAT, $user['username'],
       classLocale::$lang['fl_aks_invite_message_header'], sprintf(classLocale::$lang['fl_aks_invite_message'], $user['username']));
@@ -93,8 +93,8 @@ 
   'MISSION_NAME' => classLocale::$lang['type_mission'][MT_ACS],
 ));
 
-if($aks['eingeladen'] && is_array($members = classSupernova::db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
-  foreach($members as $row) {
+if ($aks['eingeladen'] && is_array($members = classSupernova::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'],
     ));
@@ -119,7 +119,7 @@ 
 $fleet_data = tplParseFleetObject($objFleet, $i, $user);
 
 $template->assign_block_vars('fleets', $fleet_data['fleet']);
-foreach($fleet_data['ships'] as $ship_data) {
+foreach ($fleet_data['ships'] as $ship_data) {
   $template->assign_block_vars('fleets.ships', $ship_data);
 }
 

includes/includes/sys_stat.php

Spacing +30 added lines, -30 removed lines

@@ -39,23 +39,23 @@ 
 
   $sta_update_msg = db_escape($sta_update_msg);
 
-  if($next_step) {
+  if ($next_step) {
     $sta_update_step++;
   }
   $sta_update_msg = "Update in progress. Step {$sta_update_step}/14: {$sta_update_msg}.";
 
   classSupernova::$config->db_saveItem('var_stat_update_msg', $sta_update_msg);
-  if($next_step) {
+  if ($next_step) {
     classSupernova::$debug->warning($sta_update_msg, 'Stat update', LOG_INFO_STAT_PROCESS);
   }
 }
 
 function sys_stat_calculate_flush(&$data, $force = false) {
-  if(count($data) < 25 && !$force) {
+  if (count($data) < 25 && !$force) {
     return;
   }
 
-  if(!empty($data)) {
+  if (!empty($data)) {
     doquery('REPLACE INTO {{statpoints}}
       (`id_owner`, `id_ally`, `stat_type`, `stat_code`, `tech_points`, `tech_count`, `build_points`, `build_count`,
        `defs_points`, `defs_count`, `fleet_points`, `fleet_count`, `res_points`, `res_count`, `total_points`,
@@ -95,11 +95,11 @@ 
   $user_list = db_user_list('', true, 'id, dark_matter, metal, crystal, deuterium, user_as_ally, ally_id');
   $row_num = count($user_list);
   // while($player = db_fetch($query))
-  foreach($user_list as $player) {
-    if($i++ % 100 == 0) {
+  foreach ($user_list as $player) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating players stats (player {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $player['id'], $user_skip_list)) {
+    if (array_key_exists($user_id = $player['id'], $user_skip_list)) {
       continue;
     }
 
@@ -109,7 +109,7 @@ 
     // $points[$user_id][UNIT_RESOURCES] += $resources;
 
     // А здесь мы фильтруем пользователей по $user_skip_list - далее не нужно этого делать, потому что
-    if(!isset($user_skip_list[$user_id])) {
+    if (!isset($user_skip_list[$user_id])) {
       $user_allies[$user_id] = $player['ally_id'];
     }
   }
@@ -123,11 +123,11 @@ 
   $i = 0;
   $query = db_planet_list_resources_by_owner();
   $row_num = db_num_rows($query);
-  while($planet = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($planet = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating planets stats (planet {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $planet['id_owner'], $user_skip_list)) {
+    if (array_key_exists($user_id = $planet['id_owner'], $user_skip_list)) {
       continue;
     }
 
@@ -142,8 +142,8 @@ 
   $i = 0;
   $query = FleetList::dbQueryAllId();
   $row_num = db_num_rows($query);
-  while($fleet_row = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($fleet_row = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating flying fleets stats (fleet {$i}/{$row_num})", false);
     }
     $objFleet = new Fleet();
@@ -151,15 +151,15 @@ 
     // К тому же при включённом кэшировании это быстро забъёт кэш холодными данными
     // $objFleet->_reset();
     $objFleet->dbRowParse($fleet_row);
-    if(array_key_exists($user_id = $objFleet->playerOwnerId, $user_skip_list)) {
+    if (array_key_exists($user_id = $objFleet->playerOwnerId, $user_skip_list)) {
       continue;
     }
 
     $fleet = $objFleet->shipsGetArray();
-    foreach($fleet as $unit_id => $unit_amount) {
+    foreach ($fleet as $unit_id => $unit_amount) {
       $counts[$user_id][UNIT_SHIPS] += $unit_amount;
 
-      if(!isset($unit_cost_cache[$unit_id][0])) {
+      if (!isset($unit_cost_cache[$unit_id][0])) {
         $unit_cost_cache[$unit_id][0] = get_unit_param($unit_id, P_COST);
       }
       $unit_cost_data = &$unit_cost_cache[$unit_id][0];
@@ -179,11 +179,11 @@ 
   $i = 0;
   $query = db_unit_list_stat_calculate();
   $row_num = db_num_rows($query);
-  while($unit = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($unit = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating unit stats (unit {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $unit['unit_player_id'], $user_skip_list)) {
+    if (array_key_exists($user_id = $unit['unit_player_id'], $user_skip_list)) {
       continue;
     }
 
@@ -197,11 +197,11 @@ 
   $i = 0;
   $query = db_que_list_stat();
   $row_num = db_num_rows($query);
-  while($que_item = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($que_item = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating ques stats (que item {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $que_item['que_player_id'], $user_skip_list)) {
+    if (array_key_exists($user_id = $que_item['que_player_id'], $user_skip_list)) {
       continue;
     }
     $que_unit_amount = $que_item['que_unit_amount'];
@@ -220,7 +220,7 @@ 
 
   sta_set_time_limit('posting new user stats to DB');
   $data = array();
-  foreach($user_allies as $user_id => $ally_id) {
+  foreach ($user_allies as $user_id => $ally_id) {
     // $counts[UNIT_RESOURCES] дублирует $points[UNIT_RESOURCES], поэтому $points не заполняем, а берем $counts и делим на 1000
     $points[$user_id][UNIT_RESOURCES] = $counts[$user_id][UNIT_RESOURCES] / 1000;
     $points[$user_id] = array_map('floor', $points[$user_id]);
@@ -232,10 +232,10 @@ 
     $user_points = array_sum($points[$user_id]);
     $user_counts = array_sum($counts[$user_id]);
 
-    $data[] = $q = "({$user_id},{$ally_id},1,1,'{$points[$user_id][UNIT_TECHNOLOGIES]}','{$counts[$user_id][UNIT_TECHNOLOGIES]}'," .
-      "'{$points[$user_id][UNIT_STRUCTURES]}','{$counts[$user_id][UNIT_STRUCTURES]}','{$user_defence_points}','{$user_defence_counts}'," .
-      "'{$points[$user_id][UNIT_SHIPS]}','{$counts[$user_id][UNIT_SHIPS]}','{$points[$user_id][UNIT_RESOURCES]}','{$counts[$user_id][UNIT_RESOURCES]}'," .
-      "{$user_points},{$user_counts}," . SN_TIME_NOW . ")";
+    $data[] = $q = "({$user_id},{$ally_id},1,1,'{$points[$user_id][UNIT_TECHNOLOGIES]}','{$counts[$user_id][UNIT_TECHNOLOGIES]}',".
+      "'{$points[$user_id][UNIT_STRUCTURES]}','{$counts[$user_id][UNIT_STRUCTURES]}','{$user_defence_points}','{$user_defence_counts}',".
+      "'{$points[$user_id][UNIT_SHIPS]}','{$counts[$user_id][UNIT_SHIPS]}','{$points[$user_id][UNIT_RESOURCES]}','{$counts[$user_id][UNIT_RESOURCES]}',".
+      "{$user_points},{$user_counts},".SN_TIME_NOW.")";
 
     sys_stat_calculate_flush($data);
   }
@@ -255,7 +255,7 @@ 
         SUM(u.`tech_points`)+aus.`tech_points`, SUM(u.`tech_count`)+aus.`tech_count`, SUM(u.`build_points`)+aus.`build_points`, SUM(u.`build_count`)+aus.`build_count`,
         SUM(u.`defs_points`)+aus.`defs_points`, SUM(u.`defs_count`)+aus.`defs_count`, SUM(u.`fleet_points`)+aus.`fleet_points`, SUM(u.`fleet_count`)+aus.`fleet_count`,
         SUM(u.`res_points`)+aus.`res_points`, SUM(u.`res_count`)+aus.`res_count`, SUM(u.`total_points`)+aus.`total_points`, SUM(u.`total_count`)+aus.`total_count`,
-        " . SN_TIME_NOW . ", NULL, u.`id_ally`, 2, 1,
+        " . SN_TIME_NOW.", NULL, u.`id_ally`, 2, 1,
         a.tech_rank, a.build_rank, a.defs_rank, a.fleet_rank, a.res_rank, a.total_rank
       FROM {{statpoints}} AS u
         JOIN {{alliance}} AS al ON al.id = u.id_ally
@@ -276,7 +276,7 @@ 
 
   // Updating player's ranks
   sta_set_time_limit("updating ranks for players");
-  foreach($rankNames as $rankName) {
+  foreach ($rankNames as $rankName) {
     sta_set_time_limit("updating player rank '{$rankName}'", false);
     doquery($qryResetRowNum);
     doquery(sprintf($qryFormat, $rankName, 1));
@@ -284,7 +284,7 @@ 
 
   sta_set_time_limit("updating ranks for Alliances");
   // --- Updating Allie's ranks
-  foreach($rankNames as $rankName) {
+  foreach ($rankNames as $rankName) {
     sta_set_time_limit("updating Alliances rank '{$rankName}'", false);
     doquery($qryResetRowNum);
     doquery(sprintf($qryFormat, $rankName, 2));

includes/includes/market_fleeter.inc

Spacing +31 added lines, -31 removed lines

@@ -2,11 +2,11 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
+if (!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
   classSupernova::$debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
 
-$page_title .= ' - ' . classLocale::$lang["eco_mrk_{$submode}"];
+$page_title .= ' - '.classLocale::$lang["eco_mrk_{$submode}"];
 
 $template = gettemplate('market_fleet', true);
 $template->assign_vars(array(
@@ -14,8 +14,8 @@ 
   'rpg_cost' => $rpg_cost,
 ));
 
-if(is_array($shipList)) {
-  if(mrc_get_level($user, null, RES_DARK_MATTER) < $rpg_cost) {
+if (is_array($shipList)) {
+  if (mrc_get_level($user, null, RES_DARK_MATTER) < $rpg_cost) {
     $intError = MARKET_NO_DM;
   }
 
@@ -28,34 +28,34 @@ 
   // Блокируем запись о запасах кораблей у трейдера
   db_config_get_stockman_fleet();
 
-  $message .= classLocale::$lang["eco_mrk_{$submode}_ships"] . '<ul>';
+  $message .= classLocale::$lang["eco_mrk_{$submode}_ships"].'<ul>';
   $qry = array();
   $total = array();
   $db_changeset = array();
-  foreach($shipList as $shipID => &$shipCount) {
+  foreach ($shipList as $shipID => &$shipCount) {
     $shipCount = ceil(floatval($shipCount));
-    if(!$shipCount) {
+    if (!$shipCount) {
       continue;
     }
 
-    if($shipCount < 0) {
+    if ($shipCount < 0) {
       classSupernova::$debug->warning('User supplied negative ship count on Black Market page', 'Hack Attempt', 307);
       $intError = MARKET_NEGATIVE_SHIPS;
       break;
     }
 
-    if($mode == MARKET_SCRAPPER) {
+    if ($mode == MARKET_SCRAPPER) {
       $amount = mrc_get_level($user, $planetrow, $shipID, true, true); // $planetrow[get_unit_param($shipID, P_NAME)];
-    } elseif($mode == MARKET_STOCKMAN) {
+    } elseif ($mode == MARKET_STOCKMAN) {
       $amount = $stock[$shipID];
     }
 
-    if($amount < $shipCount) {
+    if ($amount < $shipCount) {
       $intError = $error_no_stock;
       break;
     }
 
-    if(!in_array($shipID, sn_get_groups('fleet'))) {
+    if (!in_array($shipID, sn_get_groups('fleet'))) {
       classSupernova::$debug->warning('Hack Attempt', 'User supplied non-ship unit ID on Black Market page', 306);
       $intError = MARKET_NOT_A_SHIP;
       break;
@@ -71,16 +71,16 @@ 
     $resTemp[RES_CRYSTAL] = floor($build_data[BUILD_CREATE][RES_CRYSTAL] * $shipCount * $config_rpg_scrape_crystal * (-$multiplier));
     $resTemp[RES_DEUTERIUM] = floor($build_data[BUILD_CREATE][RES_DEUTERIUM] * $shipCount * $config_rpg_scrape_deuterium * (-$multiplier));
 
-    foreach($resTemp as $resID => $resCount) {
+    foreach ($resTemp as $resID => $resCount) {
       $total[$resID] += $resCount;
     }
 
-    $message .= "<li>{$classLocale['tech'][$shipID]}: " . pretty_number($shipCount);
+    $message .= "<li>{$classLocale['tech'][$shipID]}: ".pretty_number($shipCount);
   }
 
-  if($mode == MARKET_STOCKMAN && $intError == MARKET_DEAL) {
-    foreach($total as $resID => $resCount) {
-      if(mrc_get_level($user, $planetrow, $resID, true, true) < -$resCount) {
+  if ($mode == MARKET_STOCKMAN && $intError == MARKET_DEAL) {
+    foreach ($total as $resID => $resCount) {
+      if (mrc_get_level($user, $planetrow, $resID, true, true) < -$resCount) {
         $intError = MARKET_NO_RESOURCES;
         classSupernova::$debug->warning('Trying to use bug in s/h market', 'S/H Ship Market', 301);
         break;
@@ -90,10 +90,10 @@ 
 
   $intError = ($intError == MARKET_DEAL) && (array_sum($total) == 0) ? $error_zero_res : $intError;
 
-  if($intError == MARKET_DEAL) {
-    $message .= '</ul>' . classLocale::$lang["eco_mrk_{$submode}_res"] . '<ul>';
-    foreach($total as $resID => $resCount) {
-      if(!$resCount) {
+  if ($intError == MARKET_DEAL) {
+    $message .= '</ul>'.classLocale::$lang["eco_mrk_{$submode}_res"].'<ul>';
+    foreach ($total as $resID => $resCount) {
+      if (!$resCount) {
         continue;
       }
 
@@ -101,7 +101,7 @@ 
       // $newrow[$resID] = $planetrow[$resID] + $resCount * (-$multiplier);
       $qry[] = "`{$resource_name}` = `{$resource_name}` + ({$resCount})";
 
-      $message .= "<li>" . classLocale::$lang['sys_' . $resource_name] . ": " . pretty_number(abs($resCount));
+      $message .= "<li>".classLocale::$lang['sys_'.$resource_name].": ".pretty_number(abs($resCount));
     }
     $message .= "</ul>";
 
@@ -127,38 +127,38 @@ 
       'MESSAGE' => classLocale::$lang['eco_mrk_errors'][$intError],
     ));
 
-    foreach($shipList as $shipID => $shipCount) {
+    foreach ($shipList as $shipID => $shipCount) {
       $data['ships'][$shipID] = max(0, intval($shipCount));
     }
   }
 }
 $message = '';
 
-if(!classSupernova::$config->eco_stockman_fleet && classSupernova::$config->eco_stockman_fleet_populate) {
-  classSupernova::$config->db_saveItem('eco_stockman_fleet', sys_unit_arr2str(array_map(function($item){return mt_rand(1, 1000);}, sn_get_groups('fleet'))));
+if (!classSupernova::$config->eco_stockman_fleet && classSupernova::$config->eco_stockman_fleet_populate) {
+  classSupernova::$config->db_saveItem('eco_stockman_fleet', sys_unit_arr2str(array_map(function($item) {return mt_rand(1, 1000); }, sn_get_groups('fleet'))));
 }
 
 tpl_set_resource_info($template, $planetrow, array());
 
-if(!$array) {
+if (!$array) {
   $array = array();
 }
 
 $group_fleet = sn_get_groups('fleet');
-foreach($array as $key => $value) {
-  if($mode == MARKET_SCRAPPER) {
+foreach ($array as $key => $value) {
+  if ($mode == MARKET_SCRAPPER) {
     $shipID = $value;
     $amount = mrc_get_level($user, $planetrow, $shipID, false, true); // $planetrow[get_unit_param($shipID, P_NAME)];
-  } elseif($mode == MARKET_STOCKMAN) {
+  } elseif ($mode == MARKET_STOCKMAN) {
     $shipID = $key;
     $amount = $value;
   }
 
-  if(!in_array($shipID, $group_fleet)) {
+  if (!in_array($shipID, $group_fleet)) {
     continue;
   }
 
-  if($amount > 0) {
+  if ($amount > 0) {
     $build_data = eco_get_build_data($user, $planetrow, $shipID);
     $template->assign_block_vars('ships', array(
       'ID'        => $shipID,

includes/includes/flt_mission_relocate.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 
   $destination_planet = &$mission_data->dst_planet;
 
-  if(empty($destination_planet['id_owner']) || $objFleet->playerOwnerId != $destination_planet['id_owner']) {
+  if (empty($destination_planet['id_owner']) || $objFleet->playerOwnerId != $destination_planet['id_owner']) {
     $objFleet->markReturnedAndSave();
 
     return CACHE_FLEET;
@@ -27,10 +27,10 @@ 
       $fleet_resources[RES_METAL], classLocale::$lang['Metal'],
       $fleet_resources[RES_CRYSTAL], classLocale::$lang['Crystal'],
       $fleet_resources[RES_DEUTERIUM], classLocale::$lang['Deuterium']
-    ) . '<br />' . classLocale::$lang['sys_relocate_mess_user'];
+    ).'<br />'.classLocale::$lang['sys_relocate_mess_user'];
   $fleet_real_array = $objFleet->shipsGetArray();
-  foreach($fleet_real_array as $ship_id => $ship_count) {
-    $Message .= classLocale::$lang['tech'][$ship_id] . ' - ' . $ship_count . '<br />';
+  foreach ($fleet_real_array as $ship_id => $ship_count) {
+    $Message .= classLocale::$lang['tech'][$ship_id].' - '.$ship_count.'<br />';
   }
   msg_send_simple_message(
     $objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT,