Completed
Push — work-fleets ( 7f5906...04acf9 )
by SuperNova.WS
06:14
created
includes/classes/userOptions.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -151,6 +151,9 @@
 block discarded – undo
151 151
   }
152 152
 
153 153
 
154
+  /**
155
+   * @param integer $user_id
156
+   */
154 157
   public function __construct($user_id) {
155 158
     $this->user_change($user_id);
156 159
   }
Please login to merge, or discard this patch.
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -122,10 +122,10 @@  discard block
 block discarded – undo
122 122
 
123 123
     $update_cache = false;
124 124
 
125
-    if(!empty($this->to_write)) {
126
-      foreach($this->to_write as $key => $cork) {
125
+    if (!empty($this->to_write)) {
126
+      foreach ($this->to_write as $key => $cork) {
127 127
         $value = is_array($this->data[$key]) ? serialize($this->data[$key]) : $this->data[$key]; // Сериализация для массивов при сохранении в БД
128
-        $this->to_write[$key] = "({$this->user_id}, '" . db_escape($key) . "', '" . db_escape($value) . "')";
128
+        $this->to_write[$key] = "({$this->user_id}, '".db_escape($key)."', '".db_escape($value)."')";
129 129
       }
130 130
 
131 131
       classSupernova::$gc->db->doReplaceValuesDeprecated(
@@ -143,21 +143,21 @@  discard block
 block discarded – undo
143 143
       $update_cache = true;
144 144
     }
145 145
 
146
-    if(!empty($this->to_delete)) {
147
-      foreach($this->to_delete as $key => &$value) {
148
-        $value = is_string($key) ? "'". db_escape($key) . "'" : $key;
146
+    if (!empty($this->to_delete)) {
147
+      foreach ($this->to_delete as $key => &$value) {
148
+        $value = is_string($key) ? "'".db_escape($key)."'" : $key;
149 149
       }
150 150
 
151 151
       classSupernova::$db->doDeleteDeprecated(TABLE_PLAYER_OPTIONS, array(
152 152
         'player_id' => $this->user_id,
153
-        "`option_id` IN (". implode(',', $this->to_delete) . ")",
153
+        "`option_id` IN (".implode(',', $this->to_delete).")",
154 154
       ));
155 155
 
156 156
       $this->to_delete = array();
157 157
       $update_cache = true;
158 158
     }
159 159
 
160
-    if($update_cache) {
160
+    if ($update_cache) {
161 161
       $field_name = $this->cached_name();
162 162
       classSupernova::$cache->$field_name = $this->data;
163 163
     }
@@ -176,11 +176,11 @@  discard block
 block discarded – undo
176 176
     $this->load();
177 177
   }
178 178
   protected function cached_name() {
179
-    return 'options_' . $this->user_id;
179
+    return 'options_'.$this->user_id;
180 180
   }
181 181
 
182 182
   protected function load() {
183
-    if($this->loaded) {
183
+    if ($this->loaded) {
184 184
       return;
185 185
     }
186 186
 
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
     $this->to_write = array();
189 189
     $this->to_delete = array();
190 190
 
191
-    if(!$this->user_id) {
191
+    if (!$this->user_id) {
192 192
       $this->loaded = true;
193 193
       return;
194 194
     }
@@ -196,13 +196,13 @@  discard block
 block discarded – undo
196 196
     $field_name = $this->cached_name();
197 197
     $a_data = classSupernova::$cache->$field_name;
198 198
 
199
-    if(!empty($a_data)) {
199
+    if (!empty($a_data)) {
200 200
       $this->data = array_replace_recursive($this->data, $a_data);
201 201
       return;
202 202
     }
203 203
 
204 204
     $query = classSupernova::$db->doSelect("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
205
-    while($row = db_fetch($query)) {
205
+    while ($row = db_fetch($query)) {
206 206
       // $this->data[$row['option_id']] = $row['value'];
207 207
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
208 208
     }
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
   }
280 280
 
281 281
   protected function cached_name() {
282
-    return 'options_' . $this->user_id;
282
+    return 'options_'.$this->user_id;
283 283
   }
284 284
 
285 285
   // TODO - serialize/unserialize options
@@ -287,14 +287,14 @@  discard block
 block discarded – undo
287 287
     // Если в массиве индекса только один элемент - значит это просто индекс
288 288
     is_array($option_id) && count($option_id) == 1 ? $option_id = reset($option_id) : false;
289 289
 
290
-    if(!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
290
+    if (!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
291 291
       $this->load();
292 292
     }
293 293
 
294
-    if(is_array($option_id)) {
294
+    if (is_array($option_id)) {
295 295
       $result = $this->data;
296
-      foreach($option_id as $sub_key) {
297
-        if(!isset($result) || !isset($result[$sub_key])) {
296
+      foreach ($option_id as $sub_key) {
297
+        if (!isset($result) || !isset($result[$sub_key])) {
298 298
           $result = null;
299 299
           break;
300 300
         }
@@ -312,12 +312,12 @@  discard block
 block discarded – undo
312 312
    * @param null|mixed $value
313 313
    */
314 314
   public function __set($option, $value = null) {
315
-    if(empty($option) || !$this->user_id) {
315
+    if (empty($option) || !$this->user_id) {
316 316
       return;
317 317
     }
318 318
 
319 319
     // Если в массиве индекса только один элемент - значит это просто индекс
320
-    if(is_array($option) && count($option) == 1) {
320
+    if (is_array($option) && count($option) == 1) {
321 321
       // Разворачиваем его в индекс
322 322
       $option = array(reset($option) => $value);
323 323
       unset($value);
@@ -326,13 +326,13 @@  discard block
 block discarded – undo
326 326
 
327 327
     $to_write = array();
328 328
     // Адресация многомерного массива через массив индексов в $option
329
-    if(is_array($option) && isset($value)) {
329
+    if (is_array($option) && isset($value)) {
330 330
       $a_data = &$this->data;
331
-      foreach($option as $option_id) {
331
+      foreach ($option as $option_id) {
332 332
         !is_array($a_data[$option_id]) ? $a_data[$option_id] = array() : false;
333 333
         $a_data = &$a_data[$option_id];
334 334
       }
335
-      if($a_data != $value) {
335
+      if ($a_data != $value) {
336 336
         $a_data = $value;
337 337
         $to_write[reset($option)] = null;
338 338
       }
@@ -340,11 +340,11 @@  discard block
 block discarded – undo
340 340
       // Пакетная запись из массива ключ -> значение
341 341
       !is_array($option) ? $option = array($option => $value) : false;
342 342
 
343
-      foreach($option as $option_id => $option_value) {
344
-        if($this->data[$option_id] !== $option_value) {
343
+      foreach ($option as $option_id => $option_value) {
344
+        if ($this->data[$option_id] !== $option_value) {
345 345
           // TODO - вынести отдельно в обработчик
346
-          if($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON &&  $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
347
-            sn_setcookie(SN_COOKIE . '_menu_hidden', '0', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
346
+          if ($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON && $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
347
+            sn_setcookie(SN_COOKIE.'_menu_hidden', '0', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
348 348
           }
349 349
 
350 350
           $this->data[$option_id] = $option_value;
@@ -353,13 +353,13 @@  discard block
 block discarded – undo
353 353
       }
354 354
     }
355 355
 
356
-    if(!empty($to_write)) {
356
+    if (!empty($to_write)) {
357 357
       $field_name = $this->cached_name();
358 358
       classSupernova::$cache->$field_name = $this->data;
359 359
 
360
-      foreach($to_write as $option_id => &$option_value) {
360
+      foreach ($to_write as $option_id => &$option_value) {
361 361
         $option_value = is_array($this->data[$option_id]) ? serialize($this->data[$option_id]) : $this->data[$option_id]; // Сериализация для массивов при сохранении в БД
362
-        $to_write[$option_id] = "({$this->user_id}, '" . db_escape($option_id) . "', '" . db_escape($option_value) . "')";
362
+        $to_write[$option_id] = "({$this->user_id}, '".db_escape($option_id)."', '".db_escape($option_value)."')";
363 363
       }
364 364
 
365 365
       classSupernova::$gc->db->doReplaceValuesDeprecated(
@@ -375,26 +375,26 @@  discard block
 block discarded – undo
375 375
   }
376 376
 
377 377
   protected function load() {
378
-    if($this->loaded) {
378
+    if ($this->loaded) {
379 379
       return;
380 380
     }
381 381
 
382 382
     $this->data = $this->defaults;
383 383
 
384
-    if(!$this->user_id) {
384
+    if (!$this->user_id) {
385 385
       return;
386 386
     }
387 387
 
388 388
     $field_name = $this->cached_name();
389 389
     $a_data = classSupernova::$cache->$field_name;
390 390
 
391
-    if(!empty($a_data)) {
391
+    if (!empty($a_data)) {
392 392
       $this->data = array_replace($this->data, $a_data);
393 393
       return;
394 394
     }
395 395
 
396 396
     $query = classSupernova::$db->doSelect("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
397
-    while($row = db_fetch($query)) {
397
+    while ($row = db_fetch($query)) {
398 398
       // $this->data[$row['option_id']] = $row['value'];
399 399
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
400 400
     }
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
     return $this->__get($offset);
411 411
   }
412 412
   public function offsetSet($offset, $value) {
413
-    if(!is_null($offset)) {
413
+    if (!is_null($offset)) {
414 414
       // $this->data[$offset] = $value;
415 415
       $this->__set($offset, $value);
416 416
     } else {
Please login to merge, or discard this patch.
includes/classes/oldArrayAccessNd.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -38,8 +38,8 @@  discard block
 block discarded – undo
38 38
     !is_array($offset) ? $offset = array($offset) : false;
39 39
 
40 40
     $current_leaf = $this->__get(reset($offset));
41
-    while(($leaf_index = next($offset)) !== false) {
42
-      if(!isset($current_leaf) || !is_array($current_leaf) || !isset($current_leaf[$leaf_index])) {
41
+    while (($leaf_index = next($offset)) !== false) {
42
+      if (!isset($current_leaf) || !is_array($current_leaf) || !isset($current_leaf[$leaf_index])) {
43 43
         unset($current_leaf);
44 44
         break;
45 45
       }
@@ -64,9 +64,9 @@  discard block
 block discarded – undo
64 64
 
65 65
     !is_array($offset) ? $offset = array($offset) : false;
66 66
 
67
-    if($this->offsetExists($offset)) {
67
+    if ($this->offsetExists($offset)) {
68 68
       $result = $this->__get(reset($offset));
69
-      while(($leaf_index = next($offset)) !== false) {
69
+      while (($leaf_index = next($offset)) !== false) {
70 70
         $result = $result[$leaf_index];
71 71
       }
72 72
     }
@@ -91,12 +91,12 @@  discard block
 block discarded – undo
91 91
    */
92 92
   public function offsetSet($offset, $value = null) {
93 93
     // Если нет никакого индекса - значит нечего записывать
94
-    if(!isset($offset) || (is_array($offset) && empty($offset))) {
94
+    if (!isset($offset) || (is_array($offset) && empty($offset))) {
95 95
       return;
96 96
     }
97 97
 
98 98
     // Если в массиве индекса только один элемент - значит это просто индекс
99
-    if(is_array($offset) && count($offset) == 1) {
99
+    if (is_array($offset) && count($offset) == 1) {
100 100
       // Разворачиваем его в индекс
101 101
       $offset = array(reset($offset) => $value);
102 102
       unset($value);
@@ -104,20 +104,20 @@  discard block
 block discarded – undo
104 104
     }
105 105
 
106 106
     // Адресация многомерного массива через массив индексов в $option
107
-    if(is_array($offset) && isset($value)) {
107
+    if (is_array($offset) && isset($value)) {
108 108
       // TODO - а не переделать ли это всё на __isset() ??
109 109
 //pdump($offset, '$offset');
110 110
 //pdump($value, '$value');
111 111
       // Вытаскиваем корневой элемент
112 112
       $root = $this->__get(reset($offset));
113 113
       $current_leaf = &$root;
114
-      while(($leaf_index = next($offset)) !== false) {
114
+      while (($leaf_index = next($offset)) !== false) {
115 115
         !is_array($current_leaf[$leaf_index]) ? $current_leaf[$leaf_index] = array() : false;
116 116
         $current_leaf = &$current_leaf[$leaf_index];
117 117
       }
118 118
 //pdump($current_leaf, '$current_leaf');
119 119
 //pdump($value, '$value');
120
-      if($current_leaf != $value) {
120
+      if ($current_leaf != $value) {
121 121
         $current_leaf = $value;
122 122
 //pdump(reset($offset), 'reset($offset)');
123 123
 //pdump($root, '$root');
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
       // Пакетная запись из массива ключ -> значение
129 129
       !is_array($offset) ? $offset = array($offset => $value) : false;
130 130
 
131
-      foreach($offset as $key => $value) {
131
+      foreach ($offset as $key => $value) {
132 132
         $this->__get($key) !== $value ? $this->__set($key, $value) : false;
133 133
       }
134 134
     }
@@ -149,13 +149,13 @@  discard block
 block discarded – undo
149 149
    */
150 150
   public function offsetUnset($offset) {
151 151
     // Если нет никакого индекса - значит нечего записывать
152
-    if(!isset($offset) || (is_array($offset) && empty($offset))) {
152
+    if (!isset($offset) || (is_array($offset) && empty($offset))) {
153 153
       return;
154 154
     }
155 155
 
156 156
     !is_array($offset) ? $offset = array($offset) : false;
157 157
 
158
-    if($this->offsetExists($offset)) {
158
+    if ($this->offsetExists($offset)) {
159 159
 //pdump($offset);
160 160
       // Перематываем массив в конец
161 161
       $key_to_delete = end($offset);
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 //pdump($key_to_delete, '$key_to_delete');
164 164
       $parent_offset = $offset;
165 165
       array_pop($parent_offset);
166
-      if(!count($parent_offset)) {
166
+      if (!count($parent_offset)) {
167 167
         // В массиве был один элемент - мы удаляем в корне. Просто удаляем элемент
168 168
         $this->__unset($key_to_delete);
169 169
       } else {
Please login to merge, or discard this patch.
includes/classes/classConfig.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -190,9 +190,9 @@  discard block
 block discarded – undo
190 190
     'advGoogleLeftMenuCode'        => '(Place here code for banner)',
191 191
 
192 192
     // Alliance bonus calculations
193
-    'ali_bonus_algorithm'          => 0,  // Bonus calculation algorithm
193
+    'ali_bonus_algorithm'          => 0, // Bonus calculation algorithm
194 194
     'ali_bonus_brackets'           => 10, // Brackets count for ALI_BONUS_BY_RANK
195
-    'ali_bonus_brackets_divisor'   => 10,// Bonus divisor for ALI_BONUS_BY_RANK
195
+    'ali_bonus_brackets_divisor'   => 10, // Bonus divisor for ALI_BONUS_BY_RANK
196 196
     'ali_bonus_divisor'            => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS
197 197
     'ali_bonus_members'            => 10, // Minumum alliace size to start using bonus
198 198
 
@@ -223,25 +223,25 @@  discard block
 block discarded – undo
223 223
     'deuterium_basic_income'       => 0,
224 224
     'eco_scale_storage'            => 1,
225 225
     'eco_stockman_fleet'           => '', // Black Market - Starting amount of s/h ship merchant to sell
226
-    'eco_stockman_fleet_populate'  => 1,  // Populate empty Stockman fleet with ships or not
226
+    'eco_stockman_fleet_populate'  => 1, // Populate empty Stockman fleet with ships or not
227 227
     'empire_mercenary_base_period' => PERIOD_MONTH, // Base
228 228
     'empire_mercenary_temporary'   => 0, // Temporary empire-wide mercenaries
229 229
     'energy_basic_income'          => 0,
230 230
 
231 231
     // Bashing protection settings
232
-    'fleet_bashing_attacks'        => 3,      // Max amount of attack per wave - 3 by default
233
-    'fleet_bashing_interval'       => 1800,   // Maximum interval between attacks when they still count as one wave - 30m by default
234
-    'fleet_bashing_scope'          => 86400,  // Interval on which bashing waves counts - 24h by default
235
-    'fleet_bashing_war_delay'      => 43200,  // Delay before start bashing after declaring war to alliance - 12h by default
236
-    'fleet_bashing_waves'          => 3,      // Max amount of waves per day - 3 by default
232
+    'fleet_bashing_attacks'        => 3, // Max amount of attack per wave - 3 by default
233
+    'fleet_bashing_interval'       => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default
234
+    'fleet_bashing_scope'          => 86400, // Interval on which bashing waves counts - 24h by default
235
+    'fleet_bashing_war_delay'      => 43200, // Delay before start bashing after declaring war to alliance - 12h by default
236
+    'fleet_bashing_waves'          => 3, // Max amount of waves per day - 3 by default
237 237
 
238 238
     'Fleet_Cdr'   => 30,
239 239
     'fleet_speed' => 1,
240 240
 
241 241
     'fleet_update_interval' => 4,
242 242
 
243
-    'game_adminEmail'       => 'root@localhost',    // Admin's email to show to users
244
-    'game_counter'          => 0,  // Does built-in page hit counter is on?
243
+    'game_adminEmail'       => 'root@localhost', // Admin's email to show to users
244
+    'game_counter'          => 0, // Does built-in page hit counter is on?
245 245
     // Defaults
246 246
     'game_default_language' => 'ru',
247 247
     'game_default_skin'     => 'skins/EpicBlue/',
@@ -255,13 +255,13 @@  discard block
 block discarded – undo
255 255
     'game_maxSystem'      => 199,
256 256
     'game_maxPlanet'      => 15,
257 257
     // Game global settings
258
-    'game_mode'           => 0,           // 0 - SuperNova, 1 - oGame
258
+    'game_mode'           => 0, // 0 - SuperNova, 1 - oGame
259 259
     'game_name'           => 'SuperNova', // Server name (would be on banners and on top of left menu)
260 260
 
261 261
     'game_news_actual'   => 259200, // How long announcement would be marked as "New". In seconds. Default - 3 days
262
-    'game_news_overview' => 3,    // How much last news to show in Overview page
262
+    'game_news_overview' => 3, // How much last news to show in Overview page
263 263
     // Noob protection
264
-    'game_noob_factor'   => 5,    // Multiplier to divide "stronger" and "weaker" users
264
+    'game_noob_factor'   => 5, // Multiplier to divide "stronger" and "weaker" users
265 265
     'game_noob_points'   => 5000, // Below this point user threated as noob. 0 to disable
266 266
 
267 267
     'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccounts)
@@ -311,8 +311,8 @@  discard block
 block discarded – undo
311 311
     'payment_currency_exchange_wmu' => 30,
312 312
     'payment_currency_exchange_wmz' => 1,
313 313
 
314
-    'payment_lot_price' => 1,     // Lot price in default currency
315
-    'payment_lot_size'  => 2500,  // Lot size. Also service as minimum amount of DM that could be bought with one transaction
314
+    'payment_lot_price' => 1, // Lot price in default currency
315
+    'payment_lot_size'  => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction
316 316
 
317 317
     'planet_teleport_cost'    => 50000, //
318 318
     'planet_teleport_timeout' => 86400, //
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
     'resource_multiplier'     => 1,
331 331
 
332 332
     //Roleplay system
333
-    'rpg_bonus_divisor'       => 10,    // Amount of DM referral shoud get for partner have 1 DM bonus
333
+    'rpg_bonus_divisor'       => 10, // Amount of DM referral shoud get for partner have 1 DM bonus
334 334
     'rpg_bonus_minimum'       => 10000, // Minimum DM ammount for starting paying bonuses to affiliate
335 335
 
336 336
     // Black Market - General
Please login to merge, or discard this patch.
includes/includes/upd_helpers.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -15,10 +15,10 @@  discard block
 block discarded – undo
15 15
   // classSupernova::$db->sn_db_connect();
16 16
   if (!(strpos($query, '{{') === false)) {
17 17
     foreach ($update_tables as $tableName => $cork) {
18
-      $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix . $tableName, $query);
18
+      $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix.$tableName, $query);
19 19
     }
20 20
   }
21
-  !($result = classSupernova::$db->db_sql_query($query)) ? die('Query error for ' . $query . ': ' . classSupernova::$db->db_error()) : false;
21
+  !($result = classSupernova::$db->db_sql_query($query)) ? die('Query error for '.$query.': '.classSupernova::$db->db_error()) : false;
22 22
 
23 23
   return $result;
24 24
 }
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
   global $update_tables, $update_indexes, $update_indexes_full, $update_foreigns;
86 86
 
87 87
   $tableName = $prefixed ? str_replace(classSupernova::$config->db_prefix, '', $prefix_table_name) : $prefix_table_name;
88
-  $prefix_table_name = $prefixed ? $prefix_table_name : classSupernova::$config->db_prefix . $prefix_table_name;
88
+  $prefix_table_name = $prefixed ? $prefix_table_name : classSupernova::$config->db_prefix.$prefix_table_name;
89 89
 
90 90
   upd_unset_table_info($tableName);
91 91
 
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
     $update_indexes_full[$tableName][$r1['Key_name']][$r1['Column_name']] = $r1;
101 101
   }
102 102
 
103
-  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name) . "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
103
+  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '".db_escape(classSupernova::$db_name)."' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
104 104
   while ($r1 = db_fetch($q1)) {
105 105
     $table_referenced = str_replace(classSupernova::$config->db_prefix, '', $r1['REFERENCED_TABLE_NAME']);
106 106
 
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
     $result = upd_do_query("CREATE TABLE IF NOT EXISTS `{$db_prefix}{$table_name}` {$declaration}");
161 161
     $error = classSupernova::$db->db_error();
162 162
     if ($error) {
163
-      die("Creating error for table `{$table_name}`: {$error}<br />" . dump($declaration));
163
+      die("Creating error for table `{$table_name}`: {$error}<br />".dump($declaration));
164 164
     }
165 165
     upd_do_query('set foreign_key_checks = 1;', true);
166 166
     upd_load_table_info($table_name, false);
@@ -175,10 +175,10 @@  discard block
 block discarded – undo
175 175
     "SELECT {$fields}
176 176
     FROM {{unit}}
177 177
     WHERE
178
-      `unit_location_type` = {$location_type} AND `unit_location_id` = {$location_id} AND " . DBStaticUnit::db_unit_time_restrictions() .
179
-    ($user_id = intval($user_id) ? " AND `unit_player_id` = {$user_id}" : '') .
180
-    ($unit_snid = intval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : '') .
181
-    " LIMIT 1" .
178
+      `unit_location_type` = {$location_type} AND `unit_location_id` = {$location_id} AND ".DBStaticUnit::db_unit_time_restrictions().
179
+    ($user_id = intval($user_id) ? " AND `unit_player_id` = {$user_id}" : '').
180
+    ($unit_snid = intval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : '').
181
+    " LIMIT 1".
182 182
     ($for_update ? ' FOR UPDATE' : '')
183 183
   ));
184 184
 }
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
     foreach ($table_data as $record_id => $conditions) {
260 260
       $where = '';
261 261
       if (!empty($conditions['where'])) {
262
-        $where = 'WHERE ' . implode(' AND ', $conditions['where']);
262
+        $where = 'WHERE '.implode(' AND ', $conditions['where']);
263 263
       }
264 264
 
265 265
       $fields = array();
@@ -268,12 +268,12 @@  discard block
 block discarded – undo
268 268
           $condition = "`{$field_name}` = ";
269 269
           $value = '';
270 270
           if ($field_data['delta']) {
271
-            $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
271
+            $value = "`{$field_name}`".($field_data['delta'] >= 0 ? '+' : '').$field_data['delta'];
272 272
           } elseif ($field_data['set']) {
273 273
             $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
274 274
           }
275 275
           if ($value) {
276
-            $fields[] = $condition . $value;
276
+            $fields[] = $condition.$value;
277 277
           }
278 278
         }
279 279
       }
Please login to merge, or discard this patch.
includes/classes/FleetValidator.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
     'checkSpeedPercentOld'       => FLIGHT_FLEET_SPEED_WRONG,
15 15
     'checkTargetInUniverse'      => FLIGHT_VECTOR_BEYOND_UNIVERSE,
16 16
     'checkTargetNotSource'       => FLIGHT_VECTOR_SAME_SOURCE,
17
-    'checkSenderNoVacation'      => FLIGHT_PLAYER_VACATION_OWN,  // tODO
17
+    'checkSenderNoVacation'      => FLIGHT_PLAYER_VACATION_OWN, // tODO
18 18
     'checkTargetNoVacation'      => FLIGHT_PLAYER_VACATION,
19 19
     'checkFleetNotEmpty'         => FLIGHT_SHIPS_NO_SHIPS,
20 20
     // 'checkUnitsPositive'         => FLIGHT_SHIPS_NEGATIVE, // Unused - 'cause it's not allowed to put negative units into Unit class
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 
134 134
       $checkResult = call_user_func(array($this, $condition));
135 135
       defined('DEBUG_FLEET_MISSION_VALIDATE_DUMP_STEPS')
136
-        ? pdump($action, $condition . ' ' . ($checkResult ? 'TRUE' : 'FALSE')) : false;
136
+        ? pdump($action, $condition.' '.($checkResult ? 'TRUE' : 'FALSE')) : false;
137 137
 
138 138
       // If check failed and there no alternative actions - throw exception
139 139
       // Shortcut ACTION => FAIL_STATUS instead of ACTION => array(false => FAIL_STATUS)
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
         $this->checkMissionRestrictions($action);
157 157
       } else {
158 158
         // No - then just performing action
159
-        if($exception) {
159
+        if ($exception) {
160 160
           throw new ExceptionFleetInvalid($action, $action);
161 161
         } else {
162 162
           return $action;
@@ -598,10 +598,10 @@  discard block
 block discarded – undo
598 598
   protected function checkMissionPrefix($name, $prefix) {
599 599
     $result = false;
600 600
     if (strpos($name, $prefix) === 0) {
601
-      $mission = 'MT_' . strtoupper(substr($name, strlen($prefix)));
601
+      $mission = 'MT_'.strtoupper(substr($name, strlen($prefix)));
602 602
       if (!defined($mission)) {
603 603
         // TODO - Ну, как-то получше это обделать
604
-        throw new Exception('Mission type "' . $mission . '" is not defined', FLIGHT_MISSION_UNKNOWN);
604
+        throw new Exception('Mission type "'.$mission.'" is not defined', FLIGHT_MISSION_UNKNOWN);
605 605
       }
606 606
 
607 607
       $result = constant($mission);
Please login to merge, or discard this patch.
includes/classes/Mission/MissionFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
    * @throws ExceptionFleetInvalid
35 35
    */
36 36
   public static function build($missionType, $fleet) {
37
-    if (!empty(self::$missions[$missionType]) && class_exists($className = __NAMESPACE__ . '\\' . self::$missions[$missionType])) {
37
+    if (!empty(self::$missions[$missionType]) && class_exists($className = __NAMESPACE__.'\\'.self::$missions[$missionType])) {
38 38
       $result = new $className($fleet);
39 39
     } else {
40 40
       throw new ExceptionFleetInvalid("Mission type {$missionType} unknown", FLIGHT_MISSION_UNKNOWN);
Please login to merge, or discard this patch.
includes/classes/sn_module.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -72,10 +72,10 @@  discard block
 block discarded – undo
72 72
   }
73 73
 
74 74
   function loadModuleRootConfig() {
75
-    require SN_ROOT_PHYSICAL . 'config.php';
75
+    require SN_ROOT_PHYSICAL.'config.php';
76 76
 
77
-    $module_config_array = get_class($this) . '_config';
78
-    if(!empty($$module_config_array) && is_array($$module_config_array)) {
77
+    $module_config_array = get_class($this).'_config';
78
+    if (!empty($$module_config_array) && is_array($$module_config_array)) {
79 79
       $this->config = $$module_config_array;
80 80
 
81 81
       return true;
@@ -93,17 +93,17 @@  discard block
 block discarded – undo
93 93
 
94 94
     // TODO: Load configuration from DB. Manifest setting
95 95
     // Trying to load configuration from file
96
-    if(!$config_exists = $this->loadModuleRootConfig()) {
96
+    if (!$config_exists = $this->loadModuleRootConfig()) {
97 97
       // Конфигурация может лежать в config_path в манифеста или в корне модуля
98
-      if(isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
98
+      if (isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'].'/config.php')) {
99 99
         $config_exists = true;
100
-      } elseif(file_exists($config_filename = dirname($filename) . '/config.php')) {
100
+      } elseif (file_exists($config_filename = dirname($filename).'/config.php')) {
101 101
         $config_exists = true;
102 102
       }
103 103
 
104
-      if($config_exists) {
104
+      if ($config_exists) {
105 105
         include($config_filename);
106
-        $module_config_array = $class_module_name . '_config';
106
+        $module_config_array = $class_module_name.'_config';
107 107
         $this->config = $$module_config_array;
108 108
       }
109 109
     }
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 
119 119
     // Checking module status - is it installed and active
120 120
     $this->check_status();
121
-    if(!$this->manifest['active']) {
121
+    if (!$this->manifest['active']) {
122 122
       return;
123 123
     }
124 124
 
@@ -138,11 +138,11 @@  discard block
 block discarded – undo
138 138
 
139 139
   protected function setSystemConstants() {
140 140
     // Setting constants - if any
141
-    if(empty($this->manifest['constants']) || !is_array($this->manifest['constants'])) {
141
+    if (empty($this->manifest['constants']) || !is_array($this->manifest['constants'])) {
142 142
       return;
143 143
     }
144 144
 
145
-    foreach($this->manifest['constants'] as $constant_name => $constant_value) {
145
+    foreach ($this->manifest['constants'] as $constant_name => $constant_value) {
146 146
       !defined($constant_name) ? define($constant_name, $constant_value) : false;
147 147
     }
148 148
   }
@@ -154,48 +154,48 @@  discard block
 block discarded – undo
154 154
     // New values from module variables will overwrite previous values (for root variables) and array elements with corresponding indexes (for arrays)
155 155
     // Constants as array indexes are honored - it's make valid such declarations as 'sn_data[ques][QUE_STRUCTURES]'
156 156
     $this->manifest['vars'] = $this->__assign_vars();
157
-    if(empty($this->manifest['vars']) || !is_array($this->manifest['vars'])) {
157
+    if (empty($this->manifest['vars']) || !is_array($this->manifest['vars'])) {
158 158
       return;
159 159
     }
160 160
 
161 161
     $vars_assigned = array();
162
-    foreach($this->manifest['vars'] as $var_name => $var_value) {
162
+    foreach ($this->manifest['vars'] as $var_name => $var_value) {
163 163
       $sub_vars = explode('[', str_replace(']', '', $var_name));
164 164
       $var_name = $sub_vars[0];
165 165
 
166
-      if(!isset($vars_assigned[$var_name])) {
166
+      if (!isset($vars_assigned[$var_name])) {
167 167
         $vars_assigned[$var_name] = true;
168 168
         global $$var_name;
169 169
       }
170 170
 
171 171
       $pointer = &$$var_name;
172
-      if(($n = count($sub_vars)) > 1) {
173
-        for($i = 1; $i < $n; $i++) {
174
-          if(defined($sub_vars[$i])) {
172
+      if (($n = count($sub_vars)) > 1) {
173
+        for ($i = 1; $i < $n; $i++) {
174
+          if (defined($sub_vars[$i])) {
175 175
             $sub_vars[$i] = constant($sub_vars[$i]);
176 176
           }
177 177
 
178
-          if(!isset($pointer[$sub_vars[$i]]) && $i != $n) {
178
+          if (!isset($pointer[$sub_vars[$i]]) && $i != $n) {
179 179
             $pointer[$sub_vars[$i]] = array();
180 180
           }
181 181
           $pointer = &$pointer[$sub_vars[$i]];
182 182
         }
183 183
       }
184 184
 
185
-      if(!isset($pointer) || !is_array($pointer)) {
185
+      if (!isset($pointer) || !is_array($pointer)) {
186 186
         $pointer = $var_value;
187
-      } elseif(is_array($$var_name)) {
187
+      } elseif (is_array($$var_name)) {
188 188
         $pointer = array_merge_recursive_numeric($pointer, $var_value);
189 189
       }
190 190
     }
191 191
   }
192 192
 
193 193
   protected function mergeMenu(&$sn_menu_extra, &$menu_patch) {
194
-    if(!is_array($menu_patch)) {
194
+    if (!is_array($menu_patch)) {
195 195
       return;
196 196
     }
197 197
 
198
-    foreach($menu_patch as $menu_item_name => $menu_item_data) {
198
+    foreach ($menu_patch as $menu_item_name => $menu_item_data) {
199 199
       $sn_menu_extra[$menu_item_name] = $menu_item_data;
200 200
     }
201 201
   }
@@ -204,34 +204,34 @@  discard block
 block discarded – undo
204 204
     // Overriding function if any
205 205
     sn_sys_handler_add(classSupernova::$functions, $this->manifest['functions'], $this);
206 206
 
207
-    foreach(classSupernova::$sn_mvc as $handler_type => &$handler_data) {
207
+    foreach (classSupernova::$sn_mvc as $handler_type => &$handler_data) {
208 208
       sn_sys_handler_add($handler_data, $this->manifest['mvc'][$handler_type], $this, $handler_type);
209 209
     }
210 210
   }
211 211
 
212 212
   protected function mergeNavbarButton() {
213
-    if(empty($this->manifest['navbar_prefix_button']) || !is_array($this->manifest['navbar_prefix_button'])) {
213
+    if (empty($this->manifest['navbar_prefix_button']) || !is_array($this->manifest['navbar_prefix_button'])) {
214 214
       return;
215 215
     }
216 216
 
217
-    foreach($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
217
+    foreach ($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
218 218
       classSupernova::$sn_mvc['navbar_prefix_button'][$button_image] = $button_url_relative;
219 219
     }
220 220
   }
221 221
 
222 222
   protected function mergeI18N() {
223 223
     $arrayName = 'i18n';
224
-    if(empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
224
+    if (empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
225 225
       return;
226 226
     }
227 227
 
228
-    foreach($this->manifest[$arrayName] as $pageName => &$contentList) {
229
-      foreach($contentList as &$i18n_file_data) {
230
-        if(is_array($i18n_file_data) && !$i18n_file_data['path']) {
228
+    foreach ($this->manifest[$arrayName] as $pageName => &$contentList) {
229
+      foreach ($contentList as &$i18n_file_data) {
230
+        if (is_array($i18n_file_data) && !$i18n_file_data['path']) {
231 231
           $i18n_file_data['path'] = $this->manifest['root_relative'];
232 232
         }
233 233
       }
234
-      if(!isset(classSupernova::$sn_mvc[$arrayName][$pageName])) {
234
+      if (!isset(classSupernova::$sn_mvc[$arrayName][$pageName])) {
235 235
         classSupernova::$sn_mvc[$arrayName][$pageName] = array();
236 236
       }
237 237
       classSupernova::$sn_mvc[$arrayName][$pageName] += $contentList;
@@ -239,13 +239,13 @@  discard block
 block discarded – undo
239 239
   }
240 240
 
241 241
   protected function mergeArraySpecial($arrayName) {
242
-    if(empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
242
+    if (empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
243 243
       return;
244 244
     }
245 245
 
246
-    foreach($this->manifest[$arrayName] as $pageName => &$contentList) {
246
+    foreach ($this->manifest[$arrayName] as $pageName => &$contentList) {
247 247
       !isset(classSupernova::$sn_mvc[$arrayName][$pageName]) ? classSupernova::$sn_mvc[$arrayName][$pageName] = array() : false;
248
-      foreach($contentList as $contentName => &$content) {
248
+      foreach ($contentList as $contentName => &$content) {
249 249
         classSupernova::$sn_mvc[$arrayName][$pageName][$contentName] = $content;
250 250
       }
251 251
     }
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
           $load_order[$loaded_module_name] = $level;
300 300
         }
301 301
       }
302
-    } while($prev_order != $load_order);
302
+    } while ($prev_order != $load_order);
303 303
 
304 304
     asort($load_order);
305 305
 
Please login to merge, or discard this patch.
includes/alliance/ali_external_search.inc 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
3
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
4 4
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
5 5
 }
6 6
 
7 7
 $template = gettemplate('ali_search', true);
8 8
 
9 9
 $ali_search_text = sys_get_param_str('searchtext');
10
-if($ali_search_text) {
10
+if ($ali_search_text) {
11 11
   $template->assign_var('SEARCH_TEXT', $ali_search_text);
12 12
 
13 13
   $search = DBStaticAlly::db_ally_search_by_name_or_tag($ali_search_text);
14
-  if(classSupernova::$db->db_num_rows($search)) {
15
-    while($ally_row = db_fetch($search)) {
14
+  if (classSupernova::$db->db_num_rows($search)) {
15
+    while ($ally_row = db_fetch($search)) {
16 16
       $template->assign_block_vars('alliances', array(
17 17
         'ID'          => $ally_row['id'],
18 18
         'TAG'         => $ally_row['ally_tag'],
Please login to merge, or discard this patch.
includes/constants.php 1 patch
Spacing   +240 added lines, -240 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
@@ -267,10 +267,10 @@  discard block
 block discarded – undo
267 267
 
268 268
 
269 269
 // Operation error status HARDCODE!
270
-define('ERR_NONE'               , 0); // No error
271
-define('ERR_WARNING'            , 1); // There is warning - something altering normal operation process
272
-define('ERR_ERROR'              , 2); // There is error - something permits operation from process
273
-define('ERR_HACK'               , 4); // Operation is qualified as hack attempt
270
+define('ERR_NONE', 0); // No error
271
+define('ERR_WARNING', 1); // There is warning - something altering normal operation process
272
+define('ERR_ERROR', 2); // There is error - something permits operation from process
273
+define('ERR_HACK', 4); // Operation is qualified as hack attempt
274 274
 // New GLOBAL operation results
275 275
 //define('RESULT_DEFAULT' , 0); // Default result - all went OK or result really doesn't matter
276 276
 //define('RESULT_WARNING' , 1);
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 define('SN_PAYMENT_REQUEST_OK', 0);
291 291
 define('SN_PAYMENT_REQUEST_ERROR_UNIT_AMOUNT', 1);
292 292
 define('SN_PAYMENT_REQUEST_ERROR_PAYLINK_UNSUPPORTED', 2);
293
-define('SN_PAYMENT_REQUEST_IP_WRONG', 3);  // Неправильный IP входящей системы - обычно хак
293
+define('SN_PAYMENT_REQUEST_IP_WRONG', 3); // Неправильный IP входящей системы - обычно хак
294 294
 define('SN_PAYMENT_REQUEST_COMMAND_UNSUPPORTED', 4); // Неподдерживаемая команда - обычно хак
295 295
 define('SN_PAYMENT_REQUEST_SIGNATURE_INVALID', 5); // Неправильная подпись или не сошлась контрольная сумма - обычно хак
296 296
 define('SN_MODULE_DISABLED', 6); // Модуль отключен // УНИВЕРСАЛЬНЫЙ ОТВЕТ!
@@ -563,16 +563,16 @@  discard block
 block discarded – undo
563 563
 //define('F_DEVICE_ID',     'F_DEVICE_ID');
564 564
 //define('F_DEVICE_CYPHER', 'F_DEVICE_CYPHER');
565 565
 
566
-define('F_PROVIDER_ID',   'F_PROVIDER_ID');
566
+define('F_PROVIDER_ID', 'F_PROVIDER_ID');
567 567
 // define('F_PROVIDER_LIST', 'F_PROVIDER_LIST');
568 568
 
569 569
 define('F_IMPERSONATE_STATUS', 'F_IMPERSONATE_STATUS');
570 570
 define('F_IMPERSONATE_OPERATOR', 'F_IMPERSONATE_OPERATOR');
571 571
 
572
-define('F_LOGIN_STATUS',  'F_LOGIN_STATUS');
572
+define('F_LOGIN_STATUS', 'F_LOGIN_STATUS');
573 573
 define('F_LOGIN_MESSAGE', 'F_LOGIN_MESSAGE');
574 574
 
575
-define('F_PLAYER_REGISTER_STATUS',  'F_PLAYER_REGISTER_STATUS');
575
+define('F_PLAYER_REGISTER_STATUS', 'F_PLAYER_REGISTER_STATUS');
576 576
 define('F_PLAYER_REGISTER_MESSAGE', 'F_PLAYER_REGISTER_MESSAGE');
577 577
 
578 578
 define('F_USER_ID', 'F_USER_ID');
@@ -616,69 +616,69 @@  discard block
 block discarded – undo
616 616
 
617 617
 
618 618
 // Option groups
619
-define('OPT_ALL',      0);
620
-define('OPT_MESSAGE',  1);
619
+define('OPT_ALL', 0);
620
+define('OPT_MESSAGE', 1);
621 621
 define('OPT_UNIVERSE', 2);
622 622
 define('OPT_INTERFACE', 3);
623 623
 
624 624
 // Message classes
625
-define('MSG_TYPE_OUTBOX'   ,  -1);
626
-define('MSG_TYPE_SPY'      ,   0);
627
-define('MSG_TYPE_PLAYER'   ,   1);
628
-define('MSG_TYPE_ALLIANCE' ,   2);
629
-define('MSG_TYPE_COMBAT'   ,   3);
630
-define('MSG_TYPE_RECYCLE'  ,   4);
631
-define('MSG_TYPE_TRANSPORT',   5);
632
-define('MSG_TYPE_ADMIN'    ,   6);
633
-define('MSG_TYPE_EXPLORE'  ,  15);
634
-define('MSG_TYPE_QUE'      ,  99);
635
-define('MSG_TYPE_NEW'      , 100);
625
+define('MSG_TYPE_OUTBOX', -1);
626
+define('MSG_TYPE_SPY', 0);
627
+define('MSG_TYPE_PLAYER', 1);
628
+define('MSG_TYPE_ALLIANCE', 2);
629
+define('MSG_TYPE_COMBAT', 3);
630
+define('MSG_TYPE_RECYCLE', 4);
631
+define('MSG_TYPE_TRANSPORT', 5);
632
+define('MSG_TYPE_ADMIN', 6);
633
+define('MSG_TYPE_EXPLORE', 15);
634
+define('MSG_TYPE_QUE', 99);
635
+define('MSG_TYPE_NEW', 100);
636 636
 
637 637
 // Attack verification statuses
638
-define('FLIGHT_NO_RESULT'           ,  -2);
639
-define('FLIGHT_ALLOWED_NEW'           ,  -1);
638
+define('FLIGHT_NO_RESULT', -2);
639
+define('FLIGHT_ALLOWED_NEW', -1);
640 640
 //define('FLIGHT_DO_NOTHING'           ,  0);
641
-define('FLIGHT_ALLOWED'           ,  0);
642
-define('FLIGHT_VECTOR_NO_TARGET'         ,  1);
643
-define('FLIGHT_PLAYER_OWN'               ,  2);
644
-define('FLIGHT_MISSION_IMPOSSIBLE'     ,  3);
645
-define('FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT'   ,  4);
646
-define('FLIGHT_MISSION_RECYCLE_NO_DEBRIS'         ,  5);
647
-define('FLIGHT_PLAYER_VACATION'          ,  6);
648
-define('FLIGHT_PLAYER_SAME_IP'           ,  7);
649
-define('FLIGHT_PLAYER_BUFFING'           ,  8);
650
-define('FLIGHT_PLAYER_ADMIN'             ,  9);
651
-define('FLIGHT_PLAYER_NOOB'              , 10);
652
-define('FLIGHT_PLAYER_VACATION_OWN'      , 11);
653
-define('FLIGHT_MISSION_MISSILE_NO_SILO'           , 12);
654
-define('FLIGHT_MISSION_MISSILE_NO_MISSILES'        , 13);
655
-define('FLIGHT_SHIPS_NO_SHIPS'          , 14);
656
-define('FLIGHT_FLEET_NO_SLOTS'          , 15);
657
-define('FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES'          , 16);
658
-define('FLIGHT_SHIPS_NO_RECYCLERS'      , 17);
659
-define('FLIGHT_MISSION_SPY_NO_SPIES'          , 18);
660
-define('FLIGHT_SHIPS_NO_COLONIZER'      , 19);
661
-define('FLIGHT_MISSION_MISSILE_TOO_FAR'   , 20);
662
-define('FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE'   , 21);
663
-define('FLIGHT_RESOURCES_FUEL_NOT_ENOUGH'           , 22);
664
-define('FLIGHT_RESOURCES_NOT_ENOUGH'      , 23);
665
-define('FLIGHT_MISSION_ACS_NOT_EXISTS'            , 24);
666
-define('FLIGHT_MISSION_ACS_MISSTARGET'    , 25);
667
-define('FLIGHT_FLEET_SPEED_WRONG'       , 26);
668
-define('FLIGHT_MISSION_ACS_TOO_LATE'      , 27);
669
-define('FLIGHT_MISSION_ATTACK_BASHING'           , 28);
670
-define('FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY' , 29);
671
-define('FLIGHT_MISSION_ACS_WRONG_TARGET'  , 30);
672
-define('FLIGHT_VECTOR_SAME_SOURCE'              , 31);
641
+define('FLIGHT_ALLOWED', 0);
642
+define('FLIGHT_VECTOR_NO_TARGET', 1);
643
+define('FLIGHT_PLAYER_OWN', 2);
644
+define('FLIGHT_MISSION_IMPOSSIBLE', 3);
645
+define('FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT', 4);
646
+define('FLIGHT_MISSION_RECYCLE_NO_DEBRIS', 5);
647
+define('FLIGHT_PLAYER_VACATION', 6);
648
+define('FLIGHT_PLAYER_SAME_IP', 7);
649
+define('FLIGHT_PLAYER_BUFFING', 8);
650
+define('FLIGHT_PLAYER_ADMIN', 9);
651
+define('FLIGHT_PLAYER_NOOB', 10);
652
+define('FLIGHT_PLAYER_VACATION_OWN', 11);
653
+define('FLIGHT_MISSION_MISSILE_NO_SILO', 12);
654
+define('FLIGHT_MISSION_MISSILE_NO_MISSILES', 13);
655
+define('FLIGHT_SHIPS_NO_SHIPS', 14);
656
+define('FLIGHT_FLEET_NO_SLOTS', 15);
657
+define('FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES', 16);
658
+define('FLIGHT_SHIPS_NO_RECYCLERS', 17);
659
+define('FLIGHT_MISSION_SPY_NO_SPIES', 18);
660
+define('FLIGHT_SHIPS_NO_COLONIZER', 19);
661
+define('FLIGHT_MISSION_MISSILE_TOO_FAR', 20);
662
+define('FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE', 21);
663
+define('FLIGHT_RESOURCES_FUEL_NOT_ENOUGH', 22);
664
+define('FLIGHT_RESOURCES_NOT_ENOUGH', 23);
665
+define('FLIGHT_MISSION_ACS_NOT_EXISTS', 24);
666
+define('FLIGHT_MISSION_ACS_MISSTARGET', 25);
667
+define('FLIGHT_FLEET_SPEED_WRONG', 26);
668
+define('FLIGHT_MISSION_ACS_TOO_LATE', 27);
669
+define('FLIGHT_MISSION_ATTACK_BASHING', 28);
670
+define('FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY', 29);
671
+define('FLIGHT_MISSION_ACS_WRONG_TARGET', 30);
672
+define('FLIGHT_VECTOR_SAME_SOURCE', 31);
673 673
 define('FLIGHT_RESOURCES_FORBIDDEN', 32);
674
-define('FLIGHT_MISSION_TRANSPORT_EMPTY_CARGO'   , 33);
675
-define('FLIGHT_SHIPS_NOT_ONLY_SPIES'       , 34);
676
-define('FLIGHT_FLEET_TOO_FAR'           , 35);
677
-define('FLIGHT_FLEET_OVERLOAD'        , 36);
678
-define('FLIGHT_MISSION_UNKNOWN'    , 37);
679
-define('FLIGHT_SHIPS_UNIT_WRONG'        , 38);
680
-define('FLIGHT_SHIPS_UNMOVABLE'        , 39);
681
-define('FLIGHT_SHIPS_NEGATIVE'  , 40);
674
+define('FLIGHT_MISSION_TRANSPORT_EMPTY_CARGO', 33);
675
+define('FLIGHT_SHIPS_NOT_ONLY_SPIES', 34);
676
+define('FLIGHT_FLEET_TOO_FAR', 35);
677
+define('FLIGHT_FLEET_OVERLOAD', 36);
678
+define('FLIGHT_MISSION_UNKNOWN', 37);
679
+define('FLIGHT_SHIPS_UNIT_WRONG', 38);
680
+define('FLIGHT_SHIPS_UNMOVABLE', 39);
681
+define('FLIGHT_SHIPS_NEGATIVE', 40);
682 682
 define('FLIGHT_RESOURCES_NEGATIVE', 41);
683 683
 define('FLIGHT_MISSION_MORATORIUM', 42);
684 684
 define('FLIGHT_PLAYER_CHILD_PROTECTION', 43);
@@ -723,12 +723,12 @@  discard block
 block discarded – undo
723 723
 
724 724
 
725 725
 // *** Races - Homeworlds
726
-define('RACE_NONE'    , 0);
727
-define('RACE_EARTH'   , 1);
728
-define('RACE_MOON'    , 2);
729
-define('RACE_MERCURY' , 3);
730
-define('RACE_VENUS'   , 4);
731
-define('RACE_MARS'    , 5);
726
+define('RACE_NONE', 0);
727
+define('RACE_EARTH', 1);
728
+define('RACE_MOON', 2);
729
+define('RACE_MERCURY', 3);
730
+define('RACE_VENUS', 4);
731
+define('RACE_MARS', 5);
732 732
 define('RACE_ASTEROID', 6);
733 733
 // define('MARKET_INFO'         , 7);
734 734
 
@@ -736,114 +736,114 @@  discard block
 block discarded – undo
736 736
 
737 737
 // *** Market variables
738 738
 // === Market blocks
739
-define('MARKET_ENTRY'        , 0);
740
-define('MARKET_RESOURCES'    , 1);
741
-define('MARKET_SCRAPPER'     , 2);
742
-define('MARKET_STOCKMAN'     , 3);
743
-define('MARKET_EXCHANGE'     , 4);
744
-define('MARKET_BANKER'       , 5);
745
-define('MARKET_PAWNSHOP'     , 6);
746
-define('MARKET_INFO'         , 7);
739
+define('MARKET_ENTRY', 0);
740
+define('MARKET_RESOURCES', 1);
741
+define('MARKET_SCRAPPER', 2);
742
+define('MARKET_STOCKMAN', 3);
743
+define('MARKET_EXCHANGE', 4);
744
+define('MARKET_BANKER', 5);
745
+define('MARKET_PAWNSHOP', 6);
746
+define('MARKET_INFO', 7);
747 747
 
748 748
 // === Market error statuses
749
-define('MARKET_NOTHING'              ,  0);
750
-define('MARKET_DEAL'                 ,  1);
751
-define('MARKET_DEAL_TRADE'           ,  2);
752
-define('MARKET_NO_DM'                ,  3);
753
-define('MARKET_NO_RESOURCES'         ,  4);
754
-define('MARKET_ZERO_DEAL'            ,  5);
755
-define('MARKET_NO_SHIPS'             ,  6);
756
-define('MARKET_NOT_A_SHIP'           ,  7);
757
-define('MARKET_NO_STOCK'             ,  8);
758
-define('MARKET_ZERO_RES_STOCK'       ,  9);
759
-define('MARKET_NEGATIVE_SHIPS'       , 10);
760
-
761
-define('MARKET_INFO_PLAYER'          , 12);
762
-define('MARKET_INFO_WRONG'           , 11);
749
+define('MARKET_NOTHING', 0);
750
+define('MARKET_DEAL', 1);
751
+define('MARKET_DEAL_TRADE', 2);
752
+define('MARKET_NO_DM', 3);
753
+define('MARKET_NO_RESOURCES', 4);
754
+define('MARKET_ZERO_DEAL', 5);
755
+define('MARKET_NO_SHIPS', 6);
756
+define('MARKET_NOT_A_SHIP', 7);
757
+define('MARKET_NO_STOCK', 8);
758
+define('MARKET_ZERO_RES_STOCK', 9);
759
+define('MARKET_NEGATIVE_SHIPS', 10);
760
+
761
+define('MARKET_INFO_PLAYER', 12);
762
+define('MARKET_INFO_WRONG', 11);
763 763
 define('MARKET_INFO_PLAYER_NOT_FOUND', 13);
764
-define('MARKET_INFO_PLAYER_WRONG'    , 14);
765
-define('MARKET_INFO_PLAYER_SAME'     , 15);
764
+define('MARKET_INFO_PLAYER_WRONG', 14);
765
+define('MARKET_INFO_PLAYER_SAME', 15);
766 766
 
767 767
 
768 768
 
769 769
 
770 770
 // *** Mercenary/talent bonus types
771
-define('BONUS_NONE'    ,            0);  // No bonus
772
-define('BONUS_PERCENT' ,            1);  // Percent on base value
773
-define('BONUS_ADD'     ,            2);  // Add
774
-define('BONUS_ABILITY' ,            3);  // Some ability
775
-define('BONUS_MULTIPLY',            4);  // Multiply by value
776
-define('BONUS_PERCENT_CUMULATIVE' , 5);  // Cumulative percent on base value
777
-define('BONUS_PERCENT_DEGRADED' ,   6);  // Bonus amount degraded with increase as pow(bonus, level) (?)
778
-define('BONUS_SPEED',               7);  // Speed bonus
771
+define('BONUS_NONE', 0); // No bonus
772
+define('BONUS_PERCENT', 1); // Percent on base value
773
+define('BONUS_ADD', 2); // Add
774
+define('BONUS_ABILITY', 3); // Some ability
775
+define('BONUS_MULTIPLY', 4); // Multiply by value
776
+define('BONUS_PERCENT_CUMULATIVE', 5); // Cumulative percent on base value
777
+define('BONUS_PERCENT_DEGRADED', 6); // Bonus amount degraded with increase as pow(bonus, level) (?)
778
+define('BONUS_SPEED', 7); // Speed bonus
779 779
 
780 780
 // *** Action constant (build should be replaced with ACTION)
781
-define('BUILD_CREATE' ,  1);
781
+define('BUILD_CREATE', 1);
782 782
 define('BUILD_DESTROY', -1);
783 783
 define('BUILD_AUTOCONVERT', 2);
784 784
 
785
-define('ACTION_SELL'       , -1);
786
-define('ACTION_NOTHING'    ,  0);
787
-define('ACTION_BUY'        ,  1);
788
-define('ACTION_USE'        ,  2);
789
-define('ACTION_DELETE'     ,  3);
785
+define('ACTION_SELL', -1);
786
+define('ACTION_NOTHING', 0);
787
+define('ACTION_BUY', 1);
788
+define('ACTION_USE', 2);
789
+define('ACTION_DELETE', 3);
790 790
 
791 791
 // *** Check unit availability codes
792
-define('BUILD_ALLOWED'         , 0); // HARDCODED! DO NOT CHANGE!
792
+define('BUILD_ALLOWED', 0); // HARDCODED! DO NOT CHANGE!
793 793
 define('BUILD_REQUIRE_NOT_MEET', 1);
794
-define('BUILD_AMOUNT_WRONG'    , 2);
795
-define('BUILD_QUE_WRONG'       , 3);
796
-define('BUILD_QUE_UNIT_WRONG'  , 4);
797
-define('BUILD_INDESTRUCTABLE'  , 5);
798
-define('BUILD_NO_RESOURCES'    , 6);
799
-define('BUILD_NO_UNITS'        , 7);
800
-define('BUILD_UNIT_BUSY'       , 8);
801
-define('BUILD_QUE_FULL'        , 9);
802
-define('BUILD_SILO_FULL'       ,10);
803
-define('BUILD_MAX_REACHED'     ,11);
804
-define('BUILD_SECTORS_NONE'    ,12);
794
+define('BUILD_AMOUNT_WRONG', 2);
795
+define('BUILD_QUE_WRONG', 3);
796
+define('BUILD_QUE_UNIT_WRONG', 4);
797
+define('BUILD_INDESTRUCTABLE', 5);
798
+define('BUILD_NO_RESOURCES', 6);
799
+define('BUILD_NO_UNITS', 7);
800
+define('BUILD_UNIT_BUSY', 8);
801
+define('BUILD_QUE_FULL', 9);
802
+define('BUILD_SILO_FULL', 10);
803
+define('BUILD_MAX_REACHED', 11);
804
+define('BUILD_SECTORS_NONE', 12);
805 805
 define('BUILD_AUTOCONVERT_AVAILABLE', 13);
806 806
 
807 807
 
808 808
 // *** Que types
809 809
 define('QUE_STRUCTURES', 1);
810
-define('QUE_HANGAR'    , 4);
811
-define('QUE_RESEARCH'  , 7);
812
-define('QUE_MERCENARY' , 600); // UNIT_MERCENARIES
810
+define('QUE_HANGAR', 4);
811
+define('QUE_RESEARCH', 7);
812
+define('QUE_MERCENARY', 600); // UNIT_MERCENARIES
813 813
 // *** Subque types
814
-define('SUBQUE_PLANET'  , 1);
815
-define('SUBQUE_MOON'    , 3);
816
-define('SUBQUE_FLEET'   , 4);
817
-define('SUBQUE_DEFENSE' , 6);
814
+define('SUBQUE_PLANET', 1);
815
+define('SUBQUE_MOON', 3);
816
+define('SUBQUE_FLEET', 4);
817
+define('SUBQUE_DEFENSE', 6);
818 818
 define('SUBQUE_RESEARCH', 7);
819 819
 
820 820
 // *** Que items
821
-define('QI_UNIT_ID'   , 0);
822
-define('QI_AMOUNT'    , 1);
823
-define('QI_TIME'      , 2);
824
-define('QI_MODE'      , 3);
825
-define('QI_QUE_ID'    , 4);
826
-define('QI_QUE_TYPE'  , 4);
827
-define('QI_PLANET_ID' , 5);
821
+define('QI_UNIT_ID', 0);
822
+define('QI_AMOUNT', 1);
823
+define('QI_TIME', 2);
824
+define('QI_MODE', 3);
825
+define('QI_QUE_ID', 4);
826
+define('QI_QUE_TYPE', 4);
827
+define('QI_PLANET_ID', 5);
828 828
 
829 829
 
830 830
 // *** Units
831 831
 
832 832
 // *** Sort options
833
-define('SORT_ASCENDING' , 0);
833
+define('SORT_ASCENDING', 0);
834 834
 define('SORT_DESCENDING', 1);
835 835
 
836
-define('SORT_ID'             , 0);
837
-define('SORT_LOCATION'       , 1);
838
-define('SORT_NAME'           , 2);
839
-define('SORT_SIZE'           , 3);
840
-define('SORT_EMAIL'          , 4);
841
-define('SORT_IP'             , 5);
836
+define('SORT_ID', 0);
837
+define('SORT_LOCATION', 1);
838
+define('SORT_NAME', 2);
839
+define('SORT_SIZE', 3);
840
+define('SORT_EMAIL', 4);
841
+define('SORT_IP', 5);
842 842
 define('SORT_TIME_REGISTERED', 6);
843 843
 define('SORT_TIME_LAST_VISIT', 7);
844
-define('SORT_TIME_BAN_UNTIL' , 8);
845
-define('SORT_REFERRAL_COUNT' , 9);
846
-define('SORT_REFERRAL_DM'    , 10);
844
+define('SORT_TIME_BAN_UNTIL', 8);
845
+define('SORT_REFERRAL_COUNT', 9);
846
+define('SORT_REFERRAL_DM', 10);
847 847
 
848 848
 
849 849
 define('HULL_SIZE_TINY', 1);
@@ -987,10 +987,10 @@  discard block
 block discarded – undo
987 987
 
988 988
 // === Artifacts
989 989
 define('UNIT_ARTIFACTS', 1000);
990
-define('ART_LHC', 1001);      // Additional moon chance
991
-define('ART_RCD_SMALL', 1002);   // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
992
-define('ART_RCD_MEDIUM', 1003);  // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
993
-define('ART_RCD_LARGE', 1004);   // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
990
+define('ART_LHC', 1001); // Additional moon chance
991
+define('ART_RCD_SMALL', 1002); // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
992
+define('ART_RCD_MEDIUM', 1003); // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
993
+define('ART_RCD_LARGE', 1004); // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
994 994
 define('ART_HEURISTIC_CHIP', 1005); // Speed up research
995 995
 define('ART_NANO_BUILDER', 1006); // Speed up building
996 996
 define('ART_NANO_CONSTRUCTOR', 1007); // RESERVED Speed up hangar constructions
@@ -1061,18 +1061,18 @@  discard block
 block discarded – undo
1061 1061
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE1', 2201); // Блиц-сервер, участник 0-го раунда, 1-е место
1062 1062
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE2', 2202); // Блиц-сервер, участник 0-го раунда, 2-е место
1063 1063
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE3', 2203); // Блиц-сервер, участник 0-го раунда, 3-е место
1064
-define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
1064
+define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
1065 1065
 
1066 1066
 define('UNIT_AWARD_MEMORY', 2300); // Памятные знаки за существование и участие - например "4 года в игре". "Был онлайн в новогоднюю ночь 2013". итд
1067
-define('UNIT_AWARD_MEMORY_IMMORTAL', 2301);  // Бессмертный
1068
-define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
1067
+define('UNIT_AWARD_MEMORY_IMMORTAL', 2301); // Бессмертный
1068
+define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
1069 1069
 define('UNIT_AWARD_MEMORY_BLITZ_R0', 2303); // Блиц-сервер, участник 0-го раунда
1070 1070
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SIMPLE', 2304); // День Рождения СН
1071 1071
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_BRONZE', 2305); // День Рождения СН
1072 1072
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SILVER', 2306); // День Рождения СН
1073 1073
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_GOLD', 2307); // День Рождения СН
1074 1074
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_PLATINUM', 2308); // День Рождения СН
1075
-define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
1075
+define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
1076 1076
 
1077 1077
 define('UNIT_AWARD_PENNANT', 2400); // Переходящий вымпел - индикация статуса на сервере: "Топ-1", "Топ", "Сабтоп", "Самый большой флот" итд
1078 1078
 define('UNIT_AWARD_BADGE', 2600); // Бейджики/значки за ачивки - например, "Построил 1000 кораблей"
@@ -1169,7 +1169,7 @@  discard block
 block discarded – undo
1169 1169
 
1170 1170
 define('UNIT_NEXT', 4000); // !!! Next unit start on 4000 !!!
1171 1171
 
1172
-define('GROUP_PART',         800000);
1172
+define('GROUP_PART', 800000);
1173 1173
 // Зарезервировано для запчастей: 800.001 - 899.999
1174 1174
 // define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
1175 1175
 // define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
@@ -1426,32 +1426,32 @@  discard block
 block discarded – undo
1426 1426
 
1427 1427
 
1428 1428
 // define('NICK_ID',               -1);
1429
-define('NICK_HTML',              0);
1430
-
1431
-define('NICK_FIRST',             1);
1432
-define('NICK_RACE',           1000);
1433
-define('NICK_GENDER',         2000);
1434
-define('NICK_AWARD',          3000);
1435
-define('NICK_VACATION',       3500);
1436
-define('NICK_BIRTHSDAY',      4000);
1437
-define('NICK_PREMIUM',        5000);
1438
-define('NICK_AUTH_LEVEL',     6000);
1439
-
1440
-define('NICK_HIGHLIGHT',      6300);
1441
-define('NICK_CLASS',          6450);
1442
-
1443
-define('NICK_NICK_CLASS',     6600);
1444
-define('NICK_NICK',           7000);
1429
+define('NICK_HTML', 0);
1430
+
1431
+define('NICK_FIRST', 1);
1432
+define('NICK_RACE', 1000);
1433
+define('NICK_GENDER', 2000);
1434
+define('NICK_AWARD', 3000);
1435
+define('NICK_VACATION', 3500);
1436
+define('NICK_BIRTHSDAY', 4000);
1437
+define('NICK_PREMIUM', 5000);
1438
+define('NICK_AUTH_LEVEL', 6000);
1439
+
1440
+define('NICK_HIGHLIGHT', 6300);
1441
+define('NICK_CLASS', 6450);
1442
+
1443
+define('NICK_NICK_CLASS', 6600);
1444
+define('NICK_NICK', 7000);
1445 1445
 define('NICK_NICK_CLASS_END', 7300);
1446 1446
 
1447
-define('NICK_ALLY_CLASS',     7600);
1448
-define('NICK_ALLY',           8000);
1447
+define('NICK_ALLY_CLASS', 7600);
1448
+define('NICK_ALLY', 8000);
1449 1449
 define('NICK_ALLY_CLASS_END', 8300);
1450 1450
 
1451
-define('NICK_CLASS_END',      8450);
1452
-define('NICK_HIGHLIGHT_END',  8600);
1451
+define('NICK_CLASS_END', 8450);
1452
+define('NICK_HIGHLIGHT_END', 8600);
1453 1453
 
1454
-define('NICK_LAST',           9999);
1454
+define('NICK_LAST', 9999);
1455 1455
 
1456 1456
 // Настройки игрока
1457 1457
 define('PLAYER_OPTION_MENU_SORT', 1);
@@ -1544,8 +1544,8 @@  discard block
 block discarded – undo
1544 1544
 define('LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10', 1);
1545 1545
 
1546 1546
 define('BLITZ_REGISTER_DISABLED', 0);
1547
-define('BLITZ_REGISTER_OPEN'    , 1);
1548
-define('BLITZ_REGISTER_CLOSED'  , 2);
1547
+define('BLITZ_REGISTER_OPEN', 1);
1548
+define('BLITZ_REGISTER_CLOSED', 2);
1549 1549
 define('BLITZ_REGISTER_SHOW_LOGIN', 3);
1550 1550
 define('BLITZ_REGISTER_DISCLOSURE_NAMES', 4);
1551 1551
 
Please login to merge, or discard this patch.