@@ -21,7 +21,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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']}, 200, {$unit_id}, {$unit_count});", |
|
1292 | + ({$row['fleet_owner']}, ".LOC_FLEET.", {$row['fleet_id']}, 200, {$unit_id}, {$unit_count});", |
|
1293 | 1293 | // ({$row['fleet_owner']}, " . LOC_FLEET . ", {$row['fleet_id']}, " . get_unit_param($unit_id, P_UNIT_TYPE) . ", {$unit_id}, {$unit_count});", |
1294 | 1294 | true |
1295 | 1295 | ); |
@@ -1323,11 +1323,11 @@ discard block |
||
1323 | 1323 | |
1324 | 1324 | classSupernova::$cache->unset_by_prefix('lng_'); |
1325 | 1325 | |
1326 | -if($new_version) { |
|
1326 | +if ($new_version) { |
|
1327 | 1327 | classSupernova::$config->db_saveItem('db_version', $new_version); |
1328 | 1328 | upd_log_message("<font color=green>DB version is now {$new_version}</font>"); |
1329 | 1329 | } else { |
1330 | - upd_log_message("DB version didn't changed from " . classSupernova::$config->db_version); |
|
1330 | + upd_log_message("DB version didn't changed from ".classSupernova::$config->db_version); |
|
1331 | 1331 | } |
1332 | 1332 | |
1333 | 1333 | classSupernova::$config->db_loadAll(); |