supernova-ws / SuperNova

includes/init.php

Spacing +34 added lines, -34 removed lines

@@ -3,7 +3,7 @@ 
 use \Core\SnBootstrap;
 
 // Защита от двойного инита
-if(defined('INIT')) {
+if (defined('INIT')) {
   return;
 }
 
@@ -116,18 +116,18 @@ 
 // Но нужно, пока у нас есть не MVC-страницы
 $sn_page_data = $sn_mvc['pages'][$sn_page_name];
 $sn_page_name_file = 'includes/pages/' . $sn_page_data['filename'] . DOT_PHP_EX;
-if($sn_page_name) {
+if ($sn_page_name) {
   // Merging page options to global option pull
-  if(is_array($sn_page_data['options'])) {
+  if (is_array($sn_page_data['options'])) {
     classSupernova::$options = array_merge(classSupernova::$options, $sn_page_data['options']);
   }
 
-  if(isset($sn_page_data) && file_exists($sn_page_name_file)) {
+  if (isset($sn_page_data) && file_exists($sn_page_name_file)) {
     require_once($sn_page_name_file);
   }
 }
 
-if((defined('IN_AJAX') && IN_AJAX === true) || (defined('IN_ADMIN') && IN_ADMIN === true)) {
+if ((defined('IN_AJAX') && IN_AJAX === true) || (defined('IN_ADMIN') && IN_ADMIN === true)) {
   classSupernova::$options['fleet_update_skip'] = true;
 }
 
@@ -141,10 +141,10 @@ 
 $load_order = array();
 $sn_req = array();
 
-foreach($sn_module as $loaded_module_name => $module_data) {
+foreach ($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;
     }
   }
@@ -155,10 +155,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 {
@@ -166,21 +166,21 @@ 
       }
       $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[$loaded_module_name]->check_status();
-    if(!$sn_module[$loaded_module_name]->manifest['active']) {
+    if (!$sn_module[$loaded_module_name]->manifest['active']) {
       unset($sn_module[$loaded_module_name]);
       continue;
     }
@@ -198,29 +198,29 @@ 
 
 // А теперь проверяем - поддерживают ли у нас загруженный код такую страницу
 // TODO - костыль, что бы работали старые модули. Убрать!
-if(is_array($sn_data['pages'])) {
+if (is_array($sn_data['pages'])) {
   $sn_mvc['pages'] = array_merge($sn_mvc['pages'], $sn_data['pages']);
 }
-if(!isset($sn_mvc['pages'][$sn_page_name])) {
+if (!isset($sn_mvc['pages'][$sn_page_name])) {
   $sn_page_name = '';
 }
 
 $lang->lng_switch(sys_get_param_str('lang'));
 
 
-if(classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
+if (classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
   \Tools\VersionCheckerDeprecated::performCheckVersion();
 }
 
-if(classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
+if (classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
   require_once(SN_ROOT_PHYSICAL . 'includes/includes/user_birthday_celebrate.php');
   sn_user_birthday_celebrate();
 }
 
-if(!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
+if (!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
   classSupernova::$config->db_saveItem('var_online_user_count', db_user_count(true));
   classSupernova::$config->db_saveItem('var_online_user_time', SN_TIME_NOW);
-  if(classSupernova::$config->server_log_online) {
+  if (classSupernova::$config->server_log_online) {
     doquery("INSERT IGNORE INTO {{log_users_online}} SET online_count = " . classSupernova::$config->var_online_user_count . ";");
   }
 }
@@ -243,7 +243,7 @@ 
 
 $template_result[F_ACCOUNT_IS_AUTHORIZED] = $sys_user_logged_in = !empty($user) && isset($user['id']) && $user['id'];
 
-if(!empty($user['id'])) {
+if (!empty($user['id'])) {
   classSupernova::$user_options->user_change($user['id']);
 }
 
@@ -256,7 +256,7 @@ 
         : false
       );
 
-if($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
+if ($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
   $prohibited_characters = array_map(function($value) {
     return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
   }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
@@ -264,7 +264,7 @@ 
 }
 
 
-if(defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
+if (defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
   pdump('Отключи отладку перед продакшном!');
 }
 
@@ -278,17 +278,17 @@ 
 
 StatUpdateLauncher::unlock();
 
-if($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
+if ($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
   $template_result[F_GAME_DISABLE_REASON] = HelperString::nl2br(
     classSupernova::$config->game_disable == GAME_DISABLE_REASON
       ? classSupernova::$config->game_disable_reason
       : $lang['sys_game_disable_reason'][classSupernova::$config->game_disable]
   );
-  if(defined('IN_API')) {
+  if (defined('IN_API')) {
     return;
   }
 
-  if(
+  if (
     ($user['authlevel'] < 1 || !(defined('IN_ADMIN') && IN_ADMIN))
     &&
     !(defined('INSTALL_MODE') && defined('LOGIN_LOGOUT'))
@@ -301,8 +301,8 @@ 
 
 // TODO ban
 // TODO $skip_ban_check
-if($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
-  if(defined('IN_API')) {
+if ($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
+  if (defined('IN_API')) {
     return;
   }
 
@@ -316,10 +316,10 @@ 
 $allow_anonymous = $allow_anonymous || (isset($sn_page_data['allow_anonymous']) && $sn_page_data['allow_anonymous']);
 
 
-if($sys_user_logged_in && INITIAL_PAGE == 'login') {
+if ($sys_user_logged_in && INITIAL_PAGE == 'login') {
   sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
-} elseif($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
-} elseif(!$allow_anonymous && !$sys_user_logged_in) {
+} elseif ($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
+} elseif (!$allow_anonymous && !$sys_user_logged_in) {
   sys_redirect(SN_ROOT_VIRTUAL . 'login.php');
 }
 
@@ -343,7 +343,7 @@ 
   'fleet_update_last',
   classSupernova::$config->fleet_update_interval,
   // Promise
-  function () {classSupernova::$gc->fleetDispatcher->dispatch();},
+  function() {classSupernova::$gc->fleetDispatcher->dispatch(); },
   WATCHDOG_TIME_SQL,
   false
 );

admin/admin_analyze_matter.php

Spacing +8 added lines, -9 removed lines

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

admin/includes/admin_planet_edit.inc.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list){return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list));}
+function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list) {return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list)); }
 function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list)
 {
   global $lang;
@@ -19,7 +19,7 @@ 
   return $mode;
 }
 
-function admin_planet_edit_template(&$template, $edit_planet_row, $mode){return sn_function_call('admin_planet_edit_template', array(&$template, $edit_planet_row, $mode));}
+function admin_planet_edit_template(&$template, $edit_planet_row, $mode) {return sn_function_call('admin_planet_edit_template', array(&$template, $edit_planet_row, $mode)); }
 /**
  * @param template $template
  * @param $edit_planet_row
@@ -30,13 +30,13 @@ 
   global $lang;
 
   $unit_list = sn_get_groups($mode);
-  if(empty($unit_list))
+  if (empty($unit_list))
   {
     return;
   }
   $name_list = $lang['tech'];
 
-  foreach($unit_list as $unit_id)
+  foreach ($unit_list as $unit_id)
   {
     $template->assign_block_vars('unit', array(
       'ID'    => $unit_id,
@@ -47,10 +47,10 @@ 
   }
 }
 
-function admin_planet_edit_query_string($unit_id, $unit_amount, $mode){return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode));}
+function admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode)); }
 function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode)
 {
-  if($unit_amount && in_array($unit_id, sn_get_groups($mode)))
+  if ($unit_amount && in_array($unit_id, sn_get_groups($mode)))
   {
     $unit_amount = round($unit_amount);
     $unit_name = get_unit_param($unit_id, P_NAME);

includes/includes/flt_mission_recycle.php

Spacing +10 added lines, -10 removed lines

@@ -12,12 +12,12 @@ 
   $fleet_row          = &$mission_data['fleet'];
   $destination_planet = &$mission_data['dst_planet'];
 
-  if(!$fleet_row)
+  if (!$fleet_row)
   {
     return CACHE_NOTHING;
   }
 
-  if(!isset($destination_planet['id']))
+  if (!isset($destination_planet['id']))
   {
     // doquery("UPDATE {{fleets}} SET `fleet_mess` = 1 WHERE `fleet_id` = {$fleet_row['fleet_id']} LIMIT 1;");
     fleet_send_back($mission_data['fleet']);
@@ -29,12 +29,12 @@ 
   $RecyclerCapacity    = 0;
   $OtherFleetCapacity  = 0;
   $fleet_array = sys_unit_str2arr($fleet_row['fleet_array']);
-  foreach($fleet_array as $unit_id => $unit_count)
+  foreach ($fleet_array as $unit_id => $unit_count)
   {
-    if(in_array($unit_id, sn_get_groups('fleet')))
+    if (in_array($unit_id, sn_get_groups('fleet')))
     {
       $capacity = get_unit_param($unit_id, P_CAPACITY) * $unit_count;
-      if(in_array($unit_id, sn_get_groups('flt_recyclers')))
+      if (in_array($unit_id, sn_get_groups('flt_recyclers')))
       {
         $RecyclerCapacity += $capacity;
       }
@@ -46,19 +46,19 @@ 
   }
 
   $IncomingFleetGoods = $fleet_row["fleet_resource_metal"] + $fleet_row["fleet_resource_crystal"] + $fleet_row["fleet_resource_deuterium"];
-  if($IncomingFleetGoods > $OtherFleetCapacity)
+  if ($IncomingFleetGoods > $OtherFleetCapacity)
   {
     $RecyclerCapacity -= ($IncomingFleetGoods - $OtherFleetCapacity);
   }
 
-  if(($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity)
+  if (($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity)
   {
     $RecycledGoods["metal"]   = $destination_planet["debris_metal"];
     $RecycledGoods["crystal"] = $destination_planet["debris_crystal"];
   }
   else
   {
-    if (($destination_planet["debris_metal"]   > $RecyclerCapacity / 2) AND
+    if (($destination_planet["debris_metal"] > $RecyclerCapacity / 2) AND
       ($destination_planet["debris_crystal"] > $RecyclerCapacity / 2))
       {
       $RecycledGoods["metal"]   = $RecyclerCapacity / 2;
@@ -92,7 +92,7 @@ 
       }
     }
   }
-  $NewCargo['Metal']     = $fleet_row["fleet_resource_metal"]   + $RecycledGoods["metal"];
+  $NewCargo['Metal']     = $fleet_row["fleet_resource_metal"] + $RecycledGoods["metal"];
   $NewCargo['Crystal']   = $fleet_row["fleet_resource_crystal"] + $RecycledGoods["crystal"];
   $NewCargo['Deuterium'] = $fleet_row["fleet_resource_deuterium"];
 
@@ -105,7 +105,7 @@ 
     HelperString::numberFloorAndFormat($RecycledGoods["metal"]), $lang['Metal'],
     HelperString::numberFloorAndFormat($RecycledGoods["crystal"]), $lang['Crystal']
   );
-  msg_send_simple_message ( $fleet_row['fleet_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_RECYCLE, $lang['sys_mess_spy_control'], $lang['sys_recy_report'], $Message);
+  msg_send_simple_message($fleet_row['fleet_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_RECYCLE, $lang['sys_mess_spy_control'], $lang['sys_recy_report'], $Message);
 
 //  $QryUpdateFleet  = "UPDATE {{fleets}} SET `fleet_mess` = 1,`fleet_resource_metal` = '{$NewCargo['Metal']}',`fleet_resource_crystal` = '{$NewCargo['Crystal']}',`fleet_resource_deuterium` = '{$NewCargo['Deuterium']}' ";
 //  $QryUpdateFleet .= "WHERE `fleet_id` = '{$fleet_row['fleet_id']}' LIMIT 1;";

includes/includes/market_fleeter.inc

Spacing +26 added lines, -26 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
+if (!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
   $debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
 
@@ -12,8 +12,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;
   }
 
@@ -30,30 +30,30 @@ 
   $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) {
       $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'))) {
       $debug->warning('Hack Attempt', 'User supplied non-ship unit ID on Black Market page', 306);
       $intError = MARKET_NOT_A_SHIP;
       break;
@@ -69,16 +69,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>{$lang['tech'][$shipID]}: " . HelperString::numberFloorAndFormat($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;
         $debug->warning('Trying to use bug in s/h market', 'S/H Ship Market', 301);
         break;
@@ -88,10 +88,10 @@ 
 
   $intError = ($intError == MARKET_DEAL) && (array_sum($total) == 0) ? $error_zero_res : $intError;
 
-  if($intError == MARKET_DEAL) {
+  if ($intError == MARKET_DEAL) {
     $message .= '</ul>' . $lang["eco_mrk_{$submode}_res"] . '<ul>';
-    foreach($total as $resID => $resCount) {
-      if(!$resCount) {
+    foreach ($total as $resID => $resCount) {
+      if (!$resCount) {
         continue;
       }
 
@@ -125,38 +125,38 @@ 
       'MESSAGE' => $lang['eco_mrk_errors'][$intError],
     ));
 
-    foreach($shipList as $shipID => $shipCount) {
+    foreach ($shipList as $shipID => $shipCount) {
       $data['ships'][$shipID] = max(0, intval($shipCount));
     }
   }
 }
 $message = '';
 
-if(!$config->eco_stockman_fleet && $config->eco_stockman_fleet_populate) {
-  $config->db_saveItem('eco_stockman_fleet', sys_unit_arr2str(array_map(function($item){return mt_rand(1, 1000);}, sn_get_groups('fleet'))));
+if (!$config->eco_stockman_fleet && $config->eco_stockman_fleet_populate) {
+  $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_page3.inc

Spacing +41 added lines, -42 removed lines

@@ -3,7 +3,7 @@ 
 // @version 1.0
 // @copyright 2008 by Chlorel for XNova
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   $debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
 }
 
@@ -22,7 +22,7 @@ 
     $errorlist .= $lang['fl_limit_galaxy'];
   if (!$system || $system > $config->game_maxSystem || $system < 1)
     $errorlist .= $lang['fl_limit_system'];
-  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE ))
+  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE))
     $errorlist .= $lang['fl_limit_planet'];
   if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type)
     $errorlist .= $lang['fl_ownpl_err'];
@@ -49,35 +49,35 @@ 
   $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
 
   if ($target_mission == MT_EXPLORE) {
-    if ($MaxExpeditions == 0 ) {
+    if ($MaxExpeditions == 0) {
       $errorlist .= $lang['fl_expe_notech'];
-    } elseif ($FlyingExpeditions >= $MaxExpeditions ) {
+    } elseif ($FlyingExpeditions >= $MaxExpeditions) {
       $errorlist .= $lang['fl_expe_max'];
     }
   } else {
-    if ($TargetPlanet['id_owner']){
+    if ($TargetPlanet['id_owner']) {
       if ($target_mission == MT_COLONIZE)
         $errorlist .= $lang['fl_colonized'];
 
-      if ($TargetPlanet['id_owner'] == $planetrow['id_owner']){
+      if ($TargetPlanet['id_owner'] == $planetrow['id_owner']) {
         if ($target_mission == MT_ATTACK)
           $errorlist .= $lang['fl_no_self_attack'];
 
         if ($target_mission == MT_SPY)
           $errorlist .= $lang['fl_no_self_spy'];
-      }else{
+      } else {
         if ($target_mission == MT_RELOCATE)
           $errorlist .= $lang['fl_only_stay_at_home'];
       }
-    }else{
-      if ($target_mission < MT_COLONIZE){
+    } else {
+      if ($target_mission < MT_COLONIZE) {
         $errorlist .= $lang['fl_unknow_target'];
-      }else{
+      } else {
         if ($target_mission == MT_DESTROY)
           $errorlist .= $lang['fl_nomoon'];
 
-        if ($target_mission == MT_RECYCLE){
-          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0)
+        if ($target_mission == MT_RECYCLE) {
+          if ($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0)
             $errorlist .= $lang['fl_nodebris'];
         }
       }
@@ -85,13 +85,13 @@ 
   }
 
 
-  if($sn_module['unit_captain']->manifest['active'] && $captain_id = sys_get_param_id('captain_id')) {
+  if ($sn_module['unit_captain']->manifest['active'] && $captain_id = sys_get_param_id('captain_id')) {
     $captain = $sn_module['unit_captain']->unit_captain_get($planetrow['id']);
 //      mrc_get_level($user, $planetrow, UNIT_CAPTAIN, true);
-    if(!$captain) {
+    if (!$captain) {
       $errorlist .= $lang['module_unit_captain_error_no_captain'];
-    } elseif($captain['unit_location_type'] == LOC_PLANET) {
-      if($target_mission == MT_RELOCATE && ($arriving_captain = mrc_get_level($user, $TargetPlanet, UNIT_CAPTAIN, true))) {
+    } elseif ($captain['unit_location_type'] == LOC_PLANET) {
+      if ($target_mission == MT_RELOCATE && ($arriving_captain = mrc_get_level($user, $TargetPlanet, UNIT_CAPTAIN, true))) {
         $errorlist .= $lang['module_unit_captain_error_captain_already_bound'];
       }
     } else {
@@ -101,13 +101,13 @@ 
 
   if ($errorlist) {
     sn_db_transaction_rollback();
-    messageBox ("<span class='error'><ul>{$errorlist}</ul></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, false);
+    messageBox("<span class='error'><ul>{$errorlist}</ul></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, false);
   }
 
   // On verifie s'il y a assez de vaisseaux sur la planete !
   foreach ($fleetarray as $Ship => $Count) {
     if ($Count > mrc_get_level($user, $planetrow, $Ship)) {
-      messageBox ("<span class='error'><b>{$lang['fl_fleet_err']}</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
+      messageBox("<span class='error'><b>{$lang['fl_fleet_err']}</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
     }
   }
 
@@ -115,13 +115,13 @@ 
   $fleet_group = max(0, intval($_POST['fleet_group']));
   //But is it acs??
   //Well all acs fleets must have a fleet code.
-  if($fleet_group) {
+  if ($fleet_group) {
     //Also it must be mission type 2
     $target_mission = MT_AKS;
 
     //The co-ords must be the same as where the acs fleet is going.
     $target = "g{$galaxy}s{$system}p{$planet}t{$planet_type}";
-    if($_POST['acs_target_mr'] == $target) {
+    if ($_POST['acs_target_mr'] == $target) {
       //ACS attack must exist (if acs fleet has arrived this will also return false (2 checks in 1!!!)
       $aks = doquery("SELECT * FROM {{aks}} WHERE id = '{$fleet_group}' LIMIT 1;", true);
       if (!$aks) {
@@ -137,7 +137,7 @@ 
     }
   }
   //Check that a failed acs attack isn't being sent, if it is, make it an attack fleet.
-  if(!$fleet_group && $target_mission == MT_AKS) {
+  if (!$fleet_group && $target_mission == MT_AKS) {
     $target_mission = MT_ATTACK;
   }
 
@@ -147,22 +147,21 @@ 
   $options = array('fleet_speed_percent' => $speed_percent, 'fleet_group' => $fleet_group, 'resources' => $StorageNeeded);
   $cant_attack = flt_can_attack($planetrow, $TargetPlanet, $fleetarray, $target_mission, $options);
 
-  if($cant_attack !== ATTACK_ALLOWED) {
+  if ($cant_attack !== ATTACK_ALLOWED) {
     messageBox("<span class='error'><b>{$lang['fl_attack_error'][$cant_attack]}</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 99);
   }
 
   $speed_possible = array(10, 9, 8, 7, 6, 5, 4, 3, 2, 1);
   if (!in_array($speed_percent, $speed_possible)) {
-    messageBox ("<span class='error'><b>". $lang['fl_cheat_speed'] ."</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
+    messageBox("<span class='error'><b>" . $lang['fl_cheat_speed'] . "</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
 
   $fleet['start_time'] = $duration + SN_TIME_NOW;
 
-  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) :
-    ($target_mission == MT_HOLD ? 12 : 0);
-  if($max_duration) {
+  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) : ($target_mission == MT_HOLD ? 12 : 0);
+  if ($max_duration) {
     $StayDuration = sys_get_param_id('missiontime');
-    if($StayDuration > $max_duration || $StayDuration < 1) {
+    if ($StayDuration > $max_duration || $StayDuration < 1) {
       $debug->warning('Supplying wrong mission time', 'Hack attempt', 302, array('base_dump' => true));
       die();
     }
@@ -172,11 +171,11 @@ 
     $StayDuration = 0;
     $StayTime     = 0;
   }
-  $fleet['end_time']   = $StayDuration + (2 * $duration) + SN_TIME_NOW;
+  $fleet['end_time'] = $StayDuration + (2 * $duration) + SN_TIME_NOW;
 
-  if($aks && $target_mission == MT_AKS) {
-    if ($fleet['start_time']>$aks['ankunft']) {
-      messageBox ($lang['fl_aks_too_slow'] . 'Fleet arrival: ' . date(FMT_DATE_TIME,$fleet['start_time']) . " AKS arrival: " .date(FMT_DATE_TIME,$aks['ankunft']), $lang['fl_error']);
+  if ($aks && $target_mission == MT_AKS) {
+    if ($fleet['start_time'] > $aks['ankunft']) {
+      messageBox($lang['fl_aks_too_slow'] . 'Fleet arrival: ' . date(FMT_DATE_TIME, $fleet['start_time']) . " AKS arrival: " . date(FMT_DATE_TIME, $aks['ankunft']), $lang['fl_error']);
     }
     $fleet['start_time'] = $aks['ankunft'];
     $fleet['end_time'] = $aks['ankunft'] + $duration;
@@ -186,21 +185,21 @@ 
   $FleetShipCount      = 0;
   $db_changeset = array();
   foreach ($fleetarray as $Ship => $Count) {
-    $FleetStorage    += get_unit_param($Ship, P_CAPACITY) * $Count;
+    $FleetStorage += get_unit_param($Ship, P_CAPACITY) * $Count;
     $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($Ship, -$Count, $user, $planetrow['id']);
   }
   $fleet_array = sys_unit_arr2str($fleetarray);
-  $FleetShipCount  += array_sum($fleetarray);
-  $FleetStorage        -= $consumption;
+  $FleetShipCount += array_sum($fleetarray);
+  $FleetStorage -= $consumption;
 
-  if ( $StorageNeeded > $FleetStorage) {
-    messageBox ("<span class='error'><b>". $lang['fl_nostoragespa'] . HelperString::numberFloorAndFormat($StorageNeeded - $FleetStorage) ."</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
+  if ($StorageNeeded > $FleetStorage) {
+    messageBox("<span class='error'><b>" . $lang['fl_nostoragespa'] . HelperString::numberFloorAndFormat($StorageNeeded - $FleetStorage) . "</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
   if ($planetrow['deuterium'] < $TransDeuterium + $consumption) {
-    messageBox ("<font color=\"red\"><b>". $lang['fl_no_deuterium'] . HelperString::numberFloorAndFormat($TransDeuterium + $consumption - $planetrow['deuterium']) ."</b></font>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
+    messageBox("<font color=\"red\"><b>" . $lang['fl_no_deuterium'] . HelperString::numberFloorAndFormat($TransDeuterium + $consumption - $planetrow['deuterium']) . "</b></font>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
   if (($planetrow['metal'] < $TransMetal) || ($planetrow['crystal'] < $TransCrystal)) {
-    messageBox ("<font color=\"red\"><b>". $lang['fl_no_resources'] ."</b></font>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
+    messageBox("<font color=\"red\"><b>" . $lang['fl_no_resources'] . "</b></font>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
 
   $fleet_set = array(
@@ -242,7 +241,7 @@ 
 //    ));
 //  }
 
-  if(is_array($captain)) {
+  if (is_array($captain)) {
     DBStaticUnit::db_unit_set_by_id($captain['unit_id'], "`unit_location_type` = " . LOC_FLEET . ", `unit_location_id` = {$fleet_id}");
   }
 
@@ -255,7 +254,7 @@ 
     'START_LEFT'         => floor($fleet['end_time'] + 1 - SN_TIME_NOW),
   );
 
-  if(!empty($TargetPlanet)) {
+  if (!empty($TargetPlanet)) {
     $template_route += array(
       'END_TYPE_TEXT_SH' => $lang['sys_planet_type_sh'][$TargetPlanet['planet_type']],
       'END_COORDS'       => uni_render_coordinates($TargetPlanet),
@@ -268,8 +267,8 @@ 
   $template->assign_block_vars('fleets', $template_route);
 
   $sn_groups_fleet = sn_get_groups('fleet');
-  foreach($fleetarray as $ship_id => $ship_count) {
-    if(in_array($ship_id, $sn_groups_fleet) && $ship_count) {
+  foreach ($fleetarray as $ship_id => $ship_count) {
+    if (in_array($ship_id, $sn_groups_fleet) && $ship_count) {
 //      $ship_base_data = get_ship_data($ship_id, $user);
       $template->assign_block_vars('fleets.ships', array(
         'ID'          => $ship_id,

includes/pages/imperator.php

Spacing +21 added lines, -21 removed lines

@@ -47,7 +47,7 @@ 
 //    $same_user = false;
 //  }
 
-  if(!$user_data) {
+  if (!$user_data) {
     messageBox($lang['imp_imperator_none'], $lang['sys_error'], 'index.php', 10);
     die();
   }
@@ -58,8 +58,8 @@ 
   $stat_array = array();
   $query = doquery("SELECT * FROM {{statpoints}} WHERE `stat_type` = 1 AND `id_owner` = {$user_id} ORDER BY `stat_code` DESC;");
   $stat_count = classSupernova::$db->db_affected_rows();
-  while($row = db_fetch($query)) {
-    foreach($stat_fields as $field_db_name => $field_template_name) {
+  while ($row = db_fetch($query)) {
+    foreach ($stat_fields as $field_db_name => $field_template_name) {
       // $stat_count - $row['stat_code'] - для реверсирования ID статы в JS
       $stat_array[$field_template_name]['DATA'][$stat_count - $row['stat_code']] = $row[$field_db_name];
     }
@@ -67,7 +67,7 @@ 
 
   $stat_array_date = $stat_array['STAT_DATE'];
   empty($stat_array_date['DATA']) ? $stat_array_date['DATA'] = array() : false;
-  foreach($stat_array_date['DATA'] as $key => $value) {
+  foreach ($stat_array_date['DATA'] as $key => $value) {
     $template->assign_block_vars('stat_date', array(
       'ID' => $key,
       'VALUE' => $value,
@@ -77,21 +77,21 @@ 
 
   unset($stat_array['STAT_DATE']);
   $template_data = array();
-  foreach($stat_array as $stat_type => &$stat_type_data) {
+  foreach ($stat_array as $stat_type => &$stat_type_data) {
     $reverse_min_max = strpos($stat_type, '_RANK') !== false;
     $stat_type_data['MIN'] = $reverse_min_max ? max($stat_type_data['DATA']) : min($stat_type_data['DATA']);
     $stat_type_data['MAX'] = $reverse_min_max ? min($stat_type_data['DATA']) : max($stat_type_data['DATA']);
     $stat_type_data['AVG'] = average($stat_type_data['DATA']);
-    foreach($stat_type_data['DATA'] as $key => $value) {
+    foreach ($stat_type_data['DATA'] as $key => $value) {
       $stat_type_data['PERCENT'][$key] = ($stat_type_data['MAX'] - $value ? ($value - $stat_type_data['MIN']) / ($stat_type_data['MAX'] - $stat_type_data['MIN']) : 1) * 100;
       $template_data[$stat_type][$key]['ID'] = $key;
       $template_data[$stat_type][$key]['VALUE'] = $value;
-      $template_data[$stat_type][$key]['DELTA'] = ($reverse_min_max ? $stat_type_data['MIN']  - $value : $value - $stat_type_data['MAX']);
+      $template_data[$stat_type][$key]['DELTA'] = ($reverse_min_max ? $stat_type_data['MIN'] - $value : $value - $stat_type_data['MAX']);
       $template_data[$stat_type][$key]['PERCENT'] = $stat_type_data['PERCENT'][$key];
     }
   }
 
-  foreach($template_data as $stat_type => $stat_type_data) {
+  foreach ($template_data as $stat_type => $stat_type_data) {
     $template->assign_block_vars('stat', array(
       'TYPE' => $stat_type,
       'TEXT' => $lang['imp_stat_types'][$stat_type],
@@ -99,13 +99,13 @@ 
       'MAX' => $stat_array[$stat_type]['MAX'],
       'AVG' => $stat_array[$stat_type]['AVG'],
     ));
-    foreach($stat_type_data as $stat_entry) {
+    foreach ($stat_type_data as $stat_entry) {
       $template->assign_block_vars('stat.entry', $stat_entry);
     }
   }
 
 
-  if($same_user) {
+  if ($same_user) {
     rpg_level_up($user, RPG_STRUCTURE);
     rpg_level_up($user, RPG_RAID);
     rpg_level_up($user, RPG_TECH);
@@ -139,29 +139,29 @@ 
     'builder_xp'           => HelperString::numberFloorAndFormat($user_data['xpminier']),
     'builder_lvl'          => HelperString::numberFloorAndFormat($user_data['lvl_minier']),
     'builder_lvl_st'       => HelperString::numberFloorAndFormat(rpg_get_miner_xp($user_data['lvl_minier'])),
-    'builder_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_miner_xp($user_data['lvl_minier']+1)),
+    'builder_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_miner_xp($user_data['lvl_minier'] + 1)),
     'raid_xp'              => HelperString::numberFloorAndFormat($user_data['xpraid']),
     'raid_lvl'             => HelperString::numberFloorAndFormat($user_data['lvl_raid']),
-    'raid_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_raider_xp($user_data['lvl_raid']+1)),
+    'raid_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_raider_xp($user_data['lvl_raid'] + 1)),
     'raids'                => HelperString::numberFloorAndFormat($user_data['raids']),
     'raidswin'             => HelperString::numberFloorAndFormat($user_data['raidswin']),
     'raidsloose'           => HelperString::numberFloorAndFormat($user_data['raidsloose']),
     'tech_xp'              => HelperString::numberFloorAndFormat($user_data['player_rpg_tech_xp']),
     'tech_lvl'             => HelperString::numberFloorAndFormat($user_data['player_rpg_tech_level']),
     'tech_lvl_st'          => HelperString::numberFloorAndFormat(rpg_get_tech_xp($user_data['player_rpg_tech_level'])),
-    'tech_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_tech_xp($user_data['player_rpg_tech_level']+1)),
+    'tech_lvl_up'          => HelperString::numberFloorAndFormat(rpg_get_tech_xp($user_data['player_rpg_tech_level'] + 1)),
 
     'explore_xp'           => HelperString::numberFloorAndFormat($user_data['player_rpg_explore_xp']),
     'explore_lvl'          => HelperString::numberFloorAndFormat($user_data['player_rpg_explore_level']),
     'explore_lvl_st'       => HelperString::numberFloorAndFormat(rpg_get_explore_xp($user_data['player_rpg_explore_level'])),
-    'explore_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_explore_xp($user_data['player_rpg_explore_level']+1)),
-
-    'build_points'         => HelperString::numberFloorAndFormat( $StatRecord['build_points'] ),
-    'tech_points'          => HelperString::numberFloorAndFormat( $StatRecord['tech_points'] ),
-    'fleet_points'         => HelperString::numberFloorAndFormat( $StatRecord['fleet_points'] ),
-    'defs_points'          => HelperString::numberFloorAndFormat( $StatRecord['defs_points'] ),
-    'res_points'           => HelperString::numberFloorAndFormat( $StatRecord['res_points'] ),
-    'total_points'         => HelperString::numberFloorAndFormat( $StatRecord['total_points'] ),
+    'explore_lvl_up'       => HelperString::numberFloorAndFormat(rpg_get_explore_xp($user_data['player_rpg_explore_level'] + 1)),
+
+    'build_points'         => HelperString::numberFloorAndFormat($StatRecord['build_points']),
+    'tech_points'          => HelperString::numberFloorAndFormat($StatRecord['tech_points']),
+    'fleet_points'         => HelperString::numberFloorAndFormat($StatRecord['fleet_points']),
+    'defs_points'          => HelperString::numberFloorAndFormat($StatRecord['defs_points']),
+    'res_points'           => HelperString::numberFloorAndFormat($StatRecord['res_points']),
+    'total_points'         => HelperString::numberFloorAndFormat($StatRecord['total_points']),
     'user_rank'            => $StatRecord['total_rank'],
     'RANK_DIFF'            => $StatRecord['total_old_rank'] - $StatRecord['total_rank'],
 

stat.php

Spacing +5 added lines, -5 removed lines

@@ -11,8 +11,8 @@ 
   global $who, $lang;
 
   // $sn_group_stat_common = sn_get_groups('STAT_COMMON');
-  foreach($array as $key => $value) {
-    if($array_name == 'type' && $who == 2 && !in_array($key, $sn_group_stat_common)) {
+  foreach ($array as $key => $value) {
+    if ($array_name == 'type' && $who == 2 && !in_array($key, $sn_group_stat_common)) {
       continue;
     }
 
@@ -44,7 +44,7 @@ 
 $subject_list = array(
   1 => array('header' => $lang['stat_player']),
 );
-if(!$source) {
+if (!$source) {
   $subject_list[2] = array('header' => $lang['stat_allys']);
 }
 stat_tpl_assign($template, $who, 'subject', $subject_list, $sn_group_stat_common);
@@ -111,7 +111,7 @@ 
 
 $page_count = floor($record_count / 100);
 $pages = array();
-for($i = 0; $i <= $page_count; $i++) {
+for ($i = 0; $i <= $page_count; $i++) {
   $first_element = $i * 100 + 1;
   $last_element = $first_element + 99;
   $pages[$first_element] = array(
@@ -130,7 +130,7 @@ 
     'POINTS' => HelperString::numberFloorAndFormat($row['points']),
   );
 
-  if($who == 1) {
+  if ($who == 1) {
     $row_stat['ALLY_NAME'] = $row['ally_name'];
     $row_stat['ALLY_ID'] = $row['ally_id'];
     empty($row['username']) ? $row['username'] = $row['name'] : false;

classes/classCache.php

Spacing +3 added lines, -3 removed lines

@@ -150,7 +150,7 @@ 
 
   public function unset_by_prefix($prefix_unset = '') {
     static $array_clear;
-    !$array_clear ? $array_clear = function (&$v, $k, $p) {
+    !$array_clear ? $array_clear = function(&$v, $k, $p) {
       strpos($k, $p) === 0 ? $v = null : false;
     } : false;
 
@@ -205,7 +205,7 @@ 
     if ($this->$name[0] === null) {
       for ($i = count($name) - 1; $i > 0; $i--) {
         $cName = "{$name[$i]}_COUNT";
-        $cName1 = "{$name[$i-1]}_COUNT";
+        $cName1 = "{$name[$i - 1]}_COUNT";
         if ($this->$cName1 == null || $i == 1) {
           $this->$cName++;
         }
@@ -251,7 +251,7 @@ 
     $count = count($name);
     for ($i = 1; $i < $count; $i++) {
       $cName = "{$name[$i]}_COUNT";
-      $cName1 = "{$name[$i-1]}_COUNT";
+      $cName1 = "{$name[$i - 1]}_COUNT";
 
       if ($i == 1 || $this->$cName1 === null) {
         $this->$cName--;