supernova-ws / SuperNova

includes/classes/Mission/MissionFactory.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
    * @throws ExceptionFleetInvalid
    */
   public static function build($missionType, $fleet) {
-    if (!empty(self::$missions[$missionType]) && class_exists($className = __NAMESPACE__ . '\\' . self::$missions[$missionType])) {
+    if (!empty(self::$missions[$missionType]) && class_exists($className = __NAMESPACE__.'\\'.self::$missions[$missionType])) {
       $result = new $className($fleet);
     } else {
       throw new ExceptionFleetInvalid("Mission type {$missionType} unknown", FLIGHT_MISSION_UNKNOWN);

includes/classes/sn_module.php

Spacing +34 added lines, -34 removed lines

@@ -72,10 +72,10 @@ 
   }
 
   function loadModuleRootConfig() {
-    require SN_ROOT_PHYSICAL . 'config.php';
+    require SN_ROOT_PHYSICAL.'config.php';
 
-    $module_config_array = get_class($this) . '_config';
-    if(!empty($$module_config_array) && is_array($$module_config_array)) {
+    $module_config_array = get_class($this).'_config';
+    if (!empty($$module_config_array) && is_array($$module_config_array)) {
       $this->config = $$module_config_array;
 
       return true;
@@ -93,17 +93,17 @@ 
 
     // TODO: Load configuration from DB. Manifest setting
     // Trying to load configuration from file
-    if(!$config_exists = $this->loadModuleRootConfig()) {
+    if (!$config_exists = $this->loadModuleRootConfig()) {
       // Конфигурация может лежать в config_path в манифеста или в корне модуля
-      if(isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
+      if (isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'].'/config.php')) {
         $config_exists = true;
-      } elseif(file_exists($config_filename = dirname($filename) . '/config.php')) {
+      } elseif (file_exists($config_filename = dirname($filename).'/config.php')) {
         $config_exists = true;
       }
 
-      if($config_exists) {
+      if ($config_exists) {
         include($config_filename);
-        $module_config_array = $class_module_name . '_config';
+        $module_config_array = $class_module_name.'_config';
         $this->config = $$module_config_array;
       }
     }
@@ -118,7 +118,7 @@ 
 
     // Checking module status - is it installed and active
     $this->check_status();
-    if(!$this->manifest['active']) {
+    if (!$this->manifest['active']) {
       return;
     }
 
@@ -138,11 +138,11 @@ 
 
   protected function setSystemConstants() {
     // Setting constants - if any
-    if(empty($this->manifest['constants']) || !is_array($this->manifest['constants'])) {
+    if (empty($this->manifest['constants']) || !is_array($this->manifest['constants'])) {
       return;
     }
 
-    foreach($this->manifest['constants'] as $constant_name => $constant_value) {
+    foreach ($this->manifest['constants'] as $constant_name => $constant_value) {
       !defined($constant_name) ? define($constant_name, $constant_value) : false;
     }
   }
@@ -154,48 +154,48 @@ 
     // New values from module variables will overwrite previous values (for root variables) and array elements with corresponding indexes (for arrays)
     // Constants as array indexes are honored - it's make valid such declarations as 'sn_data[ques][QUE_STRUCTURES]'
     $this->manifest['vars'] = $this->__assign_vars();
-    if(empty($this->manifest['vars']) || !is_array($this->manifest['vars'])) {
+    if (empty($this->manifest['vars']) || !is_array($this->manifest['vars'])) {
       return;
     }
 
     $vars_assigned = array();
-    foreach($this->manifest['vars'] as $var_name => $var_value) {
+    foreach ($this->manifest['vars'] as $var_name => $var_value) {
       $sub_vars = explode('[', str_replace(']', '', $var_name));
       $var_name = $sub_vars[0];
 
-      if(!isset($vars_assigned[$var_name])) {
+      if (!isset($vars_assigned[$var_name])) {
         $vars_assigned[$var_name] = true;
         global $$var_name;
       }
 
       $pointer = &$$var_name;
-      if(($n = count($sub_vars)) > 1) {
-        for($i = 1; $i < $n; $i++) {
-          if(defined($sub_vars[$i])) {
+      if (($n = count($sub_vars)) > 1) {
+        for ($i = 1; $i < $n; $i++) {
+          if (defined($sub_vars[$i])) {
             $sub_vars[$i] = constant($sub_vars[$i]);
           }
 
-          if(!isset($pointer[$sub_vars[$i]]) && $i != $n) {
+          if (!isset($pointer[$sub_vars[$i]]) && $i != $n) {
             $pointer[$sub_vars[$i]] = array();
           }
           $pointer = &$pointer[$sub_vars[$i]];
         }
       }
 
-      if(!isset($pointer) || !is_array($pointer)) {
+      if (!isset($pointer) || !is_array($pointer)) {
         $pointer = $var_value;
-      } elseif(is_array($$var_name)) {
+      } elseif (is_array($$var_name)) {
         $pointer = array_merge_recursive_numeric($pointer, $var_value);
       }
     }
   }
 
   protected function mergeMenu(&$sn_menu_extra, &$menu_patch) {
-    if(!is_array($menu_patch)) {
+    if (!is_array($menu_patch)) {
       return;
     }
 
-    foreach($menu_patch as $menu_item_name => $menu_item_data) {
+    foreach ($menu_patch as $menu_item_name => $menu_item_data) {
       $sn_menu_extra[$menu_item_name] = $menu_item_data;
     }
   }
@@ -204,34 +204,34 @@ 
     // Overriding function if any
     sn_sys_handler_add(classSupernova::$functions, $this->manifest['functions'], $this);
 
-    foreach(classSupernova::$sn_mvc as $handler_type => &$handler_data) {
+    foreach (classSupernova::$sn_mvc as $handler_type => &$handler_data) {
       sn_sys_handler_add($handler_data, $this->manifest['mvc'][$handler_type], $this, $handler_type);
     }
   }
 
   protected function mergeNavbarButton() {
-    if(empty($this->manifest['navbar_prefix_button']) || !is_array($this->manifest['navbar_prefix_button'])) {
+    if (empty($this->manifest['navbar_prefix_button']) || !is_array($this->manifest['navbar_prefix_button'])) {
       return;
     }
 
-    foreach($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
+    foreach ($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
       classSupernova::$sn_mvc['navbar_prefix_button'][$button_image] = $button_url_relative;
     }
   }
 
   protected function mergeI18N() {
     $arrayName = 'i18n';
-    if(empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
+    if (empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
       return;
     }
 
-    foreach($this->manifest[$arrayName] as $pageName => &$contentList) {
-      foreach($contentList as &$i18n_file_data) {
-        if(is_array($i18n_file_data) && !$i18n_file_data['path']) {
+    foreach ($this->manifest[$arrayName] as $pageName => &$contentList) {
+      foreach ($contentList as &$i18n_file_data) {
+        if (is_array($i18n_file_data) && !$i18n_file_data['path']) {
           $i18n_file_data['path'] = $this->manifest['root_relative'];
         }
       }
-      if(!isset(classSupernova::$sn_mvc[$arrayName][$pageName])) {
+      if (!isset(classSupernova::$sn_mvc[$arrayName][$pageName])) {
         classSupernova::$sn_mvc[$arrayName][$pageName] = array();
       }
       classSupernova::$sn_mvc[$arrayName][$pageName] += $contentList;
@@ -239,13 +239,13 @@ 
   }
 
   protected function mergeArraySpecial($arrayName) {
-    if(empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
+    if (empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
       return;
     }
 
-    foreach($this->manifest[$arrayName] as $pageName => &$contentList) {
+    foreach ($this->manifest[$arrayName] as $pageName => &$contentList) {
       !isset(classSupernova::$sn_mvc[$arrayName][$pageName]) ? classSupernova::$sn_mvc[$arrayName][$pageName] = array() : false;
-      foreach($contentList as $contentName => &$content) {
+      foreach ($contentList as $contentName => &$content) {
         classSupernova::$sn_mvc[$arrayName][$pageName][$contentName] = $content;
       }
     }
@@ -299,7 +299,7 @@ 
           $load_order[$loaded_module_name] = $level;
         }
       }
-    } while($prev_order != $load_order);
+    } while ($prev_order != $load_order);
 
     asort($load_order);
 

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) {
   classSupernova::$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 = DBStaticAlly::db_ally_search_by_name_or_tag($ali_search_text);
-  if(classSupernova::$db->db_num_rows($search)) {
-    while($ally_row = db_fetch($search)) {
+  if (classSupernova::$db->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 +240 added lines, -240 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,27 +52,27 @@ 
 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);
 define('FONT_SIZE_PERCENT_MAX', 131.25);
 define('FONT_SIZE_PERCENT_STEP', 12.5);
-define('FONT_SIZE_PERCENT_DEFAULT_STRING', FONT_SIZE_PERCENT_DEFAULT . '%');
+define('FONT_SIZE_PERCENT_DEFAULT_STRING', FONT_SIZE_PERCENT_DEFAULT.'%');
 
 define('FONT_SIZE_PIXELS_BROWSER_BASE', 16);
 define('FONT_SIZE_PIXELS_MIN', 9);
 define('FONT_SIZE_PIXELS_DEFAULT', 11);
 define('FONT_SIZE_PIXELS_MAX', 21);
 define('FONT_SIZE_PIXELS_STEP', 1);
-define('FONT_SIZE_PIXELS_DEFAULT_STRING', FONT_SIZE_PIXELS_DEFAULT . 'px');
+define('FONT_SIZE_PIXELS_DEFAULT_STRING', FONT_SIZE_PIXELS_DEFAULT.'px');
 
 define('DEFAULT_PICTURE_EXTENSION_DOTTED', '.jpg');
 
@@ -115,54 +115,54 @@ 
 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_EXPLORE'  , 15);
-define('MT_COLONIZE' ,  7);
-define('MT_RECYCLE'  ,  8);
+define('MT_NONE', 0);
+define('MT_EXPLORE', 15);
+define('MT_COLONIZE', 7);
+define('MT_RECYCLE', 8);
 
-define('MT_RELOCATE' ,  4);
+define('MT_RELOCATE', 4);
 
-define('MT_TRANSPORT',  3);
-define('MT_HOLD'     ,  5);
+define('MT_TRANSPORT', 3);
+define('MT_HOLD', 5);
 
-define('MT_MISSILE'  , 10);
-define('MT_SPY'      ,  6);
-define('MT_ATTACK'   ,  1);
-define('MT_ACS'      ,  2);
-define('MT_DESTROY'  ,  9);
+define('MT_MISSILE', 10);
+define('MT_SPY', 6);
+define('MT_ATTACK', 1);
+define('MT_ACS', 2);
+define('MT_DESTROY', 9);
 // 11, 12, 13, 14, 16...
 
 // *** Planet Target constants starts with PT_
@@ -170,49 +170,49 @@ 
 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
@@ -267,10 +267,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);
@@ -290,7 +290,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); // Модуль отключен // УНИВЕРСАЛЬНЫЙ ОТВЕТ!
@@ -563,16 +563,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');
@@ -616,69 +616,69 @@ 
 
 
 // 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('FLIGHT_NO_RESULT'           ,  -2);
-define('FLIGHT_ALLOWED_NEW'           ,  -1);
+define('FLIGHT_NO_RESULT', -2);
+define('FLIGHT_ALLOWED_NEW', -1);
 //define('FLIGHT_DO_NOTHING'           ,  0);
-define('FLIGHT_ALLOWED'           ,  0);
-define('FLIGHT_VECTOR_NO_TARGET'         ,  1);
-define('FLIGHT_PLAYER_OWN'               ,  2);
-define('FLIGHT_MISSION_IMPOSSIBLE'     ,  3);
-define('FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT'   ,  4);
-define('FLIGHT_MISSION_RECYCLE_NO_DEBRIS'         ,  5);
-define('FLIGHT_PLAYER_VACATION'          ,  6);
-define('FLIGHT_PLAYER_SAME_IP'           ,  7);
-define('FLIGHT_PLAYER_BUFFING'           ,  8);
-define('FLIGHT_PLAYER_ADMIN'             ,  9);
-define('FLIGHT_PLAYER_NOOB'              , 10);
-define('FLIGHT_PLAYER_VACATION_OWN'      , 11);
-define('FLIGHT_MISSION_MISSILE_NO_SILO'           , 12);
-define('FLIGHT_MISSION_MISSILE_NO_MISSILES'        , 13);
-define('FLIGHT_SHIPS_NO_SHIPS'          , 14);
-define('FLIGHT_FLEET_NO_SLOTS'          , 15);
-define('FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES'          , 16);
-define('FLIGHT_SHIPS_NO_RECYCLERS'      , 17);
-define('FLIGHT_MISSION_SPY_NO_SPIES'          , 18);
-define('FLIGHT_SHIPS_NO_COLONIZER'      , 19);
-define('FLIGHT_MISSION_MISSILE_TOO_FAR'   , 20);
-define('FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE'   , 21);
-define('FLIGHT_RESOURCES_FUEL_NOT_ENOUGH'           , 22);
-define('FLIGHT_RESOURCES_NOT_ENOUGH'      , 23);
-define('FLIGHT_MISSION_ACS_NOT_EXISTS'            , 24);
-define('FLIGHT_MISSION_ACS_MISSTARGET'    , 25);
-define('FLIGHT_FLEET_SPEED_WRONG'       , 26);
-define('FLIGHT_MISSION_ACS_TOO_LATE'      , 27);
-define('FLIGHT_MISSION_ATTACK_BASHING'           , 28);
-define('FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY' , 29);
-define('FLIGHT_MISSION_ACS_WRONG_TARGET'  , 30);
-define('FLIGHT_VECTOR_SAME_SOURCE'              , 31);
+define('FLIGHT_ALLOWED', 0);
+define('FLIGHT_VECTOR_NO_TARGET', 1);
+define('FLIGHT_PLAYER_OWN', 2);
+define('FLIGHT_MISSION_IMPOSSIBLE', 3);
+define('FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT', 4);
+define('FLIGHT_MISSION_RECYCLE_NO_DEBRIS', 5);
+define('FLIGHT_PLAYER_VACATION', 6);
+define('FLIGHT_PLAYER_SAME_IP', 7);
+define('FLIGHT_PLAYER_BUFFING', 8);
+define('FLIGHT_PLAYER_ADMIN', 9);
+define('FLIGHT_PLAYER_NOOB', 10);
+define('FLIGHT_PLAYER_VACATION_OWN', 11);
+define('FLIGHT_MISSION_MISSILE_NO_SILO', 12);
+define('FLIGHT_MISSION_MISSILE_NO_MISSILES', 13);
+define('FLIGHT_SHIPS_NO_SHIPS', 14);
+define('FLIGHT_FLEET_NO_SLOTS', 15);
+define('FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES', 16);
+define('FLIGHT_SHIPS_NO_RECYCLERS', 17);
+define('FLIGHT_MISSION_SPY_NO_SPIES', 18);
+define('FLIGHT_SHIPS_NO_COLONIZER', 19);
+define('FLIGHT_MISSION_MISSILE_TOO_FAR', 20);
+define('FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE', 21);
+define('FLIGHT_RESOURCES_FUEL_NOT_ENOUGH', 22);
+define('FLIGHT_RESOURCES_NOT_ENOUGH', 23);
+define('FLIGHT_MISSION_ACS_NOT_EXISTS', 24);
+define('FLIGHT_MISSION_ACS_MISSTARGET', 25);
+define('FLIGHT_FLEET_SPEED_WRONG', 26);
+define('FLIGHT_MISSION_ACS_TOO_LATE', 27);
+define('FLIGHT_MISSION_ATTACK_BASHING', 28);
+define('FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY', 29);
+define('FLIGHT_MISSION_ACS_WRONG_TARGET', 30);
+define('FLIGHT_VECTOR_SAME_SOURCE', 31);
 define('FLIGHT_RESOURCES_FORBIDDEN', 32);
-define('FLIGHT_MISSION_TRANSPORT_EMPTY_CARGO'   , 33);
-define('FLIGHT_SHIPS_NOT_ONLY_SPIES'       , 34);
-define('FLIGHT_FLEET_TOO_FAR'           , 35);
-define('FLIGHT_FLEET_OVERLOAD'        , 36);
-define('FLIGHT_MISSION_UNKNOWN'    , 37);
-define('FLIGHT_SHIPS_UNIT_WRONG'        , 38);
-define('FLIGHT_SHIPS_UNMOVABLE'        , 39);
-define('FLIGHT_SHIPS_NEGATIVE'  , 40);
+define('FLIGHT_MISSION_TRANSPORT_EMPTY_CARGO', 33);
+define('FLIGHT_SHIPS_NOT_ONLY_SPIES', 34);
+define('FLIGHT_FLEET_TOO_FAR', 35);
+define('FLIGHT_FLEET_OVERLOAD', 36);
+define('FLIGHT_MISSION_UNKNOWN', 37);
+define('FLIGHT_SHIPS_UNIT_WRONG', 38);
+define('FLIGHT_SHIPS_UNMOVABLE', 39);
+define('FLIGHT_SHIPS_NEGATIVE', 40);
 define('FLIGHT_RESOURCES_NEGATIVE', 41);
 define('FLIGHT_MISSION_MORATORIUM', 42);
 define('FLIGHT_PLAYER_CHILD_PROTECTION', 43);
@@ -723,12 +723,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);
 
@@ -736,114 +736,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);
@@ -987,10 +987,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
@@ -1061,18 +1061,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 кораблей"
@@ -1169,7 +1169,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 штук
@@ -1426,32 +1426,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);
@@ -1544,8 +1544,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);
 

tests.int/FleetTest.php

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
 define('SN_IN_FLEET', true);
 define('SN_RENDER_NAVBAR_PLANET', true);
 
-include('../common.' . substr(strrchr(__FILE__, '.'), 1));
+include('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 // TODO - Переместить это куда-нибудь
 $fleet_page = sys_get_param_int('fleet_page', sys_get_param_int('mode'));
@@ -192,8 +192,8 @@ 
 //  break;
     }
 
-    if($exceptionCode !== null) {
-      print('<span style="color: red; font-size: 200%;">FAILED! Expected Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - FAILED!</span><br />');
+    if ($exceptionCode !== null) {
+      print('<span style="color: red; font-size: 200%;">FAILED! Expected Exception ['.$exceptionCode.']: "'.classLocale::$lang['fl_attack_error'][$exceptionCode].'" - FAILED!</span><br />');
       print('<div style="color: red; font-size: 200%;">NO EXCEPTION RAISED</div>');
       pdie();
     } else {
@@ -203,8 +203,8 @@ 
     if ($exceptionCode !== null && $e->getCode() === $exceptionCode) {
 //      print('<span style="color: darkgreen;">Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - passed</span><br />');
     } else {
-      print('<div style="color: red; font-size: 200%;">Expected Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - FAILED!</div>');
-      print('<div style="color: red; font-size: 200%;">Got Exception [' . $e->getCode() . ']: "' . $e->getMessage() . '"/"' . classLocale::$lang['fl_attack_error'][$e->getCode()] . '" . "</div>');
+      print('<div style="color: red; font-size: 200%;">Expected Exception ['.$exceptionCode.']: "'.classLocale::$lang['fl_attack_error'][$exceptionCode].'" - FAILED!</div>');
+      print('<div style="color: red; font-size: 200%;">Got Exception ['.$e->getCode().']: "'.$e->getMessage().'"/"'.classLocale::$lang['fl_attack_error'][$e->getCode()].'" . "</div>');
       throw $e;
     }
   }

includes/classes/DbQueryConstructor.php

Spacing +10 added lines, -10 removed lines

@@ -228,7 +228,7 @@ 
   // TODO - rewrite
   public function getParamsFromStaticClass($className) {
     if (is_string($className) && $className && class_exists($className)) {
-      if(method_exists($className, 'getDb')) {
+      if (method_exists($className, 'getDb')) {
         $this->setDb($className::getDb());
       }
       $this->from($className::$_table);
@@ -317,9 +317,9 @@ 
   }
 
   protected function compileFrom() {
-    $this->_compiledQuery[] = 'FROM `{{' . $this->escapeString($this->table) . '}}`';
+    $this->_compiledQuery[] = 'FROM `{{'.$this->escapeString($this->table).'}}`';
     if (!empty($this->alias)) {
-      $this->_compiledQuery[] = 'AS `' . $this->escapeString($this->alias) . '`';
+      $this->_compiledQuery[] = 'AS `'.$this->escapeString($this->alias).'`';
     }
   }
 
@@ -329,29 +329,29 @@ 
 
   protected function compileWhere() {
     // TODO - fields should be escaped !!
-    !empty($this->where) ? $this->_compiledQuery[] = 'WHERE ' . implode(' AND ', $this->where) : false;
+    !empty($this->where) ? $this->_compiledQuery[] = 'WHERE '.implode(' AND ', $this->where) : false;
   }
 
   protected function compileGroupBy() {
     // TODO - fields should be escaped !!
 //    !empty($this->groupBy) ? $this->_compiledQuery[] = 'GROUP BY ' . implode(',', $this->arrayEscape($this->groupBy)) : false;
-    !empty($this->groupBy) ? $this->_compiledQuery[] = 'GROUP BY ' . $this->selectFieldsToString($this->groupBy) : false;
+    !empty($this->groupBy) ? $this->_compiledQuery[] = 'GROUP BY '.$this->selectFieldsToString($this->groupBy) : false;
   }
 
   protected function compileOrderBy() {
     // TODO - fields should be escaped !!
-    !empty($this->orderBy) ? $this->_compiledQuery[] = 'ORDER BY ' . implode(',', $this->arrayEscape($this->orderBy)) : false;
+    !empty($this->orderBy) ? $this->_compiledQuery[] = 'ORDER BY '.implode(',', $this->arrayEscape($this->orderBy)) : false;
   }
 
   protected function compileHaving() {
     // TODO - fields should be escaped !!
-    !empty($this->having) ? $this->_compiledQuery[] = 'HAVING ' . implode(' AND ', $this->having) : false;
+    !empty($this->having) ? $this->_compiledQuery[] = 'HAVING '.implode(' AND ', $this->having) : false;
   }
 
   protected function compileLimit() {
     // TODO - fields should be escaped !!
     if ($limit = $this->fetchOne ? 1 : $this->limit) {
-      $this->_compiledQuery[] = 'LIMIT ' . $limit . (!empty($this->offset) ? ' OFFSET ' . $this->offset : '');
+      $this->_compiledQuery[] = 'LIMIT '.$limit.(!empty($this->offset) ? ' OFFSET '.$this->offset : '');
     }
   }
 
@@ -395,14 +395,14 @@ 
    */
   protected function processField($fieldName) {
     if (is_bool($fieldName)) {
-      $result = (string)intval($fieldName);
+      $result = (string) intval($fieldName);
     } elseif (is_numeric($fieldName)) {
       $result = $fieldName;
     } elseif (is_null($fieldName)) {
       $result = 'NULL';
     } else {
       // Field has other type - string or should be convertible to string
-      $result = (string)$fieldName;
+      $result = (string) $fieldName;
       if (!$fieldName instanceof DbSqlLiteral) {
         $result = $this->quoteField($fieldName);
       }

includes/classes/Pimple/Container.php

Spacing +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
 
         $factory = $this->values[$id];
 
-        $extended = function ($c) use ($callable, $factory) {
+        $extended = function($c) use ($callable, $factory) {
             return $callable($factory($c), $c);
         };
 

includes/classes/DbResultIterator.php

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
    * @since 5.1.0
    */
   public function count() {
-    throw new Exception('You should implement ' . get_called_class() . '::count()');
+    throw new Exception('You should implement '.get_called_class().'::count()');
   }
 
 }

includes/classes/PropertyHiderInObject.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 class PropertyHiderInObject extends PropertyHider {
   private function getPhysicalPropertyName($name) {
-    return '_' . $name;
+    return '_'.$name;
   }
 
   /**