Completed
Push — work-fleets ( 2c97e5...fff2b6 )
by SuperNova.WS
05:26
created
includes/constants.php 1 patch
Spacing   +238 added lines, -238 removed lines patch added patch discarded remove patch
@@ -38,8 +38,8 @@  discard block
 block discarded – undo
38 38
 
39 39
 // Game type constants starts with GAME_
40 40
 define('GAME_SUPERNOVA', 0);
41
-define('GAME_OGAME'    , 1);
42
-define('GAME_BLITZ'    , 2);
41
+define('GAME_OGAME', 1);
42
+define('GAME_BLITZ', 2);
43 43
 
44 44
 // Date & time range constants
45 45
 define('DATE_FOREVER', 2000000000);
@@ -52,27 +52,27 @@  discard block
 block discarded – undo
52 52
 define('PERIOD_YEAR', PERIOD_DAY * 365);
53 53
 define('PERIOD_FOREVER', PERIOD_YEAR * 100);
54 54
 
55
-define('PERIOD_MINUTE_2' , PERIOD_MINUTE * 2);
56
-define('PERIOD_MINUTE_3' , PERIOD_MINUTE * 3);
57
-define('PERIOD_MINUTE_5' , PERIOD_MINUTE * 5);
55
+define('PERIOD_MINUTE_2', PERIOD_MINUTE * 2);
56
+define('PERIOD_MINUTE_3', PERIOD_MINUTE * 3);
57
+define('PERIOD_MINUTE_5', PERIOD_MINUTE * 5);
58 58
 define('PERIOD_MINUTE_10', PERIOD_MINUTE * 10);
59
-define('PERIOD_DAY_3'    , PERIOD_DAY * 3);
60
-define('PERIOD_WEEK_2'   , PERIOD_WEEK * 2);
61
-define('PERIOD_MONTH_2'  , PERIOD_MONTH * 2);
62
-define('PERIOD_MONTH_3'  , PERIOD_MONTH * 3);
59
+define('PERIOD_DAY_3', PERIOD_DAY * 3);
60
+define('PERIOD_WEEK_2', PERIOD_WEEK * 2);
61
+define('PERIOD_MONTH_2', PERIOD_MONTH * 2);
62
+define('PERIOD_MONTH_3', PERIOD_MONTH * 3);
63 63
 
64 64
 define('FONT_SIZE_PERCENT_MIN', 56.25);
65 65
 define('FONT_SIZE_PERCENT_DEFAULT', 68.75);
66 66
 define('FONT_SIZE_PERCENT_MAX', 131.25);
67 67
 define('FONT_SIZE_PERCENT_STEP', 12.5);
68
-define('FONT_SIZE_PERCENT_DEFAULT_STRING', FONT_SIZE_PERCENT_DEFAULT . '%');
68
+define('FONT_SIZE_PERCENT_DEFAULT_STRING', FONT_SIZE_PERCENT_DEFAULT.'%');
69 69
 
70 70
 define('FONT_SIZE_PIXELS_BROWSER_BASE', 16);
71 71
 define('FONT_SIZE_PIXELS_MIN', 9);
72 72
 define('FONT_SIZE_PIXELS_DEFAULT', 11);
73 73
 define('FONT_SIZE_PIXELS_MAX', 21);
74 74
 define('FONT_SIZE_PIXELS_STEP', 1);
75
-define('FONT_SIZE_PIXELS_DEFAULT_STRING', FONT_SIZE_PIXELS_DEFAULT . 'px');
75
+define('FONT_SIZE_PIXELS_DEFAULT_STRING', FONT_SIZE_PIXELS_DEFAULT.'px');
76 76
 
77 77
 define('DEFAULT_PICTURE_EXTENSION_DOTTED', '.jpg');
78 78
 
@@ -115,54 +115,54 @@  discard block
 block discarded – undo
115 115
 define('SN_SYS_SEC_CHARS_ALLOWED', 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghkmnpqrstuvwxyz0123456789');
116 116
 
117 117
 // Mot qui sont interdit a la saisie !
118
-$ListCensure = array ( '/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
118
+$ListCensure = array('/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
119 119
 
120 120
 // Confirmation record types
121
-define('CONFIRM_REGISTRATION'  , 1);
121
+define('CONFIRM_REGISTRATION', 1);
122 122
 define('CONFIRM_PASSWORD_RESET', 2);
123
-define('CONFIRM_DELETE'        , 3);
123
+define('CONFIRM_DELETE', 3);
124 124
 
125 125
 define('AFFILIATE_MM_TO_REFERRAL_DM', 2);
126 126
 
127 127
 // Ally diplomacy statuses
128
-define('ALLY_DIPLOMACY_SELF'         , 'self');
129
-define('ALLY_DIPLOMACY_NEUTRAL'      , 'neutral');
130
-define('ALLY_DIPLOMACY_WAR'          , 'war');
131
-define('ALLY_DIPLOMACY_PEACE'        , 'peace');
128
+define('ALLY_DIPLOMACY_SELF', 'self');
129
+define('ALLY_DIPLOMACY_NEUTRAL', 'neutral');
130
+define('ALLY_DIPLOMACY_WAR', 'war');
131
+define('ALLY_DIPLOMACY_PEACE', 'peace');
132 132
 define('ALLY_DIPLOMACY_CONFEDERATION', 'confederation');
133
-define('ALLY_DIPLOMACY_FEDERATION'   , 'federation');
134
-define('ALLY_DIPLOMACY_UNION'        , 'union');
135
-define('ALLY_DIPLOMACY_MASTER'       , 'master');
136
-define('ALLY_DIPLOMACY_SLAVE'        , 'slave');
133
+define('ALLY_DIPLOMACY_FEDERATION', 'federation');
134
+define('ALLY_DIPLOMACY_UNION', 'union');
135
+define('ALLY_DIPLOMACY_MASTER', 'master');
136
+define('ALLY_DIPLOMACY_SLAVE', 'slave');
137 137
 
138 138
 define('ALLY_PROPOSE_SEND', 0);
139 139
 
140 140
 // Quest types
141
-define('QUEST_TYPE_BUILD'   , 1);
141
+define('QUEST_TYPE_BUILD', 1);
142 142
 define('QUEST_TYPE_RESEARCH', 2);
143
-define('QUEST_TYPE_COMBAT'  , 3);
143
+define('QUEST_TYPE_COMBAT', 3);
144 144
 
145
-define('QUEST_STATUS_NOT_STARTED' , 0);
146
-define('QUEST_STATUS_STARTED'     , 1);
147
-define('QUEST_STATUS_COMPLETE'    , 2);
145
+define('QUEST_STATUS_NOT_STARTED', 0);
146
+define('QUEST_STATUS_STARTED', 1);
147
+define('QUEST_STATUS_COMPLETE', 2);
148 148
 
149 149
 // *** Combat-related constants
150 150
 // *** Mission Type constants starts with MT_
151
-define('MT_NONE'     ,  0);
152
-define('MT_EXPLORE'  , 15);
153
-define('MT_COLONIZE' ,  7);
154
-define('MT_RECYCLE'  ,  8);
151
+define('MT_NONE', 0);
152
+define('MT_EXPLORE', 15);
153
+define('MT_COLONIZE', 7);
154
+define('MT_RECYCLE', 8);
155 155
 
156
-define('MT_RELOCATE' ,  4);
156
+define('MT_RELOCATE', 4);
157 157
 
158
-define('MT_TRANSPORT',  3);
159
-define('MT_HOLD'     ,  5);
158
+define('MT_TRANSPORT', 3);
159
+define('MT_HOLD', 5);
160 160
 
161
-define('MT_MISSILE'  , 10);
162
-define('MT_SPY'      ,  6);
163
-define('MT_ATTACK'   ,  1);
164
-define('MT_ACS'      ,  2);
165
-define('MT_DESTROY'  ,  9);
161
+define('MT_MISSILE', 10);
162
+define('MT_SPY', 6);
163
+define('MT_ATTACK', 1);
164
+define('MT_ACS', 2);
165
+define('MT_DESTROY', 9);
166 166
 // 11, 12, 13, 14, 16...
167 167
 
168 168
 // *** Planet Target constants starts with PT_
@@ -170,49 +170,49 @@  discard block
 block discarded – undo
170 170
 define('PT_ALL', 0);
171 171
 define('PT_PLANET', 1);
172 172
 define('PT_DEBRIS', 2);
173
-define('PT_MOON'  , 3);
173
+define('PT_MOON', 3);
174 174
 
175 175
 // *** Unit locations - shows db table where unit belong
176 176
 // Also cache indexes
177
-define('LOC_NONE',    -1);
177
+define('LOC_NONE', -1);
178 178
 define('LOC_UNIVERSE', 0);
179
-define('LOC_PLANET',   1);
180
-define('LOC_DEBRIS',   2); // Translates to `planets` table planet_type = 1, `debris_*` fields
181
-define('LOC_MOON',     3); // Translates to `planets` table planet_type = 3
182
-define('LOC_USER',     4);
183
-define('LOC_FLEET',    5);
184
-define('LOC_ALLY',     6);
185
-define('LOC_UNIT_NUMERIC',     7);
186
-define('LOC_UNIT_LIST',     8);
179
+define('LOC_PLANET', 1);
180
+define('LOC_DEBRIS', 2); // Translates to `planets` table planet_type = 1, `debris_*` fields
181
+define('LOC_MOON', 3); // Translates to `planets` table planet_type = 3
182
+define('LOC_USER', 4);
183
+define('LOC_FLEET', 5);
184
+define('LOC_ALLY', 6);
185
+define('LOC_UNIT_NUMERIC', 7);
186
+define('LOC_UNIT_LIST', 8);
187 187
 
188 188
 // ТОЛЬКО ВНУТРЕНЕЕ!!!
189
-define('LOC_UNIT',    'LOC_UNIT');
190
-define('LOC_QUE',     'LOC_QUE');
191
-define('LOC_LOCATION','LOC_LOCATION');
192
-define('LOC_LOCKS','LOC_LOCKS');
189
+define('LOC_UNIT', 'LOC_UNIT');
190
+define('LOC_QUE', 'LOC_QUE');
191
+define('LOC_LOCATION', 'LOC_LOCATION');
192
+define('LOC_LOCKS', 'LOC_LOCKS');
193 193
 
194 194
 // *** Caching masks
195
-define('CACHE_NOTHING'    ,  0);
196
-define('CACHE_FLEET'      ,  1);
197
-define('CACHE_PLANET'     ,  2);
198
-define('CACHE_USER'       ,  4);
199
-define('CACHE_SOURCE'     ,  8);
195
+define('CACHE_NOTHING', 0);
196
+define('CACHE_FLEET', 1);
197
+define('CACHE_PLANET', 2);
198
+define('CACHE_USER', 4);
199
+define('CACHE_SOURCE', 8);
200 200
 define('CACHE_DESTINATION', 16);
201
-define('CACHE_EVENT'      , 32);
201
+define('CACHE_EVENT', 32);
202 202
 
203
-define('CACHE_USER_SRC'  , CACHE_USER | CACHE_SOURCE);
204
-define('CACHE_USER_DST'  , CACHE_USER | CACHE_DESTINATION);
203
+define('CACHE_USER_SRC', CACHE_USER | CACHE_SOURCE);
204
+define('CACHE_USER_DST', CACHE_USER | CACHE_DESTINATION);
205 205
 define('CACHE_PLANET_SRC', CACHE_PLANET | CACHE_SOURCE);
206 206
 define('CACHE_PLANET_DST', CACHE_PLANET | CACHE_DESTINATION);
207
-define('CACHE_COMBAT'    , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
207
+define('CACHE_COMBAT', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
208 208
 
209
-define('CACHE_ALL'       , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
209
+define('CACHE_ALL', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
210 210
 
211
-define('CACHE_NONE'      , CACHE_NOTHING); // Alias for me
211
+define('CACHE_NONE', CACHE_NOTHING); // Alias for me
212 212
 
213 213
 // *** Event types
214 214
 define('EVENT_FLEET_ARRIVE', 1);
215
-define('EVENT_FLEET_STAY'  , 2);
215
+define('EVENT_FLEET_STAY', 2);
216 216
 define('EVENT_FLEET_RETURN', 3);
217 217
 
218 218
 // *** Constants for changing DM
@@ -265,10 +265,10 @@  discard block
 block discarded – undo
265 265
 
266 266
 
267 267
 // Operation error status HARDCODE!
268
-define('ERR_NONE'               , 0); // No error
269
-define('ERR_WARNING'            , 1); // There is warning - something altering normal operation process
270
-define('ERR_ERROR'              , 2); // There is error - something permits operation from process
271
-define('ERR_HACK'               , 4); // Operation is qualified as hack attempt
268
+define('ERR_NONE', 0); // No error
269
+define('ERR_WARNING', 1); // There is warning - something altering normal operation process
270
+define('ERR_ERROR', 2); // There is error - something permits operation from process
271
+define('ERR_HACK', 4); // Operation is qualified as hack attempt
272 272
 // New GLOBAL operation results
273 273
 //define('RESULT_DEFAULT' , 0); // Default result - all went OK or result really doesn't matter
274 274
 //define('RESULT_WARNING' , 1);
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
 define('SN_PAYMENT_REQUEST_OK', 0);
289 289
 define('SN_PAYMENT_REQUEST_ERROR_UNIT_AMOUNT', 1);
290 290
 define('SN_PAYMENT_REQUEST_ERROR_PAYLINK_UNSUPPORTED', 2);
291
-define('SN_PAYMENT_REQUEST_IP_WRONG', 3);  // Неправильный IP входящей системы - обычно хак
291
+define('SN_PAYMENT_REQUEST_IP_WRONG', 3); // Неправильный IP входящей системы - обычно хак
292 292
 define('SN_PAYMENT_REQUEST_COMMAND_UNSUPPORTED', 4); // Неподдерживаемая команда - обычно хак
293 293
 define('SN_PAYMENT_REQUEST_SIGNATURE_INVALID', 5); // Неправильная подпись или не сошлась контрольная сумма - обычно хак
294 294
 define('SN_MODULE_DISABLED', 6); // Модуль отключен // УНИВЕРСАЛЬНЫЙ ОТВЕТ!
@@ -561,16 +561,16 @@  discard block
 block discarded – undo
561 561
 //define('F_DEVICE_ID',     'F_DEVICE_ID');
562 562
 //define('F_DEVICE_CYPHER', 'F_DEVICE_CYPHER');
563 563
 
564
-define('F_PROVIDER_ID',   'F_PROVIDER_ID');
564
+define('F_PROVIDER_ID', 'F_PROVIDER_ID');
565 565
 // define('F_PROVIDER_LIST', 'F_PROVIDER_LIST');
566 566
 
567 567
 define('F_IMPERSONATE_STATUS', 'F_IMPERSONATE_STATUS');
568 568
 define('F_IMPERSONATE_OPERATOR', 'F_IMPERSONATE_OPERATOR');
569 569
 
570
-define('F_LOGIN_STATUS',  'F_LOGIN_STATUS');
570
+define('F_LOGIN_STATUS', 'F_LOGIN_STATUS');
571 571
 define('F_LOGIN_MESSAGE', 'F_LOGIN_MESSAGE');
572 572
 
573
-define('F_PLAYER_REGISTER_STATUS',  'F_PLAYER_REGISTER_STATUS');
573
+define('F_PLAYER_REGISTER_STATUS', 'F_PLAYER_REGISTER_STATUS');
574 574
 define('F_PLAYER_REGISTER_MESSAGE', 'F_PLAYER_REGISTER_MESSAGE');
575 575
 
576 576
 define('F_USER_ID', 'F_USER_ID');
@@ -614,66 +614,66 @@  discard block
 block discarded – undo
614 614
 
615 615
 
616 616
 // Option groups
617
-define('OPT_ALL',      0);
618
-define('OPT_MESSAGE',  1);
617
+define('OPT_ALL', 0);
618
+define('OPT_MESSAGE', 1);
619 619
 define('OPT_UNIVERSE', 2);
620 620
 define('OPT_INTERFACE', 3);
621 621
 
622 622
 // Message classes
623
-define('MSG_TYPE_OUTBOX'   ,  -1);
624
-define('MSG_TYPE_SPY'      ,   0);
625
-define('MSG_TYPE_PLAYER'   ,   1);
626
-define('MSG_TYPE_ALLIANCE' ,   2);
627
-define('MSG_TYPE_COMBAT'   ,   3);
628
-define('MSG_TYPE_RECYCLE'  ,   4);
629
-define('MSG_TYPE_TRANSPORT',   5);
630
-define('MSG_TYPE_ADMIN'    ,   6);
631
-define('MSG_TYPE_EXPLORE'  ,  15);
632
-define('MSG_TYPE_QUE'      ,  99);
633
-define('MSG_TYPE_NEW'      , 100);
623
+define('MSG_TYPE_OUTBOX', -1);
624
+define('MSG_TYPE_SPY', 0);
625
+define('MSG_TYPE_PLAYER', 1);
626
+define('MSG_TYPE_ALLIANCE', 2);
627
+define('MSG_TYPE_COMBAT', 3);
628
+define('MSG_TYPE_RECYCLE', 4);
629
+define('MSG_TYPE_TRANSPORT', 5);
630
+define('MSG_TYPE_ADMIN', 6);
631
+define('MSG_TYPE_EXPLORE', 15);
632
+define('MSG_TYPE_QUE', 99);
633
+define('MSG_TYPE_NEW', 100);
634 634
 
635 635
 // Attack verification statuses
636
-define('FLIGHT_ALLOWED'           ,  0);
637
-define('FLIGHT_VECTOR_NO_TARGET'         ,  1);
638
-define('FLIGHT_PLAYER_OWN'               ,  2);
639
-define('FLIGHT_MISSION_IMPOSSIBLE'     ,  3);
640
-define('FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT'   ,  4);
641
-define('FLIGHT_MISSION_RECYCLE_NO_DEBRIS'         ,  5);
642
-define('FLIGHT_PLAYER_VACATION'          ,  6);
643
-define('FLIGHT_PLAYER_SAME_IP'           ,  7);
644
-define('FLIGHT_PLAYER_BUFFING'           ,  8);
645
-define('FLIGHT_PLAYER_ADMIN'             ,  9);
646
-define('FLIGHT_PLAYER_NOOB'              , 10);
647
-define('FLIGHT_PLAYER_VACATION_OWN'      , 11);
648
-define('FLIGHT_MISSION_MISSILE_NO_SILO'           , 12);
649
-define('FLIGHT_MISSION_MISSILE_NO_MISSILES'        , 13);
650
-define('FLIGHT_SHIPS_NO_SHIPS'          , 14);
651
-define('FLIGHT_FLEET_NO_SLOTS'          , 15);
652
-define('FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES'          , 16);
653
-define('FLIGHT_SHIPS_NO_RECYCLERS'      , 17);
654
-define('FLIGHT_MISSION_SPY_NO_SPIES'          , 18);
655
-define('FLIGHT_SHIPS_NO_COLONIZER'      , 19);
656
-define('FLIGHT_MISSION_MISSILE_TOO_FAR'   , 20);
657
-define('FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE'   , 21);
658
-define('FLIGHT_RESOURCES_FUEL_NOT_ENOUGH'           , 22);
659
-define('FLIGHT_RESOURCES_NOT_ENOUGH'      , 23);
660
-define('FLIGHT_MISSION_ACS_NOT_EXISTS'            , 24);
661
-define('FLIGHT_MISSION_ACS_MISSTARGET'    , 25);
662
-define('FLIGHT_FLEET_SPEED_WRONG'       , 26);
663
-define('FLIGHT_MISSION_ACS_TOO_LATE'      , 27);
664
-define('FLIGHT_MISSION_ATTACK_BASHING'           , 28);
665
-define('FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY' , 29);
666
-define('FLIGHT_MISSION_ACS_WRONG_TARGET'  , 30);
667
-define('FLIGHT_VECTOR_SAME_SOURCE'              , 31);
636
+define('FLIGHT_ALLOWED', 0);
637
+define('FLIGHT_VECTOR_NO_TARGET', 1);
638
+define('FLIGHT_PLAYER_OWN', 2);
639
+define('FLIGHT_MISSION_IMPOSSIBLE', 3);
640
+define('FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT', 4);
641
+define('FLIGHT_MISSION_RECYCLE_NO_DEBRIS', 5);
642
+define('FLIGHT_PLAYER_VACATION', 6);
643
+define('FLIGHT_PLAYER_SAME_IP', 7);
644
+define('FLIGHT_PLAYER_BUFFING', 8);
645
+define('FLIGHT_PLAYER_ADMIN', 9);
646
+define('FLIGHT_PLAYER_NOOB', 10);
647
+define('FLIGHT_PLAYER_VACATION_OWN', 11);
648
+define('FLIGHT_MISSION_MISSILE_NO_SILO', 12);
649
+define('FLIGHT_MISSION_MISSILE_NO_MISSILES', 13);
650
+define('FLIGHT_SHIPS_NO_SHIPS', 14);
651
+define('FLIGHT_FLEET_NO_SLOTS', 15);
652
+define('FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES', 16);
653
+define('FLIGHT_SHIPS_NO_RECYCLERS', 17);
654
+define('FLIGHT_MISSION_SPY_NO_SPIES', 18);
655
+define('FLIGHT_SHIPS_NO_COLONIZER', 19);
656
+define('FLIGHT_MISSION_MISSILE_TOO_FAR', 20);
657
+define('FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE', 21);
658
+define('FLIGHT_RESOURCES_FUEL_NOT_ENOUGH', 22);
659
+define('FLIGHT_RESOURCES_NOT_ENOUGH', 23);
660
+define('FLIGHT_MISSION_ACS_NOT_EXISTS', 24);
661
+define('FLIGHT_MISSION_ACS_MISSTARGET', 25);
662
+define('FLIGHT_FLEET_SPEED_WRONG', 26);
663
+define('FLIGHT_MISSION_ACS_TOO_LATE', 27);
664
+define('FLIGHT_MISSION_ATTACK_BASHING', 28);
665
+define('FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY', 29);
666
+define('FLIGHT_MISSION_ACS_WRONG_TARGET', 30);
667
+define('FLIGHT_VECTOR_SAME_SOURCE', 31);
668 668
 define('FLIGHT_RESOURCES_FORBIDDEN', 32);
669
-define('FLIGHT_MISSION_TRANSPORT_EMPTY_CARGO'   , 33);
670
-define('FLIGHT_SHIPS_NOT_ONLY_SPIES'       , 34);
671
-define('FLIGHT_FLEET_TOO_FAR'           , 35);
672
-define('FLIGHT_FLEET_OVERLOAD'        , 36);
673
-define('FLIGHT_MISSION_UNKNOWN'    , 37);
674
-define('FLIGHT_SHIPS_UNIT_WRONG'        , 38);
675
-define('FLIGHT_SHIPS_UNMOVABLE'        , 39);
676
-define('FLIGHT_SHIPS_NEGATIVE'  , 40);
669
+define('FLIGHT_MISSION_TRANSPORT_EMPTY_CARGO', 33);
670
+define('FLIGHT_SHIPS_NOT_ONLY_SPIES', 34);
671
+define('FLIGHT_FLEET_TOO_FAR', 35);
672
+define('FLIGHT_FLEET_OVERLOAD', 36);
673
+define('FLIGHT_MISSION_UNKNOWN', 37);
674
+define('FLIGHT_SHIPS_UNIT_WRONG', 38);
675
+define('FLIGHT_SHIPS_UNMOVABLE', 39);
676
+define('FLIGHT_SHIPS_NEGATIVE', 40);
677 677
 define('FLIGHT_RESOURCES_NEGATIVE', 41);
678 678
 define('FLIGHT_MISSION_MORATORIUM', 42);
679 679
 define('FLIGHT_PLAYER_CHILD_PROTECTION', 43);
@@ -707,12 +707,12 @@  discard block
 block discarded – undo
707 707
 
708 708
 
709 709
 // *** Races - Homeworlds
710
-define('RACE_NONE'    , 0);
711
-define('RACE_EARTH'   , 1);
712
-define('RACE_MOON'    , 2);
713
-define('RACE_MERCURY' , 3);
714
-define('RACE_VENUS'   , 4);
715
-define('RACE_MARS'    , 5);
710
+define('RACE_NONE', 0);
711
+define('RACE_EARTH', 1);
712
+define('RACE_MOON', 2);
713
+define('RACE_MERCURY', 3);
714
+define('RACE_VENUS', 4);
715
+define('RACE_MARS', 5);
716 716
 define('RACE_ASTEROID', 6);
717 717
 // define('MARKET_INFO'         , 7);
718 718
 
@@ -720,114 +720,114 @@  discard block
 block discarded – undo
720 720
 
721 721
 // *** Market variables
722 722
 // === Market blocks
723
-define('MARKET_ENTRY'        , 0);
724
-define('MARKET_RESOURCES'    , 1);
725
-define('MARKET_SCRAPPER'     , 2);
726
-define('MARKET_STOCKMAN'     , 3);
727
-define('MARKET_EXCHANGE'     , 4);
728
-define('MARKET_BANKER'       , 5);
729
-define('MARKET_PAWNSHOP'     , 6);
730
-define('MARKET_INFO'         , 7);
723
+define('MARKET_ENTRY', 0);
724
+define('MARKET_RESOURCES', 1);
725
+define('MARKET_SCRAPPER', 2);
726
+define('MARKET_STOCKMAN', 3);
727
+define('MARKET_EXCHANGE', 4);
728
+define('MARKET_BANKER', 5);
729
+define('MARKET_PAWNSHOP', 6);
730
+define('MARKET_INFO', 7);
731 731
 
732 732
 // === Market error statuses
733
-define('MARKET_NOTHING'              ,  0);
734
-define('MARKET_DEAL'                 ,  1);
735
-define('MARKET_DEAL_TRADE'           ,  2);
736
-define('MARKET_NO_DM'                ,  3);
737
-define('MARKET_NO_RESOURCES'         ,  4);
738
-define('MARKET_ZERO_DEAL'            ,  5);
739
-define('MARKET_NO_SHIPS'             ,  6);
740
-define('MARKET_NOT_A_SHIP'           ,  7);
741
-define('MARKET_NO_STOCK'             ,  8);
742
-define('MARKET_ZERO_RES_STOCK'       ,  9);
743
-define('MARKET_NEGATIVE_SHIPS'       , 10);
744
-
745
-define('MARKET_INFO_PLAYER'          , 12);
746
-define('MARKET_INFO_WRONG'           , 11);
733
+define('MARKET_NOTHING', 0);
734
+define('MARKET_DEAL', 1);
735
+define('MARKET_DEAL_TRADE', 2);
736
+define('MARKET_NO_DM', 3);
737
+define('MARKET_NO_RESOURCES', 4);
738
+define('MARKET_ZERO_DEAL', 5);
739
+define('MARKET_NO_SHIPS', 6);
740
+define('MARKET_NOT_A_SHIP', 7);
741
+define('MARKET_NO_STOCK', 8);
742
+define('MARKET_ZERO_RES_STOCK', 9);
743
+define('MARKET_NEGATIVE_SHIPS', 10);
744
+
745
+define('MARKET_INFO_PLAYER', 12);
746
+define('MARKET_INFO_WRONG', 11);
747 747
 define('MARKET_INFO_PLAYER_NOT_FOUND', 13);
748
-define('MARKET_INFO_PLAYER_WRONG'    , 14);
749
-define('MARKET_INFO_PLAYER_SAME'     , 15);
748
+define('MARKET_INFO_PLAYER_WRONG', 14);
749
+define('MARKET_INFO_PLAYER_SAME', 15);
750 750
 
751 751
 
752 752
 
753 753
 
754 754
 // *** Mercenary/talent bonus types
755
-define('BONUS_NONE'    ,            0);  // No bonus
756
-define('BONUS_PERCENT' ,            1);  // Percent on base value
757
-define('BONUS_ADD'     ,            2);  // Add
758
-define('BONUS_ABILITY' ,            3);  // Some ability
759
-define('BONUS_MULTIPLY',            4);  // Multiply by value
760
-define('BONUS_PERCENT_CUMULATIVE' , 5);  // Cumulative percent on base value
761
-define('BONUS_PERCENT_DEGRADED' ,   6);  // Bonus amount degraded with increase as pow(bonus, level) (?)
762
-define('BONUS_SPEED',               7);  // Speed bonus
755
+define('BONUS_NONE', 0); // No bonus
756
+define('BONUS_PERCENT', 1); // Percent on base value
757
+define('BONUS_ADD', 2); // Add
758
+define('BONUS_ABILITY', 3); // Some ability
759
+define('BONUS_MULTIPLY', 4); // Multiply by value
760
+define('BONUS_PERCENT_CUMULATIVE', 5); // Cumulative percent on base value
761
+define('BONUS_PERCENT_DEGRADED', 6); // Bonus amount degraded with increase as pow(bonus, level) (?)
762
+define('BONUS_SPEED', 7); // Speed bonus
763 763
 
764 764
 // *** Action constant (build should be replaced with ACTION)
765
-define('BUILD_CREATE' ,  1);
765
+define('BUILD_CREATE', 1);
766 766
 define('BUILD_DESTROY', -1);
767 767
 define('BUILD_AUTOCONVERT', 2);
768 768
 
769
-define('ACTION_SELL'       , -1);
770
-define('ACTION_NOTHING'    ,  0);
771
-define('ACTION_BUY'        ,  1);
772
-define('ACTION_USE'        ,  2);
773
-define('ACTION_DELETE'     ,  3);
769
+define('ACTION_SELL', -1);
770
+define('ACTION_NOTHING', 0);
771
+define('ACTION_BUY', 1);
772
+define('ACTION_USE', 2);
773
+define('ACTION_DELETE', 3);
774 774
 
775 775
 // *** Check unit availability codes
776
-define('BUILD_ALLOWED'         , 0); // HARDCODED! DO NOT CHANGE!
776
+define('BUILD_ALLOWED', 0); // HARDCODED! DO NOT CHANGE!
777 777
 define('BUILD_REQUIRE_NOT_MEET', 1);
778
-define('BUILD_AMOUNT_WRONG'    , 2);
779
-define('BUILD_QUE_WRONG'       , 3);
780
-define('BUILD_QUE_UNIT_WRONG'  , 4);
781
-define('BUILD_INDESTRUCTABLE'  , 5);
782
-define('BUILD_NO_RESOURCES'    , 6);
783
-define('BUILD_NO_UNITS'        , 7);
784
-define('BUILD_UNIT_BUSY'       , 8);
785
-define('BUILD_QUE_FULL'        , 9);
786
-define('BUILD_SILO_FULL'       ,10);
787
-define('BUILD_MAX_REACHED'     ,11);
788
-define('BUILD_SECTORS_NONE'    ,12);
778
+define('BUILD_AMOUNT_WRONG', 2);
779
+define('BUILD_QUE_WRONG', 3);
780
+define('BUILD_QUE_UNIT_WRONG', 4);
781
+define('BUILD_INDESTRUCTABLE', 5);
782
+define('BUILD_NO_RESOURCES', 6);
783
+define('BUILD_NO_UNITS', 7);
784
+define('BUILD_UNIT_BUSY', 8);
785
+define('BUILD_QUE_FULL', 9);
786
+define('BUILD_SILO_FULL', 10);
787
+define('BUILD_MAX_REACHED', 11);
788
+define('BUILD_SECTORS_NONE', 12);
789 789
 define('BUILD_AUTOCONVERT_AVAILABLE', 13);
790 790
 
791 791
 
792 792
 // *** Que types
793 793
 define('QUE_STRUCTURES', 1);
794
-define('QUE_HANGAR'    , 4);
795
-define('QUE_RESEARCH'  , 7);
796
-define('QUE_MERCENARY' , 600); // UNIT_MERCENARIES
794
+define('QUE_HANGAR', 4);
795
+define('QUE_RESEARCH', 7);
796
+define('QUE_MERCENARY', 600); // UNIT_MERCENARIES
797 797
 // *** Subque types
798
-define('SUBQUE_PLANET'  , 1);
799
-define('SUBQUE_MOON'    , 3);
800
-define('SUBQUE_FLEET'   , 4);
801
-define('SUBQUE_DEFENSE' , 6);
798
+define('SUBQUE_PLANET', 1);
799
+define('SUBQUE_MOON', 3);
800
+define('SUBQUE_FLEET', 4);
801
+define('SUBQUE_DEFENSE', 6);
802 802
 define('SUBQUE_RESEARCH', 7);
803 803
 
804 804
 // *** Que items
805
-define('QI_UNIT_ID'   , 0);
806
-define('QI_AMOUNT'    , 1);
807
-define('QI_TIME'      , 2);
808
-define('QI_MODE'      , 3);
809
-define('QI_QUE_ID'    , 4);
810
-define('QI_QUE_TYPE'  , 4);
811
-define('QI_PLANET_ID' , 5);
805
+define('QI_UNIT_ID', 0);
806
+define('QI_AMOUNT', 1);
807
+define('QI_TIME', 2);
808
+define('QI_MODE', 3);
809
+define('QI_QUE_ID', 4);
810
+define('QI_QUE_TYPE', 4);
811
+define('QI_PLANET_ID', 5);
812 812
 
813 813
 
814 814
 // *** Units
815 815
 
816 816
 // *** Sort options
817
-define('SORT_ASCENDING' , 0);
817
+define('SORT_ASCENDING', 0);
818 818
 define('SORT_DESCENDING', 1);
819 819
 
820
-define('SORT_ID'             , 0);
821
-define('SORT_LOCATION'       , 1);
822
-define('SORT_NAME'           , 2);
823
-define('SORT_SIZE'           , 3);
824
-define('SORT_EMAIL'          , 4);
825
-define('SORT_IP'             , 5);
820
+define('SORT_ID', 0);
821
+define('SORT_LOCATION', 1);
822
+define('SORT_NAME', 2);
823
+define('SORT_SIZE', 3);
824
+define('SORT_EMAIL', 4);
825
+define('SORT_IP', 5);
826 826
 define('SORT_TIME_REGISTERED', 6);
827 827
 define('SORT_TIME_LAST_VISIT', 7);
828
-define('SORT_TIME_BAN_UNTIL' , 8);
829
-define('SORT_REFERRAL_COUNT' , 9);
830
-define('SORT_REFERRAL_DM'    , 10);
828
+define('SORT_TIME_BAN_UNTIL', 8);
829
+define('SORT_REFERRAL_COUNT', 9);
830
+define('SORT_REFERRAL_DM', 10);
831 831
 
832 832
 
833 833
 define('HULL_SIZE_TINY', 1);
@@ -970,10 +970,10 @@  discard block
 block discarded – undo
970 970
 
971 971
 // === Artifacts
972 972
 define('UNIT_ARTIFACTS', 1000);
973
-define('ART_LHC', 1001);      // Additional moon chance
974
-define('ART_RCD_SMALL', 1002);   // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
975
-define('ART_RCD_MEDIUM', 1003);  // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
976
-define('ART_RCD_LARGE', 1004);   // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
973
+define('ART_LHC', 1001); // Additional moon chance
974
+define('ART_RCD_SMALL', 1002); // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
975
+define('ART_RCD_MEDIUM', 1003); // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
976
+define('ART_RCD_LARGE', 1004); // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
977 977
 define('ART_HEURISTIC_CHIP', 1005); // Speed up research
978 978
 define('ART_NANO_BUILDER', 1006); // Speed up building
979 979
 define('ART_NANO_CONSTRUCTOR', 1007); // RESERVED Speed up hangar constructions
@@ -1044,18 +1044,18 @@  discard block
 block discarded – undo
1044 1044
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE1', 2201); // Блиц-сервер, участник 0-го раунда, 1-е место
1045 1045
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE2', 2202); // Блиц-сервер, участник 0-го раунда, 2-е место
1046 1046
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE3', 2203); // Блиц-сервер, участник 0-го раунда, 3-е место
1047
-define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
1047
+define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
1048 1048
 
1049 1049
 define('UNIT_AWARD_MEMORY', 2300); // Памятные знаки за существование и участие - например "4 года в игре". "Был онлайн в новогоднюю ночь 2013". итд
1050
-define('UNIT_AWARD_MEMORY_IMMORTAL', 2301);  // Бессмертный
1051
-define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
1050
+define('UNIT_AWARD_MEMORY_IMMORTAL', 2301); // Бессмертный
1051
+define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
1052 1052
 define('UNIT_AWARD_MEMORY_BLITZ_R0', 2303); // Блиц-сервер, участник 0-го раунда
1053 1053
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SIMPLE', 2304); // День Рождения СН
1054 1054
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_BRONZE', 2305); // День Рождения СН
1055 1055
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SILVER', 2306); // День Рождения СН
1056 1056
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_GOLD', 2307); // День Рождения СН
1057 1057
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_PLATINUM', 2308); // День Рождения СН
1058
-define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
1058
+define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
1059 1059
 
1060 1060
 define('UNIT_AWARD_PENNANT', 2400); // Переходящий вымпел - индикация статуса на сервере: "Топ-1", "Топ", "Сабтоп", "Самый большой флот" итд
1061 1061
 define('UNIT_AWARD_BADGE', 2600); // Бейджики/значки за ачивки - например, "Построил 1000 кораблей"
@@ -1152,7 +1152,7 @@  discard block
 block discarded – undo
1152 1152
 
1153 1153
 define('UNIT_NEXT', 4000); // !!! Next unit start on 4000 !!!
1154 1154
 
1155
-define('GROUP_PART',         800000);
1155
+define('GROUP_PART', 800000);
1156 1156
 // Зарезервировано для запчастей: 800.001 - 899.999
1157 1157
 // define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
1158 1158
 // define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
@@ -1409,32 +1409,32 @@  discard block
 block discarded – undo
1409 1409
 
1410 1410
 
1411 1411
 // define('NICK_ID',               -1);
1412
-define('NICK_HTML',              0);
1413
-
1414
-define('NICK_FIRST',             1);
1415
-define('NICK_RACE',           1000);
1416
-define('NICK_GENDER',         2000);
1417
-define('NICK_AWARD',          3000);
1418
-define('NICK_VACATION',       3500);
1419
-define('NICK_BIRTHSDAY',      4000);
1420
-define('NICK_PREMIUM',        5000);
1421
-define('NICK_AUTH_LEVEL',     6000);
1422
-
1423
-define('NICK_HIGHLIGHT',      6300);
1424
-define('NICK_CLASS',          6450);
1425
-
1426
-define('NICK_NICK_CLASS',     6600);
1427
-define('NICK_NICK',           7000);
1412
+define('NICK_HTML', 0);
1413
+
1414
+define('NICK_FIRST', 1);
1415
+define('NICK_RACE', 1000);
1416
+define('NICK_GENDER', 2000);
1417
+define('NICK_AWARD', 3000);
1418
+define('NICK_VACATION', 3500);
1419
+define('NICK_BIRTHSDAY', 4000);
1420
+define('NICK_PREMIUM', 5000);
1421
+define('NICK_AUTH_LEVEL', 6000);
1422
+
1423
+define('NICK_HIGHLIGHT', 6300);
1424
+define('NICK_CLASS', 6450);
1425
+
1426
+define('NICK_NICK_CLASS', 6600);
1427
+define('NICK_NICK', 7000);
1428 1428
 define('NICK_NICK_CLASS_END', 7300);
1429 1429
 
1430
-define('NICK_ALLY_CLASS',     7600);
1431
-define('NICK_ALLY',           8000);
1430
+define('NICK_ALLY_CLASS', 7600);
1431
+define('NICK_ALLY', 8000);
1432 1432
 define('NICK_ALLY_CLASS_END', 8300);
1433 1433
 
1434
-define('NICK_CLASS_END',      8450);
1435
-define('NICK_HIGHLIGHT_END',  8600);
1434
+define('NICK_CLASS_END', 8450);
1435
+define('NICK_HIGHLIGHT_END', 8600);
1436 1436
 
1437
-define('NICK_LAST',           9999);
1437
+define('NICK_LAST', 9999);
1438 1438
 
1439 1439
 // Настройки игрока
1440 1440
 define('PLAYER_OPTION_MENU_SORT', 1);
@@ -1527,8 +1527,8 @@  discard block
 block discarded – undo
1527 1527
 define('LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10', 1);
1528 1528
 
1529 1529
 define('BLITZ_REGISTER_DISABLED', 0);
1530
-define('BLITZ_REGISTER_OPEN'    , 1);
1531
-define('BLITZ_REGISTER_CLOSED'  , 2);
1530
+define('BLITZ_REGISTER_OPEN', 1);
1531
+define('BLITZ_REGISTER_CLOSED', 2);
1532 1532
 define('BLITZ_REGISTER_SHOW_LOGIN', 3);
1533 1533
 define('BLITZ_REGISTER_DISCLOSURE_NAMES', 4);
1534 1534
 
Please login to merge, or discard this patch.
includes/classes/FleetValidator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -871,8 +871,8 @@
 block discarded – undo
871 871
    */
872 872
   protected function checkACSInvited() {
873 873
     $playersInvited = !empty($this->fleet->acs['eingeladen']) ? explode(',', $this->fleet->acs['eingeladen']) : array();
874
-    foreach($playersInvited as $playerId) {
875
-      if(intval($playerId) == $this->fleet->dbOwnerRow['id']) {
874
+    foreach ($playersInvited as $playerId) {
875
+      if (intval($playerId) == $this->fleet->dbOwnerRow['id']) {
876 876
         return true;
877 877
       }
878 878
     }
Please login to merge, or discard this patch.
includes/classes/Fleet.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -398,31 +398,31 @@  discard block
 block discarded – undo
398 398
 
399 399
     return doquery(
400 400
     // Блокировка самого флота
401
-      "SELECT 1 FROM {{fleets}} AS f " .
401
+      "SELECT 1 FROM {{fleets}} AS f ".
402 402
 
403 403
       // Блокировка всех юнитов, принадлежащих этому флоту
404
-      "LEFT JOIN {{unit}} as unit ON unit.unit_location_type = " . static::$locationType . " AND unit.unit_location_id = f.fleet_id " .
404
+      "LEFT JOIN {{unit}} as unit ON unit.unit_location_type = ".static::$locationType." AND unit.unit_location_id = f.fleet_id ".
405 405
 
406 406
       // Блокировка всех прилетающих и улетающих флотов, если нужно
407 407
       // TODO - lock fleets by COORDINATES
408
-      ($mission_data['dst_fleets'] ? "LEFT JOIN {{fleets}} AS fd ON fd.fleet_end_planet_id = f.fleet_end_planet_id OR fd.fleet_start_planet_id = f.fleet_end_planet_id " : '') .
408
+      ($mission_data['dst_fleets'] ? "LEFT JOIN {{fleets}} AS fd ON fd.fleet_end_planet_id = f.fleet_end_planet_id OR fd.fleet_start_planet_id = f.fleet_end_planet_id " : '').
409 409
       // Блокировка всех юнитов, принадлежащих прилетающим и улетающим флотам - ufd = unit_fleet_destination
410
-      ($mission_data['dst_fleets'] ? "LEFT JOIN {{unit}} AS ufd ON ufd.unit_location_type = " . static::$locationType . " AND ufd.unit_location_id = fd.fleet_id " : '') .
410
+      ($mission_data['dst_fleets'] ? "LEFT JOIN {{unit}} AS ufd ON ufd.unit_location_type = ".static::$locationType." AND ufd.unit_location_id = fd.fleet_id " : '').
411 411
 
412
-      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{users}} AS ud ON ud.id = f.fleet_target_owner " : '') .
412
+      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{users}} AS ud ON ud.id = f.fleet_target_owner " : '').
413 413
       // Блокировка всех юнитов, принадлежащих владельцу планеты-цели
414
-      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS unit_player_dest ON unit_player_dest.unit_player_id = ud.id " : '') .
414
+      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS unit_player_dest ON unit_player_dest.unit_player_id = ud.id " : '').
415 415
       // Блокировка планеты-цели
416
-      ($mission_data['dst_planet'] ? "LEFT JOIN {{planets}} AS pd ON pd.id = f.fleet_end_planet_id " : '') .
416
+      ($mission_data['dst_planet'] ? "LEFT JOIN {{planets}} AS pd ON pd.id = f.fleet_end_planet_id " : '').
417 417
       // Блокировка всех юнитов, принадлежащих планете-цели - НЕ НУЖНО. Уже залочили ранее, как принадлежащие игроку-цели
418 418
 //      ($mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS upd ON upd.unit_location_type = " . LOC_PLANET . " AND upd.unit_location_id = pd.id " : '') .
419 419
 
420 420
 
421
-      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{users}} AS us ON us.id = f.fleet_owner " : '') .
421
+      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{users}} AS us ON us.id = f.fleet_owner " : '').
422 422
       // Блокировка всех юнитов, принадлежащих владельцу флота
423
-      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS unit_player_src ON unit_player_src.unit_player_id = us.id " : '') .
423
+      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS unit_player_src ON unit_player_src.unit_player_id = us.id " : '').
424 424
       // Блокировка планеты отправления
425
-      ($mission_data['src_planet'] ? "LEFT JOIN {{planets}} AS ps ON ps.id = f.fleet_start_planet_id " : '') .
425
+      ($mission_data['src_planet'] ? "LEFT JOIN {{planets}} AS ps ON ps.id = f.fleet_start_planet_id " : '').
426 426
       // Блокировка всех юнитов, принадлежащих планете с которой юниты были отправлены - НЕ НУЖНО. Уже залочили ранее, как принадлежащие владельцу флота
427 427
 //      ($mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS ups ON ups.unit_location_type = " . LOC_PLANET . " AND ups.unit_location_id = ps.id " : '') .
428 428
 
@@ -439,11 +439,11 @@  discard block
 block discarded – undo
439 439
   public function dbGetLockById($dbId) {
440 440
     doquery(
441 441
     // Блокировка самого флота
442
-      "SELECT 1 FROM {{fleets}} AS FLEET0 " .
442
+      "SELECT 1 FROM {{fleets}} AS FLEET0 ".
443 443
       // Lock fleet owner
444
-      "LEFT JOIN {{users}} as USER0 on USER0.id = FLEET0.fleet_owner " .
444
+      "LEFT JOIN {{users}} as USER0 on USER0.id = FLEET0.fleet_owner ".
445 445
       // Блокировка всех юнитов, принадлежащих этому флоту
446
-      "LEFT JOIN {{unit}} as UNIT0 ON UNIT0.unit_location_type = " . LOC_FLEET . " AND UNIT0.unit_location_id = FLEET0.fleet_id " .
446
+      "LEFT JOIN {{unit}} as UNIT0 ON UNIT0.unit_location_type = ".LOC_FLEET." AND UNIT0.unit_location_id = FLEET0.fleet_id ".
447 447
 
448 448
       // Без предварительной выборки неизвестно - куда летит этот флот.
449 449
       // Поэтому надо выбирать флоты, чьи координаты прибытия ИЛИ отбытия совпадают с координатами прибытия ИЛИ отбытия текущего флота.
@@ -459,9 +459,9 @@  discard block
 block discarded – undo
459 459
         FLEET1.fleet_end_planet = FLEET0.fleet_end_planet
460 460
       " .
461 461
       // Блокировка всех юнитов, принадлежащих этим флотам
462
-      "LEFT JOIN {{unit}} as UNIT1 ON UNIT1.unit_location_type = " . LOC_FLEET . " AND UNIT1.unit_location_id = FLEET1.fleet_id " .
462
+      "LEFT JOIN {{unit}} as UNIT1 ON UNIT1.unit_location_type = ".LOC_FLEET." AND UNIT1.unit_location_id = FLEET1.fleet_id ".
463 463
       // Lock fleet owner
464
-      "LEFT JOIN {{users}} as USER1 on USER1.id = FLEET1.fleet_owner " .
464
+      "LEFT JOIN {{users}} as USER1 on USER1.id = FLEET1.fleet_owner ".
465 465
 
466 466
       "LEFT JOIN {{fleets}} AS FLEET2 ON
467 467
         FLEET2.fleet_mess = 1   AND FLEET0.fleet_mess = 0 AND
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
       " .
472 472
       // Блокировка всех юнитов, принадлежащих этим флотам
473 473
       "LEFT JOIN {{unit}} as UNIT2 ON
474
-        UNIT2.unit_location_type = " . LOC_FLEET . " AND
474
+        UNIT2.unit_location_type = " . LOC_FLEET." AND
475 475
         UNIT2.unit_location_id = FLEET2.fleet_id
476 476
       " .
477 477
       // Lock fleet owner
@@ -488,11 +488,11 @@  discard block
 block discarded – undo
488 488
       " .
489 489
       // Блокировка всех юнитов, принадлежащих этим флотам
490 490
       "LEFT JOIN {{unit}} as UNIT3 ON
491
-        UNIT3.unit_location_type = " . LOC_FLEET . " AND
491
+        UNIT3.unit_location_type = " . LOC_FLEET." AND
492 492
         UNIT3.unit_location_id = FLEET3.fleet_id
493 493
       " .
494 494
       // Lock fleet owner
495
-      "LEFT JOIN {{users}} as USER3 on USER3.id = FLEET3.fleet_owner " .
495
+      "LEFT JOIN {{users}} as USER3 on USER3.id = FLEET3.fleet_owner ".
496 496
 
497 497
       "LEFT JOIN {{fleets}} AS FLEET4 ON
498 498
         FLEET4.fleet_mess = 1   AND FLEET0.fleet_mess = 1 AND
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
       " .
503 503
       // Блокировка всех юнитов, принадлежащих этим флотам
504 504
       "LEFT JOIN {{unit}} as UNIT4 ON
505
-        UNIT4.unit_location_type = " . LOC_FLEET . " AND
505
+        UNIT4.unit_location_type = " . LOC_FLEET." AND
506 506
         UNIT4.unit_location_id = FLEET4.fleet_id
507 507
       " .
508 508
       // Lock fleet owner
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
524 524
       " .
525 525
       // Блокировка всех юнитов, принадлежащих этой планете
526 526
       "LEFT JOIN {{unit}} as UNIT5 ON
527
-        UNIT5.unit_location_type = " . LOC_PLANET . " AND
527
+        UNIT5.unit_location_type = " . LOC_PLANET." AND
528 528
         UNIT5.unit_location_id = PLANETS5.id
529 529
       " .
530 530
 
@@ -542,7 +542,7 @@  discard block
 block discarded – undo
542 542
       " .
543 543
       // Блокировка всех юнитов, принадлежащих этой планете
544 544
       "LEFT JOIN {{unit}} as UNIT6 ON
545
-        UNIT6.unit_location_type = " . LOC_PLANET . " AND
545
+        UNIT6.unit_location_type = " . LOC_PLANET." AND
546 546
         UNIT6.unit_location_id = PLANETS6.id
547 547
       " .
548 548
       "WHERE FLEET0.fleet_id = {$dbId} GROUP BY 1 FOR UPDATE"
@@ -661,7 +661,7 @@  discard block
 block discarded – undo
661 661
       } elseif ($this->isResource($unit_id)) {
662 662
         $this->resource_list[$unit_id] = $unit_count;
663 663
       } else {
664
-        throw new Exception('Trying to pass to fleet non-resource and non-ship ' . var_export($unit_array, true), ERR_ERROR);
664
+        throw new Exception('Trying to pass to fleet non-resource and non-ship '.var_export($unit_array, true), ERR_ERROR);
665 665
       }
666 666
     }
667 667
   }
@@ -986,7 +986,7 @@  discard block
 block discarded – undo
986 986
    */
987 987
   public function resourcesSet($resource_list) {
988 988
     if (!empty($this->propertiesAdjusted['resource_list'])) {
989
-      throw new PropertyAccessException('Property "resource_list" already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::unitSetResourceList', ERR_ERROR);
989
+      throw new PropertyAccessException('Property "resource_list" already was adjusted so no SET is possible until dbSave in '.get_called_class().'::unitSetResourceList', ERR_ERROR);
990 990
     }
991 991
     $this->resourcesAdjust($resource_list, true);
992 992
   }
@@ -1020,7 +1020,7 @@  discard block
 block discarded – undo
1020 1020
       // Check for negative unit value
1021 1021
       if ($this->resource_list[$resource_id] < 0) {
1022 1022
         // TODO
1023
-        throw new Exception('Resource ' . $resource_id . ' will become negative in ' . get_called_class() . '::unitAdjustResourceList', ERR_ERROR);
1023
+        throw new Exception('Resource '.$resource_id.' will become negative in '.get_called_class().'::unitAdjustResourceList', ERR_ERROR);
1024 1024
       }
1025 1025
     }
1026 1026
   }
@@ -1193,7 +1193,7 @@  discard block
 block discarded – undo
1193 1193
 
1194 1194
   protected function printErrorIfNoShips() {
1195 1195
     if ($this->unitList->unitsCount() <= 0) {
1196
-      message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 5);
1196
+      message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet'.DOT_PHP_EX, 5);
1197 1197
     }
1198 1198
   }
1199 1199
 
@@ -1681,7 +1681,7 @@  discard block
 block discarded – undo
1681 1681
 
1682 1682
 
1683 1683
     if (!empty($captain['unit_id'])) {
1684
-      db_unit_set_by_id($captain['unit_id'], "`unit_location_type` = " . LOC_FLEET . ", `unit_location_id` = {$this->_dbId}");
1684
+      db_unit_set_by_id($captain['unit_id'], "`unit_location_type` = ".LOC_FLEET.", `unit_location_id` = {$this->_dbId}");
1685 1685
     }
1686 1686
 
1687 1687
 //    return $this->fleet->acs['ankunft'] - $this->fleet->time_launch >= $this->fleet->travelData['duration'];
@@ -1693,7 +1693,7 @@  discard block
 block discarded – undo
1693 1693
     $template_result['.']['fleets'][] = $this->renderFleet(SN_TIME_NOW, $timeMissionJob);
1694 1694
 
1695 1695
     $template_result += array(
1696
-      'mission'         => classLocale::$lang['type_mission'][$this->_mission_type] . ($this->_mission_type == MT_EXPLORE || $this->_mission_type == MT_HOLD ? ' ' . pretty_time($timeMissionJob) : ''),
1696
+      'mission'         => classLocale::$lang['type_mission'][$this->_mission_type].($this->_mission_type == MT_EXPLORE || $this->_mission_type == MT_HOLD ? ' '.pretty_time($timeMissionJob) : ''),
1697 1697
       'dist'            => pretty_number($this->travelData['distance']),
1698 1698
       'speed'           => pretty_number($this->travelData['fleet_speed']),
1699 1699
       'deute_need'      => pretty_number($this->travelData['consumption']),
Please login to merge, or discard this patch.