supernova-ws / SuperNova

classes/DBAL/ActiveRecordAbstract.php

Doc Comments +2 added lines, -4 removed lines

@@ -94,7 +94,7 @@ 
   }
 
   /**
-   * @return array[]
+   * @return \array[]
    */
   protected static function dbGetTableFields() {
     return static::db()->schema()->getTableSchema(static::tableName())->fields;
@@ -118,7 +118,6 @@ 
   /**
    * Instate ActiveRecord from array of field values - even if it is empty
    *
-   * @param array $fields List of field values [$propertyName => $propertyValue]
    *
    * @return static
    */
@@ -132,7 +131,6 @@ 
   /**
    * Instate ActiveRecord from array of field values
    *
-   * @param array $fields List of field values [$propertyName => $propertyValue]
    *
    * @return static|bool
    */
@@ -618,7 +616,7 @@ 
    * DOES NOT override existing values
    * DOES set default values for empty fields
    *
-   * @param array $fields List of field values [$fieldName => $fieldValue]
+   * @param string[] $fields List of field values [$fieldName => $fieldValue]
    */
   protected function fromFields(array $fields) {
     $this->fromProperties(static::translateNames($fields, self::FIELDS_TO_PROPERTIES));

classes/DBAL/TableSchema.php

Doc Comments -1 removed lines

@@ -37,7 +37,6 @@
    * TableSchema constructor.
    *
    * @param string         $tableName
-   * @param \db_mysql|null $db
    */
   public function __construct($tableName, Schema $dbSchema) {
     $this->dbSchema = $dbSchema;

classes/HelperArray.php

Doc Comments +2 added lines, -2 removed lines

@@ -41,8 +41,8 @@
   /**
    * Convert $delimiter delimited string to array
    *
-   * @param mixed  $string
-   * @param string $delimiter
+   * @param string  $string
+   * @param string string
    *
    * @return array
    */

Spacing +6 added lines, -6 removed lines

@@ -240,7 +240,7 @@ 
    * @return array
    */
   public static function parseParamStrings($array, $delimiter = '=') {
-    !is_array($array) ? $array = array((string)$array) : false;
+    !is_array($array) ? $array = array((string) $array) : false;
 
     $result = array();
     foreach ($array as $param) {
@@ -262,8 +262,8 @@ 
    * @return float|null
    */
   public static function maxValueByField(&$array, $fieldName) {
-    return array_reduce($array, function ($carry, $item) use ($fieldName) {
-      if(is_array($item) && isset($item[$fieldName]) && (!isset($carry) || $carry < $item[$fieldName])) {
+    return array_reduce($array, function($carry, $item) use ($fieldName) {
+      if (is_array($item) && isset($item[$fieldName]) && (!isset($carry) || $carry < $item[$fieldName])) {
         $carry = $item[$fieldName];
       }
 
@@ -280,8 +280,8 @@ 
 
     return
       array_reduce($array,
-        function ($carry, $item) use (&$fieldName, $maxValue) {
-          if(is_array($item) && isset($item[$fieldName]) && $item[$fieldName] == $maxValue) {
+        function($carry, $item) use (&$fieldName, $maxValue) {
+          if (is_array($item) && isset($item[$fieldName]) && $item[$fieldName] == $maxValue) {
             $carry[] = $item;
           }
 
@@ -292,7 +292,7 @@ 
   }
 
   public static function intersectByKeys(array &$array1, array &$array2) {
-    return array_uintersect_assoc($array1, $array2, function ($a, $b) {return 0;});
+    return array_uintersect_assoc($array1, $array2, function($a, $b) {return 0; });
   }
 
 }

includes/constants.php

Spacing +242 added lines, -242 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;
 }
 
@@ -35,7 +35,7 @@ 
 define('SN_ROOT_VIRTUAL', 'http' . (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 's' : '') . '://' . $_server_http_host . SN_ROOT_RELATIVE);
 
 $_server_server_name = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
-if(strpos(strtolower($_server_server_name), 'google.') !== false) {
+if (strpos(strtolower($_server_server_name), 'google.') !== false) {
   define('SN_GOOGLE', true);
 }
 define('SN_ROOT_VIRTUAL_PARENT', str_replace('//google.', '//', SN_ROOT_VIRTUAL));
@@ -54,8 +54,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);
@@ -68,14 +68,14 @@ 
 define('PERIOD_YEAR', PERIOD_DAY * 365);
 define('PERIOD_FOREVER', PERIOD_YEAR * 100);
 
-define('PERIOD_MINUTE_2' , PERIOD_MINUTE * 2);
-define('PERIOD_MINUTE_3' , PERIOD_MINUTE * 3);
-define('PERIOD_MINUTE_5' , PERIOD_MINUTE * 5);
+define('PERIOD_MINUTE_2', PERIOD_MINUTE * 2);
+define('PERIOD_MINUTE_3', PERIOD_MINUTE * 3);
+define('PERIOD_MINUTE_5', PERIOD_MINUTE * 5);
 define('PERIOD_MINUTE_10', PERIOD_MINUTE * 10);
-define('PERIOD_DAY_3'    , PERIOD_DAY * 3);
-define('PERIOD_WEEK_2'   , PERIOD_WEEK * 2);
-define('PERIOD_MONTH_2'  , PERIOD_MONTH * 2);
-define('PERIOD_MONTH_3'  , PERIOD_MONTH * 3);
+define('PERIOD_DAY_3', PERIOD_DAY * 3);
+define('PERIOD_WEEK_2', PERIOD_WEEK * 2);
+define('PERIOD_MONTH_2', PERIOD_MONTH * 2);
+define('PERIOD_MONTH_3', PERIOD_MONTH * 3);
 
 define('FONT_SIZE_PERCENT_MIN', 56.25);
 define('FONT_SIZE_PERCENT_DEFAULT', 68.75);
@@ -129,38 +129,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');
@@ -173,66 +173,66 @@ 
 
 // *** Combat-related constants
 // *** Mission Type constants starts with MT_
-define('MT_NONE'     ,  0);
-define('MT_ATTACK'   ,  1);
-define('MT_AKS'      ,  2);
-define('MT_TRANSPORT',  3);
-define('MT_RELOCATE' ,  4);
-define('MT_HOLD'     ,  5);
-define('MT_SPY'      ,  6);
-define('MT_COLONIZE' ,  7);
-define('MT_RECYCLE'  ,  8);
-define('MT_DESTROY'  ,  9);
-define('MT_MISSILE'  , 10);
-define('MT_EXPLORE'  , 15);
+define('MT_NONE', 0);
+define('MT_ATTACK', 1);
+define('MT_AKS', 2);
+define('MT_TRANSPORT', 3);
+define('MT_RELOCATE', 4);
+define('MT_HOLD', 5);
+define('MT_SPY', 6);
+define('MT_COLONIZE', 7);
+define('MT_RECYCLE', 8);
+define('MT_DESTROY', 9);
+define('MT_MISSILE', 10);
+define('MT_EXPLORE', 15);
 
 // *** Planet Target constants starts with PT_
 define('PT_NONE', 0);
 define('PT_ALL', 0);
 define('PT_PLANET', 1);
 define('PT_DEBRIS', 2);
-define('PT_MOON'  , 3);
+define('PT_MOON', 3);
 
 // *** Unit locations - shows db table where unit belong
 // Also cache indexes
-define('LOC_NONE',    -1);
+define('LOC_NONE', -1);
 define('LOC_UNIVERSE', 0);
-define('LOC_PLANET',   1);
-define('LOC_DEBRIS',   2); // Translates to `planets` table planet_type = 1, `debris_*` fields
-define('LOC_MOON',     3); // Translates to `planets` table planet_type = 3
-define('LOC_USER',     4);
-define('LOC_FLEET',    5);
-define('LOC_ALLY',     6);
+define('LOC_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',    '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);
 
 // *** Constants for changing DM
@@ -289,11 +289,11 @@ 
 
 
 // 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_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);
@@ -313,7 +313,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); // Модуль отключен // УНИВЕРСАЛЬНЫЙ ОТВЕТ!
@@ -589,16 +589,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');
@@ -642,78 +642,78 @@ 
 
 
 // Option groups
-define('OPT_ALL',      0);
-define('OPT_MESSAGE',  1);
+define('OPT_ALL', 0);
+define('OPT_MESSAGE', 1);
 define('OPT_UNIVERSE', 2);
 define('OPT_INTERFACE', 3);
 
 // Message classes
-define('MSG_TYPE_OUTBOX'   ,  -1);
-define('MSG_TYPE_SPY'      ,   0);
-define('MSG_TYPE_PLAYER'   ,   1);
-define('MSG_TYPE_ALLIANCE' ,   2);
-define('MSG_TYPE_COMBAT'   ,   3);
-define('MSG_TYPE_RECYCLE'  ,   4);
-define('MSG_TYPE_TRANSPORT',   5);
-define('MSG_TYPE_ADMIN'    ,   6);
-define('MSG_TYPE_EXPLORE'  ,  15);
-define('MSG_TYPE_QUE'      ,  99);
-define('MSG_TYPE_NEW'      , 100);
+define('MSG_TYPE_OUTBOX', -1);
+define('MSG_TYPE_SPY', 0);
+define('MSG_TYPE_PLAYER', 1);
+define('MSG_TYPE_ALLIANCE', 2);
+define('MSG_TYPE_COMBAT', 3);
+define('MSG_TYPE_RECYCLE', 4);
+define('MSG_TYPE_TRANSPORT', 5);
+define('MSG_TYPE_ADMIN', 6);
+define('MSG_TYPE_EXPLORE', 15);
+define('MSG_TYPE_QUE', 99);
+define('MSG_TYPE_NEW', 100);
 
 // Attack verification statuses
-define('ATTACK_ALLOWED'           ,  0);
-define('ATTACK_NO_TARGET'         ,  1);
-define('ATTACK_OWN'               ,  2);
-define('ATTACK_WRONG_MISSION'     ,  3);
-define('ATTACK_NO_ALLY_DEPOSIT'   ,  4);
-define('ATTACK_NO_DEBRIS'         ,  5);
-define('ATTACK_VACATION'          ,  6);
-define('ATTACK_SAME_IP'           ,  7);
-define('ATTACK_BUFFING'           ,  8);
-define('ATTACK_ADMIN'             ,  9);
-define('ATTACK_NOOB'              , 10);
-define('ATTACK_OWN_VACATION'      , 11);
-define('ATTACK_NO_SILO'           , 12);
-define('ATTACK_NO_MISSILE'        , 13);
-define('ATTACK_NO_FLEET'          , 14);
-define('ATTACK_NO_SLOTS'          , 15);
-define('ATTACK_NO_SHIPS'          , 16);
-define('ATTACK_NO_RECYCLERS'      , 17);
-define('ATTACK_NO_SPIES'          , 18);
-define('ATTACK_NO_COLONIZER'      , 19);
-define('ATTACK_MISSILE_TOO_FAR'   , 20);
-define('ATTACK_WRONG_STRUCTURE'   , 21);
-define('ATTACK_NO_FUEL'           , 22);
-define('ATTACK_NO_RESOURCES'      , 23);
-define('ATTACK_NO_ACS'            , 24);
-define('ATTACK_ACS_MISSTARGET'    , 25);
-define('ATTACK_WRONG_SPEED'       , 26);
-define('ATTACK_ACS_TOO_LATE'      , 27);
-define('ATTACK_BASHING'           , 28);
-define('ATTACK_BASHING_WAR_DELAY' , 29);
-define('ATTACK_ACS_WRONG_TARGET'  , 30);
-define('ATTACK_SAME'              , 31);
+define('ATTACK_ALLOWED', 0);
+define('ATTACK_NO_TARGET', 1);
+define('ATTACK_OWN', 2);
+define('ATTACK_WRONG_MISSION', 3);
+define('ATTACK_NO_ALLY_DEPOSIT', 4);
+define('ATTACK_NO_DEBRIS', 5);
+define('ATTACK_VACATION', 6);
+define('ATTACK_SAME_IP', 7);
+define('ATTACK_BUFFING', 8);
+define('ATTACK_ADMIN', 9);
+define('ATTACK_NOOB', 10);
+define('ATTACK_OWN_VACATION', 11);
+define('ATTACK_NO_SILO', 12);
+define('ATTACK_NO_MISSILE', 13);
+define('ATTACK_NO_FLEET', 14);
+define('ATTACK_NO_SLOTS', 15);
+define('ATTACK_NO_SHIPS', 16);
+define('ATTACK_NO_RECYCLERS', 17);
+define('ATTACK_NO_SPIES', 18);
+define('ATTACK_NO_COLONIZER', 19);
+define('ATTACK_MISSILE_TOO_FAR', 20);
+define('ATTACK_WRONG_STRUCTURE', 21);
+define('ATTACK_NO_FUEL', 22);
+define('ATTACK_NO_RESOURCES', 23);
+define('ATTACK_NO_ACS', 24);
+define('ATTACK_ACS_MISSTARGET', 25);
+define('ATTACK_WRONG_SPEED', 26);
+define('ATTACK_ACS_TOO_LATE', 27);
+define('ATTACK_BASHING', 28);
+define('ATTACK_BASHING_WAR_DELAY', 29);
+define('ATTACK_ACS_WRONG_TARGET', 30);
+define('ATTACK_SAME', 31);
 define('ATTACK_RESOURCE_FORBIDDEN', 32);
-define('ATTACK_TRANSPORT_EMPTY'   , 33);
-define('ATTACK_SPIES_LONLY'       , 34);
-define('ATTACK_TOO_FAR'           , 35);
-define('ATTACK_OVERLOADED'        , 36);
-define('ATTACK_MISSION_ABSENT'    , 37);
-define('ATTACK_WRONG_UNIT'        , 38);
-define('ATTACK_ZERO_SPEED'        , 39);
-define('ATTACK_SHIP_COUNT_WRONG'  , 40);
+define('ATTACK_TRANSPORT_EMPTY', 33);
+define('ATTACK_SPIES_LONLY', 34);
+define('ATTACK_TOO_FAR', 35);
+define('ATTACK_OVERLOADED', 36);
+define('ATTACK_MISSION_ABSENT', 37);
+define('ATTACK_WRONG_UNIT', 38);
+define('ATTACK_ZERO_SPEED', 39);
+define('ATTACK_SHIP_COUNT_WRONG', 40);
 define('ATTACK_RESOURCE_COUNT_WRONG', 41);
 define('ATTACK_MORATORIUM', 42);
 define('ATTACK_CHILD_PROTECTION', 43);
 
 
 // *** Races - Homeworlds
-define('RACE_NONE'    , 0);
-define('RACE_EARTH'   , 1);
-define('RACE_MOON'    , 2);
-define('RACE_MERCURY' , 3);
-define('RACE_VENUS'   , 4);
-define('RACE_MARS'    , 5);
+define('RACE_NONE', 0);
+define('RACE_EARTH', 1);
+define('RACE_MOON', 2);
+define('RACE_MERCURY', 3);
+define('RACE_VENUS', 4);
+define('RACE_MARS', 5);
 define('RACE_ASTEROID', 6);
 // define('MARKET_INFO'         , 7);
 
@@ -721,114 +721,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);
@@ -971,10 +971,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
@@ -1047,21 +1047,21 @@ 
 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_2017_WOMEN_DAY_BEST', 2205);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
-define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206);  // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
+define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
+define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_BEST', 2205); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
+define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206); // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
 
 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_2017_WOMEN_DAY', 2310);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года
+define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
+define('UNIT_AWARD_MEMORY_2017_WOMEN_DAY', 2310); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SIMPLE', 2311); // День Рождения СН - 2017
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_BRONZE', 2312); // День Рождения СН - 2017
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SILVER', 2313); // День Рождения СН - 2017
@@ -1181,7 +1181,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 штук
@@ -1495,32 +1495,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);
@@ -1620,8 +1620,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);
 

classes/DBAL/Schema.php

Spacing +6 added lines, -6 removed lines

@@ -52,11 +52,11 @@ 
 
     $prefix_length = strlen($this->db->db_prefix);
 
-    while($row = $this->db->db_fetch($query)) {
-      foreach($row as $table_name) {
+    while ($row = $this->db->db_fetch($query)) {
+      foreach ($row as $table_name) {
         $this->tablesAll[$table_name] = $table_name;
 
-        if(strpos($table_name, $this->db->db_prefix) === 0) {
+        if (strpos($table_name, $this->db->db_prefix) === 0) {
           $table_name_sn = substr($table_name, $prefix_length);
           $this->tablesSn[$table_name_sn] = $table_name_sn;
         }
@@ -70,7 +70,7 @@ 
    * @return \string[]
    */
   public function getAllTables() {
-    if(!isset($this->tablesAll)) {
+    if (!isset($this->tablesAll)) {
       $this->loadTableNamesFromDb();
     }
 
@@ -83,7 +83,7 @@ 
    * @return string[]
    */
   public function getSnTables() {
-    if(!isset($this->tablesSn)) {
+    if (!isset($this->tablesSn)) {
       $this->loadTableNamesFromDb();
     }
 
@@ -107,7 +107,7 @@ 
    * @return TableSchema
    */
   public function getTableSchema($tableName) {
-    if(empty($this->tableSchemas[$tableName])) {
+    if (empty($this->tableSchemas[$tableName])) {
       $this->tableSchemas[$tableName] = new TableSchema($tableName, $this);
     }
 

classes/Core/Repository.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
    */
   protected $_repository;
 
- /**
+  /**
    * @var ContainerPlus $_oldRepo
    */
   protected $_oldRepo;

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 
   public function get($entityClass, $id) {
     $entityIndex = get_class($entityClass) . '\\' . $id;
-    if(!isset($this->_repository[$entityIndex])) {
+    if (!isset($this->_repository[$entityIndex])) {
 
     }
 

classes/classConfig.php

Spacing +17 added lines, -17 removed lines

@@ -71,9 +71,9 @@ 
     'advGoogleLeftMenuCode'        => '(Place here code for banner)',
 
     // Alliance bonus calculations
-    'ali_bonus_algorithm'          => 0,  // Bonus calculation algorithm
+    'ali_bonus_algorithm'          => 0, // Bonus calculation algorithm
     'ali_bonus_brackets'           => 10, // Brackets count for ALI_BONUS_BY_RANK
-    'ali_bonus_brackets_divisor'   => 10,// Bonus divisor for ALI_BONUS_BY_RANK
+    'ali_bonus_brackets_divisor'   => 10, // Bonus divisor for ALI_BONUS_BY_RANK
     'ali_bonus_divisor'            => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS
     'ali_bonus_members'            => 10, // Minumum alliace size to start using bonus
 
@@ -109,17 +109,17 @@ 
     'deuterium_basic_income'       => 0,
     'eco_scale_storage'            => 1,
     'eco_stockman_fleet'           => '', // Black Market - Starting amount of s/h ship merchant to sell
-    'eco_stockman_fleet_populate'  => 1,  // Populate empty Stockman fleet with ships or not
+    'eco_stockman_fleet_populate'  => 1, // Populate empty Stockman fleet with ships or not
     'empire_mercenary_base_period' => PERIOD_MONTH, // Base
     'empire_mercenary_temporary'   => 0, // Temporary empire-wide mercenaries
     'energy_basic_income'          => 0,
 
     // Bashing protection settings
-    'fleet_bashing_attacks'        => 3,      // Max amount of attack per wave - 3 by default
-    'fleet_bashing_interval'       => 1800,   // Maximum interval between attacks when they still count as one wave - 30m by default
-    'fleet_bashing_scope'          => 86400,  // Interval on which bashing waves counts - 24h by default
-    'fleet_bashing_war_delay'      => 43200,  // Delay before start bashing after declaring war to alliance - 12h by default
-    'fleet_bashing_waves'          => 3,      // Max amount of waves per day - 3 by default
+    'fleet_bashing_attacks'        => 3, // Max amount of attack per wave - 3 by default
+    'fleet_bashing_interval'       => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default
+    'fleet_bashing_scope'          => 86400, // Interval on which bashing waves counts - 24h by default
+    'fleet_bashing_war_delay'      => 43200, // Delay before start bashing after declaring war to alliance - 12h by default
+    'fleet_bashing_waves'          => 3, // Max amount of waves per day - 3 by default
 
     'Fleet_Cdr'   => 30,
     'fleet_speed' => 1,
@@ -127,8 +127,8 @@ 
     'fleet_update_interval' => 4,
     'fleet_update_lock'     => '', // SQL time when lock was acquired
 
-    'game_adminEmail'       => 'root@localhost',    // Admin's email to show to users
-    'game_counter'          => 0,  // Does built-in page hit counter is on?
+    'game_adminEmail'       => 'root@localhost', // Admin's email to show to users
+    'game_counter'          => 0, // Does built-in page hit counter is on?
     // Defaults
     'game_default_language' => 'ru',
     'game_default_skin'     => 'skins/EpicBlue/',
@@ -142,14 +142,14 @@ 
     'game_maxSystem'      => 199,
     'game_maxPlanet'      => 15,
     // Game global settings
-    'game_mode'           => 0,           // 0 - SuperNova, 1 - oGame
+    'game_mode'           => 0, // 0 - SuperNova, 1 - oGame
     'game_name'           => 'SuperNova', // Server name (would be on banners and on top of left menu)
 
     'game_news_actual'        => PERIOD_DAY_3, // How long announcement would be marked as "New". In seconds. Default - 3 days
-    'game_news_overview'      => 3,    // How much last news to show in Overview page
-    'game_news_overview_show' => PERIOD_WEEK_2,    // How long news will be shown in Overview page in seconds. Default - 2 weeks
+    'game_news_overview'      => 3, // How much last news to show in Overview page
+    'game_news_overview_show' => PERIOD_WEEK_2, // How long news will be shown in Overview page in seconds. Default - 2 weeks
     // Noob protection
-    'game_noob_factor'        => 5,    // Multiplier to divide "stronger" and "weaker" users
+    'game_noob_factor'        => 5, // Multiplier to divide "stronger" and "weaker" users
     'game_noob_points'        => 5000, // Below this point user threated as noob. 0 to disable
 
     'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccounts)
@@ -203,8 +203,8 @@ 
     'payment_currency_exchange_wmu' => 30,
     'payment_currency_exchange_wmz' => 1,
 
-    'payment_lot_price' => 1,     // Lot price in default currency
-    'payment_lot_size'  => 2500,  // Lot size. Also service as minimum amount of DM that could be bought with one transaction
+    'payment_lot_price' => 1, // Lot price in default currency
+    'payment_lot_size'  => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction
 
     'planet_teleport_cost'    => 50000, //
     'planet_teleport_timeout' => 86400, //
@@ -222,7 +222,7 @@ 
     'resource_multiplier'     => 1,
 
     //Roleplay system
-    'rpg_bonus_divisor'       => 10,    // Amount of DM referral shoud get for partner have 1 DM bonus
+    'rpg_bonus_divisor'       => 10, // Amount of DM referral shoud get for partner have 1 DM bonus
     'rpg_bonus_minimum'       => 10000, // Minimum DM ammount for starting paying bonuses to affiliate
 
     // Black Market - General

classes/db_mysql.php

Spacing +49 added lines, -49 removed lines

@@ -64,7 +64,7 @@ 
   }
 
   public function schema() {
-    if(!isset(self::$schema)) {
+    if (!isset(self::$schema)) {
       self::$schema = new \DBAL\Schema($this);
     }
 
@@ -82,23 +82,23 @@ 
   function sn_db_connect($external_db_settings = null) {
     $this->db_disconnect();
 
-    if(!empty($external_db_settings) && is_array($external_db_settings)) {
+    if (!empty($external_db_settings) && is_array($external_db_settings)) {
       $this->dbsettings = $external_db_settings;
     }
 
-    if(empty($this->dbsettings)) {
+    if (empty($this->dbsettings)) {
       $this->load_db_settings();
     }
 
     // TODO - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
-    if(!empty($this->dbsettings)) {
+    if (!empty($this->dbsettings)) {
       $driver_name = empty($this->dbsettings['sn_driver']) ? 'db_mysql_v5' : $this->dbsettings['sn_driver'];
       $this->driver = new $driver_name();
       $this->db_prefix = $this->dbsettings['prefix'];
 
       $this->connected = $this->connected || $this->driver_connect();
 
-      if($this->connected && empty($this->schema()->getSnTables())) {
+      if ($this->connected && empty($this->schema()->getSnTables())) {
         die('DB error - cannot find any table. Halting...');
       }
     } else {
@@ -111,11 +111,11 @@ 
   function driver_connect() {
     global $debug;
 
-    if(!is_object($this->driver)) {
+    if (!is_object($this->driver)) {
       $debug->error_fatal('DB Error - No driver for MySQL found!');
     }
 
-    if(!method_exists($this->driver, 'mysql_connect')) {
+    if (!method_exists($this->driver, 'mysql_connect')) {
       $debug->error_fatal('DB Error - WRONG MySQL driver!');
     }
 
@@ -123,7 +123,7 @@ 
   }
 
   function db_disconnect() {
-    if($this->connected) {
+    if ($this->connected) {
       $this->connected = !$this->driver_disconnect();
       $this->connected = false;
     }
@@ -134,11 +134,11 @@ 
   function doquery($query, $table = '', $fetch = false, $skip_query_check = false) {
     global $numqueries, $debug, $sn_cache, $config;
 
-    if(!is_string($table)) {
+    if (!is_string($table)) {
       $fetch = $table;
     }
 
-    if(!$this->connected) {
+    if (!$this->connected) {
       $this->sn_db_connect();
     }
 
@@ -147,30 +147,30 @@ 
     $skip_query_check or $this->security_query_check_bad_words($query);
 
     $sql = $query;
-    if(strpos($sql, '{{') !== false) {
-      foreach($this->schema()->getSnTables() as $tableName) {
+    if (strpos($sql, '{{') !== false) {
+      foreach ($this->schema()->getSnTables() as $tableName) {
         $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
       }
     }
 
-    if($config->debug) {
+    if ($config->debug) {
       $numqueries++;
       $arr = debug_backtrace();
-      $file = end(explode('/',$arr[0]['file']));
+      $file = end(explode('/', $arr[0]['file']));
       $line = $arr[0]['line'];
       $debug->add("<tr><th>Query $numqueries: </th><th>$query</th><th>$file($line)</th><th>$table</th><th>$fetch</th></tr>");
     }
 
-    if(defined('DEBUG_SQL_COMMENT')) {
+    if (defined('DEBUG_SQL_COMMENT')) {
       $backtrace = debug_backtrace();
       $sql_comment = $debug->compact_backtrace($backtrace, defined('DEBUG_SQL_COMMENT_LONG'));
 
       $sql_commented = '/* ' . implode("<br />", $sql_comment) . '<br /> */ ' . preg_replace("/\s+/", ' ', $sql);
-      if(defined('DEBUG_SQL_ONLINE')) {
+      if (defined('DEBUG_SQL_ONLINE')) {
         $debug->warning($sql_commented, 'SQL Debug', LOG_DEBUG_SQL);
       }
 
-      if(defined('DEBUG_SQL_ERROR')) {
+      if (defined('DEBUG_SQL_ERROR')) {
         array_unshift($sql_comment, preg_replace("/\s+/", ' ', $sql));
         $debug->add_to_array($sql_comment);
         // $debug->add_to_array($sql_comment . preg_replace("/\s+/", ' ', $sql));
@@ -178,7 +178,7 @@ 
       $sql = $sql_commented;
     }
 
-    $sqlquery = $this->db_sql_query($sql) or $debug->error(db_error()."<br />$sql<br />",'SQL Error');
+    $sqlquery = $this->db_sql_query($sql) or $debug->error(db_error() . "<br />$sql<br />", 'SQL Error');
 
     return $fetch ? $this->db_fetch($sqlquery) : $sqlquery;
   }
@@ -197,16 +197,16 @@ 
     // TODO Заменить это на новый логгер
     global $config, $is_watching, $user, $debug;
 
-    if(!$is_watching && $config->game_watchlist_array && in_array($user['id'], $config->game_watchlist_array))
+    if (!$is_watching && $config->game_watchlist_array && in_array($user['id'], $config->game_watchlist_array))
     {
-      if(!preg_match('/^(select|commit|rollback|start transaction)/i', $query)) {
+      if (!preg_match('/^(select|commit|rollback|start transaction)/i', $query)) {
         $is_watching = true;
         $msg = "\$query = \"{$query}\"\n\r";
-        if(!empty($_POST)) {
-          $msg .= "\n\r" . dump($_POST,'$_POST');
+        if (!empty($_POST)) {
+          $msg .= "\n\r" . dump($_POST, '$_POST');
         }
-        if(!empty($_GET)) {
-          $msg .= "\n\r" . dump($_GET,'$_GET');
+        if (!empty($_GET)) {
+          $msg .= "\n\r" . dump($_GET, '$_GET');
         }
         $debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
         $is_watching = false;
@@ -218,7 +218,7 @@ 
   function security_query_check_bad_words($query) {
     global $user, $dm_change_legit, $mm_change_legit;
 
-    switch(true) {
+    switch (true) {
       case stripos($query, 'RUNCATE TABL') != false:
       case stripos($query, 'ROP TABL') != false:
       case stripos($query, 'ENAME TABL') != false:
@@ -229,33 +229,33 @@ 
       case stripos($query, 'RPG_POINTS') != false && stripos(trim($query), 'UPDATE ') === 0 && !$dm_change_legit:
       case stripos($query, 'METAMATTER') != false && stripos(trim($query), 'UPDATE ') === 0 && !$mm_change_legit:
       case stripos($query, 'AUTHLEVEL') != false && $user['authlevel'] < 3 && stripos($query, 'SELECT') !== 0:
-        $report  = "Hacking attempt (".date("d.m.Y H:i:s")." - [".time()."]):\n";
+        $report  = "Hacking attempt (" . date("d.m.Y H:i:s") . " - [" . time() . "]):\n";
         $report .= ">Database Inforamation\n";
-        $report .= "\tID - ".$user['id']."\n";
-        $report .= "\tUser - ".$user['username']."\n";
-        $report .= "\tAuth level - ".$user['authlevel']."\n";
-        $report .= "\tAdmin Notes - ".$user['adminNotes']."\n";
-        $report .= "\tCurrent Planet - ".$user['current_planet']."\n";
-        $report .= "\tUser IP - ".$user['user_lastip']."\n";
-        $report .= "\tUser IP at Reg - ".$user['ip_at_reg']."\n";
-        $report .= "\tUser Agent- ".$_SERVER['HTTP_USER_AGENT']."\n";
-        $report .= "\tCurrent Page - ".$user['current_page']."\n";
-        $report .= "\tRegister Time - ".$user['register_time']."\n";
+        $report .= "\tID - " . $user['id'] . "\n";
+        $report .= "\tUser - " . $user['username'] . "\n";
+        $report .= "\tAuth level - " . $user['authlevel'] . "\n";
+        $report .= "\tAdmin Notes - " . $user['adminNotes'] . "\n";
+        $report .= "\tCurrent Planet - " . $user['current_planet'] . "\n";
+        $report .= "\tUser IP - " . $user['user_lastip'] . "\n";
+        $report .= "\tUser IP at Reg - " . $user['ip_at_reg'] . "\n";
+        $report .= "\tUser Agent- " . $_SERVER['HTTP_USER_AGENT'] . "\n";
+        $report .= "\tCurrent Page - " . $user['current_page'] . "\n";
+        $report .= "\tRegister Time - " . $user['register_time'] . "\n";
         $report .= "\n";
 
         $report .= ">Query Information\n";
-        $report .= "\tQuery - ".$query."\n";
+        $report .= "\tQuery - " . $query . "\n";
         $report .= "\n";
 
         $report .= ">\$_SERVER Information\n";
-        $report .= "\tIP - ".$_SERVER['REMOTE_ADDR']."\n";
-        $report .= "\tHost Name - ".$_SERVER['HTTP_HOST']."\n";
-        $report .= "\tUser Agent - ".$_SERVER['HTTP_USER_AGENT']."\n";
-        $report .= "\tRequest Method - ".$_SERVER['REQUEST_METHOD']."\n";
-        $report .= "\tCame From - ".$_SERVER['HTTP_REFERER']."\n";
-        $report .= "\tPage is - ".$_SERVER['SCRIPT_NAME']."\n";
-        $report .= "\tUses Port - ".$_SERVER['REMOTE_PORT']."\n";
-        $report .= "\tServer Protocol - ".$_SERVER['SERVER_PROTOCOL']."\n";
+        $report .= "\tIP - " . $_SERVER['REMOTE_ADDR'] . "\n";
+        $report .= "\tHost Name - " . $_SERVER['HTTP_HOST'] . "\n";
+        $report .= "\tUser Agent - " . $_SERVER['HTTP_USER_AGENT'] . "\n";
+        $report .= "\tRequest Method - " . $_SERVER['REQUEST_METHOD'] . "\n";
+        $report .= "\tCame From - " . $_SERVER['HTTP_REFERER'] . "\n";
+        $report .= "\tPage is - " . $_SERVER['SCRIPT_NAME'] . "\n";
+        $report .= "\tUses Port - " . $_SERVER['REMOTE_PORT'] . "\n";
+        $report .= "\tServer Protocol - " . $_SERVER['SERVER_PROTOCOL'] . "\n";
 
         $report .= "\n--------------------------------------------------------------------------------------------------\n";
 
@@ -286,7 +286,7 @@ 
 
     $prefixedTableName_safe = $this->db_escape($this->db_prefix . $tableName_unsafe);
     $q1 = $this->db_sql_query("SHOW FULL COLUMNS FROM `{$prefixedTableName_safe}`;");
-    while($r1 = db_fetch($q1)) {
+    while ($r1 = db_fetch($q1)) {
       $result[$r1['Field']] = $r1;
     }
     return $result;
@@ -302,7 +302,7 @@ 
 
     $prefixedTableName_safe = $this->db_escape($this->db_prefix . $tableName_unsafe);
     $q1 = $this->db_sql_query("SHOW INDEX FROM {$prefixedTableName_safe};");
-    while($r1 = db_fetch($q1)) {
+    while ($r1 = db_fetch($q1)) {
       $indexName = $r1['Key_name'];
 
       $result[$indexName]['name'] = $r1['Key_name'];
@@ -327,8 +327,8 @@ 
 
     $prefixedTableName_safe = $this->db_escape($this->db_prefix . $tableName_unsafe);
 
-    $q1 = $this->db_sql_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name). "' AND `TABLE_NAME` = '{$prefixedTableName_safe}' AND `REFERENCED_TABLE_NAME` IS NOT NULL;");
-    while($r1 = db_fetch($q1)) {
+    $q1 = $this->db_sql_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name) . "' AND `TABLE_NAME` = '{$prefixedTableName_safe}' AND `REFERENCED_TABLE_NAME` IS NOT NULL;");
+    while ($r1 = db_fetch($q1)) {
       $indexName = $r1['CONSTRAINT_NAME'];
 
       $table_referenced = str_replace($this->db_prefix, '', $r1['REFERENCED_TABLE_NAME']);

classes/Common/GlobalContainer.php

Spacing +14 added lines, -14 removed lines

@@ -70,66 +70,66 @@
 
     // Services --------------------------------------------------------------------------------------------------------
     // Default db
-    $gc->db = function (GlobalContainer $c) {
+    $gc->db = function(GlobalContainer $c) {
       classSupernova::$db = new \db_mysql($c);
 
       return classSupernova::$db;
     };
 
-    $gc->debug = function (GlobalContainer $c) {
+    $gc->debug = function(GlobalContainer $c) {
       return new \debug();
     };
 
-    $gc->cache = function (GlobalContainer $gc) {
+    $gc->cache = function(GlobalContainer $gc) {
       return new \classCache($gc->cachePrefix);
     };
 
-    $gc->config = function (GlobalContainer $gc) {
+    $gc->config = function(GlobalContainer $gc) {
       return new \classConfig($gc->cachePrefix);
     };
 
 
-    $gc->repository = function (GlobalContainer $gc) {
+    $gc->repository = function(GlobalContainer $gc) {
       return new \Core\Repository($gc);
     };
 
-    $gc->storage = function (GlobalContainer $gc) {
+    $gc->storage = function(GlobalContainer $gc) {
       return new \Storage($gc);
     };
 
-    $gc->design = function (GlobalContainer $gc) {
+    $gc->design = function(GlobalContainer $gc) {
       return new \Design($gc);
     };
 
-    $gc->bbCodeParser = function (GlobalContainer $gc) {
+    $gc->bbCodeParser = function(GlobalContainer $gc) {
       return new \BBCodeParser($gc);
     };
 
-    $gc->fleetDispatcher = function (GlobalContainer $gc) {
+    $gc->fleetDispatcher = function(GlobalContainer $gc) {
       return new \FleetDispatcher($gc);
     };
 
-    $gc->watchdog = function (GlobalContainer $gc) {
+    $gc->watchdog = function(GlobalContainer $gc) {
       return new Watchdog($gc);
     };
 
-    $gc->eventBus = function (GlobalContainer $gc) {
+    $gc->eventBus = function(GlobalContainer $gc) {
       return new EventBus($gc);
     };
 
     // Dummy objects ---------------------------------------------------------------------------------------------------
-    $gc->theUser = function (GlobalContainer $gc) {
+    $gc->theUser = function(GlobalContainer $gc) {
       return new \TheUser($gc);
     };
 
 
     // Models ----------------------------------------------------------------------------------------------------------
     $gc->skinEntityClass = 'SkinV2';
-    $gc->skinModel = function (GlobalContainer $gc) {
+    $gc->skinModel = function(GlobalContainer $gc) {
       return new \SkinModel($gc);
     };
 
-    $gc->textModel = function (GlobalContainer $gc) {
+    $gc->textModel = function(GlobalContainer $gc) {
       return new \TextModel($gc);
     };