Completed
Push — work-fleets ( cb2521...9eb2f3 )
by SuperNova.WS
08:26
created
includes/includes/market_trader.inc 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if((!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) && (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)) {
3
+if ((!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) && (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)) {
4 4
   classSupernova::$debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
5 5
 }
6 6
 
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
 
27 27
   // $dm_db_name = pname_resource_name(RES_DARK_MATTER);
28 28
   $exchangeTo = in_array($exchangeTo = sys_get_param_int('exchangeTo'), sn_get_groups('resources_trader')) ? $exchangeTo : 0;
29
-  if($exchangeTo && is_array($tradeList = $_POST['spend'])) {
29
+  if ($exchangeTo && is_array($tradeList = $_POST['spend'])) {
30 30
     $value = 0;
31 31
 
32 32
     sn_db_transaction_start();
33
-    if($planetrow['id_owner']) {
33
+    if ($planetrow['id_owner']) {
34 34
       $global_data = sys_o_get_updated($user, $planetrow, SN_TIME_NOW);
35 35
       $planetrow = $global_data['planet'];
36 36
     }
@@ -40,26 +40,26 @@  discard block
 block discarded – undo
40 40
     }
41 41
 
42 42
     $fields = array();
43
-    foreach(sn_get_groups('resources_trader') as $resource_id) {
43
+    foreach (sn_get_groups('resources_trader') as $resource_id) {
44 44
       $amount = floatval($tradeList[$resource_id]);
45
-      if($amount < 0) {
45
+      if ($amount < 0) {
46 46
         classSupernova::$debug->error('Trying to supply negative resource amount on Black Market Page', 'Hack Attempt', 305);
47 47
       }
48 48
 
49
-      if($resource_id == RES_DARK_MATTER && $exchangeTo == RES_DARK_MATTER) {
49
+      if ($resource_id == RES_DARK_MATTER && $exchangeTo == RES_DARK_MATTER) {
50 50
         continue;
51 51
       }
52 52
 
53 53
       $sign = '+';
54
-      if($exchangeTo == RES_DARK_MATTER) {
54
+      if ($exchangeTo == RES_DARK_MATTER) {
55 55
         $amount = floor($tradeList[RES_DARK_MATTER] / 3 * $rates[RES_DARK_MATTER] / $rates[$resource_id]);
56 56
         $value += $amount;
57 57
       } else {
58 58
         $value += floor($amount * $rates[$resource_id] / $rates[$exchangeTo]);
59
-        if($resource_id == RES_DARK_MATTER) {
59
+        if ($resource_id == RES_DARK_MATTER) {
60 60
           $amount = 0;
61 61
         } else {
62
-          if(mrc_get_level($user, $planetrow, $resource_id, true) < $amount) {
62
+          if (mrc_get_level($user, $planetrow, $resource_id, true) < $amount) {
63 63
             $intError = MARKET_NO_RESOURCES;
64 64
             break;
65 65
           }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
         }
69 69
       }
70 70
 
71
-      if($amount) {
71
+      if ($amount) {
72 72
         $fields[pname_resource_name($resource_id)] = "{$sign} {$amount}";
73 73
       }
74 74
     }
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
78 78
     $intError = $value <= 0 ? MARKET_ZERO_DEAL : $intError;
79 79
     $intError = mrc_get_level($user, null, RES_DARK_MATTER) < $operation_cost ? MARKET_NO_DM : $intError;
80 80
 
81
-    if($intError == MARKET_DEAL) {
82
-      if($exchangeTo != RES_DARK_MATTER) {
81
+    if ($intError == MARKET_DEAL) {
82
+      if ($exchangeTo != RES_DARK_MATTER) {
83 83
         $amountExchangeTo = floor($value);
84 84
         $fields[pname_resource_name($exchangeTo)] = $amountExchangeTo;
85 85
       }
@@ -115,8 +115,8 @@  discard block
 block discarded – undo
115 115
     'EXCHANGE_TO_RESOURCE_ID' => $exchangeTo,
116 116
   ));
117 117
 
118
-  foreach(sn_get_groups('resources_trader') as $resource_id) {
119
-    if($resource_id == RES_DARK_MATTER) {
118
+  foreach (sn_get_groups('resources_trader') as $resource_id) {
119
+    if ($resource_id == RES_DARK_MATTER) {
120 120
       $amount = floor(mrc_get_level($user, null, RES_DARK_MATTER) - classSupernova::$config->rpg_cost_trader);
121 121
     } else {
122 122
       $amount = floor(mrc_get_level($user, $planetrow, $resource_id));
Please login to merge, or discard this patch.
includes/includes/flt_page4.inc 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -2,28 +2,28 @@  discard block
 block discarded – undo
2 2
 
3 3
 $classLocale = classLocale::$lang;
4 4
 
5
-if(SN_IN_FLEET !== true) {
5
+if (SN_IN_FLEET !== true) {
6 6
   classSupernova::$debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
7 7
 }
8 8
 
9 9
 $fleetid = sys_get_param_id('fleetid');
10 10
 
11
-if(!is_numeric($fleetid) || empty($fleetid)) {
11
+if (!is_numeric($fleetid) || empty($fleetid)) {
12 12
   header("Location: fleet.php");
13 13
   exit();
14 14
 }
15 15
 
16 16
 $objFleet = new Fleet();
17 17
 $objFleet->dbLoad($fleetid);
18
-if(!$objFleet->dbId) {
18
+if (!$objFleet->dbId) {
19 19
   message(classLocale::$lang['fl_fleet_not_exists'], classLocale::$lang['fl_error']);
20 20
 }
21 21
 
22
-if($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
22
+if ($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
23 23
   message(classLocale::$lang['fl_isback'], classLocale::$lang['fl_error']);
24 24
 }
25 25
 
26
-if($objFleet->playerOwnerId != $user['id']) {
26
+if ($objFleet->playerOwnerId != $user['id']) {
27 27
   classSupernova::$debug->warning(classLocale::$lang['fl_aks_hack_wrong_fleet'], 'Wrong Fleet Owner', 301);
28 28
   message(classLocale::$lang['fl_aks_hack_wrong_fleet'], classLocale::$lang['fl_error']);
29 29
 }
@@ -34,19 +34,19 @@  discard block
 block discarded – undo
34 34
 
35 35
 !$aks && !$userToAdd_unsafe ? $userToAdd_unsafe = $user['username'] : false;
36 36
 
37
-if($userToAdd_unsafe) {
37
+if ($userToAdd_unsafe) {
38 38
   $userToAdd = db_escape($userToAdd_unsafe);
39 39
   $userToAddID = DBStaticUser::db_user_by_username($userToAdd_unsafe, false, 'id', true, true);
40 40
   $userToAddID = $userToAddID['id'];
41 41
 
42
-  if($objFleet->target_owner_id == $userToAddID) {
42
+  if ($objFleet->target_owner_id == $userToAddID) {
43 43
     message(classLocale::$lang['flt_aks_player_same'], classLocale::$lang['fl_error']);
44 44
   }
45 45
 
46
-  if($userToAddID) {
47
-    if(!$aks) {
46
+  if ($userToAddID) {
47
+    if (!$aks) {
48 48
       // No AСS exists - making one
49
-      if(!$objFleet->group_id) {
49
+      if (!$objFleet->group_id) {
50 50
         DBStaticFleetACS::db_acs_insert($fleetid, $user['id'], $objFleet);
51 51
 
52 52
         $aks = DBStaticFleetACS::db_acs_get_by_fleet($fleetid);
@@ -61,24 +61,24 @@  discard block
 block discarded – undo
61 61
 
62 62
     $isUserExists = false;
63 63
     $invited_ar = explode(",", $aks['eingeladen']);
64
-    foreach($invited_ar as $inv) {
65
-      if($userToAddID == $inv) {
64
+    foreach ($invited_ar as $inv) {
65
+      if ($userToAddID == $inv) {
66 66
         $isUserExists = true;
67 67
       }
68 68
     }
69 69
 
70
-    if(count($invited_ar) >= 5) {
70
+    if (count($invited_ar) >= 5) {
71 71
       message(classLocale::$lang['flt_aks_error_too_much_players'], classLocale::$lang['fl_error']);
72 72
     }
73 73
 
74
-    if($isUserExists) {
74
+    if ($isUserExists) {
75 75
       $userToAdd_unsafe != $user['username'] ? $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited_already'], $userToAdd) : false;
76 76
     } else {
77 77
       $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited'], $userToAdd);
78
-      if(!(DBStaticFleetACS::db_acs_update($userToAddID, $fleetid))) {
78
+      if (!(DBStaticFleetACS::db_acs_update($userToAddID, $fleetid))) {
79 79
         die(sprintf(classLocale::$lang['fl_aks_adding_error'], classSupernova::$db->db_error()));
80 80
       }
81
-      $aks['eingeladen'] .= ',' . $userToAddID;
81
+      $aks['eingeladen'] .= ','.$userToAddID;
82 82
     }
83 83
     DBStaticMessages::msg_send_simple_message($userToAddID, $user['id'], SN_TIME_NOW, MSG_TYPE_COMBAT, $user['username'], classLocale::$lang['fl_aks_invite_message_header'], sprintf(classLocale::$lang['fl_aks_invite_message'], $user['username']));
84 84
   } else {
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
94 94
   'MISSION_NAME' => classLocale::$lang['type_mission'][MT_ACS],
95 95
 ));
96 96
 
97
-if($aks['eingeladen'] && is_array($members = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
98
-  foreach($members as $row) {
97
+if ($aks['eingeladen'] && is_array($members = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
98
+  foreach ($members as $row) {
99 99
     $template->assign_block_vars('invited', array(
100 100
       'NAME' => $row['username'],
101 101
     ));
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 $fleet_data = tplParseFleetObject($objFleet, $i, $user);
121 121
 
122 122
 $template->assign_block_vars('fleets', $fleet_data['fleet']);
123
-foreach($fleet_data['ships'] as $ship_data) {
123
+foreach ($fleet_data['ships'] as $ship_data) {
124 124
   $template->assign_block_vars('fleets.ships', $ship_data);
125 125
 }
126 126
 
Please login to merge, or discard this patch.
includes/db/db_queries.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -4,11 +4,11 @@  discard block
 block discarded – undo
4 4
 
5 5
 function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type) {
6 6
   return classSupernova::$db->doSelect(
7
-    "SELECT p.*, u.username" . ($table_parent_columns ? ', p1.name AS parent_name' : '') .
7
+    "SELECT p.*, u.username".($table_parent_columns ? ', p1.name AS parent_name' : '').
8 8
     " FROM {{planets}} AS p
9 9
       LEFT JOIN {{users}} AS u ON u.id = p.id_owner" .
10
-    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '') .
11
-    " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
10
+    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '').
11
+    " WHERE ".($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
12 12
 }
13 13
 
14 14
 function db_planet_list_search($searchtext) {
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
     ORDER BY
107 107
       sp.`{$Rank}_rank`, subject.{$source['id']}
108 108
     LIMIT
109
-      " . $start . ",100;";
109
+      ".$start.",100;";
110 110
     } else { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
111 111
       $query_str =
112 112
         "SELECT
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
     ORDER BY
120 120
       subject.{$Rank} DESC, subject.{$source['id']}
121 121
     LIMIT
122
-      " . $start . ",100;";
122
+      ".$start.",100;";
123 123
     }
124 124
   } else {
125 125
     // TODO
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
   ORDER BY
137 137
     sp.`{$Rank}_rank`, subject.id
138 138
   LIMIT
139
-    " . $start . ",100;";
139
+    ".$start.",100;";
140 140
   }
141 141
 
142 142
   return classSupernova::$db->doSelect($query_str);
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 
145 145
 
146 146
 function db_stat_list_update_ally_stats() {
147
-  return ;
147
+  return;
148 148
 }
149 149
 
150 150
 function db_stat_list_delete_ally_player() {
@@ -394,9 +394,9 @@  discard block
 block discarded – undo
394 394
  */
395 395
 function db_payment_list_get($flt_payer, $flt_status, $flt_test, $flt_module) {
396 396
   $extra_conditions =
397
-    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '') .
398
-    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '') .
399
-    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '') .
397
+    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '').
398
+    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '').
399
+    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '').
400 400
     ($flt_module ? "AND payment_module_name = '{$flt_module}' " : '');
401 401
   $query = classSupernova::$db->doSelect("SELECT * FROM `{{payment}}` WHERE 1 {$extra_conditions} ORDER BY payment_id DESC;");
402 402
 
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
 // Log Online *************************************************************************************************************
426 426
 function db_log_online_insert() {
427 427
   classSupernova::$db->doInsertSet(TABLE_LOG_USERS_ONLINE, array(
428
-    'online_count' => (int)classSupernova::$config->var_online_user_count,
428
+    'online_count' => (int) classSupernova::$config->var_online_user_count,
429 429
   ), DB_INSERT_IGNORE);
430 430
 }
431 431
 
@@ -450,9 +450,9 @@  discard block
 block discarded – undo
450 450
 function db_log_delete_update_and_stat_calc() {
451 451
   classSupernova::$db->doDeleteSimple(
452 452
     'DELETE FROM `{{logs}}` WHERE `log_code` IN ('
453
-    . LOG_INFO_DB_CHANGE . ', '
454
-    . LOG_INFO_MAINTENANCE . ', '
455
-    . LOG_INFO_STAT_PROCESS .
453
+    . LOG_INFO_DB_CHANGE.', '
454
+    . LOG_INFO_MAINTENANCE.', '
455
+    . LOG_INFO_STAT_PROCESS.
456 456
     ')'
457 457
   );
458 458
 }
@@ -521,10 +521,10 @@  discard block
 block discarded – undo
521 521
 function db_log_dark_matter_insert($user_id, $change_type, $dark_matter, $comment_unsafe, $rowUserNameUnsafe, $page_url_unsafe) {
522 522
   return classSupernova::$db->doInsertSet(TABLE_LOG_DARK_MATTER, array(
523 523
     'log_dark_matter_username' => $rowUserNameUnsafe,
524
-    'log_dark_matter_reason'   => (int)$change_type,
525
-    'log_dark_matter_amount'   => (float)$dark_matter,
526
-    'log_dark_matter_comment'  => (string)$comment_unsafe,
527
-    'log_dark_matter_page'     => (string)$page_url_unsafe,
524
+    'log_dark_matter_reason'   => (int) $change_type,
525
+    'log_dark_matter_amount'   => (float) $dark_matter,
526
+    'log_dark_matter_comment'  => (string) $comment_unsafe,
527
+    'log_dark_matter_page'     => (string) $page_url_unsafe,
528 528
     'log_dark_matter_sender'   => $user_id,
529 529
   ));
530 530
 }
@@ -693,9 +693,9 @@  discard block
 block discarded – undo
693 693
 function db_ube_report_get_best_battles() {
694 694
   $query = classSupernova::$db->doSelect("SELECT *
695 695
       FROM `{{ube_report}}`
696
-      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS . " DAY))
696
+      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS." DAY))
697 697
       ORDER BY `ube_report_debris_total_in_metal` DESC, `ube_report_id` ASC
698
-      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW . ";");
698
+      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW.";");
699 699
 
700 700
   return $query;
701 701
 }
Please login to merge, or discard this patch.
includes/update.php 1 patch
Spacing   +108 added lines, -108 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 
24 24
 use Vector\Vector;
25 25
 
26
-if(!defined('INIT')) {
26
+if (!defined('INIT')) {
27 27
 //  include_once('init.php');
28 28
   die('Unauthorized access');
29 29
 }
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
 classSupernova::$config->debug = 0;
42 42
 
43 43
 
44
-if(classSupernova::$config->db_version == DB_VERSION) {
45
-} elseif(classSupernova::$config->db_version > DB_VERSION) {
44
+if (classSupernova::$config->db_version == DB_VERSION) {
45
+} elseif (classSupernova::$config->db_version > DB_VERSION) {
46 46
   classSupernova::$config->db_saveItem('var_db_update_end', SN_TIME_NOW);
47 47
   die(
48 48
   'Internal error! Auotupdater detects DB version greater then can be handled!<br />
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
   );
52 52
 }
53 53
 
54
-if(classSupernova::$config->db_version < 26) {
54
+if (classSupernova::$config->db_version < 26) {
55 55
   $sys_log_disabled = true;
56 56
 }
57 57
 
@@ -70,20 +70,20 @@  discard block
 block discarded – undo
70 70
 $update_tables = array();
71 71
 $update_indexes = array();
72 72
 $query = upd_do_query('SHOW TABLES;', true);
73
-while($row = classSupernova::$db->db_fetch_row($query)) {
73
+while ($row = classSupernova::$db->db_fetch_row($query)) {
74 74
   upd_load_table_info($row[0]);
75 75
 }
76 76
 upd_log_message('Table info loaded. Now looking DB for upgrades...');
77 77
 
78 78
 upd_do_query('SET FOREIGN_KEY_CHECKS=0;', true);
79 79
 
80
-if($new_version < 37) {
80
+if ($new_version < 37) {
81 81
   require_once('update_old.php');
82 82
 }
83 83
 
84 84
 ini_set('memory_limit', '1024M');
85 85
 
86
-switch($new_version) {
86
+switch ($new_version) {
87 87
   case 37:
88 88
     upd_log_version_update();
89 89
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
     upd_check_key('payment_currency_exchange_mm_', 2500, !classSupernova::$config->payment_currency_exchange_mm_);
100 100
 
101
-    if(!$update_tables['log_metamatter']) {
101
+    if (!$update_tables['log_metamatter']) {
102 102
       upd_create_table('log_metamatter',
103 103
         "(
104 104
           `id` SERIAL,
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
       "ADD `payment_test` TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Is this a test payment?'",
124 124
     ), !$update_tables['payment']['payment_test']);
125 125
 
126
-    if($update_tables['payment']['payment_test']['Default'] == 1) {
126
+    if ($update_tables['payment']['payment_test']['Default'] == 1) {
127 127
       upd_alter_table('payment', array(
128 128
         "MODIFY COLUMN `payment_test` TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Is this a test payment?'",
129 129
       ));
@@ -139,15 +139,15 @@  discard block
 block discarded – undo
139 139
       "MODIFY COLUMN `metamatter` BIGINT(20) NOT NULL DEFAULT 0 COMMENT 'Metamatter amount'",
140 140
     ), $update_tables['users']['metamatter']['Type'] == 'int(20)');
141 141
 
142
-    $query = upd_do_query("SELECT * FROM {{que}} WHERE `que_type` = " . QUE_RESEARCH . " AND que_unit_id IN (" . TECH_EXPEDITION . "," . TECH_COLONIZATION . ") FOR UPDATE");
143
-    while($row = db_fetch($query)) {
142
+    $query = upd_do_query("SELECT * FROM {{que}} WHERE `que_type` = ".QUE_RESEARCH." AND que_unit_id IN (".TECH_EXPEDITION.",".TECH_COLONIZATION.") FOR UPDATE");
143
+    while ($row = db_fetch($query)) {
144 144
       $planet_id = ($row['que_planet_id_origin'] ? $row['que_planet_id_origin'] : $row['que_planet_id']);
145 145
       upd_do_query("SELECT id FROM {{planets}} WHERE id = {$planet_id} FOR UPDATE");
146 146
       $price = sys_unit_str2arr($row['que_unit_price']);
147
-      upd_do_query("UPDATE {{planets}} SET " .
148
-        "`metal` = `metal` + " . ($price[RES_METAL] ? $price[RES_METAL] : 0) . "," .
149
-        "`crystal` = `crystal` + " . ($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0) . "," .
150
-        "`deuterium` = `deuterium` + " . ($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0) .
147
+      upd_do_query("UPDATE {{planets}} SET ".
148
+        "`metal` = `metal` + ".($price[RES_METAL] ? $price[RES_METAL] : 0).",".
149
+        "`crystal` = `crystal` + ".($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0).",".
150
+        "`deuterium` = `deuterium` + ".($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0).
151 151
         " WHERE id = {$planet_id}"
152 152
       );
153 153
       upd_do_query("DELETE FROM {{que}} WHERE que_id = {$row['que_id']}");
@@ -156,10 +156,10 @@  discard block
 block discarded – undo
156 156
     $query = upd_do_query("SELECT unit_id, unit_snid, unit_level, id_planet FROM {{unit}} AS un
157 157
     LEFT JOIN {{users}} AS u ON u.id = un.unit_player_id
158 158
     LEFT JOIN {{planets}} AS p ON p.id = u.id_planet
159
-    WHERE unit_snid IN (" . TECH_EXPEDITION . "," . TECH_COLONIZATION . ")
159
+    WHERE unit_snid IN (" . TECH_EXPEDITION.",".TECH_COLONIZATION.")
160 160
     FOR UPDATE");
161
-    while($row = db_fetch($query)) {
162
-      if(!$row['id_planet']) {
161
+    while ($row = db_fetch($query)) {
162
+      if (!$row['id_planet']) {
163 163
         continue;
164 164
       }
165 165
 
@@ -167,14 +167,14 @@  discard block
 block discarded – undo
167 167
       $unit_level = $row['unit_level'];
168 168
       $price = get_unit_param($unit_id, P_COST);
169 169
       $factor = $price['factor'];
170
-      foreach($price as $resource_id => &$resource_amount) {
170
+      foreach ($price as $resource_id => &$resource_amount) {
171 171
         $resource_amount = $resource_amount * (pow($factor, $unit_level) - 1) / ($factor - 1);
172 172
       }
173 173
       // upd_do_query
174
-      upd_do_query($q = "UPDATE {{planets}} SET " .
175
-        "`metal` = `metal` + " . ($price[RES_METAL] ? $price[RES_METAL] : 0) . "," .
176
-        "`crystal` = `crystal` + " . ($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0) . "," .
177
-        "`deuterium` = `deuterium` + " . ($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0) .
174
+      upd_do_query($q = "UPDATE {{planets}} SET ".
175
+        "`metal` = `metal` + ".($price[RES_METAL] ? $price[RES_METAL] : 0).",".
176
+        "`crystal` = `crystal` + ".($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0).",".
177
+        "`deuterium` = `deuterium` + ".($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0).
178 178
         " WHERE id = {$row['id_planet']}"
179 179
       );
180 180
       upd_do_query("DELETE FROM {{unit}} WHERE unit_id = {$row['unit_id']}");
@@ -186,14 +186,14 @@  discard block
 block discarded – undo
186 186
     // Вернуть ресы за уже исследованную Экспедиционную технологию
187 187
     upd_check_key('player_max_colonies', -1, classSupernova::$config->player_max_colonies >= 0);
188 188
 
189
-    if(!isset($update_tables['users']['player_rpg_explore_xp'])) {
189
+    if (!isset($update_tables['users']['player_rpg_explore_xp'])) {
190 190
       upd_alter_table('users', array(
191 191
         "ADD COLUMN `player_rpg_explore_level` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
192 192
         "ADD COLUMN `player_rpg_explore_xp` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
193 193
       ), !isset($update_tables['users']['player_rpg_explore_xp']));
194 194
     }
195 195
 
196
-    if(!$update_tables['log_users_online']) {
196
+    if (!$update_tables['log_users_online']) {
197 197
       upd_create_table('log_users_online', "(
198 198
         `online_timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Measure time',
199 199
         `online_count` SMALLINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Users online',
@@ -208,11 +208,11 @@  discard block
 block discarded – undo
208 208
       "ADD `user_time_measured` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'When was time diff measured last time' AFTER `onlinetime`",
209 209
     ), !$update_tables['users']['user_time_measured']);
210 210
 
211
-    if($update_tables['rw']) {
211
+    if ($update_tables['rw']) {
212 212
       upd_do_query("DROP TABLE IF EXISTS {{rw}};");
213 213
     }
214 214
 
215
-    if(!$update_tables['player_award']) {
215
+    if (!$update_tables['player_award']) {
216 216
       upd_create_table('player_award', "(
217 217
         `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
218 218
         `award_type_id` int(11) DEFAULT NULL COMMENT 'Award type i.e. order, medal, pennant, rank etc',
@@ -254,14 +254,14 @@  discard block
 block discarded – undo
254 254
     upd_log_version_update();
255 255
 
256 256
 
257
-    if(!isset($update_tables['planets']['que_processed'])) {
257
+    if (!isset($update_tables['planets']['que_processed'])) {
258 258
       upd_alter_table('planets', array(
259 259
         "ADD COLUMN `que_processed` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `last_update`",
260 260
       ), true);
261 261
       upd_do_query("UPDATE {{planets}} SET que_processed = last_update;");
262 262
     }
263 263
 
264
-    if(!isset($update_tables['users']['que_processed'])) {
264
+    if (!isset($update_tables['users']['que_processed'])) {
265 265
       upd_alter_table('users', array(
266 266
         "ADD COLUMN `que_processed` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `onlinetime`",
267 267
       ), true);
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
     }
270 270
 
271 271
 
272
-    if(isset($update_tables['planets']['que'])) {
272
+    if (isset($update_tables['planets']['que'])) {
273 273
       $sn_data_aux = array(
274 274
         SHIP_SMALL_FIGHTER_WRATH    => array(
275 275
           'name' => 'ship_fighter_wrath',
@@ -354,20 +354,20 @@  discard block
 block discarded – undo
354 354
       $unit_data = array();
355 355
       $planets = array();
356 356
 
357
-      foreach($planet_unit_list as $unit_id) {
358
-        if(!($unit_name = get_unit_param($unit_id, P_NAME))) {
357
+      foreach ($planet_unit_list as $unit_id) {
358
+        if (!($unit_name = get_unit_param($unit_id, P_NAME))) {
359 359
           $unit_name = $sn_data_aux[$unit_id][P_NAME];
360 360
         }
361
-        if(isset($update_tables['planets'][$unit_name])) {
361
+        if (isset($update_tables['planets'][$unit_name])) {
362 362
           $drop[] = "DROP COLUMN `{$unit_name}`";
363 363
 
364
-          if(isset($aux_group[$unit_id])) {
364
+          if (isset($aux_group[$unit_id])) {
365 365
             $units_info[$unit_id] = $sn_data_aux[$unit_id];
366 366
             $units_info[$unit_id]['que'] = QUE_HANGAR;
367 367
           } else {
368 368
             $units_info[$unit_id] = get_unit_param($unit_id);
369
-            foreach($ques_info as $que_id => $que_data1) {
370
-              if(in_array($unit_id, $que_data1['unit_list'])) {
369
+            foreach ($ques_info as $que_id => $que_data1) {
370
+              if (in_array($unit_id, $que_data1['unit_list'])) {
371 371
                 $units_info[$unit_id]['que'] = $que_id;
372 372
                 break;
373 373
               }
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
       }
378 378
 
379 379
       $query = upd_do_query("SELECT * FROM {{planets}} FOR UPDATE");
380
-      while($row = db_fetch($query)) {
380
+      while ($row = db_fetch($query)) {
381 381
         $user_id = $row['id_owner'];
382 382
         $planet_id = $row['id'];
383 383
 
@@ -385,25 +385,25 @@  discard block
 block discarded – undo
385 385
 
386 386
         // Конвертируем юниты
387 387
         $units_levels = array();
388
-        foreach($planet_unit_list as $unit_id) {
388
+        foreach ($planet_unit_list as $unit_id) {
389 389
           $unit_name = &$units_info[$unit_id][P_NAME];
390
-          if(!isset($row[$unit_name]) || !$row[$unit_name]) {
390
+          if (!isset($row[$unit_name]) || !$row[$unit_name]) {
391 391
             continue;
392 392
           }
393 393
           $units_levels[$unit_id] = $row[$unit_name];
394
-          $unit_data[] = "({$user_id}," . LOC_PLANET . ",{$planet_id},{$units_info[$unit_id][P_UNIT_TYPE]},{$unit_id},{$units_levels[$unit_id]})";
395
-          if(count($unit_data) > 30) {
394
+          $unit_data[] = "({$user_id},".LOC_PLANET.",{$planet_id},{$units_info[$unit_id][P_UNIT_TYPE]},{$unit_id},{$units_levels[$unit_id]})";
395
+          if (count($unit_data) > 30) {
396 396
             $unit_data_max = strlen(implode(',', $unit_data)) > $unit_data_max ? strlen(implode(',', $unit_data)) : $unit_data_max;
397
-            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) . ';');
397
+            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).';');
398 398
             $unit_data = array();
399 399
           }
400 400
         }
401 401
 
402 402
         // Конвертируем очередь построек
403
-        if($row['que']) {
403
+        if ($row['que']) {
404 404
           $que = explode(';', $row['que']);
405
-          foreach($que as $que_item) {
406
-            if(!$que_item) {
405
+          foreach ($que as $que_item) {
406
+            if (!$que_item) {
407 407
               continue;
408 408
             }
409 409
 
@@ -418,8 +418,8 @@  discard block
 block discarded – undo
418 418
             $unit_factor = $unit_cost[P_FACTOR] ? $unit_cost[P_FACTOR] : 1;
419 419
             $price_increase = pow($unit_factor, $unit_level);
420 420
             // $unit_time = 0;
421
-            foreach($unit_cost as $resource_id => &$resource_amount) {
422
-              if(!in_array($resource_id, $group_resource_loot)) {
421
+            foreach ($unit_cost as $resource_id => &$resource_amount) {
422
+              if (!in_array($resource_id, $group_resource_loot)) {
423 423
                 unset($unit_cost[$resource_id]);
424 424
                 continue;
425 425
               }
@@ -433,39 +433,39 @@  discard block
 block discarded – undo
433 433
         }
434 434
 
435 435
         // Конвертируем очередь верфи
436
-        if($row['b_hangar_id']) {
436
+        if ($row['b_hangar_id']) {
437 437
           $return_resources = array(RES_METAL => 0, RES_CRYSTAL => 0, RES_DEUTERIUM => 0,);
438 438
           $hangar_units = sys_unit_str2arr($row['b_hangar_id']);
439
-          foreach($hangar_units as $unit_id => $unit_count) {
440
-            if($unit_count <= 0) {
439
+          foreach ($hangar_units as $unit_id => $unit_count) {
440
+            if ($unit_count <= 0) {
441 441
               continue;
442 442
             }
443
-            foreach($units_info[$unit_id][P_COST] as $resource_id => $resource_amount) {
444
-              if(!in_array($resource_id, $group_resource_loot)) {
443
+            foreach ($units_info[$unit_id][P_COST] as $resource_id => $resource_amount) {
444
+              if (!in_array($resource_id, $group_resource_loot)) {
445 445
                 continue;
446 446
               }
447 447
               $return_resources[$resource_id] += $unit_count * $resource_amount;
448 448
             }
449 449
           }
450
-          if(array_sum($return_resources) > 0) {
450
+          if (array_sum($return_resources) > 0) {
451 451
             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");
452 452
           }
453 453
         }
454 454
 
455 455
 
456
-        if(count($que_data) > 10) {
456
+        if (count($que_data) > 10) {
457 457
           $que_data_max = strlen(implode(',', $que_data)) > $que_data_max ? strlen(implode(',', $que_data)) : $que_data_max;
458
-          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) . ';');
458
+          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).';');
459 459
           $que_data = array();
460 460
         }
461 461
       }
462 462
 
463
-      if(!empty($unit_data)) {
464
-        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
+      if (!empty($unit_data)) {
464
+        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).';');
465 465
       }
466 466
 
467
-      if(!empty($que_data)) {
468
-        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
+      if (!empty($que_data)) {
468
+        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).';');
469 469
       }
470 470
 
471 471
       upd_alter_table('planets', $drop, true);
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
       JOIN `{{users}}` AS u ON a.`id` = u.`user_as_ally` AND `user_as_ally` IS NOT NULL AND `username` = ''
476 476
       SET u.`username` = CONCAT('[', a.`ally_tag`, ']');");
477 477
 
478
-    if($update_indexes['statpoints']['I_stats_id_ally'] != 'id_ally,stat_type,stat_code,') {
478
+    if ($update_indexes['statpoints']['I_stats_id_ally'] != 'id_ally,stat_type,stat_code,') {
479 479
       upd_do_query("SET FOREIGN_KEY_CHECKS=0;");
480 480
       upd_alter_table('statpoints', "DROP FOREIGN KEY `FK_stats_id_ally`", $update_foreigns['statpoints']['FK_stats_id_ally']);
481 481
       upd_alter_table('statpoints', "DROP KEY `I_stats_id_ally`", $update_indexes['statpoints']['I_stats_id_ally']);
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
       "ADD CONSTRAINT `FK_users_browser_id` FOREIGN KEY (`user_last_browser_id`) REFERENCES `{{security_browser}}` (`browser_id`) ON DELETE SET NULL ON UPDATE CASCADE",
572 572
     ), !isset($update_tables['users']['user_last_proxy']));
573 573
 
574
-    if(!isset($update_tables['notes']['planet_type'])) {
574
+    if (!isset($update_tables['notes']['planet_type'])) {
575 575
       upd_alter_table('notes', array(
576 576
         "ADD COLUMN `galaxy` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 0 AFTER `title`",
577 577
         "ADD COLUMN `system` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 0 AFTER `galaxy`",
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
     upd_alter_table('users', "ADD COLUMN `user_bot` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0", !isset($update_tables['users']['user_bot']));
590 590
     upd_alter_table('unit', "ADD KEY `I_unit_type_snid` (unit_type, unit_snid) USING BTREE", !$update_indexes['unit']['I_unit_type_snid']);
591 591
 
592
-    if($update_tables['users']['settings_tooltiptime']['Type'] != 'smallint(5) unsigned') {
592
+    if ($update_tables['users']['settings_tooltiptime']['Type'] != 'smallint(5) unsigned') {
593 593
       upd_alter_table('users', array(
594 594
         "MODIFY COLUMN `settings_tooltiptime` smallint(5) unsigned NOT NULL DEFAULT '500'",
595 595
       ), $update_tables['users']['settings_tooltiptime']['Type'] != 'smallint');
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
       upd_do_query("UPDATE `{{users}}` SET settings_tooltiptime = 500;");
598 598
     }
599 599
 
600
-    if(!isset($update_tables['log_users_online']['online_aggregated'])) {
600
+    if (!isset($update_tables['log_users_online']['online_aggregated'])) {
601 601
       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']));
602 602
       upd_alter_table('log_users_online', array(
603 603
         "DROP PRIMARY KEY",
@@ -605,13 +605,13 @@  discard block
 block discarded – undo
605 605
       ), $update_indexes['log_users_online']['PRIMARY'] != 'online_timestamp,online_aggregated,');
606 606
     }
607 607
 
608
-    if(!isset($update_tables['users']['gender'])) {
609
-      upd_alter_table('users', "ADD COLUMN `gender` TINYINT(1) UNSIGNED NOT NULL DEFAULT " . GENDER_UNKNOWN, !isset($update_tables['users']['gender']));
610
-      upd_do_query("UPDATE {{users}} SET `gender` = IF(UPPER(`sex`) = 'F', " . GENDER_FEMALE . ", IF(UPPER(`sex`) = 'M', " . GENDER_MALE . ", " . GENDER_UNKNOWN . "));");
608
+    if (!isset($update_tables['users']['gender'])) {
609
+      upd_alter_table('users', "ADD COLUMN `gender` TINYINT(1) UNSIGNED NOT NULL DEFAULT ".GENDER_UNKNOWN, !isset($update_tables['users']['gender']));
610
+      upd_do_query("UPDATE {{users}} SET `gender` = IF(UPPER(`sex`) = 'F', ".GENDER_FEMALE.", IF(UPPER(`sex`) = 'M', ".GENDER_MALE.", ".GENDER_UNKNOWN."));");
611 611
     }
612 612
     upd_alter_table('users', "DROP COLUMN `sex`", isset($update_tables['users']['sex']));
613 613
 
614
-    if(!$update_tables['users']['dark_matter_total']) {
614
+    if (!$update_tables['users']['dark_matter_total']) {
615 615
       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']);
616 616
       upd_do_query(
617 617
         "UPDATE `{{users}}` AS u
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
624 624
     }
625 625
 
626 626
     upd_check_key('player_metamatter_immortal', 100000, !isset(classSupernova::$config->player_metamatter_immortal));
627
-    if(!$update_tables['users']['metamatter_total']) {
627
+    if (!$update_tables['users']['metamatter_total']) {
628 628
       upd_alter_table('users', "ADD `metamatter_total` BIGINT(20) NOT NULL DEFAULT 0 COMMENT 'Total Metamatter amount ever bought'", !$update_tables['users']['metamatter_total']);
629 629
 
630 630
       upd_do_query(
@@ -636,11 +636,11 @@  discard block
 block discarded – undo
636 636
             (SELECT IF(sum(amount) IS NULL, 0, sum(amount)) FROM {{log_metamatter}} AS mm WHERE mm.user_id = u.id AND mm.amount > 0)
637 637
           );");
638 638
     }
639
-    if(!isset($update_tables['users']['immortal'])) {
639
+    if (!isset($update_tables['users']['immortal'])) {
640 640
       upd_alter_table('users', "ADD COLUMN `immortal` TIMESTAMP NULL", !isset($update_tables['users']['immortal']));
641 641
       upd_do_query("UPDATE {{users}} SET `immortal` = NOW() WHERE `metamatter_total` > 0;");
642 642
     }
643
-    if(isset($update_tables['player_award'])) {
643
+    if (isset($update_tables['player_award'])) {
644 644
       upd_do_query(
645 645
         "UPDATE {{users}} AS u JOIN {{player_award}} AS pa ON u.id = pa.player_id
646 646
           SET metamatter_total = 1, immortal = NOW()
@@ -667,7 +667,7 @@  discard block
 block discarded – undo
667 667
       CONSTRAINT `FK_user_id` FOREIGN KEY (`user_id`) REFERENCES `{{users}}` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
668 668
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;");
669 669
 
670
-    if(empty($update_tables['blitz_statpoints'])) {
670
+    if (empty($update_tables['blitz_statpoints'])) {
671 671
       upd_create_table('blitz_statpoints', " (
672 672
         `stat_date` int(11) NOT NULL DEFAULT '0',
673 673
         `id_owner` bigint(20) unsigned DEFAULT NULL,
@@ -735,7 +735,7 @@  discard block
 block discarded – undo
735 735
       CONSTRAINT `FK_survey_votes_survey_parent_id` FOREIGN KEY (`survey_parent_id`) REFERENCES `{{survey}}` (`survey_id`) ON DELETE CASCADE ON UPDATE CASCADE
736 736
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;");
737 737
 
738
-    if(empty($update_tables['security_url'])) {
738
+    if (empty($update_tables['security_url'])) {
739 739
       upd_create_table('security_url', " (
740 740
         `url_id` int unsigned NOT NULL AUTO_INCREMENT,
741 741
         `url_string` VARCHAR(250) NOT NULL DEFAULT '',
@@ -748,17 +748,17 @@  discard block
 block discarded – undo
748 748
 
749 749
         $strings = array();
750 750
         $query = classSupernova::$db->doSql($query);
751
-        while($row = db_fetch($query)) {
752
-          $strings[] = '("' . db_escape($row['url']) . '")';
753
-          if(count($strings) > 100) {
754
-            classSupernova::$db->doSql($query_string . implode(',', $strings));
751
+        while ($row = db_fetch($query)) {
752
+          $strings[] = '("'.db_escape($row['url']).'")';
753
+          if (count($strings) > 100) {
754
+            classSupernova::$db->doSql($query_string.implode(',', $strings));
755 755
             $strings = array();
756 756
           }
757 757
         }
758
-        !empty($strings) ? classSupernova::$db->doSql($query_string . implode(',', $strings)) : false;
758
+        !empty($strings) ? classSupernova::$db->doSql($query_string.implode(',', $strings)) : false;
759 759
       }
760 760
 
761
-      if(isset($update_tables['counter']['page'])) // TODO REMOVE
761
+      if (isset($update_tables['counter']['page'])) // TODO REMOVE
762 762
       {
763 763
         update_security_url("SELECT DISTINCT `page` AS url FROM {{counter}}");
764 764
         update_security_url("SELECT DISTINCT `url` AS url FROM {{counter}}");
@@ -783,7 +783,7 @@  discard block
 block discarded – undo
783 783
       "ADD CONSTRAINT `FK_counter_page_url_id` FOREIGN KEY (`page_url_id`) REFERENCES `{{security_url}}` (`url_id`) ON DELETE CASCADE ON UPDATE CASCADE",
784 784
       "ADD CONSTRAINT `FK_counter_plain_url_id` FOREIGN KEY (`plain_url_id`) REFERENCES `{{security_url}}` (`url_id`) ON DELETE CASCADE ON UPDATE CASCADE",
785 785
     ), !isset($update_tables['counter']['device_id']));
786
-    if(isset($update_tables['counter']['ip'])) {
786
+    if (isset($update_tables['counter']['ip'])) {
787 787
       // upd_do_query('UPDATE `{{counter}}` SET `user_ip` = INET_ATON(`ip`), `user_proxy` = `proxy`, `visit_time` = FROM_UNIXTIME(`time`)');
788 788
       upd_do_query('UPDATE `{{counter}}` SET `user_ip` = INET_ATON(`ip`), `visit_time` = FROM_UNIXTIME(`time`)');
789 789
       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');
@@ -834,7 +834,7 @@  discard block
 block discarded – undo
834 834
 
835 835
     upd_check_key('stats_history_days', 14, !classSupernova::$config->stats_history_days);
836 836
 
837
-    if(classSupernova::$config->payment_currency_default != 'USD') {
837
+    if (classSupernova::$config->payment_currency_default != 'USD') {
838 838
       upd_check_key('payment_currency_default', 'USD', true);
839 839
       upd_check_key('payment_currency_exchange_dm_', 20000, true);
840 840
       upd_check_key('payment_currency_exchange_mm_', 20000, true);
@@ -891,7 +891,7 @@  discard block
 block discarded – undo
891 891
 
892 892
     $virtual_exploded = explode('/', SN_ROOT_VIRTUAL_PARENT);
893 893
     // TODO - переделать всё на db_loadItem... НАВЕРНОЕ
894
-    upd_check_key('server_email', 'root@' . $virtual_exploded[2], !classSupernova::$config->db_loadItem('server_email'));
894
+    upd_check_key('server_email', 'root@'.$virtual_exploded[2], !classSupernova::$config->db_loadItem('server_email'));
895 895
 
896 896
     upd_alter_table('survey_votes', array(
897 897
       "DROP FOREIGN KEY `FK_survey_votes_user`",
@@ -917,12 +917,12 @@  discard block
 block discarded – undo
917 917
     function propagade_player_options($old_option_name, $new_option_id) {
918 918
       global $update_tables;
919 919
 
920
-      if(!empty($update_tables['users'][$old_option_name])) {
920
+      if (!empty($update_tables['users'][$old_option_name])) {
921 921
         upd_do_query(
922 922
           "REPLACE INTO {{player_options}} (`player_id`, `option_id`, `value`)
923 923
           SELECT `id`, {$new_option_id}, `{$old_option_name}`
924 924
           FROM {{users}}
925
-          WHERE `user_as_ally` is null and `user_bot` = " . USER_BOT_PLAYER);
925
+          WHERE `user_as_ally` is null and `user_bot` = ".USER_BOT_PLAYER);
926 926
         // TODO - UNCOMMENT !!!
927 927
         upd_alter_table('users', array("DROP COLUMN `{$old_option_name}`",));
928 928
       }
@@ -951,7 +951,7 @@  discard block
 block discarded – undo
951 951
 
952 952
 
953 953
     // 2015-08-03 15:05:26 40a6.0
954
-    if(empty($update_tables['planets']['position_original'])) {
954
+    if (empty($update_tables['planets']['position_original'])) {
955 955
       upd_alter_table('planets', array(
956 956
         "ADD COLUMN `position_original` smallint NOT NULL DEFAULT 0",
957 957
         "ADD COLUMN `field_max_original` smallint NOT NULL DEFAULT 0",
@@ -966,7 +966,7 @@  discard block
 block discarded – undo
966 966
       upd_do_query('UPDATE {{planets}} SET `position_original` = `planet`, `field_max_original` = `field_max`, `temp_min_original` = `temp_min`, `temp_max_original` = `temp_max`;');
967 967
 
968 968
       // Миграция тяжмета в оливин
969
-      upd_do_query('UPDATE {{planets}} SET `density_index` = ' . PLANET_DENSITY_METAL_PERIDOT . ' WHERE `density_index` = 7'); // deprecated define('PLANET_DENSITY_METAL_HEAVY', 7);
969
+      upd_do_query('UPDATE {{planets}} SET `density_index` = '.PLANET_DENSITY_METAL_PERIDOT.' WHERE `density_index` = 7'); // deprecated define('PLANET_DENSITY_METAL_HEAVY', 7);
970 970
 
971 971
       // Добавляем планету-странника
972 972
       upd_check_key('game_maxPlanet', 16, Vector::$knownPlanets == 15);
@@ -979,12 +979,12 @@  discard block
 block discarded – undo
979 979
 
980 980
     // 2015-08-27 19:14:05 40a10.0
981 981
     // Старая версия таблицы
982
-    if(!empty($update_tables['account']['account_is_global']) || empty($update_tables['account']['account_immortal'])) {
982
+    if (!empty($update_tables['account']['account_is_global']) || empty($update_tables['account']['account_immortal'])) {
983 983
       upd_drop_table('account');
984 984
       upd_drop_table('account_translate');
985 985
     }
986 986
 
987
-    if(empty($update_tables['account'])) {
987
+    if (empty($update_tables['account'])) {
988 988
       upd_create_table('account', " (
989 989
           `account_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
990 990
           `account_name` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT '',
@@ -1003,7 +1003,7 @@  discard block
 block discarded – undo
1003 1003
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;");
1004 1004
 
1005 1005
       upd_create_table('account_translate', " (
1006
-          `provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL . " COMMENT 'Account provider',
1006
+          `provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL." COMMENT 'Account provider',
1007 1007
           `provider_account_id` bigint(20) unsigned NOT NULL COMMENT 'Account ID on provider',
1008 1008
           `user_id` bigint(20) unsigned NOT NULL COMMENT 'User ID',
1009 1009
           `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -1018,12 +1018,12 @@  discard block
 block discarded – undo
1018 1018
             (`account_id`, `account_name`, `account_password`, `account_salt`, `account_email`, `account_register_time`, `account_language`, `account_metamatter`, `account_metamatter_total`, `account_immortal`)
1019 1019
           SELECT
1020 1020
             `id`, `username`, `password`, `salt`, `email_2`, FROM_UNIXTIME(register_time), `lang`, `metamatter`, `metamatter_total`, `immortal`
1021
-          FROM {{users}} WHERE `user_as_ally` IS NULL AND `user_bot` = " . USER_BOT_PLAYER . ";"
1021
+          FROM {{users}} WHERE `user_as_ally` IS NULL AND `user_bot` = " . USER_BOT_PLAYER.";"
1022 1022
       );
1023 1023
 
1024 1024
       upd_do_query(
1025 1025
         "REPLACE INTO {{account_translate}} (`provider_id`, `provider_account_id`, `user_id`, `timestamp`)
1026
-          SELECT " . ACCOUNT_PROVIDER_LOCAL . ", a.account_id, u.id, a.`account_register_time`
1026
+          SELECT " . ACCOUNT_PROVIDER_LOCAL.", a.account_id, u.id, a.`account_register_time`
1027 1027
             FROM {{users}} AS u
1028 1028
             JOIN {{account}} AS a ON
1029 1029
               a.account_name = u.username
@@ -1038,7 +1038,7 @@  discard block
 block discarded – undo
1038 1038
 
1039 1039
 
1040 1040
     // 2015-09-05 17:07:15 40a10.17
1041
-    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']));
1041
+    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']));
1042 1042
 
1043 1043
 
1044 1044
     // 2015-09-07 21:11:48 40a10.19
@@ -1046,18 +1046,18 @@  discard block
 block discarded – undo
1046 1046
 
1047 1047
 
1048 1048
     // 2015-09-24 11:39:37 40a10.25
1049
-    if(empty($update_tables['log_metamatter']['provider_id'])) {
1049
+    if (empty($update_tables['log_metamatter']['provider_id'])) {
1050 1050
       upd_alter_table('log_metamatter', array(
1051
-        "ADD COLUMN `provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL . " COMMENT 'Account provider'",
1051
+        "ADD COLUMN `provider_id` tinyint unsigned NOT NULL DEFAULT ".ACCOUNT_PROVIDER_LOCAL." COMMENT 'Account provider'",
1052 1052
         "ADD COLUMN `account_id` bigint(20) unsigned NOT NULL DEFAULT 0",
1053 1053
         "ADD COLUMN `account_name` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT ''",
1054
-        "ADD COLUMN `server_name` varchar(128) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT '" . SN_ROOT_VIRTUAL . "'",
1054
+        "ADD COLUMN `server_name` varchar(128) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT '".SN_ROOT_VIRTUAL."'",
1055 1055
       ), empty($update_tables['log_metamatter']['provider_id']));
1056 1056
 
1057 1057
       upd_do_query("UPDATE {{log_metamatter}} SET `account_id` = `user_id`, `account_name` = `username`");
1058 1058
 
1059 1059
       upd_alter_table('payment', array(
1060
-        "ADD COLUMN `payment_provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL . " COMMENT 'Payment account provider'",
1060
+        "ADD COLUMN `payment_provider_id` tinyint unsigned NOT NULL DEFAULT ".ACCOUNT_PROVIDER_LOCAL." COMMENT 'Payment account provider'",
1061 1061
         "ADD COLUMN `payment_account_id` bigint(20) unsigned NOT NULL",
1062 1062
         "ADD COLUMN `payment_account_name` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT ''",
1063 1063
       ), !$update_tables['payment']['payment_account_id']);
@@ -1098,7 +1098,7 @@  discard block
 block discarded – undo
1098 1098
     upd_check_key('event_halloween_2015_code', '', !isset(classSupernova::$config->event_halloween_2015_code));
1099 1099
     upd_check_key('event_halloween_2015_timestamp', SN_TIME_SQL, !isset(classSupernova::$config->event_halloween_2015_timestamp));
1100 1100
     upd_check_key('event_halloween_2015_units_used', serialize(array()), !isset(classSupernova::$config->event_halloween_2015_units_used));
1101
-    if(empty($update_tables['log_halloween_2015'])) {
1101
+    if (empty($update_tables['log_halloween_2015'])) {
1102 1102
       upd_create_table('log_halloween_2015', " (
1103 1103
       `log_hw2015_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
1104 1104
       `player_id` bigint(20) unsigned NOT NULL COMMENT 'User ID',
@@ -1113,7 +1113,7 @@  discard block
 block discarded – undo
1113 1113
 
1114 1114
 
1115 1115
     // 2015-11-28 06:30:27 40a19.21
1116
-    if(!isset($update_tables['ube_report']['ube_report_debris_total_in_metal'])) {
1116
+    if (!isset($update_tables['ube_report']['ube_report_debris_total_in_metal'])) {
1117 1117
       upd_alter_table('ube_report', array(
1118 1118
         "ADD COLUMN `ube_report_debris_total_in_metal` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Total debris in metal'",
1119 1119
         "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
@@ -1128,7 +1128,7 @@  discard block
 block discarded – undo
1128 1128
 
1129 1129
 
1130 1130
     // 2015-12-06 15:10:58 40b1.0
1131
-    if(!empty($update_indexes['planets']['I_metal_mine'])) {
1131
+    if (!empty($update_indexes['planets']['I_metal_mine'])) {
1132 1132
       upd_alter_table('planets', "DROP KEY `I_metal`", $update_indexes['planets']['I_metal']);
1133 1133
       upd_alter_table('planets', "DROP KEY `I_ship_sattelite_sloth`", $update_indexes['planets']['I_ship_sattelite_sloth']);
1134 1134
       upd_alter_table('planets', "DROP KEY `I_ship_bomber_envy`", $update_indexes['planets']['I_ship_bomber_envy']);
@@ -1191,7 +1191,7 @@  discard block
 block discarded – undo
1191 1191
   case 40:
1192 1192
     upd_log_version_update();
1193 1193
 
1194
-    if(empty($update_tables['festival'])) {
1194
+    if (empty($update_tables['festival'])) {
1195 1195
       upd_create_table('festival', " (
1196 1196
           `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
1197 1197
           `start` datetime NOT NULL COMMENT 'Festival start datetime',
@@ -1232,7 +1232,7 @@  discard block
 block discarded – undo
1232 1232
       );
1233 1233
     }
1234 1234
 
1235
-    if(empty($update_tables['festival_unit'])) {
1235
+    if (empty($update_tables['festival_unit'])) {
1236 1236
       upd_create_table('festival_unit', " (
1237 1237
           `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
1238 1238
           `highspot_id` int(10) unsigned DEFAULT NULL,
@@ -1249,7 +1249,7 @@  discard block
 block discarded – undo
1249 1249
     }
1250 1250
 
1251 1251
     // 2015-12-21 06:06:09 41a0.12
1252
-    if(empty($update_tables['festival_unit_log'])) {
1252
+    if (empty($update_tables['festival_unit_log'])) {
1253 1253
       upd_create_table('festival_unit_log', " (
1254 1254
           `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
1255 1255
           `highspot_id` int(10) unsigned DEFAULT NULL,
@@ -1279,19 +1279,19 @@  discard block
 block discarded – undo
1279 1279
       $update_tables['security_browser']['browser_user_agent']['Collation'] == 'latin1_bin'
1280 1280
     );
1281 1281
 
1282
-    if($update_indexes_full['security_browser']['I_browser_user_agent']['browser_user_agent']['Index_type'] == 'BTREE') {
1282
+    if ($update_indexes_full['security_browser']['I_browser_user_agent']['browser_user_agent']['Index_type'] == 'BTREE') {
1283 1283
       upd_alter_table('security_browser', "DROP KEY `I_browser_user_agent`", true);
1284 1284
       upd_alter_table('security_browser', "ADD KEY `I_browser_user_agent` (`browser_user_agent`) USING HASH", true);
1285 1285
     }
1286 1286
 
1287
-    if(!empty($update_tables['fleets']['fleet_array'])) {
1287
+    if (!empty($update_tables['fleets']['fleet_array'])) {
1288 1288
       $query = upd_do_query("SELECT * FROM {{fleets}}");
1289
-      while($row = db_fetch($query)) {
1289
+      while ($row = db_fetch($query)) {
1290 1290
         $unit_list = sys_unit_str2arr($row['fleet_array']);
1291
-        foreach($unit_list as $unit_id => $unit_count) {
1291
+        foreach ($unit_list as $unit_id => $unit_count) {
1292 1292
           upd_do_query(
1293 1293
             "REPLACE INTO {{unit}} (`unit_player_id`,`unit_location_type`,`unit_location_id`,`unit_type`,`unit_snid`,`unit_level`) VALUES
1294
-              ({$row['fleet_owner']}, " . LOC_FLEET . ", {$row['fleet_id']}, 200, {$unit_id}, {$unit_count});",
1294
+              ({$row['fleet_owner']}, ".LOC_FLEET.", {$row['fleet_id']}, 200, {$unit_id}, {$unit_count});",
1295 1295
 //              ({$row['fleet_owner']}, " . LOC_FLEET . ", {$row['fleet_id']}, " . get_unit_param($unit_id, P_UNIT_TYPE) . ", {$unit_id}, {$unit_count});",
1296 1296
             true
1297 1297
           );
@@ -1325,11 +1325,11 @@  discard block
 block discarded – undo
1325 1325
 
1326 1326
 classSupernova::$cache->unset_by_prefix('lng_');
1327 1327
 
1328
-if($new_version) {
1328
+if ($new_version) {
1329 1329
   classSupernova::$config->db_saveItem('db_version', $new_version);
1330 1330
   upd_log_message("<font color=green>DB version is now {$new_version}</font>");
1331 1331
 } else {
1332
-  upd_log_message("DB version didn't changed from " . classSupernova::$config->db_version);
1332
+  upd_log_message("DB version didn't changed from ".classSupernova::$config->db_version);
1333 1333
 }
1334 1334
 
1335 1335
 classSupernova::$config->db_loadAll();
Please login to merge, or discard this patch.
resources.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
  *
23 23
  **/
24 24
 
25
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
25
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
26 26
 
27 27
 /**
28 28
  * @param          $resource_id
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
   $storage_fill = $caps_real['total_storage'][$resource_id] ? floor(mrc_get_level($user, $planetrow, $resource_id) / $caps_real['total_storage'][$resource_id] * 100) : 0;
37 37
 
38 38
   $template->assign_block_vars('resources', array(
39
-    'NAME' => classLocale::$lang["sys_" . pname_resource_name($resource_id)],
39
+    'NAME' => classLocale::$lang["sys_".pname_resource_name($resource_id)],
40 40
 
41 41
     'HOURLY'  => pretty_number($totalProduction, true, true),
42 42
     'WEEKLY'  => pretty_number($totalProduction * 24 * 7, true, true),
@@ -76,12 +76,12 @@  discard block
 block discarded – undo
76 76
       $planetrow[$field_name] = $percent;
77 77
       $SubQry[$field_name] = $percent;
78 78
     } else {
79
-      classSupernova::$debug->warning('Supplying wrong ID in production array - attempt to change some field - ID' . $prod_id, 'Resource Page', 301);
79
+      classSupernova::$debug->warning('Supplying wrong ID in production array - attempt to change some field - ID'.$prod_id, 'Resource Page', 301);
80 80
       continue;
81 81
     }
82 82
   }
83 83
 
84
-  if(!empty($SubQry)) {
84
+  if (!empty($SubQry)) {
85 85
     DBStaticPlanet::db_planet_update_set_by_id(
86 86
       $planetrow['id'],
87 87
       $SubQry
Please login to merge, or discard this patch.
phalanx.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -11,24 +11,24 @@  discard block
 block discarded – undo
11 11
  * @copyright 2008 by Pada for XNova.project.es
12 12
  */
13 13
 
14
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
14
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
15 15
 
16 16
 lng_include('overview');
17 17
 lng_include('universe');
18 18
 
19 19
 $sensorLevel = mrc_get_level($user, $planetrow, STRUC_MOON_PHALANX);
20 20
 if (!intval($sensorLevel)) {
21
-  message (classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
21
+  message(classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
22 22
 }
23 23
 
24 24
 if ($planetrow['planet_type'] != PT_MOON) {
25
-  message (classLocale::$lang['phalanx_onlyformoons'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
25
+  message(classLocale::$lang['phalanx_onlyformoons'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
26 26
 }
27 27
 
28 28
 $scan_galaxy  = sys_get_param_int('galaxy');
29 29
 $scan_system  = sys_get_param_int('system');
30 30
 $scan_planet  = sys_get_param_int('planet');
31
-$scan_planet_type  = 1; // sys_get_param_int('planettype');
31
+$scan_planet_type = 1; // sys_get_param_int('planettype');
32 32
 $id = sys_get_param_id('id');
33 33
 
34 34
 $source_galaxy = $planetrow['galaxy'];
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
 $sensorRange = GetPhalanxRange($sensorLevel);
39 39
 
40 40
 $system_distance = abs($source_system - $scan_system);
41
-if($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
41
+if ($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
42 42
 {
43
-  message (classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
43
+  message(classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
44 44
 }
45 45
 
46 46
 $cost = $sensorLevel * 1000;
@@ -51,20 +51,20 @@  discard block
 block discarded – undo
51 51
 }
52 52
 
53 53
 $planet_scanned = DBStaticPlanet::db_planet_by_gspt($scan_galaxy, $scan_system, $scan_planet, $scan_planet_type);
54
-if(!$planet_scanned['id'])
54
+if (!$planet_scanned['id'])
55 55
 {
56 56
   message(classLocale::$lang['phalanx_planet_not_exists'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
57 57
 }
58 58
 
59
-if($planet_scanned['destruyed'])
59
+if ($planet_scanned['destruyed'])
60 60
 {
61
-  message (classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
61
+  message(classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
62 62
 }
63 63
 
64 64
 DBStaticPlanet::db_planet_update_adjust_by_id(
65 65
   $user['current_planet'],
66 66
   array(
67
-    'deuterium' => - $cost,
67
+    'deuterium' => -$cost,
68 68
   )
69 69
 );
70 70
 
Please login to merge, or discard this patch.
overview.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 
31 31
 //define('SN_RENDER_NAVBAR_PLANET', false);
32 32
 
33
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
33
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
34 34
 
35 35
 //$ccc = 0;
36 36
 //foreach(DBStaticUser::db_user_list_non_bots() as $ip) {
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 
50 50
 $result = array();
51 51
 
52
-switch($mode = sys_get_param_str('mode')) {
52
+switch ($mode = sys_get_param_str('mode')) {
53 53
   case 'manage':
54 54
     sn_sys_sector_buy('overview.php?mode=manage');
55 55
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     $template  = gettemplate('planet_manage', true);
60 60
     $planet_id = sys_get_param_id('planet_id');
61 61
 
62
-    if(sys_get_param_str('rename') && ($new_name_unsafe = sys_get_param_str_unsafe('new_name'))) {
62
+    if (sys_get_param_str('rename') && ($new_name_unsafe = sys_get_param_str_unsafe('new_name'))) {
63 63
       $planetrow['name'] = $new_name_unsafe;
64 64
       DBStaticPlanet::db_planet_update_set_by_id(
65 65
         $planetrow['id'],
@@ -67,21 +67,21 @@  discard block
 block discarded – undo
67 67
           'name' => $new_name_unsafe,
68 68
         )
69 69
       );
70
-    } elseif(sys_get_param_str('action') == 'make_capital') {
70
+    } elseif (sys_get_param_str('action') == 'make_capital') {
71 71
       try {
72 72
         sn_db_transaction_start();
73 73
         $user = DBStaticUser::db_user_by_id($user['id'], true, '*');
74 74
         $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true, '*');
75 75
 
76
-        if($planetrow['planet_type'] != PT_PLANET) {
76
+        if ($planetrow['planet_type'] != PT_PLANET) {
77 77
           throw new exception(classLocale::$lang['ov_capital_err_not_a_planet'], ERR_ERROR);
78 78
         }
79 79
 
80
-        if($planetrow['id'] == $user['id_planet']) {
80
+        if ($planetrow['id'] == $user['id_planet']) {
81 81
           throw new exception(classLocale::$lang['ov_capital_err_capital_already'], ERR_ERROR);
82 82
         }
83 83
 
84
-        if($user_dark_matter < classSupernova::$config->planet_capital_cost) {
84
+        if ($user_dark_matter < classSupernova::$config->planet_capital_cost) {
85 85
           throw new exception(classLocale::$lang['ov_capital_err_no_dark_matter'], ERR_ERROR);
86 86
         }
87 87
 
@@ -106,16 +106,16 @@  discard block
 block discarded – undo
106 106
         );
107 107
         sn_db_transaction_commit();
108 108
         sys_redirect('overview.php?mode=manage');
109
-      } catch(exception $e) {
109
+      } catch (exception $e) {
110 110
         sn_db_transaction_rollback();
111 111
         $result[] = array(
112 112
           'STATUS'  => $e->getCode(),
113 113
           'MESSAGE' => $e->getMessage(),
114 114
         );
115 115
       }
116
-    } elseif(sys_get_param_str('action') == 'planet_teleport') {
116
+    } elseif (sys_get_param_str('action') == 'planet_teleport') {
117 117
       try {
118
-        if(!uni_coordinates_valid($new_coordinates = array(
118
+        if (!uni_coordinates_valid($new_coordinates = array(
119 119
           'galaxy' => sys_get_param_int('new_galaxy'),
120 120
           'system' => sys_get_param_int('new_system'),
121 121
           'planet' => sys_get_param_int('new_planet')))
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 //        $planetrow = $global_data['planet'];
133 133
 
134 134
         $can_teleport = uni_planet_teleport_check($user, $planetrow, $new_coordinates);
135
-        if($can_teleport['result'] != ERR_NONE) {
135
+        if ($can_teleport['result'] != ERR_NONE) {
136 136
           throw new exception($can_teleport['message'], $can_teleport['result']);
137 137
         }
138 138
 
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
           array()
152 152
         );
153 153
 
154
-        if($planetrow['id'] == $user['id_planet']) {
154
+        if ($planetrow['id'] == $user['id_planet']) {
155 155
           DBStaticUser::db_user_set_by_id(
156 156
             $user['id'],
157 157
             array(
@@ -171,17 +171,17 @@  discard block
 block discarded – undo
171 171
           'MESSAGE' => classLocale::$lang['ov_teleport_err_none'],
172 172
         );
173 173
         sys_redirect('overview.php?mode=manage');
174
-      } catch(exception $e) {
174
+      } catch (exception $e) {
175 175
         sn_db_transaction_rollback();
176 176
         $result[] = array(
177 177
           'STATUS'  => $e->getCode(),
178 178
           'MESSAGE' => $e->getMessage(),
179 179
         );
180 180
       }
181
-    } elseif(sys_get_param_str('action') == 'planet_abandon') {
181
+    } elseif (sys_get_param_str('action') == 'planet_abandon') {
182 182
       // if(sec_password_check($user['id'], sys_get_param('abandon_confirm'))) {
183
-      if(classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
184
-        if($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
183
+      if (classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
184
+        if ($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
185 185
           $destroyed = SN_TIME_NOW + 60 * 60 * 24;
186 186
           DBStaticPlanet::db_planet_update_set_by_id(
187 187
             $user['current_planet'],
@@ -207,9 +207,9 @@  discard block
 block discarded – undo
207 207
           message(classLocale::$lang['ov_delete_wrong_planet'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
208 208
         }
209 209
       } else {
210
-        message(classLocale::$lang['ov_delete_wrong_pass'] , classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
210
+        message(classLocale::$lang['ov_delete_wrong_pass'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
211 211
       }
212
-    } elseif(
212
+    } elseif (
213 213
       ($hire = sys_get_param_int('hire')) && in_array($hire, sn_get_groups('governors'))
214 214
       && (
215 215
         !get_unit_param($hire, P_MAX_STACK) ||
@@ -224,8 +224,8 @@  discard block
 block discarded – undo
224 224
       $user = DBStaticUser::db_user_by_id($user['id'], true);
225 225
       $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
226 226
       $build_data = eco_get_build_data($user, $planetrow, $hire, $planetrow['PLANET_GOVERNOR_ID'] == $hire ? $planetrow['PLANET_GOVERNOR_LEVEL'] : 0);
227
-      if($build_data['CAN'][BUILD_CREATE]) {
228
-        if($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
227
+      if ($build_data['CAN'][BUILD_CREATE]) {
228
+        if ($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
229 229
           $planetrow['PLANET_GOVERNOR_LEVEL']++;
230 230
         } else {
231 231
           $planetrow['PLANET_GOVERNOR_LEVEL'] = 1;
@@ -257,8 +257,8 @@  discard block
 block discarded – undo
257 257
 
258 258
     lng_include('mrc_mercenary');
259 259
     int_planet_pretemplate($planetrow, $template);
260
-    foreach(sn_get_groups('governors') as $governor_id) {
261
-      if($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
260
+    foreach (sn_get_groups('governors') as $governor_id) {
261
+      if ($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
262 262
         continue;
263 263
       }
264 264
 
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
       'PAGE_HINT'   => classLocale::$lang['ov_manage_page_hint'],
311 311
     ));
312 312
 
313
-    foreach($result as &$a_result) {
313
+    foreach ($result as &$a_result) {
314 314
       $template->assign_block_vars('result', $a_result);
315 315
     }
316 316
 
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
   default:
321 321
     sn_sys_sector_buy();
322 322
 
323
-    if(sys_get_param_str('rename') && $new_name_unsafe = sys_get_param_str_unsafe('new_name')) {
323
+    if (sys_get_param_str('rename') && $new_name_unsafe = sys_get_param_str_unsafe('new_name')) {
324 324
       $planetrow['name'] = $new_name_unsafe;
325 325
       DBStaticPlanet::db_planet_update_set_by_id(
326 326
         $planetrow['id'],
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 
356 356
     $planet_count = 0;
357 357
     $planets_query = DBStaticPlanet::db_planet_list_sorted($user, false, '*');
358
-    foreach($planets_query as $an_id => $UserPlanet) {
358
+    foreach ($planets_query as $an_id => $UserPlanet) {
359 359
       sn_db_transaction_start();
360 360
       $UserPlanet = sys_o_get_updated($user, $UserPlanet['id'], SN_TIME_NOW, false, true);
361 361
       sn_db_transaction_commit();
@@ -366,16 +366,16 @@  discard block
 block discarded – undo
366 366
 
367 367
       $planet_fleet_id = 0;
368 368
       $fleet_list = $template_planet['fleet_list'];
369
-      if($fleet_list['own']['count']) {
369
+      if ($fleet_list['own']['count']) {
370 370
         $planet_fleet_id = "p{$UserPlanet['id']}";
371 371
         $fleets_to_planet[$UserPlanet['id']] = tpl_parse_fleet_sn($fleet_list['own']['total'], $planet_fleet_id);
372 372
 //        $fleet_id++;tpl_parse_fleet_sn
373 373
       }
374
-      if($UserPlanet['planet_type'] == PT_MOON) {
374
+      if ($UserPlanet['planet_type'] == PT_MOON) {
375 375
         continue;
376 376
       }
377 377
       $moon = DBStaticPlanet::db_planet_by_parent($UserPlanet['id']);
378
-      if($moon) {
378
+      if ($moon) {
379 379
         $moon_fill = min(100, floor($moon['field_current'] / eco_planet_fields_max($moon) * 100));
380 380
       } else {
381 381
         $moon_fill = 0;
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
     tpl_assign_fleet($template, $fleets);
416 416
 
417 417
     $lune = $planetrow['planet_type'] == PT_PLANET ? DBStaticPlanet::db_planet_by_parent($planetrow['id']) : DBStaticPlanet::db_planet_by_id($planetrow['parent_planet']);
418
-    if($lune) {
418
+    if ($lune) {
419 419
       $template->assign_vars(array(
420 420
         'MOON_ID' => $lune['id'],
421 421
         'MOON_IMG' => $lune['image'],
@@ -427,15 +427,15 @@  discard block
 block discarded – undo
427 427
     $planet_fill = $planet_fill > 100 ? 100 : $planet_fill;
428 428
 
429 429
     $planet_recyclers_orbiting = 0;
430
-    foreach(Fleet::$snGroupRecyclers as $recycler_id) {
430
+    foreach (Fleet::$snGroupRecyclers as $recycler_id) {
431 431
       $planet_recyclers_orbiting += mrc_get_level($user, $planetrow, $recycler_id);
432 432
     }
433 433
 
434 434
     int_planet_pretemplate($planetrow, $template);
435 435
 
436 436
     $sn_group_ques = sn_get_groups('ques');
437
-    if(!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
438
-      foreach(array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
437
+    if (!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
438
+      foreach (array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
439 439
         $this_que = $que['ques'][$que_id][$user['id']][$planetrow['id']];
440 440
         $template->assign_block_vars('ques', array(
441 441
           'ID'     => $que_id,
@@ -443,8 +443,8 @@  discard block
 block discarded – undo
443 443
           'LENGTH' => empty($this_que) ? 0 : count($this_que),
444 444
         ));
445 445
 
446
-        if(!empty($this_que)) {
447
-          foreach($this_que as $que_item) {
446
+        if (!empty($this_que)) {
447
+          foreach ($this_que as $que_item) {
448 448
             $template->assign_block_vars('que', que_tpl_parse_element($que_item));
449 449
           }
450 450
         }
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
       'LENGTH' => $que_hangar_length,
459 459
     ));
460 460
 
461
-    if(!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
461
+    if (!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
462 462
       $que_hangar_length = tpl_assign_hangar($template, $planetrow, SUBQUE_DEFENSE);
463 463
       $template->assign_block_vars('ques', array(
464 464
         'ID'     => SUBQUE_DEFENSE,
@@ -470,12 +470,12 @@  discard block
 block discarded – undo
470 470
     $overview_planet_rows = $user['opt_int_overview_planet_rows'];
471 471
     $overview_planet_columns = $user['opt_int_overview_planet_columns'];
472 472
 
473
-    if($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
473
+    if ($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
474 474
       $overview_planet_rows = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_rows'];
475 475
       $overview_planet_columns = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_columns'];
476 476
     }
477 477
 
478
-    if($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
478
+    if ($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
479 479
       $overview_planet_columns = ceil($planet_count / $overview_planet_rows);
480 480
     }
481 481
 
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
532 532
     ));
533 533
     tpl_set_resource_info($template, $planetrow, $fleets_to_planet, 2);
534 534
 
535
-    foreach($result as &$a_result) {
535
+    foreach ($result as &$a_result) {
536 536
       $template->assign_block_vars('result', $a_result);
537 537
     }
538 538
 
Please login to merge, or discard this patch.
jumpgate.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -10,34 +10,34 @@  discard block
 block discarded – undo
10 10
  * @copyright 2008 By Chlorel for XNova
11 11
  */
12 12
 
13
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
13
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
14 14
 
15 15
 lng_include('fleet');
16 16
 
17
-if($TargetPlanet = sys_get_param_id('jmpto'))
17
+if ($TargetPlanet = sys_get_param_id('jmpto'))
18 18
 {
19 19
   sn_db_transaction_start();
20 20
   DBStaticUser::db_user_by_id($user['id'], true, 'id');
21 21
   $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
22
-  if(!($NextJumpTime = uni_get_time_to_jump($planetrow)))
22
+  if (!($NextJumpTime = uni_get_time_to_jump($planetrow)))
23 23
   {
24 24
     $TargetGate = DBStaticPlanet::db_planet_by_id($TargetPlanet, true, '`id`, `last_jump_time`');
25
-    if(mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
25
+    if (mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
26 26
     {
27
-      $NextDestTime = uni_get_time_to_jump ( $TargetGate );
28
-      if(!$NextDestTime)
27
+      $NextDestTime = uni_get_time_to_jump($TargetGate);
28
+      if (!$NextDestTime)
29 29
       {
30 30
         $ship_list = sys_get_param('ships');
31 31
         $jumpMade = false;
32
-        foreach($ship_list as $ship_id => $ship_count)
32
+        foreach ($ship_list as $ship_id => $ship_count)
33 33
         {
34
-          if(!in_array($ship_id, Fleet::$snGroupFleet))
34
+          if (!in_array($ship_id, Fleet::$snGroupFleet))
35 35
           {
36 36
             continue;
37 37
           }
38 38
 
39 39
           $ship_count = max(0, min(floor($ship_count), mrc_get_level($user, $planetrow, $ship_id)));
40
-          if($ship_count)
40
+          if ($ship_count)
41 41
           {
42 42
             $jumpMade = true;
43 43
             DBStaticUnit::dbUpdateOrInsertUnit($ship_id, -$ship_count, $user, $planetrow['id']);
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
           }
46 46
         }
47 47
 
48
-        if($jumpMade)
48
+        if ($jumpMade)
49 49
         {
50 50
           DBStaticPlanet::db_planet_update_set_by_id(
51 51
             $TargetGate['id'],
@@ -67,31 +67,31 @@  discard block
 block discarded – undo
67 67
           );
68 68
 
69 69
           $planetrow['last_jump_time'] = SN_TIME_NOW;
70
-          $RetMessage = classLocale::$lang['gate_jump_done'] ." - ". pretty_time(uni_get_time_to_jump($planetrow));
70
+          $RetMessage = classLocale::$lang['gate_jump_done']." - ".pretty_time(uni_get_time_to_jump($planetrow));
71 71
         } else {
72 72
           $RetMessage = classLocale::$lang['gate_wait_data'];
73 73
         }
74 74
       } else {
75
-        $RetMessage = classLocale::$lang['gate_wait_dest'] ." - ". pretty_time($NextDestTime);
75
+        $RetMessage = classLocale::$lang['gate_wait_dest']." - ".pretty_time($NextDestTime);
76 76
       }
77 77
     } else {
78 78
       $RetMessage = classLocale::$lang['gate_no_dest_g'];
79 79
     }
80 80
   } else {
81
-    $RetMessage = classLocale::$lang['gate_wait_star'] ." - ". pretty_time($NextJumpTime);
81
+    $RetMessage = classLocale::$lang['gate_wait_star']." - ".pretty_time($NextJumpTime);
82 82
   }
83 83
   sn_db_transaction_commit();
84 84
   message($RetMessage, classLocale::$lang['tech'][STRUC_MOON_GATE], "jumpgate.php", 10);
85 85
 } else {
86 86
   $template = gettemplate('jumpgate', true);
87
-  if(mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
87
+  if (mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
88 88
   {
89 89
     $Combo = '';
90 90
     $MoonList = DBStaticPlanet::db_planet_list_moon_other($user['id'], $planetrow['id']);
91 91
     // while($CurMoon = db_fetch($MoonList))
92
-    foreach($MoonList as $CurMoon)
92
+    foreach ($MoonList as $CurMoon)
93 93
     {
94
-      if(mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
94
+      if (mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
95 95
       {
96 96
         $NextJumpTime = uni_get_time_to_jump($CurMoon);
97 97
         $template->assign_block_vars('moon', array(
@@ -105,9 +105,9 @@  discard block
 block discarded – undo
105 105
       }
106 106
     }
107 107
 
108
-    foreach(Fleet::$snGroupFleet as $Ship)
108
+    foreach (Fleet::$snGroupFleet as $Ship)
109 109
     {
110
-      if(($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
110
+      if (($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
111 111
       {
112 112
         continue;
113 113
       }
Please login to merge, or discard this patch.
admin/planet_edit.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -4,16 +4,16 @@  discard block
 block discarded – undo
4 4
 define('INSTALL', false);
5 5
 define('IN_ADMIN', true);
6 6
 
7
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
7
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
8 8
 
9 9
 // if($user['authlevel'] < 2)
10
-if($user['authlevel'] < 3)
10
+if ($user['authlevel'] < 3)
11 11
 {
12 12
   AdminMessage(classLocale::$lang['adm_err_denied']);
13 13
 }
14 14
 AdminMessage('Временно не работает');
15 15
 
16
-require("includes/admin_planet_edit.inc" . DOT_PHP_EX);
16
+require("includes/admin_planet_edit.inc".DOT_PHP_EX);
17 17
 
18 18
 $template = gettemplate('admin/admin_planet_edit', true);
19 19
 
@@ -21,30 +21,30 @@  discard block
 block discarded – undo
21 21
 $planet_id = sys_get_param_id('planet_id');
22 22
 
23 23
 $unit_list = sys_get_param('unit_list');
24
-if(sys_get_param('change_data') && !empty($unit_list))
24
+if (sys_get_param('change_data') && !empty($unit_list))
25 25
 {
26 26
   $query_string = array();
27
-  foreach($unit_list as $unit_id => $unit_amount)
27
+  foreach ($unit_list as $unit_id => $unit_amount)
28 28
   {
29
-    if($unit_query_string = admin_planet_edit_query_string($unit_id, $unit_amount, $mode))
29
+    if ($unit_query_string = admin_planet_edit_query_string($unit_id, $unit_amount, $mode))
30 30
     {
31 31
       $query_string[] = $unit_query_string;
32 32
     }
33 33
   }
34 34
 
35
-  if(!empty($query_string))
35
+  if (!empty($query_string))
36 36
   {
37
-    classSupernova::$db->doUpdateReallyComplex("UPDATE {{" . TABLE_PLANETS . "}} SET " . implode(', ', $query_string) . " WHERE `id` = {$planet_id}");
37
+    classSupernova::$db->doUpdateReallyComplex("UPDATE {{".TABLE_PLANETS."}} SET ".implode(', ', $query_string)." WHERE `id` = {$planet_id}");
38 38
   }
39 39
 }
40 40
 
41
-if($planet_id)
41
+if ($planet_id)
42 42
 {
43 43
   $edit_planet_row = DBStaticPlanet::db_planet_by_id($planet_id);
44 44
   admin_planet_edit_template($template, $edit_planet_row, $mode);
45 45
 }
46 46
 
47
-foreach($admin_planet_edit_mode_list as $page_mode => $mode_locale)
47
+foreach ($admin_planet_edit_mode_list as $page_mode => $mode_locale)
48 48
 {
49 49
   $template->assign_block_vars('page_menu', array(
50 50
     'ID' => $page_mode,
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 $template->assign_vars(array(
56 56
   'MODE' => $mode,
57 57
   'PLANET_ID' => $planet_id,
58
-  'PLANET_NAME' => empty($edit_planet_row) ? '' : classLocale::$lang['sys_planet_type'][$edit_planet_row['planet_type']] . ' ' . uni_render_planet($edit_planet_row),
58
+  'PLANET_NAME' => empty($edit_planet_row) ? '' : classLocale::$lang['sys_planet_type'][$edit_planet_row['planet_type']].' '.uni_render_planet($edit_planet_row),
59 59
   'PAGE_HINT' => classLocale::$lang['adm_planet_edit_hint'],
60 60
 ));
61 61
 
Please login to merge, or discard this patch.