supernova-ws / SuperNova

includes/alliance/ali_internal_members.inc

Spacing +30 added lines, -30 removed lines

@@ -2,31 +2,31 @@ 
 
 $classLocale = classLocale::$lang;
 
-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);
 }
 
 // Changing rank for single user
 $id_user = sys_get_param_id('id_user');
-if(isset($_GET['id_rank'])) {
+if (isset($_GET['id_rank'])) {
   $id_rank = sys_get_param_int('id_rank');
 }
-if($id_user && isset($id_rank) && $user_admin) {
+if ($id_user && isset($id_rank) && $user_admin) {
   db_user_set_by_id($id_user, "`ally_rank_id` = {$id_rank}");
 }
 
 $id_kick = sys_get_param_id('kick');
 
-if($id_kick && $user_can_kick) {
+if ($id_kick && $user_can_kick) {
   $u = db_user_by_id($id_kick, true);
-  if($u['ally_id'] == $ally['id'] && $u['id'] != $ally['ally_owner']) {
+  if ($u['ally_id'] == $ally['id'] && $u['id'] != $ally['ally_owner']) {
     db_user_set_by_id($id_kick, '`ally_id`= null, `ally_name` = null, `ally_tag` = null, ally_register_time = 0, ally_rank_id = 0');
     db_ally_update_member_decrease($ally);
   }
 }
 
 $sort2 = sys_get_param_int('sort2');
-if($sort2) {
+if ($sort2) {
   $sort2s = "DESC";
   $sort2 = 0;
 } else {
@@ -35,7 +35,7 @@ 
 }
 
 $sort1 = sys_get_param_int('sort1');
-if($sort1 > 5 || $sort1 < 0) {
+if ($sort1 > 5 || $sort1 < 0) {
   $sort1 = 0;
 }
 $sort1s = array(
@@ -49,28 +49,28 @@ 
 
 $template = gettemplate('ali_members', true);
 
-$userList = db_user_list("`ally_id`= {$user['ally_id']} ORDER BY " . sprintf($sort1s[$sort1], $sort2s), false,
+$userList = db_user_list("`ally_id`= {$user['ally_id']} ORDER BY ".sprintf($sort1s[$sort1], $sort2s), false,
   'id, username, galaxy, system, planet, onlinetime, ally_rank_id, ally_register_time, total_points');
 
 // while ($userRow = db_fetch($userList))
-foreach($userList as $userRow) {
+foreach ($userList as $userRow) {
   $i++;
-  if(!isset($ranks[$userRow['ally_rank_id']])) {
+  if (!isset($ranks[$userRow['ally_rank_id']])) {
     $userRow['ally_rank_id'] = 0;
   }
 
-  if($ally['ally_owner'] == $userRow['id']) {
+  if ($ally['ally_owner'] == $userRow['id']) {
     $ally_range = ($ally['ally_owner_range']) ? $ally['ally_owner_range'] : classLocale::$lang['Founder'];
   } else {
-    if($user_admin) {
-      $ally_range = '<select onchange="window.location=\'alliance.php?mode=admin&edit=members&id_user=' . $userRow['id'] . '&id_rank=\' + this.value">';
+    if ($user_admin) {
+      $ally_range = '<select onchange="window.location=\'alliance.php?mode=admin&edit=members&id_user='.$userRow['id'].'&id_rank=\' + this.value">';
 
-      foreach($ranks as $rankID => $rankArray) {
-        $ally_range .= '<option value="' . $rankID . '"';
-        if($rankID == $userRow['ally_rank_id']) {
+      foreach ($ranks as $rankID => $rankArray) {
+        $ally_range .= '<option value="'.$rankID.'"';
+        if ($rankID == $userRow['ally_rank_id']) {
           $ally_range .= " selected";
         }
-        $ally_range .= '>' . $rankArray['name'];
+        $ally_range .= '>'.$rankArray['name'];
         $ally_range .= '</option>';
       }
       $ally_range .= '</select>';
@@ -80,20 +80,20 @@ 
   }
 
   $last_active = time() - $userRow["onlinetime"];
-  if($user_admin) {
-    if($last_active < 60) {
+  if ($user_admin) {
+    if ($last_active < 60) {
       $tmp = "lime>{$classLocale['On']}";
-    } elseif($last_active < 60 * 60) {
+    } elseif ($last_active < 60 * 60) {
       $last_active = round($last_active / 60);
       $tmp = "lime>{$last_active} {$classLocale['sys_min_short']}";
-    } elseif($last_active < 60 * 60 * 24) {
+    } elseif ($last_active < 60 * 60 * 24) {
       $last_active = round($last_active / (60 * 60));
       $tmp = "green>{$last_active} {$classLocale['sys_hrs_short']}";
     } else {
       $last_active = round($last_active / (60 * 60 * 24));
-      if($last_active < 7) {
+      if ($last_active < 7) {
         $tmp = "yellow";
-      } elseif($last_active < 30) {
+      } elseif ($last_active < 30) {
         $tmp = "orange";
       } else {
         $tmp = "red";
@@ -101,10 +101,10 @@ 
       $tmp .= ">{$last_active} {$classLocale['sys_day_short']}";
     }
   } else {
-    if($user_onlinestatus) {
-      if($last_active < 60 * 5) {
+    if ($user_onlinestatus) {
+      if ($last_active < 60 * 5) {
         $tmp = "lime>{$classLocale['On']}";
-      } elseif($last_active < 60 * 15) {
+      } elseif ($last_active < 60 * 15) {
         $tmp = "yellow>{$classLocale['ali_lessThen15min']}";
       } else {
         $tmp = "red>{$classLocale['Off']}";
@@ -124,21 +124,21 @@ 
     'SYSTEM'        => $userRow['system'],
     'PLANET'        => $userRow['planet'],
     'POINTS'        => pretty_number($userRow['total_points']),
-    'ONLINE'        => '<font color=' . $tmp . '</font>',
+    'ONLINE'        => '<font color='.$tmp.'</font>',
     'RANK'          => $ally_range,
     'REGISTER_TIME' => date(FMT_DATE_TIME, $userRow['ally_register_time']),
     'SHOW_KICK'     => $user['id'] != $userRow['id'] && $ally['ally_owner'] != $userRow['id'],
   ));
 }
 
-if($i != $ally['ally_members']) {
+if ($i != $ally['ally_members']) {
   db_ally_update_member_set($i, $ally);
 }
 
 $template->assign_vars(array(
-  'mode'          => $mode . ($edit ? "&edit=" . $edit : ''),
+  'mode'          => $mode.($edit ? "&edit=".$edit : ''),
   'ADMIN_MODE'    => $user_can_kick,
-  'dpath'         => SN_ROOT_VIRTUAL . $dpath,
+  'dpath'         => SN_ROOT_VIRTUAL.$dpath,
   'onlineMessage' => $user_admin ? classLocale::$lang['ali_sys_lastActive'] : classLocale::$lang['Online'],
   'memberCount'   => count($userList),
   'memberslist'   => $page_list,

includes/alliance/ali_external_create_ally.inc

Spacing +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 // Pretty Safe
 // TODO: Add ally_tag to usertable
 
-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);
 }
 
@@ -11,21 +11,21 @@ 
 $ally_name_raw = sys_get_param_str_unsafe('name');
 $ally_name = db_escape($ally_name_raw);
 
-if($ally_tag) {
-  if(!$ally_name_raw || !$ally_tag_raw) {
+if ($ally_tag) {
+  if (!$ally_name_raw || !$ally_tag_raw) {
     message(classLocale::$lang['have_not_name'], classLocale::$lang['make_alliance']);
   }
 
   $query = db_ally_get_by_name_or_tag($ally_tag, $ally_name);
-  if($query) {
+  if ($query) {
     message(str_replace('%s', $query['ally_tag'] == $ally_tag_raw ? $ally_tag_raw : $ally_name_raw, classLocale::$lang['always_exist']), classLocale::$lang['make_alliance']);
   }
 
   db_ally_insert($ally_name, $ally_tag, $user);
   $ally_id = db_insert_id();
-  db_user_set_by_id($user['id'], "`ally_tag` = '{$ally_tag}', `ally_id`= {$ally_id}, `ally_name`='{$ally_name}', `ally_register_time`= " . SN_TIME_NOW . "");
+  db_user_set_by_id($user['id'], "`ally_tag` = '{$ally_tag}', `ally_id`= {$ally_id}, `ally_name`='{$ally_name}', `ally_register_time`= ".SN_TIME_NOW."");
 
-  $ally_user = classSupernova::db_ins_record(LOC_USER, "`username` = '[{$ally_tag}]', `register_time` = " . SN_TIME_NOW . ", `user_as_ally` = {$ally_id}");
+  $ally_user = classSupernova::db_ins_record(LOC_USER, "`username` = '[{$ally_tag}]', `register_time` = ".SN_TIME_NOW.", `user_as_ally` = {$ally_id}");
   // $ally_user_id = db_insert_id();
   $ally_user_id = is_array($ally_user) ? $ally_user['id'] : 'NULL';
   db_ally_update_ally_user($ally_user_id, $ally_id);

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/alliance/ali_internal_admin_request.inc

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
@@ -10,16 +10,16 @@ 
 
 $d = sys_get_param_id('d');
 
-if($d) {
+if ($d) {
   db_ally_request_deny($d);
 }
 
 $id_user = sys_get_param_id('id_user');
 
-if($id_user) {
+if ($id_user) {
   $ally_name_safe = db_escape($ally['ally_name']);
   $ally_tag_safe = db_escape($ally['ally_tag']);
-  db_user_set_by_id($id_user, "`ally_id` = '{$ally['id']}', `ally_name` = '{$ally_name_safe}', `ally_tag` = '{$ally_tag_safe}', `ally_register_time` = " . SN_TIME_NOW . ", `ally_rank_id` = 0");
+  db_user_set_by_id($id_user, "`ally_id` = '{$ally['id']}', `ally_name` = '{$ally_name_safe}', `ally_tag` = '{$ally_tag_safe}', `ally_register_time` = ".SN_TIME_NOW.", `ally_rank_id` = 0");
   db_ally_update_member_increase($ally);
   db_ally_request_delete_by_user_id($id_user);
 }

includes/db/db_queries_messages.php

Spacing +7 added lines, -7 removed lines

@@ -5,7 +5,7 @@ 
   return doquery(
     "SELECT * FROM {{messages}}
         WHERE
-          `message_type` = '" . MSG_TYPE_PLAYER . "' AND
+          `message_type` = '" . MSG_TYPE_PLAYER."' AND
           ((`message_owner` = '{$user['id']}' AND `message_sender` = '{$recipient_id}')
           OR
           (`message_sender` = '{$user['id']}' AND `message_owner` = '{$recipient_id}')) ORDER BY `message_time` DESC LIMIT 20;");
@@ -51,7 +51,7 @@ 
 FROM
   {{messages}} AS m
   LEFT JOIN {{users}} AS u ON u.id = m.message_owner " .
-    ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '') .
+    ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '').
     "ORDER BY
   `message_id` DESC
 LIMIT
@@ -59,7 +59,7 @@ 
 }
 
 function db_message_insert_all($message_type, $from, $subject, $text) {
-  return doquery($QryInsertMessage = 'INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
+  return doquery($QryInsertMessage = 'INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) '.
     "SELECT `id`, 0, unix_timestamp(now()), {$message_type}, '{$from}', '{$subject}', '{$text}' FROM {{users}}");
 }
 
@@ -69,7 +69,7 @@ 
  * @return array|bool|mysqli_result|null
  */
 function db_message_count_by_type($int_type_selected) {
-  $page_max = doquery('SELECT COUNT(*) AS `max` FROM {{messages}}' . ($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''), true);
+  $page_max = doquery('SELECT COUNT(*) AS `max` FROM {{messages}}'.($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''), true);
 
   return $page_max;
 }
@@ -86,13 +86,13 @@ 
  * @param $int_type_selected
  */
 function db_message_list_delete_by_date($delete_date, $int_type_selected) {
-  doquery("DELETE FROM {{messages}} WHERE message_time <= UNIX_TIMESTAMP('{$delete_date}')" . ($int_type_selected >= 0 ? " AND `message_type` = {$int_type_selected}" : ''));
+  doquery("DELETE FROM {{messages}} WHERE message_time <= UNIX_TIMESTAMP('{$delete_date}')".($int_type_selected >= 0 ? " AND `message_type` = {$int_type_selected}" : ''));
 }
 
 /**
  * @param $insert_values
  */
 function db_message_insert($insert_values) {
-  doquery('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
-    'VALUES ' . implode(',', $insert_values));
+  doquery('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) '.
+    'VALUES '.implode(',', $insert_values));
 }

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(