supernova-ws / SuperNova

announce.php

Spacing +12 added lines, -12 removed lines

@@ -23,39 +23,39 @@ 
 $mode = sys_get_param_str('mode');
 
 $announce = array();
-if($user['authlevel'] >= 3) {
-  if(!empty($text)) {
+if ($user['authlevel'] >= 3) {
+  if (!empty($text)) {
     $announce_time = strtotime($announce_time, SN_TIME_NOW);
     $announce_time = $announce_time ? $announce_time : SN_TIME_NOW;
 
-    if($mode == 'edit') {
+    if ($mode == 'edit') {
       db_news_update_set($announce_time, $text, $detail_url, $announce_id);
       db_survey_delete_by_id($announce_id);
     } else {
       db_news_insert_set($announce_time, $text, $detail_url, $user);
       $announce_id = db_insert_id();
     }
-    if(($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
+    if (($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
       $survey_answers = explode("\r\n", $survey_answers);
       $survey_until = strtotime($survey_until = sys_get_param_str('survey_until'), SN_TIME_NOW);
       $survey_until = date(FMT_DATE_TIME_SQL, $survey_until ? $survey_until : SN_TIME_NOW + PERIOD_DAY * 1);
       db_survey_insert($announce_id, $survey_question, $survey_until);
       $survey_id = db_insert_id();
-      foreach($survey_answers as $survey_answer) {
+      foreach ($survey_answers as $survey_answer) {
         $survey_answer = db_escape(trim($survey_answer));
-        if(empty($survey_answer)) {
+        if (empty($survey_answer)) {
           continue;
         }
         db_survey_answer_insert($survey_id, $survey_answer);
       }
     }
 
-    if($announce_time <= SN_TIME_NOW) {
-      if($announce_time > $config->var_news_last && $announce_time == SN_TIME_NOW) {
+    if ($announce_time <= SN_TIME_NOW) {
+      if ($announce_time > $config->var_news_last && $announce_time == SN_TIME_NOW) {
         $config->db_saveItem('var_news_last', $announce_time);
       }
 
-      if(sys_get_param_int('news_mass_mail')) {
+      if (sys_get_param_int('news_mass_mail')) {
         $text = sys_get_param('text') . ($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang['news_more']}</span></a>" : '');
         msg_send_simple_message('*', 0, 0, MSG_TYPE_ADMIN, $lang['sys_administration'], $lang['news_title'], $text);
       }
@@ -66,7 +66,7 @@ 
   }
 
   $survey_answers = '';
-  switch($mode) {
+  switch ($mode) {
     case 'del':
       db_news_delete_by_id($announce_id);
       $mode = '';
@@ -76,9 +76,9 @@ 
       $template->assign_var('ID', $announce_id);
     case 'copy':
       $announce = db_news_with_survey_select_by_id($announce_id);
-      if($announce['survey_id']) {
+      if ($announce['survey_id']) {
         $query = db_survey_answer_text_select_by_news($announce);
-        while($row = db_fetch($query)) {
+        while ($row = db_fetch($query)) {
           $survey_answers[] = $row['survey_answer_text'];
         }
         $survey_answers = implode("\r\n", $survey_answers);

includes/pages/options.php

Spacing +45 added lines, -45 removed lines

@@ -22,7 +22,7 @@ 
 
   $language_new = sys_get_param_str('langer', $user['lang']);
 
-  if($language_new != $user['lang']) {
+  if ($language_new != $user['lang']) {
     $lang->lng_switch($language_new);
   }
 
@@ -31,35 +31,35 @@ 
 
   $FMT_DATE = preg_replace(array('/d/', '/m/', '/Y/'), array('DD', 'MM', 'YYYY'), FMT_DATE);
 
-  if(sys_get_param_str('mode') == 'change') {
-    if($user['authlevel'] > 0) {
+  if (sys_get_param_str('mode') == 'change') {
+    if ($user['authlevel'] > 0) {
       $planet_protection = sys_get_param_int('adm_pl_prot') ? $user['authlevel'] : 0;
       db_planet_set_by_owner($user['id'], "`id_level` = '{$planet_protection}'");
       db_user_set_by_id($user['id'], "`admin_protection` = '{$planet_protection}'");
       $user['admin_protection'] = $planet_protection;
     }
 
-    if(sys_get_param_int('vacation') && !$config->user_vacation_disable) {
+    if (sys_get_param_int('vacation') && !$config->user_vacation_disable) {
       sn_db_transaction_start();
-      if($user['authlevel'] < 3) {
-        if($user['vacation_next'] > SN_TIME_NOW) {
+      if ($user['authlevel'] < 3) {
+        if ($user['vacation_next'] > SN_TIME_NOW) {
           message($lang['opt_vacation_err_timeout'], $lang['Error'], 'index.php?page=options', 5);
           die();
         }
 
-        if(FleetList::fleet_count_flying($user['id'])) {
+        if (FleetList::fleet_count_flying($user['id'])) {
           message($lang['opt_vacation_err_your_fleet'], $lang['Error'], 'index.php?page=options', 5);
           die();
         }
 
         $que = que_get($user['id'], false);
-        if(!empty($que)) {
+        if (!empty($que)) {
           message($lang['opt_vacation_err_que'], $lang['Error'], 'index.php?page=options', 5);
           die();
         }
 
         $query = classSupernova::db_get_record_list(LOC_PLANET, "`id_owner` = {$user['id']}");
-        foreach($query as $planet) {
+        foreach ($query as $planet) {
           // $planet = sys_o_get_updated($user, $planet, SN_TIME_NOW);
           // $planet = $planet['planet'];
 
@@ -77,9 +77,9 @@ 
       sn_db_transaction_commit();
     }
 
-    foreach($user_option_list as $option_group_id => $option_group) {
-      foreach($option_group as $option_name => $option_value) {
-        if($user[$option_name] !== null) {
+    foreach ($user_option_list as $option_group_id => $option_group) {
+      foreach ($option_group as $option_name => $option_value) {
+        if ($user[$option_name] !== null) {
           $user[$option_name] = sys_get_param_str($option_name);
         } else {
           $user[$option_name] = $option_value;
@@ -90,8 +90,8 @@ 
 
 
     $player_options = sys_get_param('options');
-    if(!empty($player_options)) {
-      array_walk($player_options, function (&$value) {
+    if (!empty($player_options)) {
+      array_walk($player_options, function(&$value) {
         // TODO - Когда будет больше параметров - сделать больше проверок
         $value = intval($value);
       });
@@ -102,15 +102,15 @@ 
 
     $username = substr(sys_get_param_str_unsafe('username'), 0, 32);
     $username_safe = db_escape($username);
-    if($username && $user['username'] != $username && $config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_NONE && sys_get_param_int('username_confirm') && !strpbrk($username, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
+    if ($username && $user['username'] != $username && $config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_NONE && sys_get_param_int('username_confirm') && !strpbrk($username, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
       // проверка на корректность
       sn_db_transaction_start();
       $name_check = db_player_name_history_get_name_by_name($username_safe);
-      if(!$name_check || $name_check['player_id'] == $user['id']) {
+      if (!$name_check || $name_check['player_id'] == $user['id']) {
         $user = db_user_by_id($user['id'], true);
-        switch($config->game_user_changename) {
+        switch ($config->game_user_changename) {
           case SERVER_PLAYER_NAME_CHANGE_PAY:
-            if(mrc_get_level($user, $planetrow, RES_DARK_MATTER) < $config->game_user_changename_cost) {
+            if (mrc_get_level($user, $planetrow, RES_DARK_MATTER) < $config->game_user_changename_cost) {
               $template_result['.']['result'][] = array(
                 'STATUS'  => ERR_ERROR,
                 'MESSAGE' => $lang['opt_msg_name_change_err_no_dm'],
@@ -140,18 +140,18 @@ 
       sn_db_transaction_commit();
     }
 
-    if($new_password = sys_get_param('newpass1')) {
+    if ($new_password = sys_get_param('newpass1')) {
       try {
-        if($new_password != sys_get_param('newpass2')) {
+        if ($new_password != sys_get_param('newpass2')) {
           throw new Exception($lang['opt_err_pass_unmatched'], ERR_WARNING);
         }
 
-        if(!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
+        if (!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
           throw new Exception($lang['opt_err_pass_wrong'], ERR_WARNING);
         }
 
         throw new Exception($lang['opt_msg_pass_changed'], ERR_NONE);
-      } catch(Exception $e) {
+      } catch (Exception $e) {
         $template_result['.']['result'][] = array(
           'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
           'MESSAGE' => $e->getMessage()
@@ -192,12 +192,12 @@ 
     $user['gender'] = $user['gender'] == GENDER_UNKNOWN ? $gender : $user['gender'];
 
     try {
-      if($user['birthday']) {
+      if ($user['birthday']) {
         throw new exception();
       }
 
       $user_birthday = sys_get_param_str_unsafe('user_birthday');
-      if(!$user_birthday || $user_birthday == $FMT_DATE) {
+      if (!$user_birthday || $user_birthday == $FMT_DATE) {
         throw new exception();
       }
 
@@ -207,16 +207,16 @@ 
       $pos['Y'] = strpos(FMT_DATE, 'Y');
       asort($pos);
       $i = 0;
-      foreach($pos as &$position) {
+      foreach ($pos as &$position) {
         $position = ++$i;
       }
 
       $regexp = "/" . preg_replace(array('/\\\\/', '/\//', '/\./', '/\-/', '/d/', '/m/', '/Y/'), array('\\\\\\', '\/', '\.', '\-', '(\d?\d)', '(\d?\d)', '(\d{4})'), FMT_DATE) . "/";
-      if(!preg_match($regexp, $user_birthday, $match)) {
+      if (!preg_match($regexp, $user_birthday, $match)) {
         throw new exception();
       }
 
-      if(!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
+      if (!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
         throw new exception();
       }
 
@@ -224,13 +224,13 @@ 
       // EOF black magic! Now we have valid SQL date in $user['user_birthday'] - independent of date format
 
       $year = date('Y', SN_TIME_NOW);
-      if(mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
+      if (mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
         $year--;
       }
       $user['user_birthday_celebrated'] = db_escape("{$year}-{$match[$pos['m']]}-{$match[$pos['d']]}");
 
       $user_birthday = ", `user_birthday` = '{$user['user_birthday']}', `user_birthday_celebrated` = '{$user['user_birthday_celebrated']}'";
-    } catch(exception $e) {
+    } catch (exception $e) {
       $user_birthday = '';
     }
 
@@ -240,14 +240,14 @@ 
     $template_result['.']['result'][] = $avatar_upload_result;
 
     $user_time_diff = playerTimeDiff::user_time_diff_get();
-    if(sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
+    if (sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
       playerTimeDiff::user_time_diff_set(array(
         PLAYER_OPTION_TIME_DIFF              => sys_get_param_int('PLAYER_OPTION_TIME_DIFF'),
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
         PLAYER_OPTION_TIME_DIFF_FORCED       => 1,
         PLAYER_OPTION_TIME_DIFF_MEASURE_TIME => SN_TIME_SQL,
       ));
-    } elseif(sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
+    } elseif (sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
       playerTimeDiff::user_time_diff_set(array(
         PLAYER_OPTION_TIME_DIFF              => '',
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
@@ -267,7 +267,7 @@ 
       'STATUS'  => ERR_NONE,
       'MESSAGE' => $lang['opt_msg_saved']
     );
-  } elseif(sys_get_param_str('result') == 'ok') {
+  } elseif (sys_get_param_str('result') == 'ok') {
     $template_result['.']['result'][] = array(
       'STATUS'  => ERR_NONE,
       'MESSAGE' => $lang['opt_msg_saved']
@@ -295,8 +295,8 @@ 
 //  );
 
   $dir = dir(SN_ROOT_PHYSICAL . 'skins');
-  while(($entry = $dir->read()) !== false) {
-    if(is_dir("skins/{$entry}") && $entry[0] != '.') {
+  while (($entry = $dir->read()) !== false) {
+    if (is_dir("skins/{$entry}") && $entry[0] != '.') {
       $template_result['.']['skin_list'][] = array(
         'VALUE'    => $entry,
         'NAME'     => $entry,
@@ -306,7 +306,7 @@ 
   }
   $dir->close();
 
-  foreach($lang['opt_planet_sort_options'] as $key => &$value) {
+  foreach ($lang['opt_planet_sort_options'] as $key => &$value) {
     $template_result['.']['planet_sort_options'][] = array(
       'VALUE'    => $key,
       'NAME'     => $value,
@@ -322,7 +322,7 @@ 
       );
     }
   */
-  foreach($lang['sys_gender_list'] as $key => $value) {
+  foreach ($lang['sys_gender_list'] as $key => $value) {
     $template_result['.']['gender_list'][] = array(
       'VALUE'    => $key,
       'NAME'     => $value,
@@ -331,7 +331,7 @@ 
   }
 
   $lang_list = lng_get_list();
-  foreach($lang_list as $lang_id => $lang_data) {
+  foreach ($lang_list as $lang_id => $lang_data) {
     $template_result['.']['languages'][] = array(
       'VALUE'    => $lang_id,
       'NAME'     => $lang_data['LANG_NAME_NATIVE'],
@@ -340,8 +340,8 @@ 
   }
 
 
-  if(isset($lang['menu_customize_show_hide_button_state'])) {
-    foreach($lang['menu_customize_show_hide_button_state'] as $key => $value) {
+  if (isset($lang['menu_customize_show_hide_button_state'])) {
+    foreach ($lang['menu_customize_show_hide_button_state'] as $key => $value) {
       $template->assign_block_vars('menu_customize_show_hide_button_state', array(
         'ID'   => $key,
         'NAME' => $value,
@@ -451,10 +451,10 @@ 
     'PAGE_HEADER' => $lang['opt_header'],
   ));
 
-  foreach($user_option_list as $option_group_id => $option_group) {
-    if($option_group_id == OPT_MESSAGE) {
-      foreach($sn_message_class_list as $message_class_id => $message_class_data) {
-        if($message_class_data['switchable'] || ($message_class_data['email'] && $config->game_email_pm)) {
+  foreach ($user_option_list as $option_group_id => $option_group) {
+    if ($option_group_id == OPT_MESSAGE) {
+      foreach ($sn_message_class_list as $message_class_id => $message_class_data) {
+        if ($message_class_data['switchable'] || ($message_class_data['email'] && $config->game_email_pm)) {
           $option_name = $message_class_data['name'];
 
           $template->assign_block_vars("options_{$option_group_id}", array(
@@ -466,8 +466,8 @@ 
         }
       }
     } else {
-      foreach($option_group as $option_name => $option_value) {
-        if(array_key_exists($option_name, $user_option_types)) {
+      foreach ($option_group as $option_name => $option_value) {
+        if (array_key_exists($option_name, $user_option_types)) {
           $option_type = $user_option_types[$option_name];
         } else {
           $option_type = 'switch';

includes/pages/chat.php

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php
 /**
- * chat.php
- * Main chat window
- *
- * Changelog:
- * 4.0 copyright © 2009-2012 Gorlum for http://supernova.ws
- * [!] Another rewrite
- * [+] preMVC-compatible
- * 3.0 copyright © 2009-2011 Gorlum for http://supernova.ws
- * [!] Almost full rewrote
- * [+] Complies with PCG1
- * 2.0 copyright © 2009-2010 Gorlum for http://supernova.ws
- * [+] Rewrote to remove unnecessary code dupes
- * 1.5 copyright © 2009-2010 Gorlum for http://supernova.ws
- * [~] More DDoS-realted fixes
- * 1.4 copyright © 2009-2010 Gorlum for http://supernova.ws
- * [~] DDoS-realted fixes
- * 1.3 copyright © 2009-2010 Gorlum for http://supernova.ws
- * [~] Security checks for SQL-injection
- * 1.2 by Ihor
- * 1.0 Shoutbox copyright © 2008 by e-Zobar for XNova
- **/
+   * chat.php
+   * Main chat window
+   *
+   * Changelog:
+   * 4.0 copyright © 2009-2012 Gorlum for http://supernova.ws
+   * [!] Another rewrite
+   * [+] preMVC-compatible
+   * 3.0 copyright © 2009-2011 Gorlum for http://supernova.ws
+   * [!] Almost full rewrote
+   * [+] Complies with PCG1
+   * 2.0 copyright © 2009-2010 Gorlum for http://supernova.ws
+   * [+] Rewrote to remove unnecessary code dupes
+   * 1.5 copyright © 2009-2010 Gorlum for http://supernova.ws
+   * [~] More DDoS-realted fixes
+   * 1.4 copyright © 2009-2010 Gorlum for http://supernova.ws
+   * [~] DDoS-realted fixes
+   * 1.3 copyright © 2009-2010 Gorlum for http://supernova.ws
+   * [~] Security checks for SQL-injection
+   * 1.2 by Ihor
+   * 1.0 Shoutbox copyright © 2008 by e-Zobar for XNova
+   **/
 /*
 $sn_mvc['model']['chat'][] = 'sn_chat_model';
 $sn_mvc['model']['chat_add'][] = 'sn_chat_add_model';

Spacing +13 added lines, -13 removed lines

@@ -36,7 +36,7 @@ 
   $user_auth_level = isset($user['authlevel']) ? $user['authlevel'] : AUTH_LEVEL_ANONYMOUS;
 
   $mode = sys_get_param_int('mode');
-  switch($mode) {
+  switch ($mode) {
     case CHAT_MODE_ALLY:
       $template_result['ALLY'] = intval($user['ally_id']);
       $page_title = $lang['chat_ally'];
@@ -49,12 +49,12 @@ 
   }
 
   $template_result['.']['smiles'] = array();
-  foreach($supernova->design['smiles'] as $auth_level => $replaces) {
-    if($auth_level > $user_auth_level) {
+  foreach ($supernova->design['smiles'] as $auth_level => $replaces) {
+    if ($auth_level > $user_auth_level) {
       continue;
     }
 
-    foreach($replaces as $bbcode => $filename) {
+    foreach ($replaces as $bbcode => $filename) {
       $template_result['.']['smiles'][] = array(
         'BBCODE'   => $bbcode,
         'FILENAME' => $filename,
@@ -77,11 +77,11 @@ 
   define('IN_AJAX', true);
   $skip_fleet_update = true;
 
-  if($config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) {
+  if ($config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) {
     die();
   }
 
-  if(($message = sys_get_param_str('message')) && $user['username']) {
+  if (($message = sys_get_param_str('message')) && $user['username']) {
     $ally_id = sys_get_param('ally') && $user['ally_id'] ? $user['ally_id'] : 0;
     $nick = db_escape(player_nick_compact(player_nick_render_current_to_array($user, array('color' => true, 'icons' => true, 'ally' => !$ally_id))));
 
@@ -102,7 +102,7 @@ 
   $skip_fleet_update = true;
 
   $history = sys_get_param_str('history');
-  if(!$history) {
+  if (!$history) {
     $config->array_set('users', $user['id'], 'chat_last_refresh', SN_TIME_MICRO);
   }
 
@@ -110,7 +110,7 @@ 
   $last_message = '';
   $alliance = 0;
   $template_result['.']['chat'] = array();
-  if(!$history && $config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) {
+  if (!$history && $config->_MODE != CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout) {
     $result['disable'] = true;
     $template_result['.']['chat'][] = array(
       'TIME'    => date(FMT_DATE_TIME, htmlentities(SN_CLIENT_TIME_LOCAL, ENT_QUOTES, 'utf-8')),
@@ -123,11 +123,11 @@ 
 
     $where_add = '';
     $last_message = 0;
-    if($history) {
+    if ($history) {
       $rows = db_chat_message_count_by_ally($alliance);
       $page_count = ceil($rows['CNT'] / $page_limit);
 
-      for($i = 0; $i < $page_count; $i++) {
+      for ($i = 0; $i < $page_count; $i++) {
         $template_result['.']['page'][] = array(
           'NUMBER' => $i
         );
@@ -141,12 +141,12 @@ 
 
     $start_row = $page * $page_limit;
     $query = db_chat_message_get_page($alliance, $where_add, $start_row, $page_limit);
-    while($chat_row = db_fetch($query)) {
+    while ($chat_row = db_fetch($query)) {
       // Little magik here - to retain HTML codes from DB and stripping HTML codes from nick
       $chat_row['user'] = player_nick_render_to_html($chat_row['user']);
       $nick_stripped = htmlentities(strip_tags($chat_row['user']), ENT_QUOTES, 'utf-8');
       $nick = str_replace(strip_tags($chat_row['user']), $nick_stripped, $chat_row['user']);
-      if(!$history) {
+      if (!$history) {
         $nick = "<span style=\"cursor: pointer;\" onclick=\"addSmiley('({$nick_stripped})');\">{$nick}</span>";
       }
 
@@ -171,7 +171,7 @@ 
   $template = gettemplate('chat_messages', $template);
   $template->assign_recursive($template_result);
 
-  if($history) {
+  if ($history) {
     display($template, "{$lang['chat_history']} - {$lang[$alliance ? 'chat_ally' : 'chat_common']}", true, '', false, true);
   } else {
     $result['last_message'] = $last_message;

includes/alliance/ali_internal_admin_diplomacy.inc

Spacing +20 added lines, -20 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) {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
-if(!$user_can_negotiate) {
+if (!$user_can_negotiate) {
   message($lang['Denied_access'], $lang['ali_dip_title']);
 }
 
@@ -15,24 +15,24 @@ 
 
 
 
-if(sys_get_param_str('ali_dip_offer_make')) {
+if (sys_get_param_str('ali_dip_offer_make')) {
   $alliance_negotiation_relation = sys_get_param_str('alliance_negotiation_relation');
-  if(!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list)) {
+  if (!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list)) {
     message($lang['ali_dip_err_wrong_offer'], $page_title);
   }
 
   $alliance_negotiation_contr_ally_id = sys_get_param_id('alliance_negotiation_contr_ally_id');
-  if($alliance_negotiation_contr_ally_id == $user['ally_id']) {
+  if ($alliance_negotiation_contr_ally_id == $user['ally_id']) {
     message($lang['ali_dip_err_same_ally'], $page_title);
   }
 
   $contr_ally_row = db_ally_get_by_id($alliance_negotiation_contr_ally_id);
-  if(!$contr_ally_row) {
+  if (!$contr_ally_row) {
     message($lang['ali_dip_err_no_ally'], $page_title);
   }
 
   $relation_current_id = ali_relation($user['ally_id'], $alliance_negotiation_contr_ally_id);
-  if($alliance_negotiation_relation == $relation_current_id) {
+  if ($alliance_negotiation_relation == $relation_current_id) {
     message(sprintf($lang['ali_dip_err_offer_same'], $lang['ali_dip_relations'][$alliance_negotiation_relation]), $page_title);
   }
 
@@ -43,7 +43,7 @@ 
 
   $relation_new = $sn_diplomacy_relation_list[$alliance_negotiation_relation];
   $relation_current = $sn_diplomacy_relation_list[$relation_current_id];
-  if($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1) {
+  if ($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1) {
     sn_db_perform('{{alliance_negotiation}}',
       array(
         'alliance_negotiation_ally_id'         => $user['ally_id'],
@@ -70,33 +70,33 @@ 
   }
 } else {
   $offer_id = sys_get_param_id('offer_id');
-  if($offer_id) {
+  if ($offer_id) {
     $offer_answer = sys_get_param_str('answer');
 
     $negotiation = db_ally_negotiation_get_by_offer_id($offer_id);
-    if(!$negotiation) {
+    if (!$negotiation) {
       message($lang['ali_dip_err_offer_none'], $page_title);
-    } elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id']) {
+    } elseif ($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id']) {
       // TODO: Add log of hack attempt
       message($lang['ali_dip_err_offer_alien'], $page_title);
-    } elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id']) {
-      if($offer_answer == 'accept') {
+    } elseif ($negotiation['alliance_negotiation_ally_id'] == $user['ally_id']) {
+      if ($offer_answer == 'accept') {
         // TODO: Add log of hack attempt
         message($lang['ali_dip_err_offer_accept_own'], $page_title);
-      } elseif($offer_answer == 'deny') {
+      } elseif ($offer_answer == 'deny') {
         db_ally_negotiation_delete_by_offer_id($offer_id);
       }
     } else {
-      if($offer_answer == 'accept') {
+      if ($offer_answer == 'accept') {
         $accept_offer = true;
-      } elseif($offer_answer == 'deny') {
+      } elseif ($offer_answer == 'deny') {
         db_ally_negotiation_update_status_1($offer_id);
       }
     }
   }
 }
 
-if($accept_offer) {
+if ($accept_offer) {
   sn_db_transaction_start();
 
   // TODO: Make sn_db_perform() multirow
@@ -125,7 +125,7 @@ 
   sn_db_transaction_commit();
 }
 
-foreach($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation) {
+foreach ($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation) {
   $template->assign_block_vars('relation', array(
     'ID'   => $diplomacy_relation_id,
     'TEXT' => $lang['ali_dip_relations'][$diplomacy_relation_id],
@@ -134,7 +134,7 @@ 
 
 
 $query = db_ally_list_get_by_not_user_ally($user);
-while($alliance = db_fetch($query)) {
+while ($alliance = db_fetch($query)) {
   $template->assign_block_vars('alliance', array(
     'ID'   => $alliance['id'],
     'NAME' => js_safe_string($alliance['ally_name']),
@@ -143,7 +143,7 @@ 
 }
 
 $query = db_ally_negotiation_list($user);
-while($offer = db_fetch($query)) {
+while ($offer = db_fetch($query)) {
   $template->assign_block_vars('offer', array(
     'ID'       => $offer['alliance_negotiation_id'],
     'NAME'     => $offer['ally_name'],

includes/alliance/ali_external_create_ally.inc

Spacing +4 added lines, -4 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) {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
@@ -11,13 +11,13 @@ 
 $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($lang['have_not_name'], $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, $lang['always_exist']), $lang['make_alliance']);
   }
 

includes/alliance/ali_info.inc

Spacing +13 added lines, -13 removed lines

@@ -1,17 +1,17 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
 $template = gettemplate('ali_info', true);
 
-if($mode == 'exit') {
-  if($ally['ally_owner'] == $user['id']) {
+if ($mode == 'exit') {
+  if ($ally['ally_owner'] == $user['id']) {
     message($lang['Owner_cant_go_out'], $lang['Alliance']);
   }
 
-  if(sys_get_param_int('ali_info_leave_confirm')) {
+  if (sys_get_param_int('ali_info_leave_confirm')) {
     sn_db_transaction_start();
     db_user_set_by_id($user['id'], "`ally_id` = null, `ally_name` = null, `ally_tag` = null, `ally_register_time` = 0, `ally_rank_id` = 0");
     db_ally_list_recalc_counts();
@@ -19,20 +19,20 @@ 
     $lang['Go_out_welldone'] = str_replace("%s", $ally_name, $lang['Go_out_welldone']);
     message(sprintf($lang['ali_info_leave_success'], $ally['ally_name']), $lang['sys_alliance']);
   }
-} elseif($mode == 'ainfo') {
+} elseif ($mode == 'ainfo') {
   $tag = sys_get_param_str('tag');
   $id_ally = sys_get_param_id('a');
-  if($tag) {
+  if ($tag) {
     $ally = db_ally_get_by_tag($tag);
-  } elseif($id_ally) {
+  } elseif ($id_ally) {
     $ally = db_ally_get_by_id($id_ally);
   }
 
-  if(!$ally) {
+  if (!$ally) {
     message($lang['ali_sys_notFound'], $lang['Ally_info_1']);
   }
 
-  if(!$ally['ally_description']) {
+  if (!$ally['ally_description']) {
     $ally['ally_description'] = $lang['Ally_nodescription'];
   }
 
@@ -44,9 +44,9 @@ 
 } else {
   $page_header = $lang['your_alliance'];
 
-  if($ally['ally_owner'] == $user['id']) {
+  if ($ally['ally_owner'] == $user['id']) {
     $range = $ally['ally_owner_range'] ? $ally['ally_owner_range'] : $lang['Founder'];
-  } elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) {
+  } elseif ($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) {
     $range = $ranks[$user['ally_rank_id']]['name'];
   } else {
     $range = $lang['member'];
@@ -87,8 +87,8 @@ 
 ));
 
 $relations = ali_relations($ally['id']);
-foreach($relations as $relation) {
-  if($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id']) {
+foreach ($relations as $relation) {
+  if ($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id']) {
     $template->assign_block_vars('relation', array(
       'NAME'     => $relation['alliance_diplomacy_contr_ally_name'],
       'RELATION' => $lang['ali_dip_relations'][$relation['alliance_diplomacy_relation']],

includes/alliance/ali_internal_admin.inc

Spacing +18 added lines, -18 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) {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
-if(!$user_admin) {
+if (!$user_admin) {
   message($lang['Denied_access'], $lang['ally_admin']);
 }
 
@@ -22,7 +22,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'];
@@ -34,46 +34,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($lang['Denied_access'], $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);
@@ -81,8 +81,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($lang['Denied_access'], $lang['ally_admin']);
   }
   sn_db_transaction_start();
@@ -128,7 +128,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>";
   }
@@ -136,8 +136,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_external_search.inc

Spacing +4 added lines, -4 removed lines

@@ -1,18 +1,18 @@
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
 $template = gettemplate('ali_search', true);
 
 $ali_search_text = sys_get_param_str('searchtext');
-if($ali_search_text) {
+if ($ali_search_text) {
   $template->assign_var('SEARCH_TEXT', $ali_search_text);
 
   $search = db_ally_search_by_name_or_tag($ali_search_text);
-  if(db_num_rows($search)) {
-    while($ally_row = db_fetch($search)) {
+  if (db_num_rows($search)) {
+    while ($ally_row = db_fetch($search)) {
       $template->assign_block_vars('alliances', array(
         'ID'          => $ally_row['id'],
         'TAG'         => $ally_row['ally_tag'],

includes/constants.php

Spacing +236 added lines, -236 removed lines

@@ -38,8 +38,8 @@ 
 
 // Game type constants starts with GAME_
 define('GAME_SUPERNOVA', 0);
-define('GAME_OGAME'    , 1);
-define('GAME_BLITZ'    , 2);
+define('GAME_OGAME', 1);
+define('GAME_BLITZ', 2);
 
 // Date & time range constants
 define('DATE_FOREVER', 2000000000);
@@ -52,14 +52,14 @@ 
 define('PERIOD_YEAR', PERIOD_DAY * 365);
 define('PERIOD_FOREVER', PERIOD_YEAR * 100);
 
-define('PERIOD_MINUTE_2' , PERIOD_MINUTE * 2);
-define('PERIOD_MINUTE_3' , PERIOD_MINUTE * 3);
-define('PERIOD_MINUTE_5' , PERIOD_MINUTE * 5);
+define('PERIOD_MINUTE_2', PERIOD_MINUTE * 2);
+define('PERIOD_MINUTE_3', PERIOD_MINUTE * 3);
+define('PERIOD_MINUTE_5', PERIOD_MINUTE * 5);
 define('PERIOD_MINUTE_10', PERIOD_MINUTE * 10);
-define('PERIOD_DAY_3'    , PERIOD_DAY * 3);
-define('PERIOD_WEEK_2'   , PERIOD_WEEK * 2);
-define('PERIOD_MONTH_2'  , PERIOD_MONTH * 2);
-define('PERIOD_MONTH_3'  , PERIOD_MONTH * 3);
+define('PERIOD_DAY_3', PERIOD_DAY * 3);
+define('PERIOD_WEEK_2', PERIOD_WEEK * 2);
+define('PERIOD_MONTH_2', PERIOD_MONTH * 2);
+define('PERIOD_MONTH_3', PERIOD_MONTH * 3);
 
 define('FONT_SIZE_PERCENT_MIN', 56.25);
 define('FONT_SIZE_PERCENT_DEFAULT', 68.75);
@@ -112,100 +112,100 @@ 
 define('SN_SYS_SEC_CHARS_ALLOWED', 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghkmnpqrstuvwxyz0123456789');
 
 // Mot qui sont interdit a la saisie !
-$ListCensure = array ( '/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
+$ListCensure = array('/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
 
 // Confirmation record types
-define('CONFIRM_REGISTRATION'  , 1);
+define('CONFIRM_REGISTRATION', 1);
 define('CONFIRM_PASSWORD_RESET', 2);
-define('CONFIRM_DELETE'        , 3);
+define('CONFIRM_DELETE', 3);
 
 define('AFFILIATE_MM_TO_REFERRAL_DM', 2);
 
 // Ally diplomacy statuses
-define('ALLY_DIPLOMACY_SELF'         , 'self');
-define('ALLY_DIPLOMACY_NEUTRAL'      , 'neutral');
-define('ALLY_DIPLOMACY_WAR'          , 'war');
-define('ALLY_DIPLOMACY_PEACE'        , 'peace');
+define('ALLY_DIPLOMACY_SELF', 'self');
+define('ALLY_DIPLOMACY_NEUTRAL', 'neutral');
+define('ALLY_DIPLOMACY_WAR', 'war');
+define('ALLY_DIPLOMACY_PEACE', 'peace');
 define('ALLY_DIPLOMACY_CONFEDERATION', 'confederation');
-define('ALLY_DIPLOMACY_FEDERATION'   , 'federation');
-define('ALLY_DIPLOMACY_UNION'        , 'union');
-define('ALLY_DIPLOMACY_MASTER'       , 'master');
-define('ALLY_DIPLOMACY_SLAVE'        , 'slave');
+define('ALLY_DIPLOMACY_FEDERATION', 'federation');
+define('ALLY_DIPLOMACY_UNION', 'union');
+define('ALLY_DIPLOMACY_MASTER', 'master');
+define('ALLY_DIPLOMACY_SLAVE', 'slave');
 
 define('ALLY_PROPOSE_SEND', 0);
 
 // Quest types
-define('QUEST_TYPE_BUILD'   , 1);
+define('QUEST_TYPE_BUILD', 1);
 define('QUEST_TYPE_RESEARCH', 2);
-define('QUEST_TYPE_COMBAT'  , 3);
+define('QUEST_TYPE_COMBAT', 3);
 
-define('QUEST_STATUS_NOT_STARTED' , 0);
-define('QUEST_STATUS_STARTED'     , 1);
-define('QUEST_STATUS_COMPLETE'    , 2);
+define('QUEST_STATUS_NOT_STARTED', 0);
+define('QUEST_STATUS_STARTED', 1);
+define('QUEST_STATUS_COMPLETE', 2);
 
 // *** Combat-related constants
 // *** Mission Type constants starts with MT_
-define('MT_NONE'     ,  0);
-define('MT_ATTACK'   ,  1);
-define('MT_AKS'      ,  2);
-define('MT_TRANSPORT',  3);
-define('MT_RELOCATE' ,  4);
-define('MT_HOLD'     ,  5);
-define('MT_SPY'      ,  6);
-define('MT_COLONIZE' ,  7);
-define('MT_RECYCLE'  ,  8);
-define('MT_DESTROY'  ,  9);
-define('MT_MISSILE'  , 10);
-define('MT_EXPLORE'  , 15);
+define('MT_NONE', 0);
+define('MT_ATTACK', 1);
+define('MT_AKS', 2);
+define('MT_TRANSPORT', 3);
+define('MT_RELOCATE', 4);
+define('MT_HOLD', 5);
+define('MT_SPY', 6);
+define('MT_COLONIZE', 7);
+define('MT_RECYCLE', 8);
+define('MT_DESTROY', 9);
+define('MT_MISSILE', 10);
+define('MT_EXPLORE', 15);
 
 // *** Planet Target constants starts with PT_
 define('PT_NONE', 0);
 define('PT_ALL', 0);
 define('PT_PLANET', 1);
 define('PT_DEBRIS', 2);
-define('PT_MOON'  , 3);
+define('PT_MOON', 3);
 
 // *** Unit locations - shows db table where unit belong
 // Also cache indexes
-define('LOC_NONE',    -1);
+define('LOC_NONE', -1);
 define('LOC_UNIVERSE', 0);
-define('LOC_PLANET',   1);
-define('LOC_DEBRIS',   2); // Translates to `planets` table planet_type = 1, `debris_*` fields
-define('LOC_MOON',     3); // Translates to `planets` table planet_type = 3
-define('LOC_USER',     4);
-define('LOC_FLEET',    5);
-define('LOC_ALLY',     6);
-define('LOC_UNIT_NUMERIC',     7);
-define('LOC_UNIT_LIST',     8);
+define('LOC_PLANET', 1);
+define('LOC_DEBRIS', 2); // Translates to `planets` table planet_type = 1, `debris_*` fields
+define('LOC_MOON', 3); // Translates to `planets` table planet_type = 3
+define('LOC_USER', 4);
+define('LOC_FLEET', 5);
+define('LOC_ALLY', 6);
+define('LOC_UNIT_NUMERIC', 7);
+define('LOC_UNIT_LIST', 8);
 
 // ТОЛЬКО ВНУТРЕНЕЕ!!!
-define('LOC_UNIT',    'LOC_UNIT');
-define('LOC_QUE',     'LOC_QUE');
-define('LOC_LOCATION','LOC_LOCATION');
-define('LOC_LOCKS','LOC_LOCKS');
+define('LOC_UNIT', 'LOC_UNIT');
+define('LOC_QUE', 'LOC_QUE');
+define('LOC_LOCATION', 'LOC_LOCATION');
+define('LOC_LOCKS', 'LOC_LOCKS');
 
 // *** Caching masks
-define('CACHE_NOTHING'    ,  0);
-define('CACHE_FLEET'      ,  1);
-define('CACHE_PLANET'     ,  2);
-define('CACHE_USER'       ,  4);
-define('CACHE_SOURCE'     ,  8);
+define('CACHE_NOTHING', 0);
+define('CACHE_FLEET', 1);
+define('CACHE_PLANET', 2);
+define('CACHE_USER', 4);
+define('CACHE_SOURCE', 8);
 define('CACHE_DESTINATION', 16);
-define('CACHE_EVENT'      , 32);
+define('CACHE_EVENT', 32);
 
-define('CACHE_USER_SRC'  , CACHE_USER | CACHE_SOURCE);
-define('CACHE_USER_DST'  , CACHE_USER | CACHE_DESTINATION);
+define('CACHE_USER_SRC', CACHE_USER | CACHE_SOURCE);
+define('CACHE_USER_DST', CACHE_USER | CACHE_DESTINATION);
 define('CACHE_PLANET_SRC', CACHE_PLANET | CACHE_SOURCE);
 define('CACHE_PLANET_DST', CACHE_PLANET | CACHE_DESTINATION);
-define('CACHE_COMBAT'    , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
+define('CACHE_COMBAT', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
 
-define('CACHE_ALL'       , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
+define('CACHE_ALL', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
 
-define('CACHE_NONE'      , CACHE_NOTHING); // Alias for me
+define('CACHE_NONE', CACHE_NOTHING); // Alias for me
 
 // *** Event types
 define('EVENT_FLEET_ARRIVE', 1);
-define('EVENT_FLEET_STAY'  , 2);
+define('EVENT_FLEET_STAY', 2);
 define('EVENT_FLEET_RETURN', 3);
 
 // *** Constants for changing DM
@@ -258,10 +258,10 @@ 
 
 
 // Operation error status HARDCODE!
-define('ERR_NONE'               , 0); // No error
-define('ERR_WARNING'            , 1); // There is warning - something altering normal operation process
-define('ERR_ERROR'              , 2); // There is error - something permits operation from process
-define('ERR_HACK'               , 4); // Operation is qualified as hack attempt
+define('ERR_NONE', 0); // No error
+define('ERR_WARNING', 1); // There is warning - something altering normal operation process
+define('ERR_ERROR', 2); // There is error - something permits operation from process
+define('ERR_HACK', 4); // Operation is qualified as hack attempt
 // New GLOBAL operation results
 //define('RESULT_DEFAULT' , 0); // Default result - all went OK or result really doesn't matter
 //define('RESULT_WARNING' , 1);
@@ -281,7 +281,7 @@ 
 define('SN_PAYMENT_REQUEST_OK', 0);
 define('SN_PAYMENT_REQUEST_ERROR_UNIT_AMOUNT', 1);
 define('SN_PAYMENT_REQUEST_ERROR_PAYLINK_UNSUPPORTED', 2);
-define('SN_PAYMENT_REQUEST_IP_WRONG', 3);  // Неправильный IP входящей системы - обычно хак
+define('SN_PAYMENT_REQUEST_IP_WRONG', 3); // Неправильный IP входящей системы - обычно хак
 define('SN_PAYMENT_REQUEST_COMMAND_UNSUPPORTED', 4); // Неподдерживаемая команда - обычно хак
 define('SN_PAYMENT_REQUEST_SIGNATURE_INVALID', 5); // Неправильная подпись или не сошлась контрольная сумма - обычно хак
 define('SN_MODULE_DISABLED', 6); // Модуль отключен // УНИВЕРСАЛЬНЫЙ ОТВЕТ!
@@ -554,16 +554,16 @@ 
 //define('F_DEVICE_ID',     'F_DEVICE_ID');
 //define('F_DEVICE_CYPHER', 'F_DEVICE_CYPHER');
 
-define('F_PROVIDER_ID',   'F_PROVIDER_ID');
+define('F_PROVIDER_ID', 'F_PROVIDER_ID');
 // define('F_PROVIDER_LIST', 'F_PROVIDER_LIST');
 
 define('F_IMPERSONATE_STATUS', 'F_IMPERSONATE_STATUS');
 define('F_IMPERSONATE_OPERATOR', 'F_IMPERSONATE_OPERATOR');
 
-define('F_LOGIN_STATUS',  'F_LOGIN_STATUS');
+define('F_LOGIN_STATUS', 'F_LOGIN_STATUS');
 define('F_LOGIN_MESSAGE', 'F_LOGIN_MESSAGE');
 
-define('F_PLAYER_REGISTER_STATUS',  'F_PLAYER_REGISTER_STATUS');
+define('F_PLAYER_REGISTER_STATUS', 'F_PLAYER_REGISTER_STATUS');
 define('F_PLAYER_REGISTER_MESSAGE', 'F_PLAYER_REGISTER_MESSAGE');
 
 define('F_USER_ID', 'F_USER_ID');
@@ -607,78 +607,78 @@ 
 
 
 // Option groups
-define('OPT_ALL',      0);
-define('OPT_MESSAGE',  1);
+define('OPT_ALL', 0);
+define('OPT_MESSAGE', 1);
 define('OPT_UNIVERSE', 2);
 define('OPT_INTERFACE', 3);
 
 // Message classes
-define('MSG_TYPE_OUTBOX'   ,  -1);
-define('MSG_TYPE_SPY'      ,   0);
-define('MSG_TYPE_PLAYER'   ,   1);
-define('MSG_TYPE_ALLIANCE' ,   2);
-define('MSG_TYPE_COMBAT'   ,   3);
-define('MSG_TYPE_RECYCLE'  ,   4);
-define('MSG_TYPE_TRANSPORT',   5);
-define('MSG_TYPE_ADMIN'    ,   6);
-define('MSG_TYPE_EXPLORE'  ,  15);
-define('MSG_TYPE_QUE'      ,  99);
-define('MSG_TYPE_NEW'      , 100);
+define('MSG_TYPE_OUTBOX', -1);
+define('MSG_TYPE_SPY', 0);
+define('MSG_TYPE_PLAYER', 1);
+define('MSG_TYPE_ALLIANCE', 2);
+define('MSG_TYPE_COMBAT', 3);
+define('MSG_TYPE_RECYCLE', 4);
+define('MSG_TYPE_TRANSPORT', 5);
+define('MSG_TYPE_ADMIN', 6);
+define('MSG_TYPE_EXPLORE', 15);
+define('MSG_TYPE_QUE', 99);
+define('MSG_TYPE_NEW', 100);
 
 // Attack verification statuses
-define('ATTACK_ALLOWED'           ,  0);
-define('ATTACK_NO_TARGET'         ,  1);
-define('ATTACK_OWN'               ,  2);
-define('ATTACK_WRONG_MISSION'     ,  3);
-define('ATTACK_NO_ALLY_DEPOSIT'   ,  4);
-define('ATTACK_NO_DEBRIS'         ,  5);
-define('ATTACK_VACATION'          ,  6);
-define('ATTACK_SAME_IP'           ,  7);
-define('ATTACK_BUFFING'           ,  8);
-define('ATTACK_ADMIN'             ,  9);
-define('ATTACK_NOOB'              , 10);
-define('ATTACK_OWN_VACATION'      , 11);
-define('ATTACK_NO_SILO'           , 12);
-define('ATTACK_NO_MISSILE'        , 13);
-define('ATTACK_NO_FLEET'          , 14);
-define('ATTACK_NO_SLOTS'          , 15);
-define('ATTACK_NO_SHIPS'          , 16);
-define('ATTACK_NO_RECYCLERS'      , 17);
-define('ATTACK_NO_SPIES'          , 18);
-define('ATTACK_NO_COLONIZER'      , 19);
-define('ATTACK_MISSILE_TOO_FAR'   , 20);
-define('ATTACK_WRONG_STRUCTURE'   , 21);
-define('ATTACK_NO_FUEL'           , 22);
-define('ATTACK_NO_RESOURCES'      , 23);
-define('ATTACK_NO_ACS'            , 24);
-define('ATTACK_ACS_MISSTARGET'    , 25);
-define('ATTACK_WRONG_SPEED'       , 26);
-define('ATTACK_ACS_TOO_LATE'      , 27);
-define('ATTACK_BASHING'           , 28);
-define('ATTACK_BASHING_WAR_DELAY' , 29);
-define('ATTACK_ACS_WRONG_TARGET'  , 30);
-define('ATTACK_SAME'              , 31);
+define('ATTACK_ALLOWED', 0);
+define('ATTACK_NO_TARGET', 1);
+define('ATTACK_OWN', 2);
+define('ATTACK_WRONG_MISSION', 3);
+define('ATTACK_NO_ALLY_DEPOSIT', 4);
+define('ATTACK_NO_DEBRIS', 5);
+define('ATTACK_VACATION', 6);
+define('ATTACK_SAME_IP', 7);
+define('ATTACK_BUFFING', 8);
+define('ATTACK_ADMIN', 9);
+define('ATTACK_NOOB', 10);
+define('ATTACK_OWN_VACATION', 11);
+define('ATTACK_NO_SILO', 12);
+define('ATTACK_NO_MISSILE', 13);
+define('ATTACK_NO_FLEET', 14);
+define('ATTACK_NO_SLOTS', 15);
+define('ATTACK_NO_SHIPS', 16);
+define('ATTACK_NO_RECYCLERS', 17);
+define('ATTACK_NO_SPIES', 18);
+define('ATTACK_NO_COLONIZER', 19);
+define('ATTACK_MISSILE_TOO_FAR', 20);
+define('ATTACK_WRONG_STRUCTURE', 21);
+define('ATTACK_NO_FUEL', 22);
+define('ATTACK_NO_RESOURCES', 23);
+define('ATTACK_NO_ACS', 24);
+define('ATTACK_ACS_MISSTARGET', 25);
+define('ATTACK_WRONG_SPEED', 26);
+define('ATTACK_ACS_TOO_LATE', 27);
+define('ATTACK_BASHING', 28);
+define('ATTACK_BASHING_WAR_DELAY', 29);
+define('ATTACK_ACS_WRONG_TARGET', 30);
+define('ATTACK_SAME', 31);
 define('ATTACK_RESOURCE_FORBIDDEN', 32);
-define('ATTACK_TRANSPORT_EMPTY'   , 33);
-define('ATTACK_SPIES_LONLY'       , 34);
-define('ATTACK_TOO_FAR'           , 35);
-define('ATTACK_OVERLOADED'        , 36);
-define('ATTACK_MISSION_ABSENT'    , 37);
-define('ATTACK_WRONG_UNIT'        , 38);
-define('ATTACK_ZERO_SPEED'        , 39);
-define('ATTACK_SHIP_COUNT_WRONG'  , 40);
+define('ATTACK_TRANSPORT_EMPTY', 33);
+define('ATTACK_SPIES_LONLY', 34);
+define('ATTACK_TOO_FAR', 35);
+define('ATTACK_OVERLOADED', 36);
+define('ATTACK_MISSION_ABSENT', 37);
+define('ATTACK_WRONG_UNIT', 38);
+define('ATTACK_ZERO_SPEED', 39);
+define('ATTACK_SHIP_COUNT_WRONG', 40);
 define('ATTACK_RESOURCE_COUNT_WRONG', 41);
 define('ATTACK_MORATORIUM', 42);
 define('ATTACK_CHILD_PROTECTION', 43);
 
 
 // *** Races - Homeworlds
-define('RACE_NONE'    , 0);
-define('RACE_EARTH'   , 1);
-define('RACE_MOON'    , 2);
-define('RACE_MERCURY' , 3);
-define('RACE_VENUS'   , 4);
-define('RACE_MARS'    , 5);
+define('RACE_NONE', 0);
+define('RACE_EARTH', 1);
+define('RACE_MOON', 2);
+define('RACE_MERCURY', 3);
+define('RACE_VENUS', 4);
+define('RACE_MARS', 5);
 define('RACE_ASTEROID', 6);
 // define('MARKET_INFO'         , 7);
 
@@ -686,114 +686,114 @@ 
 
 // *** Market variables
 // === Market blocks
-define('MARKET_ENTRY'        , 0);
-define('MARKET_RESOURCES'    , 1);
-define('MARKET_SCRAPPER'     , 2);
-define('MARKET_STOCKMAN'     , 3);
-define('MARKET_EXCHANGE'     , 4);
-define('MARKET_BANKER'       , 5);
-define('MARKET_PAWNSHOP'     , 6);
-define('MARKET_INFO'         , 7);
+define('MARKET_ENTRY', 0);
+define('MARKET_RESOURCES', 1);
+define('MARKET_SCRAPPER', 2);
+define('MARKET_STOCKMAN', 3);
+define('MARKET_EXCHANGE', 4);
+define('MARKET_BANKER', 5);
+define('MARKET_PAWNSHOP', 6);
+define('MARKET_INFO', 7);
 
 // === Market error statuses
-define('MARKET_NOTHING'              ,  0);
-define('MARKET_DEAL'                 ,  1);
-define('MARKET_DEAL_TRADE'           ,  2);
-define('MARKET_NO_DM'                ,  3);
-define('MARKET_NO_RESOURCES'         ,  4);
-define('MARKET_ZERO_DEAL'            ,  5);
-define('MARKET_NO_SHIPS'             ,  6);
-define('MARKET_NOT_A_SHIP'           ,  7);
-define('MARKET_NO_STOCK'             ,  8);
-define('MARKET_ZERO_RES_STOCK'       ,  9);
-define('MARKET_NEGATIVE_SHIPS'       , 10);
-
-define('MARKET_INFO_PLAYER'          , 12);
-define('MARKET_INFO_WRONG'           , 11);
+define('MARKET_NOTHING', 0);
+define('MARKET_DEAL', 1);
+define('MARKET_DEAL_TRADE', 2);
+define('MARKET_NO_DM', 3);
+define('MARKET_NO_RESOURCES', 4);
+define('MARKET_ZERO_DEAL', 5);
+define('MARKET_NO_SHIPS', 6);
+define('MARKET_NOT_A_SHIP', 7);
+define('MARKET_NO_STOCK', 8);
+define('MARKET_ZERO_RES_STOCK', 9);
+define('MARKET_NEGATIVE_SHIPS', 10);
+
+define('MARKET_INFO_PLAYER', 12);
+define('MARKET_INFO_WRONG', 11);
 define('MARKET_INFO_PLAYER_NOT_FOUND', 13);
-define('MARKET_INFO_PLAYER_WRONG'    , 14);
-define('MARKET_INFO_PLAYER_SAME'     , 15);
+define('MARKET_INFO_PLAYER_WRONG', 14);
+define('MARKET_INFO_PLAYER_SAME', 15);
 
 
 
 
 // *** Mercenary/talent bonus types
-define('BONUS_NONE'    ,            0);  // No bonus
-define('BONUS_PERCENT' ,            1);  // Percent on base value
-define('BONUS_ADD'     ,            2);  // Add
-define('BONUS_ABILITY' ,            3);  // Some ability
-define('BONUS_MULTIPLY',            4);  // Multiply by value
-define('BONUS_PERCENT_CUMULATIVE' , 5);  // Cumulative percent on base value
-define('BONUS_PERCENT_DEGRADED' ,   6);  // Bonus amount degraded with increase as pow(bonus, level) (?)
-define('BONUS_SPEED',               7);  // Speed bonus
+define('BONUS_NONE', 0); // No bonus
+define('BONUS_PERCENT', 1); // Percent on base value
+define('BONUS_ADD', 2); // Add
+define('BONUS_ABILITY', 3); // Some ability
+define('BONUS_MULTIPLY', 4); // Multiply by value
+define('BONUS_PERCENT_CUMULATIVE', 5); // Cumulative percent on base value
+define('BONUS_PERCENT_DEGRADED', 6); // Bonus amount degraded with increase as pow(bonus, level) (?)
+define('BONUS_SPEED', 7); // Speed bonus
 
 // *** Action constant (build should be replaced with ACTION)
-define('BUILD_CREATE' ,  1);
+define('BUILD_CREATE', 1);
 define('BUILD_DESTROY', -1);
 define('BUILD_AUTOCONVERT', 2);
 
-define('ACTION_SELL'       , -1);
-define('ACTION_NOTHING'    ,  0);
-define('ACTION_BUY'        ,  1);
-define('ACTION_USE'        ,  2);
-define('ACTION_DELETE'     ,  3);
+define('ACTION_SELL', -1);
+define('ACTION_NOTHING', 0);
+define('ACTION_BUY', 1);
+define('ACTION_USE', 2);
+define('ACTION_DELETE', 3);
 
 // *** Check unit availability codes
-define('BUILD_ALLOWED'         , 0); // HARDCODED! DO NOT CHANGE!
+define('BUILD_ALLOWED', 0); // HARDCODED! DO NOT CHANGE!
 define('BUILD_REQUIRE_NOT_MEET', 1);
-define('BUILD_AMOUNT_WRONG'    , 2);
-define('BUILD_QUE_WRONG'       , 3);
-define('BUILD_QUE_UNIT_WRONG'  , 4);
-define('BUILD_INDESTRUCTABLE'  , 5);
-define('BUILD_NO_RESOURCES'    , 6);
-define('BUILD_NO_UNITS'        , 7);
-define('BUILD_UNIT_BUSY'       , 8);
-define('BUILD_QUE_FULL'        , 9);
-define('BUILD_SILO_FULL'       ,10);
-define('BUILD_MAX_REACHED'     ,11);
-define('BUILD_SECTORS_NONE'    ,12);
+define('BUILD_AMOUNT_WRONG', 2);
+define('BUILD_QUE_WRONG', 3);
+define('BUILD_QUE_UNIT_WRONG', 4);
+define('BUILD_INDESTRUCTABLE', 5);
+define('BUILD_NO_RESOURCES', 6);
+define('BUILD_NO_UNITS', 7);
+define('BUILD_UNIT_BUSY', 8);
+define('BUILD_QUE_FULL', 9);
+define('BUILD_SILO_FULL', 10);
+define('BUILD_MAX_REACHED', 11);
+define('BUILD_SECTORS_NONE', 12);
 define('BUILD_AUTOCONVERT_AVAILABLE', 13);
 
 
 // *** Que types
 define('QUE_STRUCTURES', 1);
-define('QUE_HANGAR'    , 4);
-define('QUE_RESEARCH'  , 7);
-define('QUE_MERCENARY' , 600); // UNIT_MERCENARIES
+define('QUE_HANGAR', 4);
+define('QUE_RESEARCH', 7);
+define('QUE_MERCENARY', 600); // UNIT_MERCENARIES
 // *** Subque types
-define('SUBQUE_PLANET'  , 1);
-define('SUBQUE_MOON'    , 3);
-define('SUBQUE_FLEET'   , 4);
-define('SUBQUE_DEFENSE' , 6);
+define('SUBQUE_PLANET', 1);
+define('SUBQUE_MOON', 3);
+define('SUBQUE_FLEET', 4);
+define('SUBQUE_DEFENSE', 6);
 define('SUBQUE_RESEARCH', 7);
 
 // *** Que items
-define('QI_UNIT_ID'   , 0);
-define('QI_AMOUNT'    , 1);
-define('QI_TIME'      , 2);
-define('QI_MODE'      , 3);
-define('QI_QUE_ID'    , 4);
-define('QI_QUE_TYPE'  , 4);
-define('QI_PLANET_ID' , 5);
+define('QI_UNIT_ID', 0);
+define('QI_AMOUNT', 1);
+define('QI_TIME', 2);
+define('QI_MODE', 3);
+define('QI_QUE_ID', 4);
+define('QI_QUE_TYPE', 4);
+define('QI_PLANET_ID', 5);
 
 
 // *** Units
 
 // *** Sort options
-define('SORT_ASCENDING' , 0);
+define('SORT_ASCENDING', 0);
 define('SORT_DESCENDING', 1);
 
-define('SORT_ID'             , 0);
-define('SORT_LOCATION'       , 1);
-define('SORT_NAME'           , 2);
-define('SORT_SIZE'           , 3);
-define('SORT_EMAIL'          , 4);
-define('SORT_IP'             , 5);
+define('SORT_ID', 0);
+define('SORT_LOCATION', 1);
+define('SORT_NAME', 2);
+define('SORT_SIZE', 3);
+define('SORT_EMAIL', 4);
+define('SORT_IP', 5);
 define('SORT_TIME_REGISTERED', 6);
 define('SORT_TIME_LAST_VISIT', 7);
-define('SORT_TIME_BAN_UNTIL' , 8);
-define('SORT_REFERRAL_COUNT' , 9);
-define('SORT_REFERRAL_DM'    , 10);
+define('SORT_TIME_BAN_UNTIL', 8);
+define('SORT_REFERRAL_COUNT', 9);
+define('SORT_REFERRAL_DM', 10);
 
 
 define('HULL_SIZE_TINY', 1);
@@ -936,10 +936,10 @@ 
 
 // === Artifacts
 define('UNIT_ARTIFACTS', 1000);
-define('ART_LHC', 1001);      // Additional moon chance
-define('ART_RCD_SMALL', 1002);   // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
-define('ART_RCD_MEDIUM', 1003);  // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
-define('ART_RCD_LARGE', 1004);   // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
+define('ART_LHC', 1001); // Additional moon chance
+define('ART_RCD_SMALL', 1002); // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
+define('ART_RCD_MEDIUM', 1003); // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
+define('ART_RCD_LARGE', 1004); // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
 define('ART_HEURISTIC_CHIP', 1005); // Speed up research
 define('ART_NANO_BUILDER', 1006); // Speed up building
 define('ART_NANO_CONSTRUCTOR', 1007); // RESERVED Speed up hangar constructions
@@ -1010,18 +1010,18 @@ 
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE1', 2201); // Блиц-сервер, участник 0-го раунда, 1-е место
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE2', 2202); // Блиц-сервер, участник 0-го раунда, 2-е место
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE3', 2203); // Блиц-сервер, участник 0-го раунда, 3-е место
-define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
+define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
 
 define('UNIT_AWARD_MEMORY', 2300); // Памятные знаки за существование и участие - например "4 года в игре". "Был онлайн в новогоднюю ночь 2013". итд
-define('UNIT_AWARD_MEMORY_IMMORTAL', 2301);  // Бессмертный
-define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
+define('UNIT_AWARD_MEMORY_IMMORTAL', 2301); // Бессмертный
+define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
 define('UNIT_AWARD_MEMORY_BLITZ_R0', 2303); // Блиц-сервер, участник 0-го раунда
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SIMPLE', 2304); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_BRONZE', 2305); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SILVER', 2306); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_GOLD', 2307); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_PLATINUM', 2308); // День Рождения СН
-define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
+define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
 
 define('UNIT_AWARD_PENNANT', 2400); // Переходящий вымпел - индикация статуса на сервере: "Топ-1", "Топ", "Сабтоп", "Самый большой флот" итд
 define('UNIT_AWARD_BADGE', 2600); // Бейджики/значки за ачивки - например, "Построил 1000 кораблей"
@@ -1118,7 +1118,7 @@ 
 
 define('UNIT_NEXT', 4000); // !!! Next unit start on 4000 !!!
 
-define('GROUP_PART',         800000);
+define('GROUP_PART', 800000);
 // Зарезервировано для запчастей: 800.001 - 899.999
 // define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
 // define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
@@ -1373,32 +1373,32 @@ 
 
 
 // define('NICK_ID',               -1);
-define('NICK_HTML',              0);
-
-define('NICK_FIRST',             1);
-define('NICK_RACE',           1000);
-define('NICK_GENDER',         2000);
-define('NICK_AWARD',          3000);
-define('NICK_VACATION',       3500);
-define('NICK_BIRTHSDAY',      4000);
-define('NICK_PREMIUM',        5000);
-define('NICK_AUTH_LEVEL',     6000);
-
-define('NICK_HIGHLIGHT',      6300);
-define('NICK_CLASS',          6450);
-
-define('NICK_NICK_CLASS',     6600);
-define('NICK_NICK',           7000);
+define('NICK_HTML', 0);
+
+define('NICK_FIRST', 1);
+define('NICK_RACE', 1000);
+define('NICK_GENDER', 2000);
+define('NICK_AWARD', 3000);
+define('NICK_VACATION', 3500);
+define('NICK_BIRTHSDAY', 4000);
+define('NICK_PREMIUM', 5000);
+define('NICK_AUTH_LEVEL', 6000);
+
+define('NICK_HIGHLIGHT', 6300);
+define('NICK_CLASS', 6450);
+
+define('NICK_NICK_CLASS', 6600);
+define('NICK_NICK', 7000);
 define('NICK_NICK_CLASS_END', 7300);
 
-define('NICK_ALLY_CLASS',     7600);
-define('NICK_ALLY',           8000);
+define('NICK_ALLY_CLASS', 7600);
+define('NICK_ALLY', 8000);
 define('NICK_ALLY_CLASS_END', 8300);
 
-define('NICK_CLASS_END',      8450);
-define('NICK_HIGHLIGHT_END',  8600);
+define('NICK_CLASS_END', 8450);
+define('NICK_HIGHLIGHT_END', 8600);
 
-define('NICK_LAST',           9999);
+define('NICK_LAST', 9999);
 
 // Настройки игрока
 define('PLAYER_OPTION_MENU_SORT', 1);
@@ -1491,8 +1491,8 @@ 
 define('LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10', 1);
 
 define('BLITZ_REGISTER_DISABLED', 0);
-define('BLITZ_REGISTER_OPEN'    , 1);
-define('BLITZ_REGISTER_CLOSED'  , 2);
+define('BLITZ_REGISTER_OPEN', 1);
+define('BLITZ_REGISTER_CLOSED', 2);
 define('BLITZ_REGISTER_SHOW_LOGIN', 3);
 define('BLITZ_REGISTER_DISCLOSURE_NAMES', 4);