Completed
Push — work-fleets ( 1735a9...f6000a )
by SuperNova.WS
06:05
created
includes/update.php 1 patch
Spacing   +108 added lines, -108 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
    [!] DB code updates
22 22
 */
23 23
 
24
-if(!defined('INIT')) {
24
+if (!defined('INIT')) {
25 25
 //  include_once('init.php');
26 26
   die('Unauthorized access');
27 27
 }
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
 classSupernova::$config->debug = 0;
40 40
 
41 41
 
42
-if(classSupernova::$config->db_version == DB_VERSION) {
43
-} elseif(classSupernova::$config->db_version > DB_VERSION) {
42
+if (classSupernova::$config->db_version == DB_VERSION) {
43
+} elseif (classSupernova::$config->db_version > DB_VERSION) {
44 44
   classSupernova::$config->db_saveItem('var_db_update_end', SN_TIME_NOW);
45 45
   die(
46 46
   'Internal error! Auotupdater detects DB version greater then can be handled!<br />
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
   );
50 50
 }
51 51
 
52
-if(classSupernova::$config->db_version < 26) {
52
+if (classSupernova::$config->db_version < 26) {
53 53
   $sys_log_disabled = true;
54 54
 }
55 55
 
@@ -68,20 +68,20 @@  discard block
 block discarded – undo
68 68
 $update_tables = array();
69 69
 $update_indexes = array();
70 70
 $query = upd_do_query('SHOW TABLES;', true);
71
-while($row = db_fetch_row($query)) {
71
+while ($row = db_fetch_row($query)) {
72 72
   upd_load_table_info($row[0]);
73 73
 }
74 74
 upd_log_message('Table info loaded. Now looking DB for upgrades...');
75 75
 
76 76
 upd_do_query('SET FOREIGN_KEY_CHECKS=0;', true);
77 77
 
78
-if($new_version < 37) {
78
+if ($new_version < 37) {
79 79
   require_once('update_old.php');
80 80
 }
81 81
 
82 82
 ini_set('memory_limit', '1024M');
83 83
 
84
-switch($new_version) {
84
+switch ($new_version) {
85 85
   case 37:
86 86
     upd_log_version_update();
87 87
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 
97 97
     upd_check_key('payment_currency_exchange_mm_', 2500, !classSupernova::$config->payment_currency_exchange_mm_);
98 98
 
99
-    if(!$update_tables['log_metamatter']) {
99
+    if (!$update_tables['log_metamatter']) {
100 100
       upd_create_table('log_metamatter',
101 101
         "(
102 102
           `id` SERIAL,
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
       "ADD `payment_test` TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Is this a test payment?'",
122 122
     ), !$update_tables['payment']['payment_test']);
123 123
 
124
-    if($update_tables['payment']['payment_test']['Default'] == 1) {
124
+    if ($update_tables['payment']['payment_test']['Default'] == 1) {
125 125
       upd_alter_table('payment', array(
126 126
         "MODIFY COLUMN `payment_test` TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Is this a test payment?'",
127 127
       ));
@@ -137,15 +137,15 @@  discard block
 block discarded – undo
137 137
       "MODIFY COLUMN `metamatter` BIGINT(20) NOT NULL DEFAULT 0 COMMENT 'Metamatter amount'",
138 138
     ), $update_tables['users']['metamatter']['Type'] == 'int(20)');
139 139
 
140
-    $query = upd_do_query("SELECT * FROM {{que}} WHERE `que_type` = " . QUE_RESEARCH . " AND que_unit_id IN (" . TECH_EXPEDITION . "," . TECH_COLONIZATION . ") FOR UPDATE");
141
-    while($row = db_fetch($query)) {
140
+    $query = upd_do_query("SELECT * FROM {{que}} WHERE `que_type` = ".QUE_RESEARCH." AND que_unit_id IN (".TECH_EXPEDITION.",".TECH_COLONIZATION.") FOR UPDATE");
141
+    while ($row = db_fetch($query)) {
142 142
       $planet_id = ($row['que_planet_id_origin'] ? $row['que_planet_id_origin'] : $row['que_planet_id']);
143 143
       upd_do_query("SELECT id FROM {{planets}} WHERE id = {$planet_id} FOR UPDATE");
144 144
       $price = sys_unit_str2arr($row['que_unit_price']);
145
-      upd_do_query("UPDATE {{planets}} SET " .
146
-        "`metal` = `metal` + " . ($price[RES_METAL] ? $price[RES_METAL] : 0) . "," .
147
-        "`crystal` = `crystal` + " . ($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0) . "," .
148
-        "`deuterium` = `deuterium` + " . ($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0) .
145
+      upd_do_query("UPDATE {{planets}} SET ".
146
+        "`metal` = `metal` + ".($price[RES_METAL] ? $price[RES_METAL] : 0).",".
147
+        "`crystal` = `crystal` + ".($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0).",".
148
+        "`deuterium` = `deuterium` + ".($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0).
149 149
         " WHERE id = {$planet_id}"
150 150
       );
151 151
       upd_do_query("DELETE FROM {{que}} WHERE que_id = {$row['que_id']}");
@@ -154,10 +154,10 @@  discard block
 block discarded – undo
154 154
     $query = upd_do_query("SELECT unit_id, unit_snid, unit_level, id_planet FROM {{unit}} AS un
155 155
     LEFT JOIN {{users}} AS u ON u.id = un.unit_player_id
156 156
     LEFT JOIN {{planets}} AS p ON p.id = u.id_planet
157
-    WHERE unit_snid IN (" . TECH_EXPEDITION . "," . TECH_COLONIZATION . ")
157
+    WHERE unit_snid IN (" . TECH_EXPEDITION.",".TECH_COLONIZATION.")
158 158
     FOR UPDATE");
159
-    while($row = db_fetch($query)) {
160
-      if(!$row['id_planet']) {
159
+    while ($row = db_fetch($query)) {
160
+      if (!$row['id_planet']) {
161 161
         continue;
162 162
       }
163 163
 
@@ -165,14 +165,14 @@  discard block
 block discarded – undo
165 165
       $unit_level = $row['unit_level'];
166 166
       $price = get_unit_param($unit_id, P_COST);
167 167
       $factor = $price['factor'];
168
-      foreach($price as $resource_id => &$resource_amount) {
168
+      foreach ($price as $resource_id => &$resource_amount) {
169 169
         $resource_amount = $resource_amount * (pow($factor, $unit_level) - 1) / ($factor - 1);
170 170
       }
171 171
       // upd_do_query
172
-      upd_do_query($q = "UPDATE {{planets}} SET " .
173
-        "`metal` = `metal` + " . ($price[RES_METAL] ? $price[RES_METAL] : 0) . "," .
174
-        "`crystal` = `crystal` + " . ($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0) . "," .
175
-        "`deuterium` = `deuterium` + " . ($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0) .
172
+      upd_do_query($q = "UPDATE {{planets}} SET ".
173
+        "`metal` = `metal` + ".($price[RES_METAL] ? $price[RES_METAL] : 0).",".
174
+        "`crystal` = `crystal` + ".($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0).",".
175
+        "`deuterium` = `deuterium` + ".($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0).
176 176
         " WHERE id = {$row['id_planet']}"
177 177
       );
178 178
       upd_do_query("DELETE FROM {{unit}} WHERE unit_id = {$row['unit_id']}");
@@ -184,14 +184,14 @@  discard block
 block discarded – undo
184 184
     // Вернуть ресы за уже исследованную Экспедиционную технологию
185 185
     upd_check_key('player_max_colonies', -1, classSupernova::$config->player_max_colonies >= 0);
186 186
 
187
-    if(!isset($update_tables['users']['player_rpg_explore_xp'])) {
187
+    if (!isset($update_tables['users']['player_rpg_explore_xp'])) {
188 188
       upd_alter_table('users', array(
189 189
         "ADD COLUMN `player_rpg_explore_level` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
190 190
         "ADD COLUMN `player_rpg_explore_xp` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
191 191
       ), !isset($update_tables['users']['player_rpg_explore_xp']));
192 192
     }
193 193
 
194
-    if(!$update_tables['log_users_online']) {
194
+    if (!$update_tables['log_users_online']) {
195 195
       upd_create_table('log_users_online', "(
196 196
         `online_timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Measure time',
197 197
         `online_count` SMALLINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Users online',
@@ -206,11 +206,11 @@  discard block
 block discarded – undo
206 206
       "ADD `user_time_measured` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'When was time diff measured last time' AFTER `onlinetime`",
207 207
     ), !$update_tables['users']['user_time_measured']);
208 208
 
209
-    if($update_tables['rw']) {
209
+    if ($update_tables['rw']) {
210 210
       upd_do_query("DROP TABLE IF EXISTS {{rw}};");
211 211
     }
212 212
 
213
-    if(!$update_tables['player_award']) {
213
+    if (!$update_tables['player_award']) {
214 214
       upd_create_table('player_award', "(
215 215
         `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
216 216
         `award_type_id` int(11) DEFAULT NULL COMMENT 'Award type i.e. order, medal, pennant, rank etc',
@@ -252,14 +252,14 @@  discard block
 block discarded – undo
252 252
     upd_log_version_update();
253 253
 
254 254
 
255
-    if(!isset($update_tables['planets']['que_processed'])) {
255
+    if (!isset($update_tables['planets']['que_processed'])) {
256 256
       upd_alter_table('planets', array(
257 257
         "ADD COLUMN `que_processed` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `last_update`",
258 258
       ), true);
259 259
       upd_do_query("UPDATE {{planets}} SET que_processed = last_update;");
260 260
     }
261 261
 
262
-    if(!isset($update_tables['users']['que_processed'])) {
262
+    if (!isset($update_tables['users']['que_processed'])) {
263 263
       upd_alter_table('users', array(
264 264
         "ADD COLUMN `que_processed` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `onlinetime`",
265 265
       ), true);
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
     }
268 268
 
269 269
 
270
-    if(isset($update_tables['planets']['que'])) {
270
+    if (isset($update_tables['planets']['que'])) {
271 271
       $sn_data_aux = array(
272 272
         SHIP_SMALL_FIGHTER_WRATH    => array(
273 273
           'name' => 'ship_fighter_wrath',
@@ -352,20 +352,20 @@  discard block
 block discarded – undo
352 352
       $unit_data = array();
353 353
       $planets = array();
354 354
 
355
-      foreach($planet_unit_list as $unit_id) {
356
-        if(!($unit_name = get_unit_param($unit_id, P_NAME))) {
355
+      foreach ($planet_unit_list as $unit_id) {
356
+        if (!($unit_name = get_unit_param($unit_id, P_NAME))) {
357 357
           $unit_name = $sn_data_aux[$unit_id][P_NAME];
358 358
         }
359
-        if(isset($update_tables['planets'][$unit_name])) {
359
+        if (isset($update_tables['planets'][$unit_name])) {
360 360
           $drop[] = "DROP COLUMN `{$unit_name}`";
361 361
 
362
-          if(isset($aux_group[$unit_id])) {
362
+          if (isset($aux_group[$unit_id])) {
363 363
             $units_info[$unit_id] = $sn_data_aux[$unit_id];
364 364
             $units_info[$unit_id]['que'] = QUE_HANGAR;
365 365
           } else {
366 366
             $units_info[$unit_id] = get_unit_param($unit_id);
367
-            foreach($ques_info as $que_id => $que_data1) {
368
-              if(in_array($unit_id, $que_data1['unit_list'])) {
367
+            foreach ($ques_info as $que_id => $que_data1) {
368
+              if (in_array($unit_id, $que_data1['unit_list'])) {
369 369
                 $units_info[$unit_id]['que'] = $que_id;
370 370
                 break;
371 371
               }
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
       }
376 376
 
377 377
       $query = upd_do_query("SELECT * FROM {{planets}} FOR UPDATE");
378
-      while($row = db_fetch($query)) {
378
+      while ($row = db_fetch($query)) {
379 379
         $user_id = $row['id_owner'];
380 380
         $planet_id = $row['id'];
381 381
 
@@ -383,25 +383,25 @@  discard block
 block discarded – undo
383 383
 
384 384
         // Конвертируем юниты
385 385
         $units_levels = array();
386
-        foreach($planet_unit_list as $unit_id) {
386
+        foreach ($planet_unit_list as $unit_id) {
387 387
           $unit_name = &$units_info[$unit_id][P_NAME];
388
-          if(!isset($row[$unit_name]) || !$row[$unit_name]) {
388
+          if (!isset($row[$unit_name]) || !$row[$unit_name]) {
389 389
             continue;
390 390
           }
391 391
           $units_levels[$unit_id] = $row[$unit_name];
392
-          $unit_data[] = "({$user_id}," . LOC_PLANET . ",{$planet_id},{$units_info[$unit_id][P_UNIT_TYPE]},{$unit_id},{$units_levels[$unit_id]})";
393
-          if(count($unit_data) > 30) {
392
+          $unit_data[] = "({$user_id},".LOC_PLANET.",{$planet_id},{$units_info[$unit_id][P_UNIT_TYPE]},{$unit_id},{$units_levels[$unit_id]})";
393
+          if (count($unit_data) > 30) {
394 394
             $unit_data_max = strlen(implode(',', $unit_data)) > $unit_data_max ? strlen(implode(',', $unit_data)) : $unit_data_max;
395
-            upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES ' . implode(',', $unit_data) . ';');
395
+            upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES '.implode(',', $unit_data).';');
396 396
             $unit_data = array();
397 397
           }
398 398
         }
399 399
 
400 400
         // Конвертируем очередь построек
401
-        if($row['que']) {
401
+        if ($row['que']) {
402 402
           $que = explode(';', $row['que']);
403
-          foreach($que as $que_item) {
404
-            if(!$que_item) {
403
+          foreach ($que as $que_item) {
404
+            if (!$que_item) {
405 405
               continue;
406 406
             }
407 407
 
@@ -416,8 +416,8 @@  discard block
 block discarded – undo
416 416
             $unit_factor = $unit_cost[P_FACTOR] ? $unit_cost[P_FACTOR] : 1;
417 417
             $price_increase = pow($unit_factor, $unit_level);
418 418
             // $unit_time = 0;
419
-            foreach($unit_cost as $resource_id => &$resource_amount) {
420
-              if(!in_array($resource_id, $group_resource_loot)) {
419
+            foreach ($unit_cost as $resource_id => &$resource_amount) {
420
+              if (!in_array($resource_id, $group_resource_loot)) {
421 421
                 unset($unit_cost[$resource_id]);
422 422
                 continue;
423 423
               }
@@ -431,39 +431,39 @@  discard block
 block discarded – undo
431 431
         }
432 432
 
433 433
         // Конвертируем очередь верфи
434
-        if($row['b_hangar_id']) {
434
+        if ($row['b_hangar_id']) {
435 435
           $return_resources = array(RES_METAL => 0, RES_CRYSTAL => 0, RES_DEUTERIUM => 0,);
436 436
           $hangar_units = sys_unit_str2arr($row['b_hangar_id']);
437
-          foreach($hangar_units as $unit_id => $unit_count) {
438
-            if($unit_count <= 0) {
437
+          foreach ($hangar_units as $unit_id => $unit_count) {
438
+            if ($unit_count <= 0) {
439 439
               continue;
440 440
             }
441
-            foreach($units_info[$unit_id][P_COST] as $resource_id => $resource_amount) {
442
-              if(!in_array($resource_id, $group_resource_loot)) {
441
+            foreach ($units_info[$unit_id][P_COST] as $resource_id => $resource_amount) {
442
+              if (!in_array($resource_id, $group_resource_loot)) {
443 443
                 continue;
444 444
               }
445 445
               $return_resources[$resource_id] += $unit_count * $resource_amount;
446 446
             }
447 447
           }
448
-          if(array_sum($return_resources) > 0) {
448
+          if (array_sum($return_resources) > 0) {
449 449
             upd_do_query("UPDATE {{planets}} SET `metal` = `metal` + {$return_resources[RES_METAL]}, `crystal` = `crystal` + {$return_resources[RES_CRYSTAL]}, `deuterium` = `deuterium` + {$return_resources[RES_DEUTERIUM]} WHERE `id` = {$planet_id} LIMIT 1");
450 450
           }
451 451
         }
452 452
 
453 453
 
454
-        if(count($que_data) > 10) {
454
+        if (count($que_data) > 10) {
455 455
           $que_data_max = strlen(implode(',', $que_data)) > $que_data_max ? strlen(implode(',', $que_data)) : $que_data_max;
456
-          upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES ' . implode(',', $que_data) . ';');
456
+          upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES '.implode(',', $que_data).';');
457 457
           $que_data = array();
458 458
         }
459 459
       }
460 460
 
461
-      if(!empty($unit_data)) {
462
-        upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES ' . implode(',', $unit_data) . ';');
461
+      if (!empty($unit_data)) {
462
+        upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES '.implode(',', $unit_data).';');
463 463
       }
464 464
 
465
-      if(!empty($que_data)) {
466
-        upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES ' . implode(',', $que_data) . ';');
465
+      if (!empty($que_data)) {
466
+        upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES '.implode(',', $que_data).';');
467 467
       }
468 468
 
469 469
       upd_alter_table('planets', $drop, true);
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
       JOIN `{{users}}` AS u ON a.`id` = u.`user_as_ally` AND `user_as_ally` IS NOT NULL AND `username` = ''
474 474
       SET u.`username` = CONCAT('[', a.`ally_tag`, ']');");
475 475
 
476
-    if($update_indexes['statpoints']['I_stats_id_ally'] != 'id_ally,stat_type,stat_code,') {
476
+    if ($update_indexes['statpoints']['I_stats_id_ally'] != 'id_ally,stat_type,stat_code,') {
477 477
       upd_do_query("SET FOREIGN_KEY_CHECKS=0;");
478 478
       upd_alter_table('statpoints', "DROP FOREIGN KEY `FK_stats_id_ally`", $update_foreigns['statpoints']['FK_stats_id_ally']);
479 479
       upd_alter_table('statpoints', "DROP KEY `I_stats_id_ally`", $update_indexes['statpoints']['I_stats_id_ally']);
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
       "ADD CONSTRAINT `FK_users_browser_id` FOREIGN KEY (`user_last_browser_id`) REFERENCES `{{security_browser}}` (`browser_id`) ON DELETE SET NULL ON UPDATE CASCADE",
570 570
     ), !isset($update_tables['users']['user_last_proxy']));
571 571
 
572
-    if(!isset($update_tables['notes']['planet_type'])) {
572
+    if (!isset($update_tables['notes']['planet_type'])) {
573 573
       upd_alter_table('notes', array(
574 574
         "ADD COLUMN `galaxy` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 0 AFTER `title`",
575 575
         "ADD COLUMN `system` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 0 AFTER `galaxy`",
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
     upd_alter_table('users', "ADD COLUMN `user_bot` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0", !isset($update_tables['users']['user_bot']));
588 588
     upd_alter_table('unit', "ADD KEY `I_unit_type_snid` (unit_type, unit_snid) USING BTREE", !$update_indexes['unit']['I_unit_type_snid']);
589 589
 
590
-    if($update_tables['users']['settings_tooltiptime']['Type'] != 'smallint(5) unsigned') {
590
+    if ($update_tables['users']['settings_tooltiptime']['Type'] != 'smallint(5) unsigned') {
591 591
       upd_alter_table('users', array(
592 592
         "MODIFY COLUMN `settings_tooltiptime` smallint(5) unsigned NOT NULL DEFAULT '500'",
593 593
       ), $update_tables['users']['settings_tooltiptime']['Type'] != 'smallint');
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
595 595
       upd_do_query("UPDATE `{{users}}` SET settings_tooltiptime = 500;");
596 596
     }
597 597
 
598
-    if(!isset($update_tables['log_users_online']['online_aggregated'])) {
598
+    if (!isset($update_tables['log_users_online']['online_aggregated'])) {
599 599
       upd_alter_table('log_users_online', "ADD COLUMN `online_aggregated` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0", !isset($update_tables['log_users_online']['online_aggregated']));
600 600
       upd_alter_table('log_users_online', array(
601 601
         "DROP PRIMARY KEY",
@@ -603,13 +603,13 @@  discard block
 block discarded – undo
603 603
       ), $update_indexes['log_users_online']['PRIMARY'] != 'online_timestamp,online_aggregated,');
604 604
     }
605 605
 
606
-    if(!isset($update_tables['users']['gender'])) {
607
-      upd_alter_table('users', "ADD COLUMN `gender` TINYINT(1) UNSIGNED NOT NULL DEFAULT " . GENDER_UNKNOWN, !isset($update_tables['users']['gender']));
608
-      upd_do_query("UPDATE {{users}} SET `gender` = IF(UPPER(`sex`) = 'F', " . GENDER_FEMALE . ", IF(UPPER(`sex`) = 'M', " . GENDER_MALE . ", " . GENDER_UNKNOWN . "));");
606
+    if (!isset($update_tables['users']['gender'])) {
607
+      upd_alter_table('users', "ADD COLUMN `gender` TINYINT(1) UNSIGNED NOT NULL DEFAULT ".GENDER_UNKNOWN, !isset($update_tables['users']['gender']));
608
+      upd_do_query("UPDATE {{users}} SET `gender` = IF(UPPER(`sex`) = 'F', ".GENDER_FEMALE.", IF(UPPER(`sex`) = 'M', ".GENDER_MALE.", ".GENDER_UNKNOWN."));");
609 609
     }
610 610
     upd_alter_table('users', "DROP COLUMN `sex`", isset($update_tables['users']['sex']));
611 611
 
612
-    if(!$update_tables['users']['dark_matter_total']) {
612
+    if (!$update_tables['users']['dark_matter_total']) {
613 613
       upd_alter_table('users', "ADD `dark_matter_total` BIGINT(20) NOT NULL DEFAULT 0 COMMENT 'Total Dark Matter amount ever gained' AFTER `dark_matter`", !$update_tables['users']['dark_matter_total']);
614 614
       upd_do_query(
615 615
         "UPDATE `{{users}}` AS u
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
     }
623 623
 
624 624
     upd_check_key('player_metamatter_immortal', 100000, !isset(classSupernova::$config->player_metamatter_immortal));
625
-    if(!$update_tables['users']['metamatter_total']) {
625
+    if (!$update_tables['users']['metamatter_total']) {
626 626
       upd_alter_table('users', "ADD `metamatter_total` BIGINT(20) NOT NULL DEFAULT 0 COMMENT 'Total Metamatter amount ever bought'", !$update_tables['users']['metamatter_total']);
627 627
 
628 628
       upd_do_query(
@@ -634,11 +634,11 @@  discard block
 block discarded – undo
634 634
             (SELECT IF(sum(amount) IS NULL, 0, sum(amount)) FROM {{log_metamatter}} AS mm WHERE mm.user_id = u.id AND mm.amount > 0)
635 635
           );");
636 636
     }
637
-    if(!isset($update_tables['users']['immortal'])) {
637
+    if (!isset($update_tables['users']['immortal'])) {
638 638
       upd_alter_table('users', "ADD COLUMN `immortal` TIMESTAMP NULL", !isset($update_tables['users']['immortal']));
639 639
       upd_do_query("UPDATE {{users}} SET `immortal` = NOW() WHERE `metamatter_total` > 0;");
640 640
     }
641
-    if(isset($update_tables['player_award'])) {
641
+    if (isset($update_tables['player_award'])) {
642 642
       upd_do_query(
643 643
         "UPDATE {{users}} AS u JOIN {{player_award}} AS pa ON u.id = pa.player_id
644 644
           SET metamatter_total = 1, immortal = NOW()
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
       CONSTRAINT `FK_user_id` FOREIGN KEY (`user_id`) REFERENCES `{{users}}` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
666 666
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;");
667 667
 
668
-    if(empty($update_tables['blitz_statpoints'])) {
668
+    if (empty($update_tables['blitz_statpoints'])) {
669 669
       upd_create_table('blitz_statpoints', " (
670 670
         `stat_date` int(11) NOT NULL DEFAULT '0',
671 671
         `id_owner` bigint(20) unsigned DEFAULT NULL,
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
       CONSTRAINT `FK_survey_votes_survey_parent_id` FOREIGN KEY (`survey_parent_id`) REFERENCES `{{survey}}` (`survey_id`) ON DELETE CASCADE ON UPDATE CASCADE
734 734
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;");
735 735
 
736
-    if(empty($update_tables['security_url'])) {
736
+    if (empty($update_tables['security_url'])) {
737 737
       upd_create_table('security_url', " (
738 738
         `url_id` int unsigned NOT NULL AUTO_INCREMENT,
739 739
         `url_string` VARCHAR(250) NOT NULL DEFAULT '',
@@ -746,17 +746,17 @@  discard block
 block discarded – undo
746 746
 
747 747
         $strings = array();
748 748
         $query = doquery($query);
749
-        while($row = db_fetch($query)) {
750
-          $strings[] = '("' . db_escape($row['url']) . '")';
751
-          if(count($strings) > 100) {
752
-            doquery($query_string . implode(',', $strings));
749
+        while ($row = db_fetch($query)) {
750
+          $strings[] = '("'.db_escape($row['url']).'")';
751
+          if (count($strings) > 100) {
752
+            doquery($query_string.implode(',', $strings));
753 753
             $strings = array();
754 754
           }
755 755
         }
756
-        !empty($strings) ? doquery($query_string . implode(',', $strings)) : false;
756
+        !empty($strings) ? doquery($query_string.implode(',', $strings)) : false;
757 757
       }
758 758
 
759
-      if(isset($update_tables['counter']['page'])) // TODO REMOVE
759
+      if (isset($update_tables['counter']['page'])) // TODO REMOVE
760 760
       {
761 761
         update_security_url("SELECT DISTINCT `page` AS url FROM {{counter}}");
762 762
         update_security_url("SELECT DISTINCT `url` AS url FROM {{counter}}");
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
781 781
       "ADD CONSTRAINT `FK_counter_page_url_id` FOREIGN KEY (`page_url_id`) REFERENCES `{{security_url}}` (`url_id`) ON DELETE CASCADE ON UPDATE CASCADE",
782 782
       "ADD CONSTRAINT `FK_counter_plain_url_id` FOREIGN KEY (`plain_url_id`) REFERENCES `{{security_url}}` (`url_id`) ON DELETE CASCADE ON UPDATE CASCADE",
783 783
     ), !isset($update_tables['counter']['device_id']));
784
-    if(isset($update_tables['counter']['ip'])) {
784
+    if (isset($update_tables['counter']['ip'])) {
785 785
       // upd_do_query('UPDATE `{{counter}}` SET `user_ip` = INET_ATON(`ip`), `user_proxy` = `proxy`, `visit_time` = FROM_UNIXTIME(`time`)');
786 786
       upd_do_query('UPDATE `{{counter}}` SET `user_ip` = INET_ATON(`ip`), `visit_time` = FROM_UNIXTIME(`time`)');
787 787
       upd_do_query('UPDATE `{{counter}}` AS c JOIN {{security_url}} AS u ON u.url_string = c.page SET c.page_url_id = u.url_id');
@@ -832,7 +832,7 @@  discard block
 block discarded – undo
832 832
 
833 833
     upd_check_key('stats_history_days', 14, !classSupernova::$config->stats_history_days);
834 834
 
835
-    if(classSupernova::$config->payment_currency_default != 'USD') {
835
+    if (classSupernova::$config->payment_currency_default != 'USD') {
836 836
       upd_check_key('payment_currency_default', 'USD', true);
837 837
       upd_check_key('payment_currency_exchange_dm_', 20000, true);
838 838
       upd_check_key('payment_currency_exchange_mm_', 20000, true);
@@ -889,7 +889,7 @@  discard block
 block discarded – undo
889 889
 
890 890
     $virtual_exploded = explode('/', SN_ROOT_VIRTUAL_PARENT);
891 891
     // TODO - переделать всё на db_loadItem... НАВЕРНОЕ
892
-    upd_check_key('server_email', 'root@' . $virtual_exploded[2], !classSupernova::$config->db_loadItem('server_email'));
892
+    upd_check_key('server_email', 'root@'.$virtual_exploded[2], !classSupernova::$config->db_loadItem('server_email'));
893 893
 
894 894
     upd_alter_table('survey_votes', array(
895 895
       "DROP FOREIGN KEY `FK_survey_votes_user`",
@@ -915,12 +915,12 @@  discard block
 block discarded – undo
915 915
     function propagade_player_options($old_option_name, $new_option_id) {
916 916
       global $update_tables;
917 917
 
918
-      if(!empty($update_tables['users'][$old_option_name])) {
918
+      if (!empty($update_tables['users'][$old_option_name])) {
919 919
         upd_do_query(
920 920
           "REPLACE INTO {{player_options}} (`player_id`, `option_id`, `value`)
921 921
           SELECT `id`, {$new_option_id}, `{$old_option_name}`
922 922
           FROM {{users}}
923
-          WHERE `user_as_ally` is null and `user_bot` = " . USER_BOT_PLAYER);
923
+          WHERE `user_as_ally` is null and `user_bot` = ".USER_BOT_PLAYER);
924 924
         // TODO - UNCOMMENT !!!
925 925
         upd_alter_table('users', array("DROP COLUMN `{$old_option_name}`",));
926 926
       }
@@ -949,7 +949,7 @@  discard block
 block discarded – undo
949 949
 
950 950
 
951 951
     // 2015-08-03 15:05:26 40a6.0
952
-    if(empty($update_tables['planets']['position_original'])) {
952
+    if (empty($update_tables['planets']['position_original'])) {
953 953
       upd_alter_table('planets', array(
954 954
         "ADD COLUMN `position_original` smallint NOT NULL DEFAULT 0",
955 955
         "ADD COLUMN `field_max_original` smallint NOT NULL DEFAULT 0",
@@ -964,7 +964,7 @@  discard block
 block discarded – undo
964 964
       upd_do_query('UPDATE {{planets}} SET `position_original` = `planet`, `field_max_original` = `field_max`, `temp_min_original` = `temp_min`, `temp_max_original` = `temp_max`;');
965 965
 
966 966
       // Миграция тяжмета в оливин
967
-      upd_do_query('UPDATE {{planets}} SET `density_index` = ' . PLANET_DENSITY_METAL_PERIDOT . ' WHERE `density_index` = 7'); // deprecated define('PLANET_DENSITY_METAL_HEAVY', 7);
967
+      upd_do_query('UPDATE {{planets}} SET `density_index` = '.PLANET_DENSITY_METAL_PERIDOT.' WHERE `density_index` = 7'); // deprecated define('PLANET_DENSITY_METAL_HEAVY', 7);
968 968
 
969 969
       // Добавляем планету-странника
970 970
       upd_check_key('game_maxPlanet', 16, Vector::$knownPlanets == 15);
@@ -977,12 +977,12 @@  discard block
 block discarded – undo
977 977
 
978 978
     // 2015-08-27 19:14:05 40a10.0
979 979
     // Старая версия таблицы
980
-    if(!empty($update_tables['account']['account_is_global']) || empty($update_tables['account']['account_immortal'])) {
980
+    if (!empty($update_tables['account']['account_is_global']) || empty($update_tables['account']['account_immortal'])) {
981 981
       upd_drop_table('account');
982 982
       upd_drop_table('account_translate');
983 983
     }
984 984
 
985
-    if(empty($update_tables['account'])) {
985
+    if (empty($update_tables['account'])) {
986 986
       upd_create_table('account', " (
987 987
           `account_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
988 988
           `account_name` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT '',
@@ -1001,7 +1001,7 @@  discard block
 block discarded – undo
1001 1001
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;");
1002 1002
 
1003 1003
       upd_create_table('account_translate', " (
1004
-          `provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL . " COMMENT 'Account provider',
1004
+          `provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL." COMMENT 'Account provider',
1005 1005
           `provider_account_id` bigint(20) unsigned NOT NULL COMMENT 'Account ID on provider',
1006 1006
           `user_id` bigint(20) unsigned NOT NULL COMMENT 'User ID',
1007 1007
           `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -1016,12 +1016,12 @@  discard block
 block discarded – undo
1016 1016
             (`account_id`, `account_name`, `account_password`, `account_salt`, `account_email`, `account_register_time`, `account_language`, `account_metamatter`, `account_metamatter_total`, `account_immortal`)
1017 1017
           SELECT
1018 1018
             `id`, `username`, `password`, `salt`, `email_2`, FROM_UNIXTIME(register_time), `lang`, `metamatter`, `metamatter_total`, `immortal`
1019
-          FROM {{users}} WHERE `user_as_ally` IS NULL AND `user_bot` = " . USER_BOT_PLAYER . ";"
1019
+          FROM {{users}} WHERE `user_as_ally` IS NULL AND `user_bot` = " . USER_BOT_PLAYER.";"
1020 1020
       );
1021 1021
 
1022 1022
       upd_do_query(
1023 1023
         "REPLACE INTO {{account_translate}} (`provider_id`, `provider_account_id`, `user_id`, `timestamp`)
1024
-          SELECT " . ACCOUNT_PROVIDER_LOCAL . ", a.account_id, u.id, a.`account_register_time`
1024
+          SELECT " . ACCOUNT_PROVIDER_LOCAL.", a.account_id, u.id, a.`account_register_time`
1025 1025
             FROM {{users}} AS u
1026 1026
             JOIN {{account}} AS a ON
1027 1027
               a.account_name = u.username
@@ -1036,7 +1036,7 @@  discard block
 block discarded – undo
1036 1036
 
1037 1037
 
1038 1038
     // 2015-09-05 17:07:15 40a10.17
1039
-    upd_alter_table('ube_report', "ADD COLUMN `ube_report_capture_result` tinyint unsigned NOT NULL DEFAULT " . UBE_CAPTURE_DISABLED, empty($update_tables['ube_report']['ube_report_capture_result']));
1039
+    upd_alter_table('ube_report', "ADD COLUMN `ube_report_capture_result` tinyint unsigned NOT NULL DEFAULT ".UBE_CAPTURE_DISABLED, empty($update_tables['ube_report']['ube_report_capture_result']));
1040 1040
 
1041 1041
 
1042 1042
     // 2015-09-07 21:11:48 40a10.19
@@ -1044,18 +1044,18 @@  discard block
 block discarded – undo
1044 1044
 
1045 1045
 
1046 1046
     // 2015-09-24 11:39:37 40a10.25
1047
-    if(empty($update_tables['log_metamatter']['provider_id'])) {
1047
+    if (empty($update_tables['log_metamatter']['provider_id'])) {
1048 1048
       upd_alter_table('log_metamatter', array(
1049
-        "ADD COLUMN `provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL . " COMMENT 'Account provider'",
1049
+        "ADD COLUMN `provider_id` tinyint unsigned NOT NULL DEFAULT ".ACCOUNT_PROVIDER_LOCAL." COMMENT 'Account provider'",
1050 1050
         "ADD COLUMN `account_id` bigint(20) unsigned NOT NULL DEFAULT 0",
1051 1051
         "ADD COLUMN `account_name` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT ''",
1052
-        "ADD COLUMN `server_name` varchar(128) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT '" . SN_ROOT_VIRTUAL . "'",
1052
+        "ADD COLUMN `server_name` varchar(128) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT '".SN_ROOT_VIRTUAL."'",
1053 1053
       ), empty($update_tables['log_metamatter']['provider_id']));
1054 1054
 
1055 1055
       upd_do_query("UPDATE {{log_metamatter}} SET `account_id` = `user_id`, `account_name` = `username`");
1056 1056
 
1057 1057
       upd_alter_table('payment', array(
1058
-        "ADD COLUMN `payment_provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL . " COMMENT 'Payment account provider'",
1058
+        "ADD COLUMN `payment_provider_id` tinyint unsigned NOT NULL DEFAULT ".ACCOUNT_PROVIDER_LOCAL." COMMENT 'Payment account provider'",
1059 1059
         "ADD COLUMN `payment_account_id` bigint(20) unsigned NOT NULL",
1060 1060
         "ADD COLUMN `payment_account_name` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT ''",
1061 1061
       ), !$update_tables['payment']['payment_account_id']);
@@ -1096,7 +1096,7 @@  discard block
 block discarded – undo
1096 1096
     upd_check_key('event_halloween_2015_code', '', !isset(classSupernova::$config->event_halloween_2015_code));
1097 1097
     upd_check_key('event_halloween_2015_timestamp', SN_TIME_SQL, !isset(classSupernova::$config->event_halloween_2015_timestamp));
1098 1098
     upd_check_key('event_halloween_2015_units_used', serialize(array()), !isset(classSupernova::$config->event_halloween_2015_units_used));
1099
-    if(empty($update_tables['log_halloween_2015'])) {
1099
+    if (empty($update_tables['log_halloween_2015'])) {
1100 1100
       upd_create_table('log_halloween_2015', " (
1101 1101
       `log_hw2015_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
1102 1102
       `player_id` bigint(20) unsigned NOT NULL COMMENT 'User ID',
@@ -1111,7 +1111,7 @@  discard block
 block discarded – undo
1111 1111
 
1112 1112
 
1113 1113
     // 2015-11-28 06:30:27 40a19.21
1114
-    if(!isset($update_tables['ube_report']['ube_report_debris_total_in_metal'])) {
1114
+    if (!isset($update_tables['ube_report']['ube_report_debris_total_in_metal'])) {
1115 1115
       upd_alter_table('ube_report', array(
1116 1116
         "ADD COLUMN `ube_report_debris_total_in_metal` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Total debris in metal'",
1117 1117
         "ADD KEY `I_ube_report_time_debris_id` (`ube_report_time_process` DESC, `ube_report_debris_total_in_metal` DESC, `ube_report_id` ASC)", // For Best Battles module
@@ -1126,7 +1126,7 @@  discard block
 block discarded – undo
1126 1126
 
1127 1127
 
1128 1128
     // 2015-12-06 15:10:58 40b1.0
1129
-    if(!empty($update_indexes['planets']['I_metal_mine'])) {
1129
+    if (!empty($update_indexes['planets']['I_metal_mine'])) {
1130 1130
       upd_alter_table('planets', "DROP KEY `I_metal`", $update_indexes['planets']['I_metal']);
1131 1131
       upd_alter_table('planets', "DROP KEY `I_ship_sattelite_sloth`", $update_indexes['planets']['I_ship_sattelite_sloth']);
1132 1132
       upd_alter_table('planets', "DROP KEY `I_ship_bomber_envy`", $update_indexes['planets']['I_ship_bomber_envy']);
@@ -1189,7 +1189,7 @@  discard block
 block discarded – undo
1189 1189
   case 40:
1190 1190
     upd_log_version_update();
1191 1191
 
1192
-    if(empty($update_tables['festival'])) {
1192
+    if (empty($update_tables['festival'])) {
1193 1193
       upd_create_table('festival', " (
1194 1194
           `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
1195 1195
           `start` datetime NOT NULL COMMENT 'Festival start datetime',
@@ -1230,7 +1230,7 @@  discard block
 block discarded – undo
1230 1230
       );
1231 1231
     }
1232 1232
 
1233
-    if(empty($update_tables['festival_unit'])) {
1233
+    if (empty($update_tables['festival_unit'])) {
1234 1234
       upd_create_table('festival_unit', " (
1235 1235
           `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
1236 1236
           `highspot_id` int(10) unsigned DEFAULT NULL,
@@ -1247,7 +1247,7 @@  discard block
 block discarded – undo
1247 1247
     }
1248 1248
 
1249 1249
     // 2015-12-21 06:06:09 41a0.12
1250
-    if(empty($update_tables['festival_unit_log'])) {
1250
+    if (empty($update_tables['festival_unit_log'])) {
1251 1251
       upd_create_table('festival_unit_log', " (
1252 1252
           `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
1253 1253
           `highspot_id` int(10) unsigned DEFAULT NULL,
@@ -1277,19 +1277,19 @@  discard block
 block discarded – undo
1277 1277
       $update_tables['security_browser']['browser_user_agent']['Collation'] == 'latin1_bin'
1278 1278
     );
1279 1279
 
1280
-    if($update_indexes_full['security_browser']['I_browser_user_agent']['browser_user_agent']['Index_type'] == 'BTREE') {
1280
+    if ($update_indexes_full['security_browser']['I_browser_user_agent']['browser_user_agent']['Index_type'] == 'BTREE') {
1281 1281
       upd_alter_table('security_browser', "DROP KEY `I_browser_user_agent`", true);
1282 1282
       upd_alter_table('security_browser', "ADD KEY `I_browser_user_agent` (`browser_user_agent`) USING HASH", true);
1283 1283
     }
1284 1284
 
1285
-    if(!empty($update_tables['fleets']['fleet_array'])) {
1285
+    if (!empty($update_tables['fleets']['fleet_array'])) {
1286 1286
       $query = upd_do_query("SELECT * FROM {{fleets}}");
1287
-      while($row = db_fetch($query)) {
1287
+      while ($row = db_fetch($query)) {
1288 1288
         $unit_list = sys_unit_str2arr($row['fleet_array']);
1289
-        foreach($unit_list as $unit_id => $unit_count) {
1289
+        foreach ($unit_list as $unit_id => $unit_count) {
1290 1290
           upd_do_query(
1291 1291
             "REPLACE INTO {{unit}} (`unit_player_id`,`unit_location_type`,`unit_location_id`,`unit_type`,`unit_snid`,`unit_level`) VALUES
1292
-              ({$row['fleet_owner']}, " . LOC_FLEET . ", {$row['fleet_id']}, " . get_unit_param($unit_id, P_UNIT_TYPE) . ", {$unit_id}, {$unit_count});",
1292
+              ({$row['fleet_owner']}, ".LOC_FLEET.", {$row['fleet_id']}, ".get_unit_param($unit_id, P_UNIT_TYPE).", {$unit_id}, {$unit_count});",
1293 1293
             true
1294 1294
           );
1295 1295
         }
@@ -1322,11 +1322,11 @@  discard block
 block discarded – undo
1322 1322
 
1323 1323
 classSupernova::$cache->unset_by_prefix('lng_');
1324 1324
 
1325
-if($new_version) {
1325
+if ($new_version) {
1326 1326
   classSupernova::$config->db_saveItem('db_version', $new_version);
1327 1327
   upd_log_message("<font color=green>DB version is now {$new_version}</font>");
1328 1328
 } else {
1329
-  upd_log_message("DB version didn't changed from " . classSupernova::$config->db_version);
1329
+  upd_log_message("DB version didn't changed from ".classSupernova::$config->db_version);
1330 1330
 }
1331 1331
 
1332 1332
 classSupernova::$config->db_loadAll();
Please login to merge, or discard this patch.
includes/debug.class.php 1 patch
Spacing   +74 added lines, -75 removed lines patch added patch discarded remove patch
@@ -30,10 +30,10 @@  discard block
 block discarded – undo
30 30
 
31 31
 defined('INSIDE') || die();
32 32
 
33
-if(php_sapi_name() == "cli") {
33
+if (php_sapi_name() == "cli") {
34 34
   // In cli-mode
35 35
   define('__DEBUG_CRLF', "\r\n");
36
-  define('__DEBUG_LINE', '-------------------------------------------------' . __DEBUG_CRLF);
36
+  define('__DEBUG_LINE', '-------------------------------------------------'.__DEBUG_CRLF);
37 37
 } else {
38 38
   // Not in cli-mode
39 39
   define('__DEBUG_CRLF', '<br />');
@@ -50,17 +50,17 @@  discard block
 block discarded – undo
50 50
   function log_file($message, $ident_change = 0) {
51 51
     static $ident = 0;
52 52
 
53
-    if(!defined('SN_DEBUG_LOG')) {
53
+    if (!defined('SN_DEBUG_LOG')) {
54 54
       return;
55 55
     }
56 56
 
57
-    if($this->log_file_handler === null) {
58
-      $this->log_file_handler = @fopen(SN_ROOT_PHYSICAL . '/.logs/supernova.log', 'a+');
57
+    if ($this->log_file_handler === null) {
58
+      $this->log_file_handler = @fopen(SN_ROOT_PHYSICAL.'/.logs/supernova.log', 'a+');
59 59
       @fwrite($this->log_file_handler, "\r\n\r\n");
60 60
     }
61 61
     $ident_change < 0 ? $ident += $ident_change * 2 : false;
62
-    if($this->log_file_handler) {
63
-      @fwrite($this->log_file_handler, date(FMT_DATE_TIME_SQL, time()) . str_repeat(' ', $ident + 1) . $message . "\r\n");
62
+    if ($this->log_file_handler) {
63
+      @fwrite($this->log_file_handler, date(FMT_DATE_TIME_SQL, time()).str_repeat(' ', $ident + 1).$message."\r\n");
64 64
     }
65 65
     $ident_change > 0 ? $ident += $ident_change * 2 : false;
66 66
   }
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
   }
81 81
 
82 82
   function echo_log() {
83
-    echo '<br><table><tr><td class=k colspan=4><a href="' . SN_ROOT_PHYSICAL . "admin/settings.php\">Debug Log</a>:</td></tr>{$this->log}</table>";
83
+    echo '<br><table><tr><td class=k colspan=4><a href="'.SN_ROOT_PHYSICAL."admin/settings.php\">Debug Log</a>:</td></tr>{$this->log}</table>";
84 84
     die();
85 85
   }
86 86
 
@@ -90,25 +90,25 @@  discard block
 block discarded – undo
90 90
     $result = array();
91 91
     $transaction_id = classSupernova::db_transaction_check(false) ? classSupernova::$transaction_id : classSupernova::$transaction_id++;
92 92
     $result[] = "tID {$transaction_id}";
93
-    foreach($backtrace as $a_trace) {
94
-      if(in_array($a_trace['function'], $exclude_functions)) {
93
+    foreach ($backtrace as $a_trace) {
94
+      if (in_array($a_trace['function'], $exclude_functions)) {
95 95
         continue;
96 96
       }
97 97
       $function =
98 98
         ($a_trace['type']
99 99
           ? ($a_trace['type'] == '->'
100
-            ? "({$a_trace['class']})" . get_class($a_trace['object'])
100
+            ? "({$a_trace['class']})".get_class($a_trace['object'])
101 101
             : $a_trace['class']
102
-          ) . $a_trace['type']
102
+          ).$a_trace['type']
103 103
           : ''
104
-        ) . $a_trace['function'] . '()';
104
+        ).$a_trace['function'].'()';
105 105
 
106 106
       $file = str_replace(SN_ROOT_PHYSICAL, '', str_replace('\\', '/', $a_trace['file']));
107 107
 
108 108
       // $result[] = "{$function} ({$a_trace['line']})'{$file}'";
109 109
       $result[] = "{$function} - '{$file}' Line {$a_trace['line']}";
110 110
 
111
-      if(!$long_comment) {
111
+      if (!$long_comment) {
112 112
         break;
113 113
       }
114 114
     }
@@ -122,26 +122,26 @@  discard block
 block discarded – undo
122 122
   function dump($dump = false, $force_base = false, $deadlock = false) {
123 123
     global $user, $planetrow;
124 124
 
125
-    if($dump === false) {
125
+    if ($dump === false) {
126 126
       return;
127 127
     }
128 128
 
129 129
     $error_backtrace = array();
130 130
     $base_dump = false;
131 131
 
132
-    if($force_base === true) {
132
+    if ($force_base === true) {
133 133
       $base_dump = true;
134 134
     }
135 135
 
136
-    if($dump === true) {
136
+    if ($dump === true) {
137 137
       $base_dump = true;
138 138
     } else {
139
-      if(!is_array($dump)) {
139
+      if (!is_array($dump)) {
140 140
         $dump = array('var' => $dump);
141 141
       }
142 142
 
143
-      foreach($dump as $dump_var_name => $dump_var) {
144
-        if($dump_var_name == 'base_dump') {
143
+      foreach ($dump as $dump_var_name => $dump_var) {
144
+        if ($dump_var_name == 'base_dump') {
145 145
           $base_dump = $dump_var;
146 146
         } else {
147 147
           $error_backtrace[$dump_var_name] = $dump_var;
@@ -149,22 +149,21 @@  discard block
 block discarded – undo
149 149
       }
150 150
     }
151 151
 
152
-    if($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
152
+    if ($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
153 153
       $error_backtrace['deadlock'] = explode("\n", $q['Status']);
154 154
       $error_backtrace['locks'] = classSupernova::$locks;
155 155
       $error_backtrace['cSN_data'] = classSupernova::$data;
156
-      foreach($error_backtrace['cSN_data'] as &$location) {
157
-        foreach($location as $location_id => &$location_data) {
158
-          $location_data = isset($location_data['username']) ? $location_data['username'] :
159
-            (isset($location_data['name']) ? $location_data['name'] : $location_id);
156
+      foreach ($error_backtrace['cSN_data'] as &$location) {
157
+        foreach ($location as $location_id => &$location_data) {
158
+          $location_data = isset($location_data['username']) ? $location_data['username'] : (isset($location_data['name']) ? $location_data['name'] : $location_id);
160 159
         }
161 160
       }
162 161
       $error_backtrace['cSN_queries'] = classSupernova::$queries;
163 162
     }
164 163
 
165
-    if($base_dump) {
166
-      if(is_array($this->log_array) && count($this->log_array) > 0) {
167
-        foreach($this->log_array as $log) {
164
+    if ($base_dump) {
165
+      if (is_array($this->log_array) && count($this->log_array) > 0) {
166
+        foreach ($this->log_array as $log) {
168 167
           $error_backtrace['queries'][] = $log;
169 168
         }
170 169
       }
@@ -193,14 +192,14 @@  discard block
 block discarded – undo
193 192
   function error($message = 'There is a error on page', $title = 'Internal Error', $error_code = 500, $dump = true) {
194 193
     global $sys_stop_log_hit, $sys_log_disabled, $user;
195 194
 
196
-    if(empty(classSupernova::$db->connected)) {
195
+    if (empty(classSupernova::$db->connected)) {
197 196
       // TODO - писать ошибку в файл
198 197
       die('SQL server currently unavailable. Please contact Administration...');
199 198
     }
200 199
 
201 200
     sn_db_transaction_rollback();
202 201
 
203
-    if(classSupernova::$config->debug == 1) {
202
+    if (classSupernova::$config->debug == 1) {
204 203
       echo "<h2>{$title}</h2><br><font color=red>{$message}</font><br><hr>";
205 204
       echo "<table>{$this->log}</table>";
206 205
     }
@@ -210,15 +209,15 @@  discard block
 block discarded – undo
210 209
     $error_text = db_escape($message);
211 210
     $error_backtrace = $this->dump($dump, true, strpos($message, 'Deadlock') !== false);
212 211
 
213
-    if(!$sys_log_disabled) {
212
+    if (!$sys_log_disabled) {
214 213
       $query = "INSERT INTO `{{logs}}` SET
215
-        `log_time` = '" . time() . "', `log_code` = '" . db_escape($error_code) . "', `log_sender` = '" . db_escape($user['id']) . "',
216
-        `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
217
-        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE))) . "'" .
218
-        ($error_backtrace ? ", `log_dump` = '" . db_escape(serialize($error_backtrace)) . "'" : '') . ";";
219
-      doquery($query, '', false, true) or die($fatal_error . db_error());
214
+        `log_time` = '" . time()."', `log_code` = '".db_escape($error_code)."', `log_sender` = '".db_escape($user['id'])."',
215
+        `log_username` = '" . db_escape($user['user_name'])."', `log_title` = '".db_escape($title)."',  `log_text` = '".db_escape($message)."',
216
+        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE)))."'".
217
+        ($error_backtrace ? ", `log_dump` = '".db_escape(serialize($error_backtrace))."'" : '').";";
218
+      doquery($query, '', false, true) or die($fatal_error.db_error());
220 219
 
221
-      $message = "Пожалуйста, свяжитесь с админом, если ошибка повторится. Ошибка №: <b>" . db_insert_id() . "</b>";
220
+      $message = "Пожалуйста, свяжитесь с админом, если ошибка повторится. Ошибка №: <b>".db_insert_id()."</b>";
222 221
 
223 222
       $sys_stop_log_hit = true;
224 223
       $sys_log_disabled = true;
@@ -228,7 +227,7 @@  discard block
 block discarded – undo
228 227
       ob_start();
229 228
       print("<hr>User ID {$user['id']} raised error code {$error_code} titled '{$title}' with text '{$error_text}' on page {$_SERVER['SCRIPT_NAME']}");
230 229
 
231
-      foreach($error_backtrace as $name => $value) {
230
+      foreach ($error_backtrace as $name => $value) {
232 231
         print(__DEBUG_LINE);
233 232
         pdump($value, $name);
234 233
       }
@@ -240,19 +239,19 @@  discard block
 block discarded – undo
240 239
   function warning($message, $title = 'System Message', $log_code = 300, $dump = false) {
241 240
     global $user, $sys_log_disabled;
242 241
 
243
-    if(empty(classSupernova::$db->connected)) {
242
+    if (empty(classSupernova::$db->connected)) {
244 243
       // TODO - писать ошибку в файл
245 244
       die('SQL server currently unavailable. Please contact Administration...');
246 245
     }
247 246
 
248 247
     $error_backtrace = $this->dump($dump, false);
249 248
 
250
-    if(!$sys_log_disabled) {
249
+    if (!$sys_log_disabled) {
251 250
       $query = "INSERT INTO `{{logs}}` SET
252
-        `log_time` = '" . time() . "', `log_code` = '" . db_escape($log_code) . "', `log_sender` = '" . db_escape($user['id']) . "',
253
-        `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
254
-        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE))) . "'" .
255
-        ($error_backtrace ? ", `log_dump` = '" . db_escape(serialize($error_backtrace)) . "'" : '') . ";";
251
+        `log_time` = '" . time()."', `log_code` = '".db_escape($log_code)."', `log_sender` = '".db_escape($user['id'])."',
252
+        `log_username` = '" . db_escape($user['user_name'])."', `log_title` = '".db_escape($title)."',  `log_text` = '".db_escape($message)."',
253
+        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE)))."'".
254
+        ($error_backtrace ? ", `log_dump` = '".db_escape(serialize($error_backtrace))."'" : '').";";
256 255
       doquery($query, '', false, true);
257 256
     } else {
258 257
 //        // TODO Здесь надо писать в файло
@@ -265,11 +264,11 @@  discard block
 block discarded – undo
265 264
 // Dump variables nicer then var_dump()
266 265
 
267 266
 function dump($value, $varname = null, $level = 0, $dumper = '') {
268
-  if(isset($varname)) {
267
+  if (isset($varname)) {
269 268
     $varname .= " = ";
270 269
   }
271 270
 
272
-  if($level == -1) {
271
+  if ($level == -1) {
273 272
     $trans[' '] = '&there4;';
274 273
     $trans["\t"] = '&rArr;';
275 274
     $trans["\n"] = '&para;;';
@@ -278,31 +277,31 @@  discard block
 block discarded – undo
278 277
 
279 278
     return strtr(htmlspecialchars($value), $trans);
280 279
   }
281
-  if($level == 0) {
280
+  if ($level == 0) {
282 281
 //    $dumper = '<pre>' . mt_rand(10, 99) . '|' . $varname;
283
-    $dumper = mt_rand(10, 99) . '|' . $varname;
282
+    $dumper = mt_rand(10, 99).'|'.$varname;
284 283
   }
285 284
 
286 285
   $type = gettype($value);
287 286
   $dumper .= $type;
288 287
 
289
-  if($type == 'string') {
290
-    $dumper .= '(' . strlen($value) . ')';
288
+  if ($type == 'string') {
289
+    $dumper .= '('.strlen($value).')';
291 290
     $value = dump($value, '', -1);
292
-  } elseif($type == 'boolean') {
291
+  } elseif ($type == 'boolean') {
293 292
     $value = ($value ? 'true' : 'false');
294
-  } elseif($type == 'object') {
293
+  } elseif ($type == 'object') {
295 294
     $props = get_class_vars(get_class($value));
296
-    $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
297
-    foreach($props as $key => $val) {
298
-      $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
295
+    $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
296
+    foreach ($props as $key => $val) {
297
+      $dumper .= "\n".str_repeat("\t", $level + 1).$key.' => ';
299 298
       $dumper .= dump($value->$key, '', $level + 1);
300 299
     }
301 300
     $value = '';
302
-  } elseif($type == 'array') {
303
-    $dumper .= '(' . count($value) . ')';
304
-    foreach($value as $key => $val) {
305
-      $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, '', -1) . ' => ';
301
+  } elseif ($type == 'array') {
302
+    $dumper .= '('.count($value).')';
303
+    foreach ($value as $key => $val) {
304
+      $dumper .= "\n".str_repeat("\t", $level + 1).dump($key, '', -1).' => ';
306 305
       $dumper .= dump($val, '', $level + 1);
307 306
     }
308 307
     $value = '';
@@ -321,24 +320,24 @@  discard block
 block discarded – undo
321 320
 //  $backtrace = $backtrace[1];
322 321
 
323 322
   $caller = '';
324
-  if(defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
325
-    $caller = (!empty($backtrace[1]['class']) ? $backtrace[1]['class'] : '') .
326
-      (!empty($backtrace[1]['type']) ? $backtrace[1]['type'] : '') .
327
-      $backtrace[1]['function'] .
323
+  if (defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
324
+    $caller = (!empty($backtrace[1]['class']) ? $backtrace[1]['class'] : '').
325
+      (!empty($backtrace[1]['type']) ? $backtrace[1]['type'] : '').
326
+      $backtrace[1]['function'].
328 327
       (!empty($backtrace[0]['file'])
329 328
         ? (
330
-          ' (' . substr($backtrace[0]['file'], SN_ROOT_PHYSICAL_STR_LEN) .
331
-          (!empty($backtrace[0]['line']) ? ':' . $backtrace[0]['line'] : '') .
329
+          ' ('.substr($backtrace[0]['file'], SN_ROOT_PHYSICAL_STR_LEN).
330
+          (!empty($backtrace[0]['line']) ? ':'.$backtrace[0]['line'] : '').
332 331
           ')'
333 332
         )
334 333
         : ''
335 334
       );
336
-    $caller = "\r\n" . $caller;
335
+    $caller = "\r\n".$caller;
337 336
   }
338 337
 
339
-  print('<pre style="text-align: left; background-color: #111111; color: #0A0; font-family: Courier, monospace !important; padding: 1em 0; font-weight: 800; font-size: 14px;">' .
340
-    dump($value, $varname) .
341
-    $caller .
338
+  print('<pre style="text-align: left; background-color: #111111; color: #0A0; font-family: Courier, monospace !important; padding: 1em 0; font-weight: 800; font-size: 14px;">'.
339
+    dump($value, $varname).
340
+    $caller.
342 341
     '</pre>'
343 342
   );
344 343
 }
@@ -348,24 +347,24 @@  discard block
 block discarded – undo
348 347
 }
349 348
 
350 349
 function pr($prePrint = false) {
351
-  if($prePrint) {
350
+  if ($prePrint) {
352 351
     print(__DEBUG_CRLF);
353 352
   }
354
-  print(mt_rand() . __DEBUG_CRLF);
353
+  print(mt_rand().__DEBUG_CRLF);
355 354
 }
356 355
 
357 356
 function pc($prePrint = false) {
358 357
   global $_PRINT_COUNT_VALUE;
359 358
   $_PRINT_COUNT_VALUE++;
360 359
 
361
-  if($prePrint) {
360
+  if ($prePrint) {
362 361
     print(__DEBUG_CRLF);
363 362
   }
364
-  print($_PRINT_COUNT_VALUE . __DEBUG_CRLF);
363
+  print($_PRINT_COUNT_VALUE.__DEBUG_CRLF);
365 364
 }
366 365
 
367 366
 function prep($message) {
368
-  print('<pre>' . $message . '</pre>');
367
+  print('<pre>'.$message.'</pre>');
369 368
 }
370 369
 
371 370
 function backtrace_no_arg() {
@@ -388,5 +387,5 @@  discard block
 block discarded – undo
388 387
  */
389 388
 function pdie($message = '') {
390 389
   $backtrace = debug_backtrace();
391
-  die(__DEBUG_LINE . ($message ? $message . ' @ ' : '') . $backtrace[0]['file'] . ':' . $backtrace[0]['line']);
390
+  die(__DEBUG_LINE.($message ? $message.' @ ' : '').$backtrace[0]['file'].':'.$backtrace[0]['line']);
392 391
 }
Please login to merge, or discard this patch.
includes/functions/eco_planet_update.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -14,13 +14,13 @@  discard block
 block discarded – undo
14 14
 
15 15
   $no_data = array('user' => false, 'planet' => false, 'que' => false);
16 16
 
17
-  if(!$planet) {
17
+  if (!$planet) {
18 18
     return $no_data;
19 19
   }
20 20
 
21
-  if(!$no_user_update) {
21
+  if (!$no_user_update) {
22 22
     $user = intval(is_array($user) && $user['id'] ? $user['id'] : $user);
23
-    if(!$user) {
23
+    if (!$user) {
24 24
       // TODO - Убрать позже
25 25
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sys_o_get_updated() - USER пустой!</h1>');
26 26
       $backtrace = debug_backtrace();
@@ -32,17 +32,17 @@  discard block
 block discarded – undo
32 32
     $user = db_user_by_id($user, !$simulation, '*', true);
33 33
   }
34 34
 
35
-  if(empty($user['id'])) {
35
+  if (empty($user['id'])) {
36 36
     return $no_data;
37 37
   }
38 38
 
39
-  if(is_array($planet) && isset($planet['galaxy']) && $planet['galaxy']) {
39
+  if (is_array($planet) && isset($planet['galaxy']) && $planet['galaxy']) {
40 40
     $planet = db_planet_by_vector($planet, '', !$simulation);
41 41
   } else {
42 42
     $planet = intval(is_array($planet) && isset($planet['id']) ? $planet['id'] : $planet);
43 43
     $planet = db_planet_by_id($planet, !$simulation);
44 44
   }
45
-  if(!is_array($planet) || !isset($planet['id'])) {
45
+  if (!is_array($planet) || !isset($planet['id'])) {
46 46
     return $no_data;
47 47
   }
48 48
 
@@ -65,19 +65,19 @@  discard block
 block discarded – undo
65 65
     RES_DEUTERIUM => 0,
66 66
   );
67 67
 
68
-  switch($planet['planet_type']) {
68
+  switch ($planet['planet_type']) {
69 69
     case PT_PLANET:
70
-      foreach($resources_increase as $resource_id => &$increment) {
70
+      foreach ($resources_increase as $resource_id => &$increment) {
71 71
         $resource_name = pname_resource_name($resource_id);
72 72
         $increment = $caps_real['total'][$resource_id] * $ProductionTime / 3600;
73 73
         $store_free = $caps_real['total_storage'][$resource_id] - $planet[$resource_name];
74 74
         $increment = min($increment, max(0, $store_free));
75 75
 
76
-        if($planet[$resource_name] + $increment < 0 && !$simulation) {
76
+        if ($planet[$resource_name] + $increment < 0 && !$simulation) {
77 77
           classSupernova::$debug->warning("Player ID {$user['id']} have negative resources on ID {$planet['id']}.{$planet['planet_type']} [{$planet['galaxy']}:{$planet['system']}:{$planet['planet']}]. Difference {$planet[$resource_name]} of {$resource_name}", 'Negative Resources', 501);
78 78
         }
79 79
         $planet[$resource_name] += $increment;
80
-        $planet[$resource_name . '_perhour'] = $caps_real['total'][$resource_id];
80
+        $planet[$resource_name.'_perhour'] = $caps_real['total'][$resource_id];
81 81
       }
82 82
     break;
83 83
 
@@ -94,13 +94,13 @@  discard block
 block discarded – undo
94 94
   // TODO пересчитывать размер планеты только при постройке чего-нибудь и при покупке сектора
95 95
   $planet['field_current'] = 0;
96 96
   $sn_group_build_allow = sn_get_groups('build_allow');
97
-  if(is_array($sn_group_build_allow[$planet['planet_type']])) {
98
-    foreach($sn_group_build_allow[$planet['planet_type']] as $building_id) {
97
+  if (is_array($sn_group_build_allow[$planet['planet_type']])) {
98
+    foreach ($sn_group_build_allow[$planet['planet_type']] as $building_id) {
99 99
       $planet['field_current'] += mrc_get_level($user, $planet, $building_id, !$simulation, true);
100 100
     }
101 101
   }
102 102
 
103
-  if($simulation) {
103
+  if ($simulation) {
104 104
     return array('user' => $user, 'planet' => $planet, 'que' => $que);
105 105
   }
106 106
 
Please login to merge, or discard this patch.
includes/functions/ali_alliances.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -3,10 +3,10 @@  discard block
 block discarded – undo
3 3
 function ali_rank_list_save($ranks) {
4 4
   global $user;
5 5
 
6
-  if(!empty($ranks)) {
7
-    foreach($ranks as $rank => $rights) {
6
+  if (!empty($ranks)) {
7
+    foreach ($ranks as $rank => $rights) {
8 8
       $rights = implode(',', $rights);
9
-      $ranklist .= $rights . ';';
9
+      $ranklist .= $rights.';';
10 10
     }
11 11
   }
12 12
 
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
   $temp_array = array();
23 23
   $query = db_ally_diplomacy_get_relations($ally_from, $ally_to);
24 24
 
25
-  while($record = db_fetch($query)) {
25
+  while ($record = db_fetch($query)) {
26 26
     $temp_array[$record['alliance_diplomacy_contr_ally_id']] = $record;
27 27
   }
28 28
 
Please login to merge, or discard this patch.
includes/functions/msg_send_simple_message.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -22,10 +22,10 @@  discard block
 block discarded – undo
22 22
 
23 23
   $list = '';
24 24
   $query = db_user_list(
25
-    "ally_id = '{$ally_id}'" . ($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
25
+    "ally_id = '{$ally_id}'".($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
26 26
     false, 'id, username');
27 27
   // while ($u = db_fetch($query))
28
-  foreach($query as $u) {
28
+  foreach ($query as $u) {
29 29
     $sendList[] = $u['id'];
30 30
     $list .= "<br>{$u['username']} ";
31 31
   }
@@ -38,17 +38,17 @@  discard block
 block discarded – undo
38 38
 function msg_send_simple_message($owners, $sender, $timestamp, $message_type, $from, $subject, $text, $escaped = false, $force = false) {
39 39
   global $user, $sn_message_class_list;
40 40
 
41
-  if(!$owners) {
41
+  if (!$owners) {
42 42
     return;
43 43
   }
44 44
 
45 45
   $timestamp = $timestamp ? $timestamp : SN_TIME_NOW;
46 46
   $sender = intval($sender);
47
-  if(!is_array($owners)) {
47
+  if (!is_array($owners)) {
48 48
     $owners = array($owners);
49 49
   }
50 50
 
51
-  if(!$escaped) {
51
+  if (!$escaped) {
52 52
     $from = db_escape($from);
53 53
     $subject = db_escape($subject);
54 54
     $text = db_escape($text);
@@ -63,8 +63,8 @@  discard block
 block discarded – undo
63 63
 
64 64
   $message_class_name_total = $sn_message_class_list[MSG_TYPE_NEW]['name'];
65 65
 
66
-  if($owners[0] == '*') {
67
-    if($user['authlevel'] < 3) {
66
+  if ($owners[0] == '*') {
67
+    if ($user['authlevel'] < 3) {
68 68
       return false;
69 69
     }
70 70
     // TODO Добавить $timestamp - рассылка может быть и отсроченной
@@ -73,26 +73,26 @@  discard block
 block discarded – undo
73 73
     $owners = array();
74 74
   } else {
75 75
     $insert_values = array();
76
-    $insert_template = "('%u'," . str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
76
+    $insert_template = "('%u',".str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
77 77
 
78
-    foreach($owners as $owner) {
79
-      if($user['id'] != $owner) {
78
+    foreach ($owners as $owner) {
79
+      if ($user['id'] != $owner) {
80 80
         $owner_row = db_user_by_id($owner);
81 81
       } else {
82 82
         $owner_row = $user;
83 83
       }
84 84
       sys_user_options_unpack($owner_row);
85 85
 
86
-      if($force || !$message_class_switchable || $owner_row["opt_{$message_class_name}"]) {
86
+      if ($force || !$message_class_switchable || $owner_row["opt_{$message_class_name}"]) {
87 87
         $insert_values[] = sprintf($insert_template, $owner);
88 88
       }
89 89
 
90
-      if($message_class_email && classSupernova::$config->game_email_pm && $owner_row["opt_email_{$message_class_name}"]) {
90
+      if ($message_class_email && classSupernova::$config->game_email_pm && $owner_row["opt_email_{$message_class_name}"]) {
91 91
         @$result = mymail($owner_row['email'], $subject, $text_unescaped, '', true);
92 92
       }
93 93
     }
94 94
 
95
-    if(empty($insert_values)) {
95
+    if (empty($insert_values)) {
96 96
       return;
97 97
     }
98 98
 
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
   }
101 101
   db_user_list_set_mass_mail($owners, "`{$message_class_name}` = `{$message_class_name}` + 1, `{$message_class_name_total}` = `{$message_class_name_total}` + 1");
102 102
 
103
-  if(in_array($user['id'], $owners) || $owners[0] == '*') {
103
+  if (in_array($user['id'], $owners) || $owners[0] == '*') {
104 104
     $user[$message_class_name]++;
105 105
     $user[$message_class_name_total]++;
106 106
   }
Please login to merge, or discard this patch.
includes/functions/lng_language.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 // ----------------------------------------------------------------------------------------------------------------
4 4
 function lng_try_filepath($path, $file_path_relative)
5 5
 {
6
-  $file_path = SN_ROOT_PHYSICAL . ($path && file_exists(SN_ROOT_PHYSICAL . $path . $file_path_relative) ? $path : '') . $file_path_relative;
6
+  $file_path = SN_ROOT_PHYSICAL.($path && file_exists(SN_ROOT_PHYSICAL.$path.$file_path_relative) ? $path : '').$file_path_relative;
7 7
   return file_exists($file_path) ? $file_path : false;
8 8
 }
9 9
 
Please login to merge, or discard this patch.
includes/functions/sys_maintenance.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -22,10 +22,10 @@  discard block
 block discarded – undo
22 22
     ),
23 23
   );
24 24
 
25
-  foreach($queries as &$query) {
26
-    if(!empty($query['query'])) {
25
+  foreach ($queries as &$query) {
26
+    if (!empty($query['query'])) {
27 27
       $query['result'] = doquery($query['query']);
28
-    } elseif(!empty($query['callable']) && is_callable($query['callable'])) {
28
+    } elseif (!empty($query['callable']) && is_callable($query['callable'])) {
29 29
       call_user_func($query['callable']);
30 30
     }
31 31
     $query['error'] = classSupernova::$db->db_error();
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
   $today_array = array($today_array['seconds'], $today_array['minutes'], $today_array['hours'], $today_array['mday'], $today_array['mon'], $today_array['year']);
70 70
 //  pdump($prev_run_array);
71 71
   $scheduleList = explode(',', $scheduleList);
72
-  array_walk($scheduleList, function (&$schedule) use ($prev_run_array, $today_array, $date_part_names_reverse, &$possible_schedules) {
72
+  array_walk($scheduleList, function(&$schedule) use ($prev_run_array, $today_array, $date_part_names_reverse, &$possible_schedules) {
73 73
     // pdump($schedule);
74 74
     $schedule = array('schedule_array' => array_reverse(explode(':', trim($schedule))));
75 75
 
@@ -81,21 +81,21 @@  discard block
 block discarded – undo
81 81
     */
82 82
     // pdump($schedule);
83 83
 
84
-    foreach($prev_run_array as $index => $date_part) {
84
+    foreach ($prev_run_array as $index => $date_part) {
85 85
       $schedule['array']['recorded'][$index] = isset($schedule['schedule_array'][$index]) ? intval($schedule['schedule_array'][$index]) : $date_part;
86 86
       $schedule['array']['now'][$index] = isset($schedule['schedule_array'][$index]) ? intval($schedule['schedule_array'][$index]) : $today_array[$index];
87 87
     }
88
-    if($schedule['array']['recorded'] == $schedule['array']['now']) {
88
+    if ($schedule['array']['recorded'] == $schedule['array']['now']) {
89 89
       unset($schedule['array']['now']);
90 90
     }
91 91
 
92
-    foreach($schedule['array'] as $name => $array) {
92
+    foreach ($schedule['array'] as $name => $array) {
93 93
       $schedule['string'][$name] = "{$array[5]}-{$array[4]}-{$array[3]} {$array[2]}:{$array[1]}:{$array[0]}";
94
-      $schedule['string'][$name . '_next'] = $schedule['string'][$name] . ' +1 ' . $interval;
95
-      $schedule['string'][$name . '_prev'] = $schedule['string'][$name] . ' -1 ' . $interval;
94
+      $schedule['string'][$name.'_next'] = $schedule['string'][$name].' +1 '.$interval;
95
+      $schedule['string'][$name.'_prev'] = $schedule['string'][$name].' -1 '.$interval;
96 96
     }
97 97
 
98
-    foreach($schedule['string'] as $string) {
98
+    foreach ($schedule['string'] as $string) {
99 99
       $timestamp = strtotime($string);
100 100
       $schedule['timestamp'][$timestamp] = $possible_schedules[$timestamp] = date(FMT_DATE_TIME_SQL, strtotime($string));
101 101
     }
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 
128 128
   $prev_run = 0;
129 129
   $next_run = 0;
130
-  foreach($possible_schedules as $timestamp => $string_date) {
130
+  foreach ($possible_schedules as $timestamp => $string_date) {
131 131
     $prev_run = SN_TIME_NOW >= $timestamp ? $timestamp : $prev_run;
132 132
     $next_run = SN_TIME_NOW < $timestamp && !$next_run ? $timestamp : $next_run;
133 133
 //    pdump($schedule, '$schedule ' . date(FMT_DATE_TIME_SQL, $schedule));
Please login to merge, or discard this patch.
includes/functions/sys_bbcode.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -107,23 +107,23 @@
 block discarded – undo
107 107
 
108 108
   !empty(classSupernova::$config->url_faq) ? $msg = str_replace('faq://', classSupernova::$config->url_faq, $msg) : false;
109 109
 
110
-  foreach($supernova->design['bbcodes'] as $auth_level => $replaces) {
111
-    if($auth_level > $author_auth) {
110
+  foreach ($supernova->design['bbcodes'] as $auth_level => $replaces) {
111
+    if ($auth_level > $author_auth) {
112 112
       continue;
113 113
     }
114 114
 
115
-    foreach($replaces as $key => $html) {
115
+    foreach ($replaces as $key => $html) {
116 116
       $msg = preg_replace(''.$key.'', $html, $msg);
117 117
     }
118 118
   }
119 119
 
120
-  foreach($supernova->design['smiles'] as $auth_level => $replaces) {
121
-    if($auth_level > $author_auth) {
120
+  foreach ($supernova->design['smiles'] as $auth_level => $replaces) {
121
+    if ($auth_level > $author_auth) {
122 122
       continue;
123 123
     }
124 124
 
125
-    foreach($replaces as $key => $imgName) {
126
-      $msg = preg_replace("#" . addcslashes($key, '()[]{}') . "#isU","<img src=\"design/images/smileys/".$imgName.".gif\" align=\"absmiddle\" title=\"".$key."\" alt=\"".$key."\">",$msg);
125
+    foreach ($replaces as $key => $imgName) {
126
+      $msg = preg_replace("#".addcslashes($key, '()[]{}')."#isU", "<img src=\"design/images/smileys/".$imgName.".gif\" align=\"absmiddle\" title=\"".$key."\" alt=\"".$key."\">", $msg);
127 127
     }
128 128
   }
129 129
 
Please login to merge, or discard this patch.
includes/functions/flt_mission_missile.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
   $mip_data = get_unit_param(UNIT_DEF_MISSILE_INTERPLANET);
15 15
   $MIPDamage = floor(mrc_modify_value($attackerTech, false, TECH_WEAPON, $MIPs * $mip_data[P_ATTACK] * mt_rand(80, 120) / 100));
16
-  foreach($structures as $key => $structure)
16
+  foreach ($structures as $key => $structure)
17 17
   {
18 18
     $unit_info = get_unit_param($key);
19 19
     $amplify = isset($mip_data[P_AMPLIFY][$key]) ? $mip_data[P_AMPLIFY][$key] : 1;
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
   {
32 32
     //attacking only selected structure
33 33
     $damageDone = $structures[$targetedStructure][$damageTo];
34
-    $structsDestroyed = min( floor($MIPDamage/$damageDone), $structures[$targetedStructure][0] );
34
+    $structsDestroyed = min(floor($MIPDamage / $damageDone), $structures[$targetedStructure][0]);
35 35
     $structures[$targetedStructure][0] -= $structsDestroyed;
36
-    $MIPDamage -= $structsDestroyed*$damageDone;
36
+    $MIPDamage -= $structsDestroyed * $damageDone;
37 37
   }
38 38
   else
39 39
   {
@@ -44,16 +44,16 @@  discard block
 block discarded – undo
44 44
     do
45 45
     {
46 46
       // finding is there any structure that can be damaged with leftovers of $MIPDamage
47
-      foreach($can_be_damaged as $key => $unit_id)
47
+      foreach ($can_be_damaged as $key => $unit_id)
48 48
       {
49 49
 //debug($structures[$unit_id][0]);
50 50
 //debug($structures[$unit_id][$damageTo], $MIPDamage);
51
-        if($structures[$unit_id][0] <= 0 || $structures[$unit_id][$damageTo] > $MIPDamage)
51
+        if ($structures[$unit_id][0] <= 0 || $structures[$unit_id][$damageTo] > $MIPDamage)
52 52
         {
53 53
           unset($can_be_damaged[$key]);
54 54
         }
55 55
       }
56
-      if(empty($can_be_damaged))
56
+      if (empty($can_be_damaged))
57 57
       {
58 58
         break;
59 59
       }
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 //debug($destroyed, 'Actually destroyed');
73 73
 
74 74
 //print('<hr>');
75
-    } while($MIPDamage > 0 && !empty($can_be_damaged));
75
+    } while ($MIPDamage > 0 && !empty($can_be_damaged));
76 76
 //debug($MIPDamage, 'MIPDamage left');
77 77
   }
78 78
 //debug($structures);//die();
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
     $crystal += $destroyed * $unit_info[P_COST][RES_CRYSTAL] / 4;
88 88
   }
89 89
 
90
-  $return['structures'] = $structures;     // Structures left after attack
91
-  $return['metal']      = floor($metal);   // Metal scraps
90
+  $return['structures'] = $structures; // Structures left after attack
91
+  $return['metal']      = floor($metal); // Metal scraps
92 92
   $return['crystal']    = floor($crystal); // Crystal scraps
93 93
 
94 94
   return $return;
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 
113 113
   $iraks = db_missile_list_by_arrival();
114 114
 
115
-  while($fleetRow = db_fetch($iraks)) {
115
+  while ($fleetRow = db_fetch($iraks)) {
116 116
     set_time_limit(15);
117 117
     $db_changeset = array();
118 118
 
@@ -128,9 +128,9 @@  discard block
 block discarded – undo
128 128
 
129 129
     $rowAttacker = db_user_by_id($fleetRow['fleet_owner'], true);
130 130
 
131
-    if($target_planet_row['id']) {
131
+    if ($target_planet_row['id']) {
132 132
       $planetDefense = array();
133
-      foreach(sn_get_groups('defense_active') as $unit_id) {
133
+      foreach (sn_get_groups('defense_active') as $unit_id) {
134 134
         $planetDefense[$unit_id] = array(mrc_get_level($targetUser, $target_planet_row, $unit_id, true, true));
135 135
       }
136 136
 
@@ -141,24 +141,24 @@  discard block
 block discarded – undo
141 141
         $message = classLocale::$lang['mip_all_destroyed'];
142 142
         $db_changeset['unit'][] = sn_db_unit_changeset_prepare(UNIT_DEF_MISSILE_INTERCEPTOR, -$missiles, $targetUser, $target_planet_row['id']);
143 143
       } else {
144
-        if($interceptors) {
144
+        if ($interceptors) {
145 145
           $message = sprintf(classLocale::$lang['mip_destroyed'], $interceptors);
146 146
           $db_changeset['unit'][] = sn_db_unit_changeset_prepare(UNIT_DEF_MISSILE_INTERCEPTOR, -$interceptors, $targetUser, $target_planet_row['id']);
147 147
         }
148 148
 
149 149
         $attackResult = COE_missileAttack($targetUser, $rowAttacker, $missiles - $interceptors, $planetDefense, $fleetRow['primaer']);
150 150
 
151
-        foreach($attackResult['structures'] as $key => $structure) {
151
+        foreach ($attackResult['structures'] as $key => $structure) {
152 152
           $destroyed = $planetDefense[$key][0] - $structure[0];
153
-          if($destroyed) {
153
+          if ($destroyed) {
154 154
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($key, -$destroyed, $targetUser, $target_planet_row['id']);
155 155
 
156 156
             $message .= "&nbsp;&nbsp;{$classLocale['tech'][$key]} - {$destroyed} {$classLocale['quantity']}<br>";
157 157
           }
158 158
         }
159 159
 
160
-        if(!empty($message)) {
161
-          $message = classLocale::$lang['mip_defense_destroyed'] . $message . "{$classLocale['mip_recycled']}{$classLocale['Metal']}: {$attackResult['metal']}, {$classLocale['Crystal']}: {$attackResult['crystal']}<br>";
160
+        if (!empty($message)) {
161
+          $message = classLocale::$lang['mip_defense_destroyed'].$message."{$classLocale['mip_recycled']}{$classLocale['Metal']}: {$attackResult['metal']}, {$classLocale['Crystal']}: {$attackResult['crystal']}<br>";
162 162
 
163 163
           db_planet_set_by_id($target_planet_row['id'], "`metal` = `metal` + {$attackResult['metal']}, `crystal` = `crystal` + {$attackResult['crystal']}");
164 164
         }
@@ -175,8 +175,8 @@  discard block
 block discarded – undo
175 175
 
176 176
       empty($message) ? $message = classLocale::$lang['mip_no_defense'] : false;
177 177
 
178
-      msg_send_simple_message ( $fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage . $message );
179
-      msg_send_simple_message ( $fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage . $message );
178
+      msg_send_simple_message($fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage.$message);
179
+      msg_send_simple_message($fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage.$message);
180 180
     }
181 181
     db_missile_delete($fleetRow);
182 182
   }
Please login to merge, or discard this patch.