supernova-ws / SuperNova

includes/includes/user_birthday_celebrate.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
   $query = db_user_list_to_celebrate($config->user_birthday_range);
 
-  while($row = db_fetch($query))
+  while ($row = db_fetch($query))
   {
     $row['username'] = SN::$db->db_escape($row['username']);
     rpg_points_change($row['id'], RPG_BIRTHDAY, $config->user_birthday_gift, "Birthday gift for user {$row['username']} ID {$row['id']} on his birthday on {$row['user_birthday']}. Gift last gaved at {$row['user_birthday_celebrated']}");

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 
-function sn_user_birthday_celebrate()
-{
+function sn_user_birthday_celebrate() {
   global $config, $lang;
 
   SN::db_transaction_start();

includes/update.php

Spacing +14 added lines, -14 removed lines

@@ -237,7 +237,7 @@ 
       }
     }
 
-    $updater->upd_alter_table('users', ["DROP COLUMN `dpath`",], $updater->isFieldExists('users', 'dpath'));
+    $updater->upd_alter_table('users', ["DROP COLUMN `dpath`", ], $updater->isFieldExists('users', 'dpath'));
 
     // 2017-06-12 13:47:36 42c1
     $updater->new_version = 42;
@@ -250,14 +250,14 @@ 
 
     // 2017-10-11 09:51:49 43a4.3
     $updater->upd_alter_table('messages',
-      ["ADD COLUMN `message_json` tinyint(1) unsigned NOT NULL DEFAULT 0 AFTER `message_text`",],
+      ["ADD COLUMN `message_json` tinyint(1) unsigned NOT NULL DEFAULT 0 AFTER `message_text`", ],
       !$updater->isFieldExists('messages', 'message_json')
     );
 
 
     // 2017-10-17 09:49:24 43a6.0
     // Removing old index i_user_id
-    $updater->upd_alter_table('counter', ['DROP KEY `i_user_id`',], $updater->isIndexExists('counter', 'i_user_id'));
+    $updater->upd_alter_table('counter', ['DROP KEY `i_user_id`', ], $updater->isIndexExists('counter', 'i_user_id'));
     // Adding new index I_counter_user_id
     $updater->upd_alter_table('counter',
       [
@@ -311,7 +311,7 @@ 
       );
     }
 
-    $updater->updPatchApply(1, function () use ($updater) {
+    $updater->updPatchApply(1, function() use ($updater) {
       $q = $updater->upd_do_query("SELECT `messageid`, `user` FROM `{{chat}}`", true);
       while ($row = db_fetch($q)) {
         if (strpos($row['user'], 'a:') !== 0) {
@@ -333,7 +333,7 @@ 
     });
 
     // 2018-03-07 09:23:41 43a13.23 + 2018-03-07 12:00:47 43a13.24
-    $updater->updPatchApply(2, function () use ($updater) {
+    $updater->updPatchApply(2, function() use ($updater) {
       $updater->upd_alter_table('festival_gifts', [
         "ADD COLUMN `disclosure` tinyint(1) unsigned NOT NULL DEFAULT 0 AFTER `amount`",
         "ADD COLUMN `message` VARCHAR(4096) CHARSET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' AFTER `disclosure`",
@@ -341,7 +341,7 @@ 
     });
 
     // 2018-03-12 13:23:10 43a13.33
-    $updater->updPatchApply(3, function () use ($updater) {
+    $updater->updPatchApply(3, function() use ($updater) {
       $updater->upd_alter_table('player_options',
         [
           "MODIFY COLUMN `value` VARCHAR(16000) CHARSET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT ''",
@@ -351,7 +351,7 @@ 
     });
 
     // 2018-03-24 21:31:51 43a16.16 - OiS
-    $updater->updPatchApply(4, function () use ($updater) {
+    $updater->updPatchApply(4, function() use ($updater) {
       if (!$updater->isTableExists('festival_ois_player')) {
         $updater->upd_create_table(
           'festival_ois_player',
@@ -370,7 +370,7 @@ 
     });
 
     // 2018-03-25 08:11:39 43a16.21
-    $updater->updPatchApply(5, function () use ($updater) {
+    $updater->updPatchApply(5, function() use ($updater) {
       $updater->upd_alter_table(
         'que',
         "ADD COLUMN `que_unit_one_time_raw` DECIMAL(20,5) NOT NULL DEFAULT 0",
@@ -387,7 +387,7 @@ 
     $updater->upd_log_version_update();
 
     // 2018-12-21 14:00:41 44a5 Module "ad_promo_code" support
-    $updater->updPatchApply(6, function () use ($updater) {
+    $updater->updPatchApply(6, function() use ($updater) {
       if (!$updater->isTableExists('ad_promo_codes')) {
         $updater->upd_create_table(
           'ad_promo_codes',
@@ -428,7 +428,7 @@ 
     });
 
     // 2018-12-22 11:42:20 44a12
-    $updater->updPatchApply(7, function () use ($updater) {
+    $updater->updPatchApply(7, function() use ($updater) {
       // Creating table for HTTP query strings
       $updater->upd_create_table(
         'security_query_strings',
@@ -570,7 +570,7 @@ 
     $updater->upd_log_version_update();
 
     // 2019-08-15 00:10:48 45a8
-    $updater->updPatchApply(8, function () use ($updater) {
+    $updater->updPatchApply(8, function() use ($updater) {
       if (!$updater->isTableExists('player_ignore')) {
         $updater->upd_create_table(
           'player_ignore',
@@ -591,7 +591,7 @@ 
     }, PATCH_REGISTER);
 
     // 2019-08-21 20:14:18 45a19
-    $updater->updPatchApply(9, function () use ($updater) {
+    $updater->updPatchApply(9, function() use ($updater) {
       $updater->upd_alter_table('payment', [
         'ADD COLUMN `payment_method_id` smallint DEFAULT NULL AFTER `payment_module_name`',
         'ADD KEY `I_payment_method_id` (`payment_method_id`)',
@@ -599,7 +599,7 @@ 
     }, PATCH_REGISTER);
 
     // 2020-02-18 21:00:19 45a71
-    $updater->updPatchApply(10, function () use ($updater) {
+    $updater->updPatchApply(10, function() use ($updater) {
       $name = classConfig::FLEET_UPDATE_MAX_RUN_TIME;
       if (!SN::$gc->config->pass()->$name) {
         SN::$gc->config->pass()->$name = 30;
@@ -615,7 +615,7 @@ 
     $updater->upd_log_version_update();
 
     // 2021-03-03 13:41:05 46a13
-    $updater->updPatchApply(11, function () use ($updater) {
+    $updater->updPatchApply(11, function() use ($updater) {
       $updater->upd_alter_table('festival_gifts', [
         'ADD COLUMN `gift_unit_id` bigint(20) NOT NULL DEFAULT 0 AFTER `amount`',
       ], !$updater->isFieldExists('festival_gifts', 'gift_unit_id'));

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);
 }
@@ -12,15 +12,15 @@ 
 $ally_name_raw = sys_get_param_str_unsafe('name');
 $ally_name     = SN::$db->db_escape($ally_name_raw);
 
-if($ally_tag)
+if ($ally_tag)
 {
-  if(!$ally_name_raw || !$ally_tag_raw)
+  if (!$ally_name_raw || !$ally_tag_raw)
   {
     SnTemplate::messageBox($lang['have_not_name'], $lang['make_alliance']);
   }
 
   $query = doquery("SELECT ally_tag FROM {{alliance}} WHERE `ally_tag` = '{$ally_tag}' or `ally_name` = '{$ally_name}' LIMIT 1;", true);
-  if($query)
+  if ($query)
   {
     SnTemplate::messageBox(str_replace('%s', $query['ally_tag'] == $ally_tag_raw ? $ally_tag_raw : $ally_name_raw, $lang['always_exist']), $lang['make_alliance']);
   }

includes/alliance/ali_internal_admin.inc

Spacing +25 added lines, -25 removed lines

@@ -3,26 +3,26 @@ 
 use Alliance\DBStaticAlly;
 use Old\Avatar;
 
-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) {
   SnTemplate::messageBox($lang['Denied_access'], $lang['ally_admin']);
 }
 
 $template = SnTemplate::gettemplate('ali_admin', $template);
 
 $text_list = array(
-  1 => array ('db_field' => 'ally_description', 'text_type' => 'Public_text_of_alliance'),
-  2 => array ('db_field' => 'ally_text', 'text_type' => 'Internal_text'),
-  3 => array ('db_field' => 'ally_request', 'text_type' => 'Show_of_request_text'),
+  1 => array('db_field' => 'ally_description', 'text_type' => 'Public_text_of_alliance'),
+  2 => array('db_field' => 'ally_text', 'text_type' => 'Internal_text'),
+  3 => array('db_field' => 'ally_request', 'text_type' => 'Show_of_request_text'),
 );
 
 $allyTextID = sys_get_param_int('t', 1);
-$allyTextID = ($allyTextID<1 || $allyTextID>3) ? 1 : $allyTextID;
+$allyTextID = ($allyTextID < 1 || $allyTextID > 3) ? 1 : $allyTextID;
 
-if(sys_get_param_str('isSaveOptions')) {
+if (sys_get_param_str('isSaveOptions')) {
   $new_image = $ally['ally_image'];
   $avatar_upload_result = Avatar::sys_avatar_upload($ally['id'], $new_image, 'ally');
   $template->assign_vars([
@@ -31,32 +31,32 @@ 
   ]);
 
   $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_unsafe = $new_tag;
     $new_tag = SN::$db->db_escape($new_tag);
     $isTaggedAllyExists = DBStaticAlly::db_ally_get_by_tag($new_tag);
-    if(!empty($isTaggedAllyExists)) {
+    if (!empty($isTaggedAllyExists)) {
       SnTemplate::messageBox(sprintf($lang['ally_message_tag_exists'], $new_tag_unsafe), '', 'alliance.php?mode=admin&edit=ally');
     }
     $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_unsafe = $new_name;
     $new_name = SN::$db->db_escape($new_name);
     $isTaggedAllyExists = DBStaticAlly::db_ally_get_by_name($new_name);
-    if(!empty($isTaggedAllyExists)) {
+    if (!empty($isTaggedAllyExists)) {
       SnTemplate::messageBox(sprintf($lang['ally_message_name_exists'], $new_name_unsafe), '', 'alliance.php?mode=admin&edit=ally');
     }
     $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 = SN::$db->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 = SN::$db->db_escape($new_web);
     $ally_changeset[] = "`ally_web` = '{$new_web}'";
   }
@@ -65,31 +65,31 @@ 
 //  if(($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) && $new_request != $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)) {
     doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;");
     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');
   doquery("UPDATE {{alliance}} SET `{$text_list[$allyTextID]['db_field']}`='{$text['safe']}' WHERE `id`='{$ally['id']}';");
   $ally[$text_list[$allyTextID]['db_field']] = $text['unsafe'];
 }
-elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
+elseif (sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
 {
-  if(!$isAllyOwner)
+  if (!$isAllyOwner)
   {
     SnTemplate::messageBox($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'");
@@ -99,9 +99,9 @@ 
     sys_redirect('alliance.php');
   }
 }
-elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
+elseif (sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
 {
-  if(!$isAllyOwner)
+  if (!$isAllyOwner)
   {
     SnTemplate::messageBox($lang['Denied_access'], $lang['ally_admin']);
   }
@@ -124,7 +124,7 @@ 
   'ally_name' => htmlspecialchars($ally['ally_name']),
   'ally_tag' => htmlspecialchars($ally['ally_tag']),
   'ally_web' => htmlspecialchars($ally['ally_web']),
-  'ally_request_notallow_0' => (( $ally['ally_request_notallow']) ? ' SELECTED' : ''),
+  'ally_request_notallow_0' => (($ally['ally_request_notallow']) ? ' SELECTED' : ''),
   'ally_request_notallow_1' => ((!$ally['ally_request_notallow']) ? ' SELECTED' : ''),
   'ally_owner_range' => htmlspecialchars($ally['ally_owner_range']),
   'hideNotOwner' => $ally['ally_owner'] != $user['id'] ? 'display: hide;' : '',
@@ -133,7 +133,7 @@ 
 {
   $userAllyAdmins = db_user_list("`ally_id`= {$ally['id']}", false, '`id`, `username`');
   unset($tmp);
-  foreach($userAllyAdmins as $userAllyAdmin)
+  foreach ($userAllyAdmins as $userAllyAdmin)
   {
     $tmp .= "<option value={$userAllyAdmin['id']}>{$userAllyAdmin['username']}</option>";
   }
@@ -141,9 +141,9 @@ 
   $template->assign_var('adminMembers', $tmp);
 }
 
-foreach($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale)
+foreach ($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale)
 {
-  if(!$sn_ali_admin_action_locale['title'])
+  if (!$sn_ali_admin_action_locale['title'])
   {
     continue;
   }

Braces +3 added lines, -6 removed lines

@@ -74,14 +74,12 @@ 
     doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;");
     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');
   doquery("UPDATE {{alliance}} SET `{$text_list[$allyTextID]['db_field']}`='{$text['safe']}' WHERE `id`='{$ally['id']}';");
   $ally[$text_list[$allyTextID]['db_field']] = $text['unsafe'];
-}
-elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
+} elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader'))
 {
   if(!$isAllyOwner)
   {
@@ -98,8 +96,7 @@ 
     SN::db_transaction_commit();
     sys_redirect('alliance.php');
   }
-}
-elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
+} elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband'))
 {
   if(!$isAllyOwner)
   {

includes/alliance/ali_internal_admin_request.inc

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 use Alliance\DBStaticAlly;
 
-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,12 +11,12 @@ 
 }
 
 $d = sys_get_param_id('d');
-if($d) {
+if ($d) {
   doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '{$lang['ali_req_deny_reason']}' WHERE `id_user`= {$d} LIMIT 1;");
 }
 
 $id_user = sys_get_param_id('id_user');
-if($id_user) {
+if ($id_user) {
   $ally_name_safe = SN::$db->db_escape($ally['ally_name']);
   $ally_tag_safe = SN::$db->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");

includes/general/general_urlAndHttp.php

Spacing +2 added lines, -2 removed lines

@@ -116,11 +116,11 @@
   );
 
   // Quick hack to support IPv6 at least on local host
-  if($ip['ip'] == '::1') {
+  if ($ip['ip'] == '::1') {
     $ip['ip'] = '127.0.0.1';
   }
 
-  foreach($ip as &$val) {
+  foreach ($ip as &$val) {
     $val = SN::$db->db_escape($val);
   }
 

includes/constants/constants.php

Spacing +234 added lines, -234 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(defined('__SN_CONSTANTS_DEFINED') && __SN_CONSTANTS_DEFINED === true) {
+if (defined('__SN_CONSTANTS_DEFINED') && __SN_CONSTANTS_DEFINED === true) {
   return;
 }
 
@@ -51,8 +51,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);
@@ -65,16 +65,16 @@ 
 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_MINUTE_15', PERIOD_MINUTE * 15);
-define('PERIOD_DAY_3'    , PERIOD_DAY * 3);
-define('PERIOD_WEEK_2'   , PERIOD_WEEK * 2);
-define('PERIOD_WEEK_4'   , PERIOD_WEEK * 4);
-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_WEEK_4', PERIOD_WEEK * 4);
+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);
@@ -92,11 +92,11 @@ 
 define('DEFAULT_PICTURE_EXTENSION_DOTTED', '.jpg');
 
 // Operation error status HARDCODED!
-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_NOTICE'             , 8); // There is notice - nothing really critical but operator should know
+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_NOTICE', 8); // There is notice - nothing really critical but operator should know
 // New GLOBAL operation results
 //define('RESULT_DEFAULT' , 0); // Default result - all went OK or result really doesn't matter
 //define('RESULT_WARNING' , 1);
@@ -143,38 +143,38 @@ 
 
 // Mot qui sont interdit a la saisie !
 global $ListCensure;
-$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_EXCEPT_COMPLETE' , -2);
-define('QUEST_STATUS_ALL' , -1);
-define('QUEST_STATUS_NOT_STARTED' , 0);
-define('QUEST_STATUS_STARTED'     , 1);
-define('QUEST_STATUS_COMPLETE'    , 2);
+define('QUEST_STATUS_EXCEPT_COMPLETE', -2);
+define('QUEST_STATUS_ALL', -1);
+define('QUEST_STATUS_NOT_STARTED', 0);
+define('QUEST_STATUS_STARTED', 1);
+define('QUEST_STATUS_COMPLETE', 2);
 
 define('TYPE_EMPTY', '');
 define('TYPE_INTEGER', 'integer');
@@ -187,69 +187,69 @@ 
 
 // *** 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_AUTODETECT', -2);
-define('LOC_NONE',    -1); // Deprecated
+define('LOC_NONE', -1); // Deprecated
 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_PLAYER',   4);
-define('LOC_USER',     LOC_PLAYER); // Deprecated alias for LOC_PLAYER
-define('LOC_FLEET',    5);
-define('LOC_ALLY',     6);
-define('LOC_SERVER',   7); // Located on server
+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_PLAYER', 4);
+define('LOC_USER', LOC_PLAYER); // Deprecated alias for LOC_PLAYER
+define('LOC_FLEET', 5);
+define('LOC_ALLY', 6);
+define('LOC_SERVER', 7); // Located on server
 
 // ТОЛЬКО ВНУТРЕНЕЕ!!!
-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_NONE', 0);
 define('EVENT_FLEET_ARRIVE', 1);
-define('EVENT_FLEET_STAY'  , 2);
+define('EVENT_FLEET_STAY', 2);
 define('EVENT_FLEET_RETURN', 3);
 
 
@@ -421,16 +421,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');
@@ -474,66 +474,66 @@ 
 
 
 // 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);
@@ -541,12 +541,12 @@ 
 
 
 // *** 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);
 
@@ -554,116 +554,116 @@ 
 
 // *** 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_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);
 define('BUILD_HIGHSPOT_NOT_ACTIVE', 14);
 
 
 // *** 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_VACATION'       , 11);
+define('SORT_TIME_BAN_UNTIL', 8);
+define('SORT_REFERRAL_COUNT', 9);
+define('SORT_REFERRAL_DM', 10);
+define('SORT_VACATION', 11);
 
 
 define('HULL_SIZE_TINY', 1);
@@ -783,35 +783,35 @@ 
 
 
 // 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_BIRTHDAY',       4000);
-define('NICK_RANK',           4500);
-define('NICK_RANK_NO_TEXT',   4750);
-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_BIRTHDAY', 4000);
+define('NICK_RANK', 4500);
+define('NICK_RANK_NO_TEXT', 4750);
+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_SORT',          10000);
+define('NICK_LAST', 9999);
+define('NICK_SORT', 10000);
 
 // Настройки игрока
 define('PLAYER_OPTION_MENU_SORT', 1);
@@ -915,8 +915,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);
 
@@ -1047,8 +1047,8 @@ 
 const MODULE_LOAD_ORDER_AUTH_VKONTAKTE        = 3;
 const MODULE_LOAD_ORDER_PAYMENT_SECONDARY     = 90000;
 const MODULE_LOAD_ORDER_UNIT_RES_METAMATTER   = 99999;
-const MODULE_LOAD_ORDER_DEFAULT               = 100000;     // HARDCODED
-const MODULE_LOAD_ORDER_CORE_SHIP_CONSTRUCTOR = 999999;     // RESERVED
+const MODULE_LOAD_ORDER_DEFAULT               = 100000; // HARDCODED
+const MODULE_LOAD_ORDER_CORE_SHIP_CONSTRUCTOR = 999999; // RESERVED
 const MODULE_LOAD_ORDER_MENU_CUSTOMIZE        = 200000000;
 const MODULE_LOAD_ORDER_LATEST                = 2000000000; // HARDCODED
 const MODULE_LOAD_ORDER_GAME_SKIRMISH         = 2000100000;

buddy.php

Spacing +19 added lines, -19 removed lines

@@ -18,39 +18,39 @@ 
 {
   SN::db_transaction_start();
 
-  if($buddy_id = sys_get_param_id('buddy_id'))
+  if ($buddy_id = sys_get_param_id('buddy_id'))
   {
     $buddy_row = doquery("SELECT BUDDY_SENDER_ID, BUDDY_OWNER_ID, BUDDY_STATUS FROM {{buddy}} WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1 FOR UPDATE;", true);
-    if(!is_array($buddy_row))
+    if (!is_array($buddy_row))
     {
       throw new exception('buddy_err_not_exist', ERR_ERROR);
     }
 
-    switch($mode = sys_get_param_str('mode'))
+    switch ($mode = sys_get_param_str('mode'))
     {
       case 'accept':
-        if($buddy_row['BUDDY_SENDER_ID'] == $user['id'])
+        if ($buddy_row['BUDDY_SENDER_ID'] == $user['id'])
         {
           throw new exception('buddy_err_accept_own', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_OWNER_ID'] != $user['id'])
+        if ($buddy_row['BUDDY_OWNER_ID'] != $user['id'])
         {
           throw new exception('buddy_err_accept_alien', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE)
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE)
         {
           throw new exception('buddy_err_accept_already', ERR_WARNING);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_DENIED)
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_DENIED)
         {
           throw new exception('buddy_err_accept_denied', ERR_ERROR);
         }
 
         doquery("UPDATE {{buddy}} SET `BUDDY_STATUS` = " . BUDDY_REQUEST_ACTIVE . " WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
-        if(SN::$db->db_affected_rows())
+        if (SN::$db->db_affected_rows())
         {
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_accept_title'],
             sprintf($lang['buddy_msg_accept_text'], $user['username']));
@@ -64,12 +64,12 @@ 
       break;
 
       case 'delete':
-        if($buddy_row['BUDDY_SENDER_ID'] != $user['id'] && $buddy_row['BUDDY_OWNER_ID'] != $user['id'])
+        if ($buddy_row['BUDDY_SENDER_ID'] != $user['id'] && $buddy_row['BUDDY_OWNER_ID'] != $user['id'])
         {
           throw new exception('buddy_err_delete_alien', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
         {
           $ex_friend_id = $buddy_row['BUDDY_SENDER_ID'] == $user['id'] ? $buddy_row['BUDDY_OWNER_ID'] : $buddy_row['BUDDY_SENDER_ID'];
 
@@ -80,13 +80,13 @@ 
           SN::db_transaction_commit();
           throw new exception('buddy_err_unfriend_none', ERR_NONE);
         }
-        elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
+        elseif ($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
         {
           doquery("DELETE FROM {{buddy}} WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
           SN::db_transaction_commit();
           throw new exception('buddy_err_delete_own', ERR_NONE);
         }
-        elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
+        elseif ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
         {
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_deny_title'],
             sprintf($lang['buddy_msg_deny_text'], $user['username']));
@@ -101,24 +101,24 @@ 
 
   // New request?
   // Checking for user ID - in case if it was request from outside buddy system
-  if($new_friend_id = sys_get_param_id('request_user_id'))
+  if ($new_friend_id = sys_get_param_id('request_user_id'))
   {
     $new_friend_row = db_user_by_id($new_friend_id, true, '`id`, `username`');
   }
-  elseif($new_friend_name = sys_get_param_str_unsafe('request_user_name'))
+  elseif ($new_friend_name = sys_get_param_str_unsafe('request_user_name'))
   {
     $new_friend_row = db_user_by_username($new_friend_name);
     $new_friend_name = SN::$db->db_escape($new_friend_name);
   }
 
-  if($new_friend_row['id'] == $user['id'])
+  if ($new_friend_row['id'] == $user['id'])
   {
     unset($new_friend_row);
     throw new exception('buddy_err_adding_self', ERR_ERROR);
   }
 
   // Checking for user name & request text - in case if it was request to adding new request
-  if(isset($new_friend_row['id']) && ($new_request_text = sys_get_param_str('request_text')))
+  if (isset($new_friend_row['id']) && ($new_request_text = sys_get_param_str('request_text')))
   {
     $check_relation = doquery("SELECT `BUDDY_ID` FROM {{buddy}} WHERE
       (`BUDDY_SENDER_ID` = {$user['id']} AND `BUDDY_OWNER_ID` = {$new_friend_row['id']})
@@ -126,7 +126,7 @@ 
       (`BUDDY_SENDER_ID` = {$new_friend_row['id']} AND `BUDDY_OWNER_ID` = {$user['id']})
       LIMIT 1 FOR UPDATE;"
     , true);
-    if(isset($check_relation['BUDDY_ID']))
+    if (isset($check_relation['BUDDY_ID']))
     {
       throw new exception('buddy_err_adding_exists', ERR_WARNING);
     }
@@ -139,7 +139,7 @@ 
     throw new exception('buddy_err_adding_none', ERR_NONE);
   }
 }
-catch(exception $e)
+catch (exception $e)
 {
   $result[] = array(
     'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
@@ -150,7 +150,7 @@ 
 SN::db_transaction_rollback();
 
 $query = db_buddy_list_by_user($user['id']);
-while($row = db_fetch($query))
+while ($row = db_fetch($query))
 {
   $row['BUDDY_REQUEST'] = HelperString::nl2br($row['BUDDY_REQUEST']);
 

Braces +12 added lines, -11 removed lines

@@ -56,8 +56,7 @@ 
             sprintf($lang['buddy_msg_accept_text'], $user['username']));
           SN::db_transaction_commit();
           throw new exception('buddy_err_accept_none', ERR_NONE);
-        }
-        else
+        } else
         {
           throw new exception('buddy_err_accept_internal', ERR_ERROR);
         }
@@ -69,9 +68,11 @@ 
           throw new exception('buddy_err_delete_alien', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
+        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) {
+          // Existing friendship
         {
           $ex_friend_id = $buddy_row['BUDDY_SENDER_ID'] == $user['id'] ? $buddy_row['BUDDY_OWNER_ID'] : $buddy_row['BUDDY_SENDER_ID'];
+        }
 
           msg_send_simple_message($ex_friend_id, $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_unfriend_title'],
             sprintf($lang['buddy_msg_unfriend_text'], $user['username']));
@@ -79,17 +80,19 @@ 
           doquery("DELETE FROM {{buddy}} WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
           SN::db_transaction_commit();
           throw new exception('buddy_err_unfriend_none', ERR_NONE);
-        }
-        elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
+        } elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) {
+          // Player's outcoming request - either denied or waiting
         {
           doquery("DELETE FROM {{buddy}} WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
+        }
           SN::db_transaction_commit();
           throw new exception('buddy_err_delete_own', ERR_NONE);
-        }
-        elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
+        } elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) {
+          // Deny incoming request
         {
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_deny_title'],
             sprintf($lang['buddy_msg_deny_text'], $user['username']));
+        }
 
           doquery("UPDATE {{buddy}} SET `BUDDY_STATUS` = " . BUDDY_REQUEST_DENIED . " WHERE `BUDDY_ID` = {$buddy_id} LIMIT 1;");
           SN::db_transaction_commit();
@@ -104,8 +107,7 @@ 
   if($new_friend_id = sys_get_param_id('request_user_id'))
   {
     $new_friend_row = db_user_by_id($new_friend_id, true, '`id`, `username`');
-  }
-  elseif($new_friend_name = sys_get_param_str_unsafe('request_user_name'))
+  } elseif($new_friend_name = sys_get_param_str_unsafe('request_user_name'))
   {
     $new_friend_row = db_user_by_username($new_friend_name);
     $new_friend_name = SN::$db->db_escape($new_friend_name);
@@ -138,8 +140,7 @@ 
     SN::db_transaction_commit();
     throw new exception('buddy_err_adding_none', ERR_NONE);
   }
-}
-catch(exception $e)
+} catch(exception $e)
 {
   $result[] = array(
     'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,

notes.php

Spacing +20 added lines, -20 removed lines

@@ -15,34 +15,34 @@ 
 $template = SnTemplate::gettemplate('notes', true);
 
 $result = array();
-if(($result_message = sys_get_param_str('MESSAGE')) && isset($lang[$result_message])) {
+if (($result_message = sys_get_param_str('MESSAGE')) && isset($lang[$result_message])) {
   $result[] = array('STATUS' => sys_get_param_int('STATUS'), 'MESSAGE' => $lang[$result_message]);
 }
 
 $note_id_edit = sys_get_param_id('note_id_edit');
-if(sys_get_param('note_delete')) {
+if (sys_get_param('note_delete')) {
   try {
     $not = '';
     $query_where = '';
-    switch(sys_get_param_str('note_delete_range')) {
+    switch (sys_get_param_str('note_delete_range')) {
       case 'all':
       break;
 
       case 'marked_not':
         $not = 'NOT';
       case 'marked':
-        if(!is_array($notes_marked = sys_get_param('note'))) {
+        if (!is_array($notes_marked = sys_get_param('note'))) {
           throw new exception('note_err_none_selected', ERR_WARNING);
         }
 
         $notes_marked_filtered = array();
-        foreach($notes_marked as $note_id => $note_select) {
-          if($note_select == 'on' && $note_id = idval($note_id)) {
+        foreach ($notes_marked as $note_id => $note_select) {
+          if ($note_select == 'on' && $note_id = idval($note_id)) {
             $notes_marked_filtered[] = $note_id;
           }
         }
 
-        if(empty($notes_marked_filtered)) {
+        if (empty($notes_marked_filtered)) {
           throw new exception('note_err_none_selected', ERR_WARNING);
         }
 
@@ -59,7 +59,7 @@ 
     doquery("DELETE FROM {{notes}} WHERE `owner` = {$user['id']} {$query_where};");
     SN::db_transaction_commit();
     throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
-  } catch(exception $e) {
+  } catch (exception $e) {
     $note_id_edit = 0;
     SN::db_transaction_rollback();
     $result[] = array(
@@ -67,7 +67,7 @@ 
       'MESSAGE' => $lang[$e->getMessage()],
     );
   }
-} elseif(($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
+} elseif (($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
   $note_title == SN::$db->db_escape($lang['note_new_title']) ? $note_title = '' : false;
   ($note_text = sys_get_param_str('note_text')) == SN::$db->db_escape($lang['note_new_text']) ? $note_text = '' : false;
 
@@ -76,7 +76,7 @@ 
     $note_system = max(0, min(sys_get_param_id('note_system'), SN::$config->game_maxSystem));
     $note_planet = max(0, min(sys_get_param_id('note_planet'), SN::$config->game_maxPlanet + 1));
 
-    if(!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
+    if (!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
       throw new exception('note_err_note_empty', ERR_WARNING);
     }
 
@@ -85,15 +85,15 @@ 
     $note_sticky = intval(sys_get_param_id('note_sticky')) ? 1 : 0;
 
     SN::db_transaction_start();
-    if($note_id_edit) {
+    if ($note_id_edit) {
       $check_note_id = doquery("SELECT `id`, `owner` FROM {{notes}} WHERE `id` = {$note_id_edit} LIMIT 1 FOR UPDATE", true);
-      if(!$check_note_id) {
+      if (!$check_note_id) {
         throw new exception('note_err_note_not_found', ERR_ERROR);
       }
     }
 
-    if($note_id_edit) {
-      if($check_note_id['owner'] != $user['id']) {
+    if ($note_id_edit) {
+      if ($check_note_id['owner'] != $user['id']) {
         throw new exception('note_err_owner_wrong', ERR_ERROR);
       }
 
@@ -108,7 +108,7 @@ 
     SN::db_transaction_commit();
     sys_redirect('notes.php?STATUS=' . ERR_NONE . '&MESSAGE=' . ($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added'));
 //    throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
-  } catch(exception $e) {
+  } catch (exception $e) {
     $note_id_edit = 0;
     SN::db_transaction_rollback();
     $result[] = array(
@@ -118,7 +118,7 @@ 
   }
 }
 
-if(!$note_id_edit) {
+if (!$note_id_edit) {
   \Note\Note::note_assign($template, array(
     'id' => 0,
     'time' => SN_TIME_NOW,
@@ -131,13 +131,13 @@ 
 
 $note_exist = false;
 $notes_query = doquery("SELECT * FROM {{notes}} WHERE owner={$user['id']} ORDER BY priority DESC, galaxy ASC, system ASC, planet ASC, planet_type ASC, `time` DESC");
-while($note_row = db_fetch($notes_query)) {
+while ($note_row = db_fetch($notes_query)) {
   \Note\Note::note_assign($template, $note_row);
   $note_exist = $note_exist || $note_row['id'] == $note_id_edit;
 }
 $note_id_edit = $note_exist ? $note_id_edit : 0;
 
-foreach($note_priority_classes as $note_priority_id => $note_priority_class) {
+foreach ($note_priority_classes as $note_priority_id => $note_priority_class) {
   $template->assign_block_vars('note_priority', array(
     'ID' => $note_priority_id,
     'CLASS' => $note_priority_classes[$note_priority_id],
@@ -145,14 +145,14 @@ 
   ));
 }
 
-foreach($lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
+foreach ($lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
   $template->assign_block_vars('planet_type', array(
     'ID' => $planet_type_id,
     'TEXT' => $planet_type_string,
   ));
 }
 
-foreach($result as $result_data) {
+foreach ($result as $result_data) {
   $template->assign_block_vars('result', $result_data);
 }