Completed
Push — trunk ( 0e7a2e...6a6c5e )
by SuperNova.WS
07:28
created
includes/includes/ube_report.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -109,33 +109,33 @@  discard block
 block discarded – undo
109 109
       `ube_report_time_combat` = '" . date(FMT_DATE_TIME_SQL, $combat_data[UBE_TIME]) . "',
110 110
       `ube_report_time_spent` = {$combat_data[UBE_TIME_SPENT]},
111 111
 
112
-      `ube_report_combat_admin` = " . (int)$combat_data[UBE_OPTIONS][UBE_COMBAT_ADMIN] . ",
112
+      `ube_report_combat_admin` = " . (int) $combat_data[UBE_OPTIONS][UBE_COMBAT_ADMIN] . ",
113 113
       `ube_report_mission_type` = {$combat_data[UBE_OPTIONS][UBE_MISSION_TYPE]},
114 114
 
115 115
       `ube_report_combat_result` = {$outcome[UBE_COMBAT_RESULT]},
116
-      `ube_report_combat_sfr` = " . (int)$outcome[UBE_SFR] . ",
116
+      `ube_report_combat_sfr` = " . (int) $outcome[UBE_SFR] . ",
117 117
 
118
-      `ube_report_debris_metal` = " . (float)$outcome[UBE_DEBRIS][RES_METAL] . ",
119
-      `ube_report_debris_crystal` = " . (float)$outcome[UBE_DEBRIS][RES_CRYSTAL] . ",
118
+      `ube_report_debris_metal` = " . (float) $outcome[UBE_DEBRIS][RES_METAL] . ",
119
+      `ube_report_debris_crystal` = " . (float) $outcome[UBE_DEBRIS][RES_CRYSTAL] . ",
120 120
       `ube_report_debris_total_in_metal` = " . $ube_report_debris_total_in_metal . ",
121 121
 
122
-      `ube_report_planet_id`          = " . (int)$outcome[UBE_PLANET][PLANET_ID] . ",
122
+      `ube_report_planet_id`          = " . (int) $outcome[UBE_PLANET][PLANET_ID] . ",
123 123
       `ube_report_planet_name`        = '" . db_escape($outcome[UBE_PLANET][PLANET_NAME]) . "',
124
-      `ube_report_planet_size`        = " . (int)$outcome[UBE_PLANET][PLANET_SIZE] . ",
125
-      `ube_report_planet_galaxy`      = " . (int)$outcome[UBE_PLANET][PLANET_GALAXY] . ",
126
-      `ube_report_planet_system`      = " . (int)$outcome[UBE_PLANET][PLANET_SYSTEM] . ",
127
-      `ube_report_planet_planet`      = " . (int)$outcome[UBE_PLANET][PLANET_PLANET] . ",
128
-      `ube_report_planet_planet_type` = " . (int)$outcome[UBE_PLANET][PLANET_TYPE] . ",
124
+      `ube_report_planet_size`        = " . (int) $outcome[UBE_PLANET][PLANET_SIZE] . ",
125
+      `ube_report_planet_galaxy`      = " . (int) $outcome[UBE_PLANET][PLANET_GALAXY] . ",
126
+      `ube_report_planet_system`      = " . (int) $outcome[UBE_PLANET][PLANET_SYSTEM] . ",
127
+      `ube_report_planet_planet`      = " . (int) $outcome[UBE_PLANET][PLANET_PLANET] . ",
128
+      `ube_report_planet_planet_type` = " . (int) $outcome[UBE_PLANET][PLANET_TYPE] . ",
129 129
 
130
-      `ube_report_moon` = " . (int)$outcome[UBE_MOON] . ",
131
-      `ube_report_moon_chance` = " . (int)$outcome[UBE_MOON_CHANCE] . ",
132
-      `ube_report_moon_size` = " . (float)$outcome[UBE_MOON_SIZE] . ",
130
+      `ube_report_moon` = " . (int) $outcome[UBE_MOON] . ",
131
+      `ube_report_moon_chance` = " . (int) $outcome[UBE_MOON_CHANCE] . ",
132
+      `ube_report_moon_size` = " . (float) $outcome[UBE_MOON_SIZE] . ",
133 133
 
134
-      `ube_report_moon_reapers` = " . (int)$outcome[UBE_MOON_REAPERS] . ",
135
-      `ube_report_moon_destroy_chance` = " . (int)$outcome[UBE_MOON_DESTROY_CHANCE] . ",
136
-      `ube_report_moon_reapers_die_chance` = " . (int)$outcome[UBE_MOON_REAPERS_DIE_CHANCE] . ",
134
+      `ube_report_moon_reapers` = " . (int) $outcome[UBE_MOON_REAPERS] . ",
135
+      `ube_report_moon_destroy_chance` = " . (int) $outcome[UBE_MOON_DESTROY_CHANCE] . ",
136
+      `ube_report_moon_reapers_die_chance` = " . (int) $outcome[UBE_MOON_REAPERS_DIE_CHANCE] . ",
137 137
 
138
-      `ube_report_capture_result` = " . (int)$outcome[UBE_CAPTURE_RESULT] . "
138
+      `ube_report_capture_result` = " . (int) $outcome[UBE_CAPTURE_RESULT] . "
139 139
   ");
140 140
   $ube_report_id = $combat_data[UBE_REPORT_ID] = db_insert_id();
141 141
 
@@ -146,11 +146,11 @@  discard block
 block discarded – undo
146 146
       $player_id,
147 147
 
148 148
       "'" . db_escape($player_info[UBE_NAME]) . "'",
149
-      (int)$player_info[UBE_ATTACKER],
149
+      (int) $player_info[UBE_ATTACKER],
150 150
 
151
-      (float)$player_info[UBE_BONUSES][UBE_ATTACK],
152
-      (float)$player_info[UBE_BONUSES][UBE_SHIELD],
153
-      (float)$player_info[UBE_BONUSES][UBE_ARMOR],
151
+      (float) $player_info[UBE_BONUSES][UBE_ATTACK],
152
+      (float) $player_info[UBE_BONUSES][UBE_SHIELD],
153
+      (float) $player_info[UBE_BONUSES][UBE_ARMOR],
154 154
     );
155 155
   }
156 156
 
@@ -163,20 +163,20 @@  discard block
 block discarded – undo
163 163
       $fleet_info[UBE_OWNER],
164 164
       $fleet_id,
165 165
 
166
-      (float)$fleet_info[UBE_PLANET][PLANET_ID],
166
+      (float) $fleet_info[UBE_PLANET][PLANET_ID],
167 167
       "'" . db_escape($fleet_info[UBE_PLANET][PLANET_NAME]) . "'",
168
-      (int)$fleet_info[UBE_PLANET][PLANET_GALAXY],
169
-      (int)$fleet_info[UBE_PLANET][PLANET_SYSTEM],
170
-      (int)$fleet_info[UBE_PLANET][PLANET_PLANET],
171
-      (int)$fleet_info[UBE_PLANET][PLANET_TYPE],
172
-
173
-      (float)$fleet_info[UBE_RESOURCES][RES_METAL],
174
-      (float)$fleet_info[UBE_RESOURCES][RES_CRYSTAL],
175
-      (float)$fleet_info[UBE_RESOURCES][RES_DEUTERIUM],
176
-
177
-      (float)$fleet_info[UBE_BONUSES][UBE_ATTACK],
178
-      (float)$fleet_info[UBE_BONUSES][UBE_SHIELD],
179
-      (float)$fleet_info[UBE_BONUSES][UBE_ARMOR],
168
+      (int) $fleet_info[UBE_PLANET][PLANET_GALAXY],
169
+      (int) $fleet_info[UBE_PLANET][PLANET_SYSTEM],
170
+      (int) $fleet_info[UBE_PLANET][PLANET_PLANET],
171
+      (int) $fleet_info[UBE_PLANET][PLANET_TYPE],
172
+
173
+      (float) $fleet_info[UBE_RESOURCES][RES_METAL],
174
+      (float) $fleet_info[UBE_RESOURCES][RES_CRYSTAL],
175
+      (float) $fleet_info[UBE_RESOURCES][RES_DEUTERIUM],
176
+
177
+      (float) $fleet_info[UBE_BONUSES][UBE_ATTACK],
178
+      (float) $fleet_info[UBE_BONUSES][UBE_SHIELD],
179
+      (float) $fleet_info[UBE_BONUSES][UBE_ARMOR],
180 180
     );
181 181
 
182 182
     // Сохраняем итоговую информацию по ресурсам флота - потеряно, выброшено, увезено
@@ -185,19 +185,19 @@  discard block
 block discarded – undo
185 185
       $ube_report_id,
186 186
       $fleet_id,
187 187
 
188
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST][RES_METAL],
189
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST][RES_CRYSTAL],
190
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST][RES_DEUTERIUM],
188
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST][RES_METAL],
189
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST][RES_CRYSTAL],
190
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST][RES_DEUTERIUM],
191 191
 
192
-      (float)$fleet_outcome_data[UBE_CARGO_DROPPED][RES_METAL],
193
-      (float)$fleet_outcome_data[UBE_CARGO_DROPPED][RES_CRYSTAL],
194
-      (float)$fleet_outcome_data[UBE_CARGO_DROPPED][RES_DEUTERIUM],
192
+      (float) $fleet_outcome_data[UBE_CARGO_DROPPED][RES_METAL],
193
+      (float) $fleet_outcome_data[UBE_CARGO_DROPPED][RES_CRYSTAL],
194
+      (float) $fleet_outcome_data[UBE_CARGO_DROPPED][RES_DEUTERIUM],
195 195
 
196
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_METAL],
197
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_CRYSTAL],
198
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_DEUTERIUM],
196
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_METAL],
197
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_CRYSTAL],
198
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOOTED][RES_DEUTERIUM],
199 199
 
200
-      (float)$fleet_outcome_data[UBE_RESOURCES_LOST_IN_METAL][RES_METAL],
200
+      (float) $fleet_outcome_data[UBE_RESOURCES_LOST_IN_METAL][RES_METAL],
201 201
     );
202 202
 
203 203
     // Сохраняем результаты по юнитам - потеряно и восстановлено
@@ -209,8 +209,8 @@  discard block
 block discarded – undo
209 209
           $fleet_id,
210 210
 
211 211
           $unit_id,
212
-          (float)$fleet_outcome_data[UBE_DEFENCE_RESTORE][$unit_id],
213
-          (float)$fleet_outcome_data[UBE_UNITS_LOST][$unit_id],
212
+          (float) $fleet_outcome_data[UBE_DEFENCE_RESTORE][$unit_id],
213
+          (float) $fleet_outcome_data[UBE_UNITS_LOST][$unit_id],
214 214
 
215 215
           $unit_sort_order,
216 216
         );
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 
234 234
           $unit_id,
235 235
           $unit_count,
236
-          (int)$fleet_data[UBE_UNITS_BOOM][$unit_id],
236
+          (int) $fleet_data[UBE_UNITS_BOOM][$unit_id],
237 237
 
238 238
           $fleet_data[UBE_ATTACK][$unit_id],
239 239
           $fleet_data[UBE_SHIELD][$unit_id],
Please login to merge, or discard this patch.
classes/Fleet/MissionEspionage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 
31 31
       $this->target_message = "{$lang['sys_mess_spy_enemy_fleet']} {$this->src_planet['name']} " . uni_render_coordinates_href($this->src_planet, '', 3);
32 32
       $this->target_message .= " {$lang['sys_mess_spy_seen_at']} {$this->dst_planet['name']} " . uni_render_coordinates($this->dst_planet);
33
-      if($this->missionReport->isSpyDetected()) {
33
+      if ($this->missionReport->isSpyDetected()) {
34 34
         $this->target_message .= "<br />{$lang['sys_mess_spy_destroyed_enemy']}";
35 35
       }
36 36
 
Please login to merge, or discard this patch.
classes/Pm/DecodeEspionage.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
25 25
       $groups[get_unit_param($unitId, P_UNIT_TYPE)][$unitId] = $unitAmount;
26 26
     }
27 27
 
28
-    foreach(static::ALLOWED_UNITS as $groupId) {
29
-      if(empty($groups[$groupId])) {
28
+    foreach (static::ALLOWED_UNITS as $groupId) {
29
+      if (empty($groups[$groupId])) {
30 30
         continue;
31 31
       }
32 32
 
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
         'NAME' => $lang['tech'][$groupId],
36 36
       ]);
37 37
 
38
-      foreach($general->getGroupsById($groupId) as $unitId) {
39
-        if((!isset($groups[$groupId][$unitId]) || floor($groups[$groupId][$unitId]) < 1) && $unitId != RES_ENERGY) {
38
+      foreach ($general->getGroupsById($groupId) as $unitId) {
39
+        if ((!isset($groups[$groupId][$unitId]) || floor($groups[$groupId][$unitId]) < 1) && $unitId != RES_ENERGY) {
40 40
           continue;
41 41
         }
42 42
 
Please login to merge, or discard this patch.
includes/vars_combats.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -223,7 +223,7 @@
 block discarded – undo
223 223
       'factor'      => 1,
224 224
     ),
225 225
     P_UNIT_PRODUCTION   => array(
226
-      RES_ENERGY => function ($level, $production_factor, $user, $planet_row) { return ($planet_row["temp_max"] / 4 + 20) * $level * (0.1 * $production_factor); },
226
+      RES_ENERGY => function($level, $production_factor, $user, $planet_row) { return ($planet_row["temp_max"] / 4 + 20) * $level * (0.1 * $production_factor); },
227 227
     ),
228 228
     P_MINING_IS_MANAGED => true,
229 229
 
Please login to merge, or discard this patch.
includes/vars_structures.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
       'factor'      => 1.5,
17 17
     ),
18 18
     P_UNIT_PRODUCTION   => array(
19
-      RES_METAL  => function ($level, $production_factor, $user, $planet_row) { return 40 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
20
-      RES_ENERGY => function ($level, $production_factor, $user, $planet_row) { return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
19
+      RES_METAL  => function($level, $production_factor, $user, $planet_row) { return 40 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
20
+      RES_ENERGY => function($level, $production_factor, $user, $planet_row) { return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
21 21
     ),
22 22
     P_MINING_IS_MANAGED => true,
23 23
   ),
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
       'factor'      => 1.6,
35 35
     ),
36 36
     P_UNIT_PRODUCTION   => array(
37
-      RES_CRYSTAL => function ($level, $production_factor, $user, $planet_row) { return 32 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
38
-      RES_ENERGY  => function ($level, $production_factor, $user, $planet_row) { return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
37
+      RES_CRYSTAL => function($level, $production_factor, $user, $planet_row) { return 32 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
38
+      RES_ENERGY  => function($level, $production_factor, $user, $planet_row) { return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
39 39
     ),
40 40
     P_MINING_IS_MANAGED => true,
41 41
   ),
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
       'factor'      => 1.5,
53 53
     ),
54 54
     P_UNIT_PRODUCTION   => array(
55
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) { return 10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28); },
56
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) { return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
55
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) { return 10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28); },
56
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) { return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
57 57
     ),
58 58
     P_MINING_IS_MANAGED => true,
59 59
   ),
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
       'factor'      => 1.5,
71 71
     ),
72 72
     P_UNIT_PRODUCTION   => array(
73
-      RES_ENERGY => function ($level, $production_factor, $user, $planet_row) { return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor); },
73
+      RES_ENERGY => function($level, $production_factor, $user, $planet_row) { return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor); },
74 74
     ),
75 75
     P_MINING_IS_MANAGED => true,
76 76
   ),
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
       'factor'      => 1.8,
89 89
     ),
90 90
     P_UNIT_PRODUCTION   => array(
91
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) { return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
92
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) { return 30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, "", TECH_ENERGY), $level) * (0.1 * $production_factor); },
91
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) { return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
92
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) { return 30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, "", TECH_ENERGY), $level) * (0.1 * $production_factor); },
93 93
     ),
94 94
     P_MINING_IS_MANAGED => true,
95 95
   ),
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
       'factor'      => 2,
107 107
     ),
108 108
     'storage'  => array(
109
-      RES_METAL => function ($level) { return BASE_STORAGE_SIZE * pow(1.5, $level); },
109
+      RES_METAL => function($level) { return BASE_STORAGE_SIZE * pow(1.5, $level); },
110 110
     ),
111 111
   ),
112 112
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
       'factor'      => 2,
123 123
     ),
124 124
     'storage'  => array(
125
-      RES_CRYSTAL => function ($level) { return BASE_STORAGE_SIZE * pow(1.5, $level); },
125
+      RES_CRYSTAL => function($level) { return BASE_STORAGE_SIZE * pow(1.5, $level); },
126 126
     ),
127 127
   ),
128 128
 
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
       'factor'      => 2,
139 139
     ),
140 140
     'storage'  => array(
141
-      RES_DEUTERIUM => function ($level) { return BASE_STORAGE_SIZE * pow(1.5, $level); },
141
+      RES_DEUTERIUM => function($level) { return BASE_STORAGE_SIZE * pow(1.5, $level); },
142 142
     ),
143 143
   ),
144 144
 
Please login to merge, or discard this patch.
classes/_SnCacheInternal.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
     //print("<br />CACHE CLEAR {$cache_id} " . ($hard ? 'HARD' : 'SOFT') . "<br />");
53 53
     if ($hard && !empty(_SnCacheInternal::$data[$location_type])) {
54 54
       // Здесь нельзя делать unset - надо записывать NULL, что бы это отразилось на зависимых записях
55
-      array_walk(_SnCacheInternal::$data[$location_type], function (&$item) { $item = null; });
55
+      array_walk(_SnCacheInternal::$data[$location_type], function(&$item) { $item = null; });
56 56
     }
57 57
     _SnCacheInternal::$locator[$location_type] = [];
58 58
     _SnCacheInternal::$queries[$location_type] = [];
Please login to merge, or discard this patch.
includes/db/db_queries_users.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
     "SELECT `id` AS `ID`, `username` AS `NAME`, `ally_name` AS `ALLY`, `total_points` AS `STAT_POINTS`,
181 181
       `onlinetime` AS `ACTIVITY`
182 182
     FROM `{{users}}`
183
-    WHERE `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) ." ORDER BY user_as_ally, `". $TypeSort ."` ASC;");
183
+    WHERE `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) . " ORDER BY user_as_ally, `" . $TypeSort . "` ASC;");
184 184
 }
185 185
 
186 186
 
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
   return doquery("SELECT u.*, COUNT(r.id) AS referral_count, SUM(r.dark_matter) AS referral_dm FROM {{users}} as u
196 196
     LEFT JOIN {{referrals}} as r on r.id_partner = u.id
197 197
     WHERE" .
198
-    ($online ? " `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) : ' user_as_ally IS NULL') .
198
+    ($online ? " `onlinetime` >= " . (SN_TIME_NOW - $config->game_users_online_timeout) : ' user_as_ally IS NULL') .
199 199
     " GROUP BY u.id
200 200
     ORDER BY user_as_ally, {$sort} ASC");
201 201
 }
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
   !is_array($user_id_list) ? $user_id_list = array($user_id_list) : false;
212 212
 
213 213
   $user_list = array();
214
-  foreach($user_id_list as $user_id_unsafe) {
214
+  foreach ($user_id_list as $user_id_unsafe) {
215 215
     $user = db_user_by_id($user_id_unsafe);
216 216
     !empty($user) ? $user_list[$user_id_unsafe] = $user : false;
217 217
   }
Please login to merge, or discard this patch.
includes/includes/market_info.inc 1 patch
Spacing   +12 added lines, -12 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)
3
+if (!defined('SN_IN_MARKET') || SN_IN_MARKET !== true)
4 4
 {
5 5
   $debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
6 6
 }
@@ -15,50 +15,50 @@  discard block
 block discarded – undo
15 15
 ));
16 16
 
17 17
 $info_action = sys_get_param_int('action');
18
-if($info_action)
18
+if ($info_action)
19 19
 {
20 20
   try
21 21
   {
22 22
     sn_db_transaction_start();
23 23
 
24 24
     $user = db_user_by_id($user['id'], true);
25
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < $config->rpg_cost_info)
25
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < $config->rpg_cost_info)
26 26
     {
27 27
       throw new Exception(MARKET_NO_DM, ERR_ERROR);
28 28
     }
29 29
 
30
-    switch($info_action)
30
+    switch ($info_action)
31 31
     {
32 32
       case MARKET_INFO_PLAYER:
33 33
         $user_info_name_unsafe = sys_get_param_str_unsafe('user_info_name');
34
-        if(!$user_info_name_unsafe)
34
+        if (!$user_info_name_unsafe)
35 35
         {
36 36
           throw new Exception(MARKET_INFO_PLAYER_WRONG, ERR_ERROR);
37 37
         }
38 38
 
39
-        if(is_id($user_info_name_unsafe))
39
+        if (is_id($user_info_name_unsafe))
40 40
         {
41 41
           $user_info = db_user_by_id($user_info_name_unsafe, true, '`id`, `username`', true);
42 42
         }
43
-        if(!is_array($user_info))
43
+        if (!is_array($user_info))
44 44
         {
45 45
           $user_info = db_user_by_username($user_info_name_unsafe, true);
46 46
         }
47
-        if(!is_array($user_info))
47
+        if (!is_array($user_info))
48 48
         {
49 49
           throw new Exception(MARKET_INFO_PLAYER_NOT_FOUND, ERR_ERROR);
50 50
         }
51
-        if($user_info['id'] == $user['id'])
51
+        if ($user_info['id'] == $user['id'])
52 52
         {
53 53
           throw new Exception(MARKET_INFO_PLAYER_SAME, ERR_ERROR);
54 54
         }
55 55
 
56 56
         $msg_text = array();
57
-        foreach(sn_get_groups('mercenaries') as $mercenary_id)
57
+        foreach (sn_get_groups('mercenaries') as $mercenary_id)
58 58
         {
59 59
           $msg_text[] = "{$lang['tech'][$mercenary_id]} - " . (($mercenary_level = mrc_get_level($user_info, false, $mercenary_id)) ? "{$lang['sys_level']} {$mercenary_level}" : $lang['eco_mrk_info_not_hired']);
60 60
         }
61
-        if($mercenary_level = mrc_get_level($user_info, false, UNIT_PREMIUM))
61
+        if ($mercenary_level = mrc_get_level($user_info, false, UNIT_PREMIUM))
62 62
         {
63 63
           $msg_text[] = "{$lang['tech'][UNIT_PREMIUM]} - {$mercenary_level} {$lang['sys_level']}";
64 64
         }
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
       break;
73 73
     }
74 74
 
75
-    if(!rpg_points_change($user['id'], RPG_MARKET_INFO_MERCENARY, -$config->rpg_cost_info, "Using Black Market page {$lang['eco_mrk_info']} - getting info about user ID {$user_info['id']}"))
75
+    if (!rpg_points_change($user['id'], RPG_MARKET_INFO_MERCENARY, -$config->rpg_cost_info, "Using Black Market page {$lang['eco_mrk_info']} - getting info about user ID {$user_info['id']}"))
76 76
     {
77 77
       // TODO: throw new Exception(MARKET_INFO_PLAYER_SAME, ERR_ERROR);
78 78
     }
Please login to merge, or discard this patch.
admin/adm_payment.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -18,13 +18,13 @@  discard block
 block discarded – undo
18 18
 
19 19
 messageBoxAdminAccessDenied(AUTH_LEVEL_ADMINISTRATOR);
20 20
 
21
-$template  = gettemplate('admin/adm_payment', true);
21
+$template = gettemplate('admin/adm_payment', true);
22 22
 
23 23
 $payer_list = array(
24 24
   -1 => $lang['adm_pay_filter_all'],
25 25
 );
26 26
 $query = doquery("SELECT payment_user_id, payment_user_name FROM `{{payment}}` GROUP BY payment_user_id ORDER BY payment_user_name");
27
-while($row = db_fetch($query)) {
27
+while ($row = db_fetch($query)) {
28 28
   $payer_list[$row['payment_user_id']] = '[' . $row['payment_user_id'] . '] ' . $row['payment_user_name'];
29 29
 }
30 30
 tpl_assign_select($template, 'payer', $payer_list);
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
   '' => $lang['adm_pay_filter_all'],
34 34
 );
35 35
 $query = doquery("SELECT distinct payment_module_name FROM `{{payment}}` ORDER BY payment_module_name");
36
-while($row = db_fetch($query)) {
36
+while ($row = db_fetch($query)) {
37 37
   $module_list[$row['payment_module_name']] = $row['payment_module_name'];
38 38
 }
39 39
 tpl_assign_select($template, 'module', $module_list);
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
 
70 70
 
71 71
 //while($row = db_fetch($query)) {
72
-foreach($query as $row) {
72
+foreach ($query as $row) {
73 73
   $row2 = array();
74
-  foreach($row as $key => $value) {
74
+  foreach ($row as $key => $value) {
75 75
     $row2[strtoupper($key)] = $value;
76 76
   }
77 77
   $template->assign_block_vars('payment', $row2);
Please login to merge, or discard this patch.