supernova-ws / SuperNova

includes/alliance/ali_internal_admin.inc

Spacing +19 added lines, -19 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
-if(!$user_admin) {
+if (!$user_admin) {
   message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
 }
 
@@ -20,7 +20,7 @@ 
 $allyTextID = ($allyTextID < 1 || $allyTextID > 3) ? 1 : $allyTextID;
 
 
-if(sys_get_param_str('isSaveOptions')) {
+if (sys_get_param_str('isSaveOptions')) {
   require_once('includes/includes/sys_avatar.php');
 
   $new_image = $ally['ally_image'];
@@ -32,46 +32,46 @@ 
 //  $template->assign_block_vars('result', $avatar_upload_result);
 
   $ally_changeset = array();
-  if(($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) {
+  if (($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) {
     $new_tag = db_escape($new_tag);
     $ally_changeset[] = "`ally_tag`='{$new_tag}'";
     db_user_set_by_id($ally['ally_user_id'], "`username`='[{$new_tag}]'");
   }
-  if(($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) {
+  if (($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) {
     $new_name = db_escape($new_name);
     $ally_changeset[] = "`ally_name`='{$new_name}'";
   }
 
-  if(($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) {
+  if (($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) {
     $new_owner_rank = db_escape($new_owner_rank);
     $ally_changeset[] = "`ally_owner_range` = '{$new_owner_rank}'";
   }
-  if(($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) {
+  if (($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) {
     $new_web = db_escape($new_web);
     $ally_changeset[] = "`ally_web` = '{$new_web}'";
   }
   $new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow']);
   $ally_changeset[] = "`ally_request_notallow` = '{$new_request}'";
-  if($new_image != $ally['ally_image']) {
+  if ($new_image != $ally['ally_image']) {
     $new_image = intval($new_image);
     $ally_changeset[] = "`ally_image` = '{$new_image}'";
   }
 
-  if(!empty($ally_changeset)) {
+  if (!empty($ally_changeset)) {
     db_ally_update_by_changeset($ally_changeset, $ally);
     sys_redirect('alliance.php?mode=admin&edit=ally');
   }
-} elseif(sys_get_param_str('isSaveText')) {
+} elseif (sys_get_param_str('isSaveText')) {
   $text = sys_get_param_str_both('text');
   db_ally_update_texts($text_list, $allyTextID, $text, $ally);
   $ally[$text_list[$allyTextID]['db_field']] = $text['unsafe'];
-} elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
-  if(!$isAllyOwner) {
+} elseif (sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
+  if (!$isAllyOwner) {
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
   }
 
   $newLeader = db_user_by_id($idNewLeader, false, `ally_id`);
-  if($newLeader['ally_id'] == $user['ally_id']) {
+  if ($newLeader['ally_id'] == $user['ally_id']) {
     sn_db_transaction_start();
     db_user_set_by_id($user['id'], "`ally_rank_id`='0'");
     db_ally_update_owner($idNewLeader, $user);
@@ -79,8 +79,8 @@ 
     sn_db_transaction_commit();
     sys_redirect('alliance.php');
   }
-} elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
-  if(!$isAllyOwner) {
+} elseif (sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
+  if (!$isAllyOwner) {
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
   }
   sn_db_transaction_start();
@@ -93,7 +93,7 @@ 
 $request = db_ally_request_count_by_id($ally);
 
 $template->assign_vars(array(
-  'request_count'           => $request['request_count'] ? classLocale::$lang['ali_req_requestCount'] . ': ' . intval($request['request_count']) . '. ' . classLocale::$lang['ali_req_check'] : classLocale::$lang['ali_req_emptyList'],
+  'request_count'           => $request['request_count'] ? classLocale::$lang['ali_req_requestCount'].': '.intval($request['request_count']).'. '.classLocale::$lang['ali_req_check'] : classLocale::$lang['ali_req_emptyList'],
   'text'                    => $ally[$text_list[$allyTextID]['db_field']],
   'request_type'            => classLocale::$lang[$text_list[$allyTextID]['text_type']],
   't'                       => $allyTextID,
@@ -126,7 +126,7 @@ 
   $userAllyAdmins = db_user_list("`ally_id`= {$ally['id']}", false, '`id`, `username`');
   unset($tmp);
   // while ($userAllyAdmin = db_fetch($userAllyAdmins))
-  foreach($userAllyAdmins as $userAllyAdmin) {
+  foreach ($userAllyAdmins as $userAllyAdmin) {
 // pdump($userAllyAdmin);
     $tmp .= "<option value={$userAllyAdmin['id']}>{$userAllyAdmin['username']}</option>";
   }
@@ -134,8 +134,8 @@ 
   $template->assign_var('adminMembers', $tmp);
 }
 
-foreach($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
-  if(!$sn_ali_admin_action_locale['title']) {
+foreach ($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
+  if (!$sn_ali_admin_action_locale['title']) {
     continue;
   }
   $template->assign_block_vars('admin_actions', array(

includes/alliance/ali_internal_admin_rights.inc

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -14,7 +14,7 @@ 
 $new_rank_name = sys_get_param_str('newRankName');
 if ($new_rank_name)
 {
-  foreach($ally_rights as $fieldName)
+  foreach ($ally_rights as $fieldName)
   {
     $newRank[$fieldName] = 0;
   }
@@ -28,9 +28,9 @@ 
 {
   unset($ranks);
 
-  foreach($rankListInput as $rankID => $rank)
+  foreach ($rankListInput as $rankID => $rank)
   {
-    foreach($ally_rights as $rightName)
+    foreach ($ally_rights as $rightName)
     {
       $ranks[$rankID][$rightName] = $rank[$rightName] ? 1 : 0;
     }
@@ -41,7 +41,7 @@ 
 $d = sys_get_param_int('d');
 if ($d && isset($ranks[$d]))
 {
-  if(count($ranks) == 1)
+  if (count($ranks) == 1)
   {
     message(classLocale::$lang['ali_adm_lastRank'], classLocale::$lang['ali_adm_rights_title']);
   }
@@ -53,17 +53,17 @@ 
 
 if (count($ranks))
 {
-  foreach($ranks as $rankID => $rank)
+  foreach ($ranks as $rankID => $rank)
   {
     $rank_data = array(
       'ID'   => $rankID,
       'NAME' => $rank['name'],
     );
 
-    for($i = 1; $i < count($rank); $i++)
+    for ($i = 1; $i < count($rank); $i++)
     {
-      $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '') ;
-      $rank_data['N' . $i] = $ally_rights[$i];
+      $rank_data['R'.$i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '');
+      $rank_data['N'.$i] = $ally_rights[$i];
     }
 
     $template->assign_block_vars('rank', $rank_data);

includes/db/db_helpers.php

Spacing +7 added lines, -7 removed lines

@@ -27,19 +27,19 @@
  */
 function db_set_make_safe_string($set, $delta = false) {
   $set_safe = array();
-  foreach($set as $field => $value) {
-    if(empty($field)) {
+  foreach ($set as $field => $value) {
+    if (empty($field)) {
       continue;
     }
 
-    $field = '`' . db_escape($field) . '`';
+    $field = '`'.db_escape($field).'`';
     $new_value = $value;
-    if($value === null) {
+    if ($value === null) {
       $new_value = 'NULL';
-    } elseif(is_string($value) && (string)($new_value = floatval($value)) != (string)$value) {
+    } elseif (is_string($value) && (string) ($new_value = floatval($value)) != (string) $value) {
       // non-float
-      $new_value = '"' . db_escape($value) . '"';
-    } elseif($delta) {
+      $new_value = '"'.db_escape($value).'"';
+    } elseif ($delta) {
       // float and DELTA-set
       $new_value = "{$field} + ({$new_value})";
     }

includes/db/db_queries_notes.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
  * @param $note_id_edit
  */
 function db_note_update_by_id($note_priority, $note_title, $note_text, $note_galaxy, $note_system, $note_planet, $note_planet_type, $note_sticky, $note_id_edit) {
-  doquery("UPDATE {{notes}} SET `time` = " . SN_TIME_NOW . ", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
+  doquery("UPDATE {{notes}} SET `time` = ".SN_TIME_NOW.", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
         `galaxy` = {$note_galaxy}, `system` = {$note_system}, `planet` = {$note_planet}, `planet_type` = {$note_planet_type}, `sticky` = {$note_sticky}
         WHERE `id` = {$note_id_edit} LIMIT 1;");
 }
@@ -51,7 +51,7 @@ 
  * @param $note_sticky
  */
 function db_note_insert($user, $note_priority, $note_title, $note_text, $note_galaxy, $note_system, $note_planet, $note_planet_type, $note_sticky) {
-  doquery("INSERT INTO {{notes}} SET `owner` = {$user['id']}, `time` = " . SN_TIME_NOW . ", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
+  doquery("INSERT INTO {{notes}} SET `owner` = {$user['id']}, `time` = ".SN_TIME_NOW.", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
         `galaxy` = {$note_galaxy}, `system` = {$note_system}, `planet` = {$note_planet}, `planet_type` = {$note_planet_type}, `sticky` = {$note_sticky};");
 }
 

includes/init_secondary.php

Spacing +24 added lines, -24 removed lines

@@ -2,19 +2,19 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
-  include(SN_ROOT_PHYSICAL . 'ajax_version_check' . DOT_PHP_EX);
+if (classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
+  include(SN_ROOT_PHYSICAL.'ajax_version_check'.DOT_PHP_EX);
 }
 
-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" . DOT_PHP_EX);
+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".DOT_PHP_EX);
   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) {
     db_log_online_insert();
   }
 }
@@ -41,7 +41,7 @@ 
 $template_result[F_ACCOUNT_IS_AUTHORIZED] = $sys_user_logged_in = !empty($user) && isset($user['id']) && $user['id'];
 //pdump($template_result[F_ACCOUNT_IS_AUTHORIZED]);die();
 
-if(!empty($user['id'])) {
+if (!empty($user['id'])) {
   classSupernova::$user_options->user_change($user['id']);
 }
 
@@ -54,15 +54,15 @@ 
     : false
   );
 
-if($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
-  $prohibited_characters = array_map(function ($value) {
-    return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
+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));
   $template_result[F_LOGIN_MESSAGE] .= implode(', ', $prohibited_characters);
 }
 
 
-if(defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
+if (defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
   pdump("Отключи отладку перед продакшном!");
 }
 
@@ -76,17 +76,17 @@ 
   ? define('INSTALL_MODE', GAME_DISABLE_INSTALL)
   : false;
 
-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] = sys_bbcodeParse(
     classSupernova::$config->game_disable == GAME_DISABLE_REASON
       ? classSupernova::$config->game_disable_reason
       : classLocale::$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'))
@@ -100,8 +100,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;
   }
 
@@ -119,15 +119,15 @@ 
 // pdump($allow_anonymous, '$allow_anonymous');
 // pdump($sys_user_logged_in, '$sys_user_logged_in');
 
-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'])
+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'])
 //  pdump($sn_page_name);
 //  pdump(INITIAL_PAGE);
 //  die('{Тут должна быть ваша реклама. Точнее - ввод имени игрока}');
-} elseif(!$allow_anonymous && !$sys_user_logged_in) {
+} elseif (!$allow_anonymous && !$sys_user_logged_in) {
   // sn_setcookie(SN_COOKIE, '', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
-  sys_redirect(SN_ROOT_VIRTUAL . 'login.php');
+  sys_redirect(SN_ROOT_VIRTUAL.'login.php');
 }
 
 $user_time_diff = playerTimeDiff::user_time_diff_get();
@@ -146,16 +146,16 @@ 
 
 global $skip_fleet_update;
 $skip_fleet_update = $skip_fleet_update || $supernova->options['fleet_update_skip'] || defined('IN_ADMIN');
-if(
+if (
   !$skip_fleet_update
   && !(defined('IN_AJAX') && IN_AJAX === true)
   && SN_TIME_NOW - strtotime(classSupernova::$config->fleet_update_last) > classSupernova::$config->fleet_update_interval
 ) {
-  require_once(SN_ROOT_PHYSICAL . "includes/includes/flt_flying_fleet_handler2" . DOT_PHP_EX);
+  require_once(SN_ROOT_PHYSICAL."includes/includes/flt_flying_fleet_handler2".DOT_PHP_EX);
   flt_flying_fleet_handler($skip_fleet_update);
 }
 
-if(!defined('IN_AJAX')) {
+if (!defined('IN_AJAX')) {
   print("Scheduled processes is disabled<br />");
 }
 // scheduler_process();

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;
     }