Completed
Push — work-fleets ( 5197c7...069d1a )
by SuperNova.WS
05:03
created
includes/functions/tpl_helpers.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -185,6 +185,9 @@
 block discarded – undo
185 185
   return $result;
186 186
 }
187 187
 
188
+/**
189
+ * @param integer $que_id
190
+ */
188 191
 function tpl_parse_planet_que($que, $planet, $que_id) {
189 192
   $hangar_que = array();
190 193
   $que_hangar = $que['ques'][$que_id][$planet['id_owner']][$planet['id']];
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@  discard block
 block discarded – undo
2 2
 
3 3
 // Compare function to sort fleet in time order
4 4
 function tpl_assign_fleet_compare($a, $b) {
5
-  if($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) {
6
-    if($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) {
5
+  if ($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) {
6
+    if ($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) {
7 7
       return 0;
8 8
     }
9 9
 
@@ -19,17 +19,17 @@  discard block
 block discarded – undo
19 19
  * @param string   $js_name
20 20
  */
21 21
 function tpl_assign_fleet(&$template, $fleets, $js_name = 'fleets') {
22
-  if(!$fleets) {
22
+  if (!$fleets) {
23 23
     return;
24 24
   }
25 25
 
26 26
   usort($fleets, 'tpl_assign_fleet_compare');
27 27
 
28
-  foreach($fleets as $fleet_data) {
28
+  foreach ($fleets as $fleet_data) {
29 29
     $template->assign_block_vars($js_name, $fleet_data['fleet']);
30 30
 
31
-    if($fleet_data['ships']) {
32
-      foreach($fleet_data['ships'] as $ship_data) {
31
+    if ($fleet_data['ships']) {
32
+      foreach ($fleet_data['ships'] as $ship_data) {
33 33
         $template->assign_block_vars("{$js_name}.ships", $ship_data);
34 34
       }
35 35
     }
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
     'DEUTERIUM' => $fleet[RES_DEUTERIUM],
51 51
   );
52 52
 
53
-  foreach($fleet as $ship_id => $ship_amount) {
54
-    if(in_array($ship_id, sn_get_groups('fleet'))) {
53
+  foreach ($fleet as $ship_id => $ship_amount) {
54
+    if (in_array($ship_id, sn_get_groups('fleet'))) {
55 55
       $single_ship_data = get_ship_data($ship_id, $user_data);
56 56
       $return['ships'][$ship_id] = array(
57 57
         'ID'          => $ship_id,
@@ -90,11 +90,11 @@  discard block
 block discarded – undo
90 90
 
91 91
   $result = array();
92 92
 
93
-  if(!$user_data) {
93
+  if (!$user_data) {
94 94
     $user_data = $user;
95 95
   }
96 96
 
97
-  if(!$objFleet->isReturning() && $objFleet->mission_type == MT_AKS) {
97
+  if (!$objFleet->isReturning() && $objFleet->mission_type == MT_AKS) {
98 98
     $aks = db_acs_get_by_group_id($objFleet->group_id);
99 99
   }
100 100
 
@@ -135,14 +135,14 @@  discard block
 block discarded – undo
135 135
     'STAY_LEFT' => floor($objFleet->time_mission_job_complete + 1 - SN_TIME_NOW),
136 136
   );
137 137
 
138
-  if(property_exists($objFleet, 'fleet_start_name')) {
138
+  if (property_exists($objFleet, 'fleet_start_name')) {
139 139
     $result['START_NAME'] = $objFleet->fleet_start_name;
140 140
   }
141
-  if(property_exists($objFleet, 'fleet_end_name')) {
141
+  if (property_exists($objFleet, 'fleet_end_name')) {
142 142
     $result['END_NAME'] = $objFleet->fleet_end_name;
143 143
   }
144 144
 
145
-  if(property_exists($objFleet, 'event_time')) {
145
+  if (property_exists($objFleet, 'event_time')) {
146 146
     $result['fleet'] = array_merge($result['fleet'], array(
147 147
       'OV_LABEL'        => $objFleet->ov_label,
148 148
       'EVENT_TIME_TEXT' => property_exists($objFleet, 'event_time') ? date(FMT_DATE_TIME, $objFleet->event_time + SN_CLIENT_TIME_DIFF) : '',
@@ -154,9 +154,9 @@  discard block
 block discarded – undo
154 154
   $ship_list_fully_parsed = $objFleet->shipsGetArray();
155 155
 
156 156
   $ship_id = 0;
157
-  if($spy_level >= 6) {
158
-    foreach($ship_list_fully_parsed as $ship_sn_id => $ship_amount) {
159
-      if($spy_level >= 10) {
157
+  if ($spy_level >= 6) {
158
+    foreach ($ship_list_fully_parsed as $ship_sn_id => $ship_amount) {
159
+      if ($spy_level >= 10) {
160 160
         $single_ship_data = get_ship_data($ship_sn_id, $user_data);
161 161
         $result['ships'][$ship_sn_id] = array(
162 162
           'ID'          => $ship_sn_id,
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
188 188
 function tpl_parse_planet_que($que, $planet, $que_id) {
189 189
   $hangar_que = array();
190 190
   $que_hangar = $que['ques'][$que_id][$planet['id_owner']][$planet['id']];
191
-  if(!empty($que_hangar)) {
192
-    foreach($que_hangar as $que_item) {
191
+  if (!empty($que_hangar)) {
192
+    foreach ($que_hangar as $que_item) {
193 193
       $hangar_que['que'][] = array('id' => $que_item['que_unit_id'], 'count' => $que_item['que_unit_amount']);
194 194
       $hangar_que[$que_item['que_unit_id']] += $que_item['que_unit_amount'];
195 195
     }
@@ -252,10 +252,10 @@  discard block
 block discarded – undo
252 252
     'PLANET_GOVERNOR_LEVEL_MAX' => get_unit_param($planet['PLANET_GOVERNOR_ID'], P_MAX_STACK),
253 253
   );
254 254
 
255
-  if(!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) {
255
+  if (!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) {
256 256
     $result['building_que'] = array();
257 257
     $building_que = &$que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']];
258
-    foreach($building_que as $que_element) {
258
+    foreach ($building_que as $que_element) {
259 259
       $result['building_que'][] = que_tpl_parse_element($que_element);
260 260
     }
261 261
   }
@@ -271,19 +271,19 @@  discard block
 block discarded – undo
271 271
 function flt_get_fleets_to_planet_by_array_of_Fleet($array_of_Fleet) {
272 272
   global $user;
273 273
 
274
-  if(empty($array_of_Fleet)) {
274
+  if (empty($array_of_Fleet)) {
275 275
     return false;
276 276
   }
277 277
 
278 278
   $fleet_list = array();
279
-  foreach($array_of_Fleet as $fleet) {
280
-    if($fleet->playerOwnerId == $user['id']) {
281
-      if($fleet->mission_type == MT_MISSILE) {
279
+  foreach ($array_of_Fleet as $fleet) {
280
+    if ($fleet->playerOwnerId == $user['id']) {
281
+      if ($fleet->mission_type == MT_MISSILE) {
282 282
         continue;
283 283
       }
284 284
       $fleet_ownage = 'own';
285 285
     } else {
286
-      switch($fleet->mission_type) {
286
+      switch ($fleet->mission_type) {
287 287
         case MT_ATTACK:
288 288
         case MT_AKS:
289 289
         case MT_DESTROY:
@@ -300,10 +300,10 @@  discard block
 block discarded – undo
300 300
 
301 301
     $fleet_list[$fleet_ownage]['fleets'][$fleet->dbId] = $fleet;
302 302
 
303
-    if($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) {
303
+    if ($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) {
304 304
       $fleet_sn = $fleet->shipsGetArray();
305
-      foreach($fleet_sn as $ship_id => $ship_amount) {
306
-        if(in_array($ship_id, sn_get_groups('fleet'))) {
305
+      foreach ($fleet_sn as $ship_id => $ship_amount) {
306
+        if (in_array($ship_id, sn_get_groups('fleet'))) {
307 307
           $fleet_list[$fleet_ownage]['total'][$ship_id] += $ship_amount;
308 308
         }
309 309
       }
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
   return $fleet_list;
321 321
 }
322 322
 
323
-function tpl_set_resource_info(template &$template, $planet_row, $fleets_to_planet = array(), $round = 0) {
323
+function tpl_set_resource_info(template & $template, $planet_row, $fleets_to_planet = array(), $round = 0) {
324 324
   $template->assign_vars(array(
325 325
     'RESOURCE_ROUNDING' => $round,
326 326
 
Please login to merge, or discard this patch.
includes/includes/coe_simulator_helpers.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -1,5 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
+/**
4
+ * @param string $type
5
+ */
3 6
 function sn_ube_simulator_encode_replay($combat, $type)
4 7
 {
5 8
   $strPacked = "{$type}!";
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -4,9 +4,9 @@  discard block
 block discarded – undo
4 4
 {
5 5
   $strPacked = "{$type}!";
6 6
 
7
-  foreach($combat as $fleetID => $fleetCompress)
7
+  foreach ($combat as $fleetID => $fleetCompress)
8 8
   {
9
-    foreach($fleetCompress as $key => $value)
9
+    foreach ($fleetCompress as $key => $value)
10 10
     {
11 11
       $value = intval($value);
12 12
       $strPacked .= "{$key},{$value};";
@@ -22,29 +22,29 @@  discard block
 block discarded – undo
22 22
   $fleet_id = 0;
23 23
 
24 24
   $arr_data_unpacked = explode('!', $str_data);
25
-  foreach($arr_data_unpacked as $data_piece)
25
+  foreach ($arr_data_unpacked as $data_piece)
26 26
   {
27
-    if(!$data_piece)
27
+    if (!$data_piece)
28 28
     {
29 29
       continue;
30 30
     }
31 31
 
32
-    if($data_piece == 'A' || $data_piece == 'D')
32
+    if ($data_piece == 'A' || $data_piece == 'D')
33 33
     {
34 34
       $fleet_type = $data_piece;
35 35
       continue;
36 36
     }
37 37
 
38 38
     $arr_unit_strings = explode(';', $data_piece);
39
-    foreach($arr_unit_strings as $str_unit_string)
39
+    foreach ($arr_unit_strings as $str_unit_string)
40 40
     {
41
-      if(!$str_unit_string)
41
+      if (!$str_unit_string)
42 42
       {
43 43
         continue;
44 44
       }
45 45
 
46 46
       $arr_unit_data = explode(',', $str_unit_string);
47
-      if($arr_unit_data[1])
47
+      if ($arr_unit_data[1])
48 48
       {
49 49
         $unpacked[$fleet_type][$fleet_id][$arr_unit_data[0]] = intval($arr_unit_data[1]);
50 50
       }
Please login to merge, or discard this patch.
includes/includes/flt_mission_attack.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,9 +10,8 @@
 block discarded – undo
10 10
 
11 11
 /**
12 12
  * @param Mission $objMission
13
- * @param array   $mission_data
14 13
  *
15
- * @return array|null
14
+ * @return null|boolean
16 15
  */
17 16
 function flt_mission_attack($objMission) {
18 17
   $objFleet = $objMission->fleet;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,14 +17,14 @@
 block discarded – undo
17 17
 function flt_mission_attack($objMission) {
18 18
   $objFleet = $objMission->fleet;
19 19
 
20
-  if($objFleet->shipsGetTotal() <= 0) {
20
+  if ($objFleet->shipsGetTotal() <= 0) {
21 21
     return null;
22 22
   }
23 23
 
24 24
   $destination_user = $objMission->dst_user;
25 25
   $destination_planet = $objMission->dst_planet;
26 26
 
27
-  if(
27
+  if (
28 28
     // Нет данных о планете назначения или её владельце
29 29
     empty($destination_user) || empty($destination_planet) || !is_array($destination_user) || !is_array($destination_planet)
30 30
     ||
Please login to merge, or discard this patch.
includes/includes/flt_mission_explore.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 /**
32 32
  * Fleet mission "Relocate"
33 33
  *
34
- * @param $mission_data Mission
34
+ * @param Mission $mission_data Mission
35 35
  *
36 36
  * @return int
37 37
  *
Please login to merge, or discard this patch.
Spacing   +29 added lines, -30 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
   global $lang, $config;
22 22
   static $ship_data, $rates;
23 23
 
24
-  if(empty($mission_data->fleet_event) || $mission_data->fleet_event != EVENT_FLT_ACOMPLISH) {
24
+  if (empty($mission_data->fleet_event) || $mission_data->fleet_event != EVENT_FLT_ACOMPLISH) {
25 25
     return CACHE_NONE;
26 26
   }
27 27
 
@@ -46,10 +46,10 @@  discard block
 block discarded – undo
46 46
   $outcome_value = &$result['$outcome_value'];
47 47
   $outcome_list = &$result['$outcome_list'];
48 48
 
49
-  if(!$ship_data) {
50
-    foreach(sn_get_groups('fleet') as $unit_id) {
49
+  if (!$ship_data) {
50
+    foreach (sn_get_groups('fleet') as $unit_id) {
51 51
       $unit_info = get_unit_param($unit_id);
52
-      if($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
52
+      if ($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
53 53
         continue;
54 54
       }
55 55
       $ship_data[$unit_id][P_COST_METAL] = get_unit_cost_in($unit_info[P_COST]);
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
   $max_metal_cost = 0;
61 61
   $fleet_real_array = $objFleet->shipsGetArray();
62
-  foreach($fleet_real_array as $ship_id => $ship_amount) {
62
+  foreach ($fleet_real_array as $ship_id => $ship_amount) {
63 63
     $ship_cost_in_metal = $ship_amount * $ship_data[$ship_id][P_COST_METAL];
64 64
     $result['$fleet_metal_points'] += $ship_amount * $ship_data[$ship_id][P_COST_METAL];
65 65
     // Рассчитываем стоимость самого дорого корабля в металле
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
   $outcome_list[FLT_EXPEDITION_OUTCOME_NONE]['chance'] = ceil(200 / pow($flt_stay_hours, 1 / 1.7));
74 74
 
75 75
   $chance_max = 0;
76
-  foreach($outcome_list as $key => &$value) {
77
-    if(!$value['chance']) {
76
+  foreach ($outcome_list as $key => &$value) {
77
+    if (!$value['chance']) {
78 78
       unset($outcome_list[$key]);
79 79
       continue;
80 80
     }
@@ -82,13 +82,13 @@  discard block
 block discarded – undo
82 82
   }
83 83
   $outcome_value = mt_rand(0, $chance_max);
84 84
   $outcome_description = &$outcome_list[$mission_outcome = FLT_EXPEDITION_OUTCOME_NONE];
85
-  foreach($outcome_list as $key => &$value) {
86
-    if(!$value['chance']) {
85
+  foreach ($outcome_list as $key => &$value) {
86
+    if (!$value['chance']) {
87 87
       continue;
88 88
     }
89 89
     $mission_outcome = $key;
90 90
     $outcome_description = $value;
91
-    if($outcome_value <= $outcome_description['value']) {
91
+    if ($outcome_value <= $outcome_description['value']) {
92 92
       break;
93 93
     }
94 94
   }
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 //  $outcome_mission_sub = -1;
106 106
 
107 107
   $fleet_found = array();
108
-  switch($mission_outcome) {
108
+  switch ($mission_outcome) {
109 109
     case FLT_EXPEDITION_OUTCOME_LOST_FLEET:
110 110
       $objFleet->shipsCountApplyLossMultiplier(mt_rand(1, 3) * mt_rand(200000, 300000) / 1000000);
111 111
     break;
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
 
127 127
       // Ограничиваем корабли только теми, чья стоимость в металле меньше или равно стоимости самого дорогого корабля
128 128
       $can_be_found = array();
129
-      foreach($ship_data as $ship_id => $ship_info) {
130
-        if($ship_info['metal_cost'] < $max_metal_cost) {
129
+      foreach ($ship_data as $ship_id => $ship_info) {
130
+        if ($ship_info['metal_cost'] < $max_metal_cost) {
131 131
           $can_be_found[$ship_id] = $ship_info['metal_cost'];
132 132
         }
133 133
       }
@@ -135,13 +135,13 @@  discard block
 block discarded – undo
135 135
       unset($can_be_found[SHIP_COLONIZER]);
136 136
       unset($can_be_found[SHIP_SPY]);
137 137
 
138
-      while(count($can_be_found) && $found_in_metal >= max($can_be_found)) {
138
+      while (count($can_be_found) && $found_in_metal >= max($can_be_found)) {
139 139
         $found_index = mt_rand(1, count($can_be_found)) - 1;
140 140
         $found_ship = array_slice($can_be_found, $found_index, 1, true);
141 141
         $found_ship_cost = reset($found_ship);
142 142
         $found_ship_id = key($found_ship);
143 143
 
144
-        if($found_ship_cost > $found_in_metal) {
144
+        if ($found_ship_cost > $found_in_metal) {
145 145
           unset($can_be_found[$found_ship_id]);
146 146
         } else {
147 147
           $found_ship_count = mt_rand(1, floor($found_in_metal / $found_ship_cost));
@@ -150,10 +150,10 @@  discard block
 block discarded – undo
150 150
         }
151 151
       }
152 152
 
153
-      if(empty($fleet_found)) {
153
+      if (empty($fleet_found)) {
154 154
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
155 155
       } else {
156
-        foreach($fleet_found as $unit_id => $unit_amount) {
156
+        foreach ($fleet_found as $unit_id => $unit_amount) {
157 157
           $objFleet->shipAdjustCount($unit_id, $unit_amount);
158 158
         }
159 159
       }
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 
178 178
       $objFleet->resourcesAdjust($resources_found);
179 179
 
180
-      if(array_sum($resources_found) == 0) {
180
+      if (array_sum($resources_found) == 0) {
181 181
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
182 182
       }
183 183
     break;
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
       // Рассчитываем количество найденной ТМ
189 189
       $found_dark_matter = floor(min($outcome_percent * $result['$fleet_metal_points'] / $rates[RES_DARK_MATTER], 10000) * mt_rand(750000, 1000000) / 1000000);
190 190
 
191
-      if(!$found_dark_matter) {
191
+      if (!$found_dark_matter) {
192 192
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
193 193
       }
194 194
     break;
@@ -202,40 +202,39 @@  discard block
 block discarded – undo
202 202
 
203 203
   mission_expedition_result_adjust($result, $objFleet);
204 204
 
205
-  if($found_dark_matter) {
205
+  if ($found_dark_matter) {
206 206
     rpg_points_change($objFleet->playerOwnerId, RPG_EXPEDITION, $found_dark_matter, 'Expedition Bonus');
207 207
     $msg_text_addon = sprintf($lang['flt_mission_expedition']['found_dark_matter'], $found_dark_matter);
208 208
   }
209 209
 
210
-  if(!empty($fleet_lost)) {
210
+  if (!empty($fleet_lost)) {
211 211
     $msg_text_addon = $lang['flt_mission_expedition']['lost_fleet'];
212
-    foreach($fleet_lost as $ship_id => $ship_amount) {
212
+    foreach ($fleet_lost as $ship_id => $ship_amount) {
213 213
       $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
214 214
     }
215 215
   }
216 216
 
217
-  if(!empty($fleet_found)) {
217
+  if (!empty($fleet_found)) {
218 218
     $msg_text_addon = $lang['flt_mission_expedition']['found_fleet'];
219
-    foreach($fleet_found as $ship_id => $ship_amount) {
219
+    foreach ($fleet_found as $ship_id => $ship_amount) {
220 220
       $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
221 221
     }
222 222
   }
223 223
 
224
-  if(!empty($resources_found) && array_sum($resources_found) > 0) {
224
+  if (!empty($resources_found) && array_sum($resources_found) > 0) {
225 225
     $msg_text_addon = $lang['flt_mission_expedition']['found_resources'];
226
-    foreach($resources_found as $resource_id => $resource_amount) {
226
+    foreach ($resources_found as $resource_id => $resource_amount) {
227 227
       $msg_text_addon .= $lang['tech'][$resource_id] . ' - ' . $resource_amount . "\r\n";
228 228
     }
229 229
   }
230 230
 
231
-  if(!$msg_text) {
231
+  if (!$msg_text) {
232 232
     $messages = &$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['messages'];
233
-    if($outcome_mission_sub >= 0 && is_array($messages)) {
233
+    if ($outcome_mission_sub >= 0 && is_array($messages)) {
234 234
       $messages = &$messages[$outcome_mission_sub];
235 235
     }
236 236
 
237
-    $msg_text = is_string($messages) ? $messages :
238
-      (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
237
+    $msg_text = is_string($messages) ? $messages : (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
239 238
   }
240 239
 
241 240
   $fleet_row_end_coordinates_without_type = $objFleet->target_coordinates_without_type();
Please login to merge, or discard this patch.
includes/template.php 2 patches
Doc Comments   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
  * @param string    $title
35 35
  * @param string    $dest
36 36
  * @param int       $time
37
- * @param bool|true $show_header
37
+ * @param boolean $show_header
38 38
  */
39 39
 function message($mes, $title = 'Error', $dest = '', $time = 5, $show_header = true) {
40 40
   $template = gettemplate('message_body', true);
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
  * @param bool|true       $isDisplayTopNav
196 196
  * @param string          $metatags
197 197
  * @param bool|false      $AdminPage
198
- * @param bool|true       $isDisplayMenu
198
+ * @param boolean       $isDisplayMenu
199 199
  *
200 200
  * @return mixed
201 201
  */
@@ -208,7 +208,6 @@  discard block
 block discarded – undo
208 208
  * @param string          $title
209 209
  * @param bool|true       $isDisplayTopNav
210 210
  * @param string          $metatags
211
- * @param bool|false      $AdminPage
212 211
  * @param bool|true       $isDisplayMenu
213 212
  * @param bool|int|string $exitStatus - Код или сообщение выхода
214 213
  */
@@ -385,10 +384,10 @@  discard block
 block discarded – undo
385 384
 
386 385
 /**
387 386
  * @param       $time
388
- * @param       $event
387
+ * @param       integer $event
389 388
  * @param       $msg
390 389
  * @param       $coordinates
391
- * @param       $is_decrease
390
+ * @param       boolean $is_decrease
392 391
  * @param Fleet $objFleet
393 392
  * @param       $fleet_flying_sorter
394 393
  * @param       $fleet_flying_events
@@ -708,7 +707,7 @@  discard block
 block discarded – undo
708 707
 }
709 708
 
710 709
 /**
711
- * @param array|string  $files
710
+ * @param string  $files
712 711
  * @param template|bool $template
713 712
  * @param string|bool   $template_path
714 713
  *
Please login to merge, or discard this patch.
Spacing   +70 added lines, -70 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 function gettemplatename($u_dpath) {
11 11
   static $template_names = array();
12 12
 
13
-  if(!isset($template_names[$u_dpath])) {
13
+  if (!isset($template_names[$u_dpath])) {
14 14
     $template_names[$u_dpath] = file_exists(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') ? sys_file_read(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') : TEMPLATE_NAME;
15 15
   }
16 16
 
@@ -52,12 +52,12 @@  discard block
 block discarded – undo
52 52
  * @param $sn_menu_extra
53 53
  */
54 54
 function tpl_menu_merge_extra(&$sn_menu, &$sn_menu_extra) {
55
-  if(empty($sn_menu) || empty($sn_menu_extra)) {
55
+  if (empty($sn_menu) || empty($sn_menu_extra)) {
56 56
     return;
57 57
   }
58 58
 
59
-  foreach($sn_menu_extra as $menu_item_id => $menu_item) {
60
-    if(empty($menu_item['LOCATION'])) {
59
+  foreach ($sn_menu_extra as $menu_item_id => $menu_item) {
60
+    if (empty($menu_item['LOCATION'])) {
61 61
       $sn_menu[$menu_item_id] = $menu_item;
62 62
       continue;
63 63
     }
@@ -66,16 +66,16 @@  discard block
 block discarded – undo
66 66
     unset($menu_item['LOCATION']);
67 67
 
68 68
     $is_positioned = $item_location[0];
69
-    if($is_positioned == '+' || $is_positioned == '-') {
69
+    if ($is_positioned == '+' || $is_positioned == '-') {
70 70
       $item_location = substr($item_location, 1);
71 71
     } else {
72 72
       $is_positioned = '';
73 73
     }
74 74
 
75
-    if($item_location) {
75
+    if ($item_location) {
76 76
       $menu_keys = array_keys($sn_menu);
77 77
       $insert_position = array_search($item_location, $menu_keys);
78
-      if($insert_position === false) {
78
+      if ($insert_position === false) {
79 79
         $insert_position = count($sn_menu) - 1;
80 80
         $is_positioned = '+';
81 81
         $item_location = '';
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     $spliced = array_splice($sn_menu, $insert_position, count($sn_menu) - $insert_position);
89 89
     $sn_menu[$menu_item_id] = $menu_item;
90 90
 
91
-    if(!$is_positioned && $item_location) {
91
+    if (!$is_positioned && $item_location) {
92 92
       unset($spliced[$item_location]);
93 93
     }
94 94
     $sn_menu = array_merge($sn_menu, $spliced);
@@ -104,24 +104,24 @@  discard block
 block discarded – undo
104 104
 function tpl_menu_assign_to_template(&$sn_menu, &$template) {
105 105
   global $lang;
106 106
 
107
-  if(empty($sn_menu) || !is_array($sn_menu)) {
107
+  if (empty($sn_menu) || !is_array($sn_menu)) {
108 108
     return;
109 109
   }
110 110
 
111
-  foreach($sn_menu as $menu_item_id => $menu_item) {
112
-    if(!$menu_item) {
111
+  foreach ($sn_menu as $menu_item_id => $menu_item) {
112
+    if (!$menu_item) {
113 113
       continue;
114 114
     }
115 115
 
116
-    if(is_string($menu_item_id)) {
116
+    if (is_string($menu_item_id)) {
117 117
       $menu_item['ID'] = $menu_item_id;
118 118
     }
119 119
 
120
-    if($menu_item['TYPE'] == 'lang') {
120
+    if ($menu_item['TYPE'] == 'lang') {
121 121
       $lang_string = &$lang;
122
-      if(preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) {
123
-        for($i = 1; $i < count($matches); $i++) {
124
-          if(defined($matches[$i])) {
122
+      if (preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) {
123
+        for ($i = 1; $i < count($matches); $i++) {
124
+          if (defined($matches[$i])) {
125 125
             $matches[$i] = constant($matches[$i]);
126 126
           }
127 127
           $lang_string = &$lang_string[$matches[$i]];
@@ -133,8 +133,8 @@  discard block
 block discarded – undo
133 133
     $menu_item['ALT'] = htmlentities($menu_item['ALT']);
134 134
     $menu_item['TITLE'] = htmlentities($menu_item['TITLE']);
135 135
 
136
-    if(!empty($menu_item['ICON'])) {
137
-      if(is_string($menu_item['ICON'])) {
136
+    if (!empty($menu_item['ICON'])) {
137
+      if (is_string($menu_item['ICON'])) {
138 138
         $menu_item['ICON_PATH'] = $menu_item['ICON'];
139 139
       } else {
140 140
         $menu_item['ICON'] = $menu_item_id;
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
     'MENU_START_HIDE'     => !empty($_COOKIE[SN_COOKIE . '_menu_hidden']) || defined('SN_GOOGLE'),
165 165
   ));
166 166
 
167
-  if(isset($template_result['MENU_CUSTOMIZE'])) {
167
+  if (isset($template_result['MENU_CUSTOMIZE'])) {
168 168
     $template->assign_vars(array(
169 169
       'PLAYER_OPTION_MENU_SHOW_ON_BUTTON'   => classSupernova::$user_options[PLAYER_OPTION_MENU_SHOW_ON_BUTTON],
170 170
       'PLAYER_OPTION_MENU_HIDE_ON_BUTTON'   => classSupernova::$user_options[PLAYER_OPTION_MENU_HIDE_ON_BUTTON],
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
     ));
179 179
   }
180 180
 
181
-  if(defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) {
181
+  if (defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) {
182 182
     tpl_menu_merge_extra($sn_menu_admin, $sn_menu_admin_extra);
183 183
     tpl_menu_assign_to_template($sn_menu_admin, $template);
184 184
   } else {
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
   $in_admin = defined('IN_ADMIN') && IN_ADMIN === true;
219 219
   $is_login = defined('LOGIN_LOGOUT') && LOGIN_LOGOUT === true;
220 220
 
221
-  if(is_object($page)) {
221
+  if (is_object($page)) {
222 222
     isset($page->_rootref['MENU']) ? $isDisplayMenu = $page->_rootref['MENU'] : false;
223 223
     isset($page->_rootref['NAVBAR']) ? $isDisplayTopNav = $page->_rootref['NAVBAR'] : false;
224 224
 
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
     !isset($page->_rootref['PAGE_HEADER']) && $title ? $page->assign_var('PAGE_HEADER', $title) : false;
227 227
   }
228 228
 
229
-  if(empty($user['id']) || !is_numeric($user['id'])) {
229
+  if (empty($user['id']) || !is_numeric($user['id'])) {
230 230
     $isDisplayMenu = false;
231 231
     $isDisplayTopNav = false;
232 232
   }
@@ -238,10 +238,10 @@  discard block
 block discarded – undo
238 238
   $user_time_measured_unix = intval(isset($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) ? strtotime($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) : 0);
239 239
 
240 240
   $font_size = !empty($_COOKIE[SN_COOKIE_F]) ? $_COOKIE[SN_COOKIE_F] : classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE];
241
-  if(strpos($font_size, '%') !== false) {
241
+  if (strpos($font_size, '%') !== false) {
242 242
     // Размер шрифта в процентах
243 243
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
244
-  } elseif(strpos($font_size, 'px') !== false) {
244
+  } elseif (strpos($font_size, 'px') !== false) {
245 245
     // Размер шрифта в пикселях
246 246
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
247 247
   } else {
@@ -253,10 +253,10 @@  discard block
 block discarded – undo
253 253
 
254 254
   $template = gettemplate('_global_header', true);
255 255
 
256
-  if(!empty(classSupernova::$sn_mvc['javascript'])) {
257
-    foreach(classSupernova::$sn_mvc['javascript'] as $page_name => $script_list) {
258
-      if(empty($page_name) || $page_name == $sn_page_name) {
259
-        foreach($script_list as $filename => $content) {
256
+  if (!empty(classSupernova::$sn_mvc['javascript'])) {
257
+    foreach (classSupernova::$sn_mvc['javascript'] as $page_name => $script_list) {
258
+      if (empty($page_name) || $page_name == $sn_page_name) {
259
+        foreach ($script_list as $filename => $content) {
260 260
           $template_result['.']['javascript'][] = array(
261 261
             'FILE'    => $filename,
262 262
             'CONTENT' => $content,
@@ -282,9 +282,9 @@  discard block
 block discarded – undo
282 282
   classSupernova::$sn_mvc['css'][''] = array_merge($standard_css, classSupernova::$sn_mvc['css']['']);
283 283
 
284 284
 
285
-  foreach(classSupernova::$sn_mvc['css'] as $page_name => $script_list) {
286
-    if(empty($page_name) || $page_name == $sn_page_name) {
287
-      foreach($script_list as $filename => $content) {
285
+  foreach (classSupernova::$sn_mvc['css'] as $page_name => $script_list) {
286
+    if (empty($page_name) || $page_name == $sn_page_name) {
287
+      foreach ($script_list as $filename => $content) {
288 288
         $template_result['.']['css'][] = array(
289 289
           'FILE'    => $filename,
290 290
           'CONTENT' => $content,
@@ -331,12 +331,12 @@  discard block
 block discarded – undo
331 331
   $template->assign_recursive($template_result);
332 332
   displayP(parsetemplate($template));
333 333
 
334
-  if(($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) {
334
+  if (($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) {
335 335
     // $AdminPage = $AdminPage ? $user['authlevel'] : 0;
336 336
     displayP(parsetemplate(tpl_render_menu()));
337 337
   }
338 338
 
339
-  if($isDisplayTopNav && !$in_admin) {
339
+  if ($isDisplayTopNav && !$in_admin) {
340 340
     displayP(parsetemplate(tpl_render_topnav($user, $planetrow)));
341 341
   }
342 342
 
@@ -344,8 +344,8 @@  discard block
 block discarded – undo
344 344
 
345 345
   !is_array($page) ? $page = array($page) : false;
346 346
   $result_added = false;
347
-  foreach($page as $page_item) {
348
-    if(!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) {
347
+  foreach ($page as $page_item) {
348
+    if (!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) {
349 349
       $page_item = gettemplate('_result_message', $page_item);
350 350
       $temp = $page_item->files['_result_message'];
351 351
       unset($page_item->files['_result_message']);
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
   ));
369 369
   displayP(parsetemplate($template));
370 370
 
371
-  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false;;
371
+  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false; ;
372 372
 
373 373
   sn_db_disconnect();
374 374
 
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
  * @param string         $type
407 407
  */
408 408
 function tpl_topnav_event_build(&$template, $FleetList, $type = 'fleet') {
409
-  if(empty($FleetList)) {
409
+  if (empty($FleetList)) {
410 410
     return;
411 411
   }
412 412
 
@@ -415,19 +415,19 @@  discard block
 block discarded – undo
415 415
   $fleet_event_count = 0;
416 416
   $fleet_flying_sorter = array();
417 417
   $fleet_flying_events = array();
418
-  foreach($FleetList->_container as $objFleet) {
418
+  foreach ($FleetList->_container as $objFleet) {
419 419
     $will_return = true;
420
-    if(!$objFleet->isReturning()) {
420
+    if (!$objFleet->isReturning()) {
421 421
       // cut fleets on Hold and Expedition
422
-      if($objFleet->time_arrive_to_target >= SN_TIME_NOW) {
422
+      if ($objFleet->time_arrive_to_target >= SN_TIME_NOW) {
423 423
         $objFleet->mission_type == MT_RELOCATE ? $will_return = false : false;
424 424
         tpl_topnav_event_build_helper($objFleet->time_arrive_to_target, EVENT_FLEET_ARRIVE, $lang['sys_event_arrive'], $objFleet->target_coordinates_typed(), !$will_return, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
425 425
       }
426
-      if($objFleet->time_mission_job_complete) {
426
+      if ($objFleet->time_mission_job_complete) {
427 427
         tpl_topnav_event_build_helper($objFleet->time_mission_job_complete, EVENT_FLEET_STAY, $lang['sys_event_stay'], $objFleet->target_coordinates_typed(), false, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
428 428
       }
429 429
     }
430
-    if($will_return) {
430
+    if ($will_return) {
431 431
       tpl_topnav_event_build_helper($objFleet->time_return_to_source, EVENT_FLEET_RETURN, $lang['sys_event_return'], $objFleet->launch_coordinates_typed(), true, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
432 432
     }
433 433
   }
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
   asort($fleet_flying_sorter);
436 436
 
437 437
   $fleet_flying_count = $FleetList->count();
438
-  foreach($fleet_flying_sorter as $fleet_event_id => $fleet_time) {
438
+  foreach ($fleet_flying_sorter as $fleet_event_id => $fleet_time) {
439 439
     $fleet_event = &$fleet_flying_events[$fleet_event_id];
440 440
     $template->assign_block_vars("flying_{$type}s", array(
441 441
       'TIME' => max(0, $fleet_time - SN_TIME_NOW),
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
 function sn_tpl_render_topnav(&$user, $planetrow) {
464 464
   global $lang, $config, $template_result;
465 465
 
466
-  if(!is_array($user)) {
466
+  if (!is_array($user)) {
467 467
     return '';
468 468
   }
469 469
 
@@ -484,8 +484,8 @@  discard block
 block discarded – undo
484 484
 
485 485
   $ThisUsersPlanets = db_planet_list_sorted($user);
486 486
   // while ($CurPlanet = db_fetch($ThisUsersPlanets))
487
-  foreach($ThisUsersPlanets as $CurPlanet) {
488
-    if($CurPlanet['destruyed']) {
487
+  foreach ($ThisUsersPlanets as $CurPlanet) {
488
+    if ($CurPlanet['destruyed']) {
489 489
       continue;
490 490
     }
491 491
 
@@ -509,8 +509,8 @@  discard block
 block discarded – undo
509 509
    */
510 510
   $fleet_flying_list = array();
511 511
   $fleet_flying_list[0] = FleetList::dbGetFleetListByOwnerId($user['id']);
512
-  foreach($fleet_flying_list[0]->_container as $fleet_id => $objFleet) {
513
-    if(empty($fleet_flying_list[$objFleet->mission_type])) {
512
+  foreach ($fleet_flying_list[0]->_container as $fleet_id => $objFleet) {
513
+    if (empty($fleet_flying_list[$objFleet->mission_type])) {
514 514
       $fleet_flying_list[$objFleet->mission_type] = new FleetList();
515 515
     }
516 516
     $fleet_flying_list[$objFleet->mission_type][$fleet_id] = $objFleet;
@@ -522,8 +522,8 @@  discard block
 block discarded – undo
522 522
   que_tpl_parse($template, QUE_RESEARCH, $user, array(), null, !classSupernova::$user_options[PLAYER_OPTION_NAVBAR_RESEARCH_WIDE]);
523 523
   que_tpl_parse($template, SUBQUE_FLEET, $user, $planetrow, null, true);
524 524
 
525
-  if(!empty(classSupernova::$sn_mvc['navbar_prefix_button']) && is_array(classSupernova::$sn_mvc['navbar_prefix_button'])) {
526
-    foreach(classSupernova::$sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) {
525
+  if (!empty(classSupernova::$sn_mvc['navbar_prefix_button']) && is_array(classSupernova::$sn_mvc['navbar_prefix_button'])) {
526
+    foreach (classSupernova::$sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) {
527 527
       $template->assign_block_vars('navbar_prefix_button', array(
528 528
         'IMAGE'        => $navbar_button_image,
529 529
         'URL_RELATIVE' => $navbar_button_url,
@@ -537,13 +537,13 @@  discard block
 block discarded – undo
537 537
   $time_now_parsed = getdate(SN_TIME_NOW);
538 538
   $time_local_parsed = getdate(defined('SN_CLIENT_TIME_LOCAL') ? SN_CLIENT_TIME_LOCAL : SN_TIME_NOW);
539 539
 
540
-  if($config->game_news_overview) {
540
+  if ($config->game_news_overview) {
541 541
     $user_last_read_safe = intval($user['news_lastread']);
542 542
     nws_render($template, "WHERE UNIX_TIMESTAMP(`tsTimeStamp`) >= {$user_last_read_safe}", $config->game_news_overview);
543 543
   }
544 544
 
545 545
   $notes_query = db_note_list_by_owner($user['id'], true);
546
-  while($note_row = db_fetch($notes_query)) {
546
+  while ($note_row = db_fetch($notes_query)) {
547 547
     note_assign($template, $note_row);
548 548
   }
549 549
 
@@ -554,7 +554,7 @@  discard block
 block discarded – undo
554 554
     'QUE_ID'   => QUE_RESEARCH,
555 555
     'QUE_HTML' => 'topnav',
556 556
 
557
-    'RESEARCH_ONGOING' => (boolean)$user['que'],
557
+    'RESEARCH_ONGOING' => (boolean) $user['que'],
558 558
 
559 559
     'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], $lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
560 560
       $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
     'QUE_STRUCTURES' => QUE_STRUCTURES,
632 632
   ));
633 633
 
634
-  if((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) {
634
+  if ((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) {
635 635
     tpl_set_resource_info($template, $planetrow);
636 636
     $template->assign_vars(array(
637 637
       'SN_RENDER_NAVBAR_PLANET' => true,
@@ -646,12 +646,12 @@  discard block
 block discarded – undo
646 646
  * @param template|string $template
647 647
  */
648 648
 function displayP($template) {
649
-  if(is_object($template)) {
650
-    if(empty($template->parsed)) {
649
+  if (is_object($template)) {
650
+    if (empty($template->parsed)) {
651 651
       parsetemplate($template);
652 652
     }
653 653
 
654
-    foreach($template->files as $section => $filename) {
654
+    foreach ($template->files as $section => $filename) {
655 655
       $template->display($section);
656 656
     }
657 657
   } else {
@@ -666,11 +666,11 @@  discard block
 block discarded – undo
666 666
  * @return mixed
667 667
  */
668 668
 function parsetemplate($template, $array = false) {
669
-  if(is_object($template)) {
669
+  if (is_object($template)) {
670 670
     global $user;
671 671
 
672
-    if(!empty($array) && is_array($array)) {
673
-      foreach($array as $key => $data) {
672
+    if (!empty($array) && is_array($array)) {
673
+      foreach ($array as $key => $data) {
674 674
         $template->assign_var($key, $data);
675 675
       }
676 676
     }
@@ -711,7 +711,7 @@  discard block
 block discarded – undo
711 711
 
712 712
   $template_ex = '.tpl.html';
713 713
 
714
-  if($template === false) {
714
+  if ($template === false) {
715 715
     return sys_file_read(TEMPLATE_DIR . '/' . $files . $template_ex);
716 716
   }
717 717
 
@@ -731,7 +731,7 @@  discard block
 block discarded – undo
731 731
   !empty(classSupernova::$sn_mvc['i18n']['']) ? lng_load_i18n(classSupernova::$sn_mvc['i18n']['']) : false;
732 732
   $sn_page_name ? lng_load_i18n(classSupernova::$sn_mvc['i18n'][$sn_page_name]) : false;
733 733
 
734
-  foreach($files as &$filename) {
734
+  foreach ($files as &$filename) {
735 735
     $filename = $filename . $template_ex;
736 736
   }
737 737
 
@@ -756,13 +756,13 @@  discard block
 block discarded – undo
756 756
     'LANG'     => $language ? $language : '',
757 757
     'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
758 758
 
759
-    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
759
+    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
760 760
     'FILENAME'       => basename($_SERVER['PHP_SELF']),
761 761
   ));
762 762
 
763
-  foreach(lng_get_list() as $lng_id => $lng_data) {
764
-    if(isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) {
765
-      foreach($lng_data['LANG_VARIANTS'] as $lang_variant) {
763
+  foreach (lng_get_list() as $lng_id => $lng_data) {
764
+    if (isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) {
765
+      foreach ($lng_data['LANG_VARIANTS'] as $lang_variant) {
766 766
         $lng_data1 = $lng_data;
767 767
         $lng_data1 = array_merge($lng_data1, $lang_variant);
768 768
         $template->assign_block_vars('language', $lng_data1);
@@ -785,8 +785,8 @@  discard block
 block discarded – undo
785 785
   $que = $que['ques'][$que_type][$planet['id_owner']][$planet['id']];
786 786
 
787 787
   $que_length = 0;
788
-  if(!empty($que)) {
789
-    foreach($que as $que_item) {
788
+  if (!empty($que)) {
789
+    foreach ($que as $que_item) {
790 790
       $template->assign_block_vars('que', que_tpl_parse_element($que_item));
791 791
     }
792 792
     $que_length = count($que);
@@ -803,7 +803,7 @@  discard block
 block discarded – undo
803 803
 function tpl_planet_density_info(&$template, &$density_price_chart, $user_dark_matter) {
804 804
   global $lang;
805 805
 
806
-  foreach($density_price_chart as $density_price_index => &$density_price_data) {
806
+  foreach ($density_price_chart as $density_price_index => &$density_price_data) {
807 807
     $density_cost = $density_price_data;
808 808
     $density_number_style = pretty_number($density_cost, true, $user_dark_matter, false, false);
809 809
 
@@ -827,7 +827,7 @@  discard block
 block discarded – undo
827 827
 function tpl_assign_select(&$template, $name, $values) {
828 828
   !is_array($values) ? $values = array($values => $values) : false;
829 829
 
830
-  foreach($values as $key => $value) {
830
+  foreach ($values as $key => $value) {
831 831
     $template->assign_block_vars($name, array(
832 832
       'KEY'   => htmlentities($key, ENT_COMPAT, 'UTF-8'),
833 833
       'VALUE' => htmlentities($value, ENT_COMPAT, 'UTF-8'),
Please login to merge, or discard this patch.
common.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,25 +12,25 @@  discard block
 block discarded – undo
12 12
 global $debug, $sn_mvc, $template_result, $user;
13 13
 
14 14
 // Напоминание для Администрации, что игра отключена
15
-if($template_result[F_GAME_DISABLE]) {
15
+if ($template_result[F_GAME_DISABLE]) {
16 16
   // $disable_reason = sys_bbcodeParse($config->game_disable_reason); // Должна быть инициализирована выше по коду - в init.php
17 17
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
18 18
 }
19 19
 unset($disable_reason);
20 20
 
21 21
 
22
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
22
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
23 23
   lng_include('admin');
24
-} elseif($sys_user_logged_in) {
24
+} elseif ($sys_user_logged_in) {
25 25
   sys_user_vacation($user);
26 26
 
27 27
   $planet_id = SetSelectedPlanet($user);
28 28
 
29 29
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
30
-  if($user['ally_id']) {
30
+  if ($user['ally_id']) {
31 31
     sn_db_transaction_start();
32 32
     sn_ali_fill_user_ally($user);
33
-    if(!$user['ally']['player']['id']) {
33
+    if (!$user['ally']['player']['id']) {
34 34
       // sn_sys_logout(false, true);
35 35
       // core_auth::logout(false);
36 36
       classSupernova::$auth->logout(false);
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
   sn_db_transaction_commit();
50 50
 
51 51
   $planetrow = $global_data['planet'];
52
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
52
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
53 53
     // sn_sys_logout(false, true);
54 54
     // core_auth::logout(false);
55 55
     classSupernova::$auth->logout(false);
Please login to merge, or discard this patch.
fleet.php 2 patches
Switch Indentation   +121 added lines, -121 removed lines patch added patch discarded remove patch
@@ -69,121 +69,121 @@  discard block
 block discarded – undo
69 69
 }
70 70
 
71 71
 switch ($fleet_page) {
72
-  case 3:
72
+    case 3:
73 73
 
74
-  case 2:
75
-    $fleet_group_mr = sys_get_param_id('fleet_group');
76
-    $fleetarray     = unserialize(base64_decode(str_rot13(sys_get_param('usedfleet'))));
77
-    $fleetarray = is_array($fleetarray) ? $fleetarray : array();
74
+    case 2:
75
+      $fleet_group_mr = sys_get_param_id('fleet_group');
76
+      $fleetarray     = unserialize(base64_decode(str_rot13(sys_get_param('usedfleet'))));
77
+      $fleetarray = is_array($fleetarray) ? $fleetarray : array();
78 78
 
79
-    foreach($fleetarray as $ship_id => &$ship_amount) {
80
-      if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
81
-        $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
82
-        die();
83
-      }
84
-      $ship_amount = floatval($ship_amount);
85
-    }
86
-
87
-    $UsedPlanet = false;
88
-    $YourPlanet = false;
89
-    $missiontype = array();
90
-    if ($planet > $config->game_maxPlanet) {
91
-      $target_mission = MT_EXPLORE;
92
-      $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE];
93
-    } elseif ($galaxy && $system && $planet) {
94
-      $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
95
-
96
-      $TargetPlanet = db_planet_by_gspt($galaxy, $system, $planet, $check_type);
97
-
98
-      if ($TargetPlanet['id_owner']) {
99
-        $UsedPlanet = true;
100
-        if ($TargetPlanet['id_owner'] == $user['id']) {
101
-          $YourPlanet = true;
79
+      foreach($fleetarray as $ship_id => &$ship_amount) {
80
+        if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
81
+          $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
82
+          die();
102 83
         }
84
+        $ship_amount = floatval($ship_amount);
103 85
       }
104 86
 
105
-      if (!$UsedPlanet) {
106
-        if ($fleetarray[SHIP_COLONIZER]) {
107
-          $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE];
108
-          $target_mission = MT_COLONIZE;
109
-          $planet_type = PT_PLANET;
110
-        } else {
111
-          message ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
112
-        }
113
-      } else {
114
-        $recyclers = 0;
115
-        foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
116
-          $recyclers += $fleetarray[$recycler_id];
87
+      $UsedPlanet = false;
88
+      $YourPlanet = false;
89
+      $missiontype = array();
90
+      if ($planet > $config->game_maxPlanet) {
91
+        $target_mission = MT_EXPLORE;
92
+        $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE];
93
+      } elseif ($galaxy && $system && $planet) {
94
+        $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
95
+
96
+        $TargetPlanet = db_planet_by_gspt($galaxy, $system, $planet, $check_type);
97
+
98
+        if ($TargetPlanet['id_owner']) {
99
+          $UsedPlanet = true;
100
+          if ($TargetPlanet['id_owner'] == $user['id']) {
101
+            $YourPlanet = true;
102
+          }
117 103
         }
118
-        if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
119
-          $target_mission = MT_RECYCLE;
120
-          $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE];
121
-        } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
122
-          if ($YourPlanet) {
123
-            $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE];
124
-            $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
104
+
105
+        if (!$UsedPlanet) {
106
+          if ($fleetarray[SHIP_COLONIZER]) {
107
+            $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE];
108
+            $target_mission = MT_COLONIZE;
109
+            $planet_type = PT_PLANET;
125 110
           } else {
126
-            // Not Your Planet
127
-            if ($fleetarray[SHIP_SPY]) {
128
-              // Only spy missions if any spy
129
-              $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY];
111
+            message ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
112
+          }
113
+        } else {
114
+          $recyclers = 0;
115
+          foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
116
+            $recyclers += $fleetarray[$recycler_id];
117
+          }
118
+          if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
119
+            $target_mission = MT_RECYCLE;
120
+            $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE];
121
+          } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
122
+            if ($YourPlanet) {
123
+              $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE];
124
+              $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
130 125
             } else {
131
-              // If no spies...
132
-              if ($fleet_group_mr) {
133
-                $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS];
126
+              // Not Your Planet
127
+              if ($fleetarray[SHIP_SPY]) {
128
+                // Only spy missions if any spy
129
+                $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY];
134 130
               } else {
135
-                $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK];
136
-                $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
137
-
138
-                $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
139
-
140
-                if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
141
-                  $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
131
+                // If no spies...
132
+                if ($fleet_group_mr) {
133
+                  $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS];
134
+                } else {
135
+                  $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK];
136
+                  $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
137
+
138
+                  $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
139
+
140
+                  if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
141
+                    $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
142
+                  }
142 143
                 }
143 144
               }
144 145
             }
145 146
           }
146 147
         }
147 148
       }
148
-    }
149
-
150
-    if (!$target_mission && is_array($missiontype)) {
151
-      $target_mission = MT_ATTACK;
152
-    }
153
-
154
-//    $sn_group_missions = sn_get_groups('missions');
155
-//    foreach($sn_group_missions as $mission_id => $cork) {
156
-//      $missiontype[$mission_id] = $lang['type_mission'][$mission_id];
157
-//    }
158
-//
159
-//
160
-    ksort($missiontype);
161
-
162
-    $speed_percent = sys_get_param_int('speed', 10);
163
-    $travel_data   = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent);
164
-
165
-//    $fleet_speed   = flt_fleet_speed($user, $fleetarray);
166
-    $fleet_speed   = $travel_data['fleet_speed'];
167
-    $distance      = $travel_data['distance'];
168
-    $duration      = $travel_data['duration'];
169
-    $consumption   = $travel_data['consumption'];
170
-  // No Break
171
-
172
-  case 1:
173
-    if ($galaxy && $system && $planet) {
174
-      $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
175
-
176
-      $TargetPlanet = db_planet_by_gspt($galaxy, $system, $planet, $check_type);
177
-    }
178
-
179
-  case 0:
180
-    $template_result += array(
181
-      'thisgalaxy'      => $planetrow['galaxy'],
182
-      'thissystem'      => $planetrow['system'],
183
-      'thisplanet'      => $planetrow['planet'],
184
-      'thisplanet_type' => $planetrow['planet_type'],
185
-    );
186
-  // no break
149
+
150
+      if (!$target_mission && is_array($missiontype)) {
151
+        $target_mission = MT_ATTACK;
152
+      }
153
+
154
+  //    $sn_group_missions = sn_get_groups('missions');
155
+  //    foreach($sn_group_missions as $mission_id => $cork) {
156
+  //      $missiontype[$mission_id] = $lang['type_mission'][$mission_id];
157
+  //    }
158
+  //
159
+  //
160
+      ksort($missiontype);
161
+
162
+      $speed_percent = sys_get_param_int('speed', 10);
163
+      $travel_data   = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent);
164
+
165
+  //    $fleet_speed   = flt_fleet_speed($user, $fleetarray);
166
+      $fleet_speed   = $travel_data['fleet_speed'];
167
+      $distance      = $travel_data['distance'];
168
+      $duration      = $travel_data['duration'];
169
+      $consumption   = $travel_data['consumption'];
170
+    // No Break
171
+
172
+    case 1:
173
+      if ($galaxy && $system && $planet) {
174
+        $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
175
+
176
+        $TargetPlanet = db_planet_by_gspt($galaxy, $system, $planet, $check_type);
177
+      }
178
+
179
+    case 0:
180
+      $template_result += array(
181
+        'thisgalaxy'      => $planetrow['galaxy'],
182
+        'thissystem'      => $planetrow['system'],
183
+        'thisplanet'      => $planetrow['planet'],
184
+        'thisplanet_type' => $planetrow['planet_type'],
185
+      );
186
+    // no break
187 187
 
188 188
 }
189 189
 
@@ -205,31 +205,31 @@  discard block
 block discarded – undo
205 205
 }
206 206
 
207 207
 switch($fleet_page) {
208
-  case 1:
209
-    require('includes/includes/flt_page1.inc');
210
-  break;
208
+    case 1:
209
+      require('includes/includes/flt_page1.inc');
210
+    break;
211 211
 
212
-  case 2:
213
-    require_once('includes/includes/flt_page2.inc');
214
-    sn_fleet_page2();
215
-  break;
212
+    case 2:
213
+      require_once('includes/includes/flt_page2.inc');
214
+      sn_fleet_page2();
215
+    break;
216 216
 
217
-  case 3:
218
-    require_once('includes/includes/flt_page3.inc');
219
-    sn_fleet_page3($duration);
220
-  break;
217
+    case 3:
218
+      require_once('includes/includes/flt_page3.inc');
219
+      sn_fleet_page3($duration);
220
+    break;
221 221
 
222
-  case 4:
223
-    require('includes/includes/flt_page4.inc');
224
-  break;
222
+    case 4:
223
+      require('includes/includes/flt_page4.inc');
224
+    break;
225 225
 
226
-  case 5:
227
-    require('includes/includes/flt_page5.inc');
228
-  break;
226
+    case 5:
227
+      require('includes/includes/flt_page5.inc');
228
+    break;
229 229
 
230
-  default:
231
-    define('SN_RENDER_NAVBAR_PLANET', true);
230
+    default:
231
+      define('SN_RENDER_NAVBAR_PLANET', true);
232 232
 
233
-    require('includes/includes/flt_page0.inc');
234
-  break;
233
+      require('includes/includes/flt_page0.inc');
234
+    break;
235 235
 }
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -39,11 +39,11 @@  discard block
 block discarded – undo
39 39
 $planet = sys_get_param_int('planet', $planetrow['planet']);
40 40
 
41 41
 $target_mission = sys_get_param_int('target_mission');
42
-if($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
42
+if ($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
43 43
   $planet_type = PT_PLANET;
44
-} elseif($target_mission == MT_RECYCLE) {
44
+} elseif ($target_mission == MT_RECYCLE) {
45 45
   $planet_type = PT_DEBRIS;
46
-} elseif($target_mission == MT_DESTROY) {
46
+} elseif ($target_mission == MT_DESTROY) {
47 47
   $planet_type = PT_MOON;
48 48
 } else {
49 49
   $planet_type = sys_get_param_int('planet_type');
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
57 57
 
58 58
 $MaxFleets = GetMaxFleets($user);
59 59
 $FlyingFleets = FleetList::fleet_count_flying($user['id']);
60
-if($MaxFleets <= $FlyingFleets && $fleet_page && $fleet_page != 4) {
60
+if ($MaxFleets <= $FlyingFleets && $fleet_page && $fleet_page != 4) {
61 61
   message($lang['fl_noslotfree'], $lang['fl_error'], "fleet." . PHP_EX, 5);
62 62
 }
63 63
 
64 64
 $MaxExpeditions = get_player_max_expeditons($user);
65
-if($MaxExpeditions) {
66
-  $FlyingExpeditions  = FleetList::fleet_count_flying($user['id'], MT_EXPLORE);
65
+if ($MaxExpeditions) {
66
+  $FlyingExpeditions = FleetList::fleet_count_flying($user['id'], MT_EXPLORE);
67 67
 } else {
68 68
   $FlyingExpeditions = 0;
69 69
 }
@@ -76,8 +76,8 @@  discard block
 block discarded – undo
76 76
     $fleetarray     = unserialize(base64_decode(str_rot13(sys_get_param('usedfleet'))));
77 77
     $fleetarray = is_array($fleetarray) ? $fleetarray : array();
78 78
 
79
-    foreach($fleetarray as $ship_id => &$ship_amount) {
80
-      if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
79
+    foreach ($fleetarray as $ship_id => &$ship_amount) {
80
+      if (!in_array($ship_id, sn_get_groups('fleet')) || (string) floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
81 81
         $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
82 82
         die();
83 83
       }
@@ -108,11 +108,11 @@  discard block
 block discarded – undo
108 108
           $target_mission = MT_COLONIZE;
109 109
           $planet_type = PT_PLANET;
110 110
         } else {
111
-          message ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
111
+          message("<font color=\"red\"><b>" . $lang['fl_no_planet_type'] . "</b></font>", $lang['fl_error']);
112 112
         }
113 113
       } else {
114 114
         $recyclers = 0;
115
-        foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
115
+        foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
116 116
           $recyclers += $fleetarray[$recycler_id];
117 117
         }
118 118
         if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 
138 138
                 $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
139 139
 
140
-                if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
140
+                if ($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
141 141
                   $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
142 142
                 }
143 143
               }
@@ -197,14 +197,14 @@  discard block
 block discarded – undo
197 197
 );
198 198
 
199 199
 $is_transport_missions = false;
200
-if($missiontype) {
200
+if ($missiontype) {
201 201
   $sn_group_missions = sn_get_groups('missions');
202
-  foreach($missiontype as $mission_data_id => $mission_data) {
202
+  foreach ($missiontype as $mission_data_id => $mission_data) {
203 203
     $is_transport_missions = $is_transport_missions || (isset($sn_group_missions[$mission_data_id]['transport']) && $sn_group_missions[$mission_data_id]['transport']);
204 204
   }
205 205
 }
206 206
 
207
-switch($fleet_page) {
207
+switch ($fleet_page) {
208 208
   case 1:
209 209
     require('includes/includes/flt_page1.inc');
210 210
   break;
Please login to merge, or discard this patch.
banned.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 
21 21
 $query = db_banned_list_select();
22 22
 $i = 0;
23
-while($ban_row = db_fetch($query)) {
23
+while ($ban_row = db_fetch($query)) {
24 24
   $template->assign_block_vars('banlist', array(
25 25
     'USER_NAME'   => $ban_row['ban_user_name'],
26 26
     'REASON'      => $ban_row['ban_reason'],
Please login to merge, or discard this patch.
messages.php 2 patches
Switch Indentation   +122 added lines, -122 removed lines patch added patch discarded remove patch
@@ -48,106 +48,106 @@  discard block
 block discarded – undo
48 48
 }
49 49
 
50 50
 switch($mode) {
51
-  case 'write':
52
-    $error_list = array();
53
-    $template = gettemplate('msg_message_compose', true);
51
+    case 'write':
52
+      $error_list = array();
53
+      $template = gettemplate('msg_message_compose', true);
54 54
 
55
-    $recipient_name = sys_get_param_str_unsafe('recipient_name');
56
-    if($recipient_name) {
57
-      $recipient_row = db_user_by_username($recipient_name);
58
-    }
55
+      $recipient_name = sys_get_param_str_unsafe('recipient_name');
56
+      if($recipient_name) {
57
+        $recipient_row = db_user_by_username($recipient_name);
58
+      }
59 59
 
60
-    if(!$recipient_row) {
61
-      $recipient_id = sys_get_param_id('id');
62
-      $recipient_row = db_user_by_id($recipient_id);
63 60
       if(!$recipient_row) {
64
-        $recipient_id = 0;
61
+        $recipient_id = sys_get_param_id('id');
62
+        $recipient_row = db_user_by_id($recipient_id);
63
+        if(!$recipient_row) {
64
+          $recipient_id = 0;
65
+        }
65 66
       }
66
-    }
67
-
68
-    if($recipient_row) {
69
-      $recipient_id = $recipient_row['id'];
70
-      $recipient_name = $recipient_row['username'];
71
-    }
72
-
73
-    if($recipient_id == $user['id']) {
74
-      $error_list[] = array('MESSAGE' => $lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
75
-    }
76
-
77
-    $re = 0;
78
-    $subject = sys_get_param_str('subject');
79
-    while(strpos($subject, $lang['msg_answer_prefix']) !== false) {
80
-      $subject = substr($subject, strlen($lang['msg_answer_prefix']));
81
-      $re++;
82
-    }
83
-    $re ? $subject = $lang['msg_answer_prefix'] . $subject : false;
84 67
 
85
-    if(sys_get_param_str('msg_send')) {
86
-      $subject = $subject ? $subject : $lang['msg_subject_default'];
68
+      if($recipient_row) {
69
+        $recipient_id = $recipient_row['id'];
70
+        $recipient_name = $recipient_row['username'];
71
+      }
87 72
 
88
-      if(!$recipient_id) {
89
-        $error_list[] = array('MESSAGE' => $lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
73
+      if($recipient_id == $user['id']) {
74
+        $error_list[] = array('MESSAGE' => $lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
90 75
       }
91 76
 
92
-      $text = sys_get_param_str('text');
93
-      if(!$text) {
94
-        $error_list[] = array('MESSAGE' => $lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
77
+      $re = 0;
78
+      $subject = sys_get_param_str('subject');
79
+      while(strpos($subject, $lang['msg_answer_prefix']) !== false) {
80
+        $subject = substr($subject, strlen($lang['msg_answer_prefix']));
81
+        $re++;
95 82
       }
83
+      $re ? $subject = $lang['msg_answer_prefix'] . $subject : false;
96 84
 
97
-      if(empty($error_list)) {
98
-        $error_list[] = array('MESSAGE' => $lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
85
+      if(sys_get_param_str('msg_send')) {
86
+        $subject = $subject ? $subject : $lang['msg_subject_default'];
99 87
 
100
-        $user_safe_name = db_escape($user['username']);
101
-        $recipient_name = db_escape($recipient_name);
102
-        msg_send_simple_message($recipient_id, $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, "{$user_safe_name} [{$user['galaxy']}:{$user['system']}:{$user['planet']}]", $subject, $text, true);
88
+        if(!$recipient_id) {
89
+          $error_list[] = array('MESSAGE' => $lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
90
+        }
103 91
 
104
-        //$recipient_id = 0;
105
-        //$recipient_name = '';
106
-        //$subject = '';
107
-        $text = '';
92
+        $text = sys_get_param_str('text');
93
+        if(!$text) {
94
+          $error_list[] = array('MESSAGE' => $lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
95
+        }
108 96
 
109
-        $msg_sent = true;
110
-      } else {
111
-        $subject = sys_get_param_str_unsafe('subject');
112
-        $text = sys_get_param_str_unsafe('text');
113
-      }
114
-      $recipient_name = sys_get_param_str_unsafe('recipient_name');
115
-    }
97
+        if(empty($error_list)) {
98
+          $error_list[] = array('MESSAGE' => $lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
116 99
 
117
-    $subject = $subject ? $subject : $lang['msg_subject_default'];
100
+          $user_safe_name = db_escape($user['username']);
101
+          $recipient_name = db_escape($recipient_name);
102
+          msg_send_simple_message($recipient_id, $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, "{$user_safe_name} [{$user['galaxy']}:{$user['system']}:{$user['planet']}]", $subject, $text, true);
118 103
 
119
-    $template->assign_vars(array(
120
-      'RECIPIENT_ID'   => $recipient_id,
121
-      'RECIPIENT_NAME' => htmlspecialchars($recipient_name),
122
-      'SUBJECT'        => htmlspecialchars($subject),
123
-      'TEXT'           => htmlspecialchars($text),
124
-    ));
104
+          //$recipient_id = 0;
105
+          //$recipient_name = '';
106
+          //$subject = '';
107
+          $text = '';
125 108
 
126
-    foreach($error_list as $error_message) {
127
-      $template->assign_block_vars('result', $error_message);
128
-    }
109
+          $msg_sent = true;
110
+        } else {
111
+          $subject = sys_get_param_str_unsafe('subject');
112
+          $text = sys_get_param_str_unsafe('text');
113
+        }
114
+        $recipient_name = sys_get_param_str_unsafe('recipient_name');
115
+      }
129 116
 
130
-    $message_query = db_message_list_get_last_20($user, $recipient_id);
131
-    while($message_row = db_fetch($message_query)) {
132
-      $template->assign_block_vars('messages', array(
133
-        'ID'   => $message_row['message_id'],
134
-        'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
135
-        'FROM' => htmlspecialchars($message_row['message_from']),
136
-        'SUBJ' => htmlspecialchars($message_row['message_subject']),
137
-        'TEXT' => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
117
+      $subject = $subject ? $subject : $lang['msg_subject_default'];
138 118
 
139
-        'FROM_ID' => $message_row['message_sender'],
119
+      $template->assign_vars(array(
120
+        'RECIPIENT_ID'   => $recipient_id,
121
+        'RECIPIENT_NAME' => htmlspecialchars($recipient_name),
122
+        'SUBJECT'        => htmlspecialchars($subject),
123
+        'TEXT'           => htmlspecialchars($text),
140 124
       ));
141
-    }
142 125
 
143
-  break;
126
+      foreach($error_list as $error_message) {
127
+        $template->assign_block_vars('result', $error_message);
128
+      }
129
+
130
+      $message_query = db_message_list_get_last_20($user, $recipient_id);
131
+      while($message_row = db_fetch($message_query)) {
132
+        $template->assign_block_vars('messages', array(
133
+          'ID'   => $message_row['message_id'],
134
+          'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
135
+          'FROM' => htmlspecialchars($message_row['message_from']),
136
+          'SUBJ' => htmlspecialchars($message_row['message_subject']),
137
+          'TEXT' => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
138
+
139
+          'FROM_ID' => $message_row['message_sender'],
140
+        ));
141
+      }
144 142
 
145
-  case 'delete':
146
-    $query_add = '';
143
+    break;
147 144
 
148
-    $message_range = sys_get_param_str('message_range');
145
+    case 'delete':
146
+      $query_add = '';
149 147
 
150
-    switch($message_range) {
148
+      $message_range = sys_get_param_str('message_range');
149
+
150
+      switch($message_range) {
151 151
       case 'unchecked':
152 152
       case 'checked':
153 153
         $marked_message_list = sys_get_param('mark', array());
@@ -171,65 +171,65 @@  discard block
 block discarded – undo
171 171
       case 'all':
172 172
         $query_add = $query_add ? $query_add : true;
173 173
       break;
174
-    }
174
+      }
175 175
 
176 176
     if($query_add) {
177 177
       $query_add = $query_add === true ? '' : $query_add;
178 178
       db_message_list_delete($user, $query_add);
179 179
     }
180 180
 
181
-  case 'show':
182
-    if($current_class == MSG_TYPE_OUTBOX) {
183
-      $message_query = db_message_list_outbox_by_user_id($user['id']);
184
-    } else {
185
-      if($current_class == MSG_TYPE_NEW) {
186
-        $SubUpdateQry = array();
187
-        foreach($sn_message_class_list as $message_class_id => $message_class) {
188
-          if($message_class_id != MSG_TYPE_OUTBOX) {
189
-            $SubUpdateQry[] = "`{$message_class['name']}` = '0'";
190
-            $user[$message_class['name']] = 0;
181
+    case 'show':
182
+      if($current_class == MSG_TYPE_OUTBOX) {
183
+        $message_query = db_message_list_outbox_by_user_id($user['id']);
184
+      } else {
185
+        if($current_class == MSG_TYPE_NEW) {
186
+          $SubUpdateQry = array();
187
+          foreach($sn_message_class_list as $message_class_id => $message_class) {
188
+            if($message_class_id != MSG_TYPE_OUTBOX) {
189
+              $SubUpdateQry[] = "`{$message_class['name']}` = '0'";
190
+              $user[$message_class['name']] = 0;
191
+            }
191 192
           }
193
+          $SubUpdateQry = implode(',', $SubUpdateQry);
194
+        } else {
195
+          $SubUpdateQry = "`{$sn_message_class_list[$current_class]['name']}` = '0', `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` = `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` - '{$user[$sn_message_class_list[$current_class]['name']]}'";
196
+          $SubSelectQry = "AND `message_type` = '{$current_class}'";
197
+
198
+          $user[$sn_message_class_list[MSG_TYPE_NEW]['name']] -= $user[$sn_message_class_list[$current_class]['name']];
199
+          $user[$sn_message_class_list[$current_class]['name']] = 0;
192 200
         }
193
-        $SubUpdateQry = implode(',', $SubUpdateQry);
194
-      } else {
195
-        $SubUpdateQry = "`{$sn_message_class_list[$current_class]['name']}` = '0', `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` = `{$sn_message_class_list[MSG_TYPE_NEW]['name']}` - '{$user[$sn_message_class_list[$current_class]['name']]}'";
196
-        $SubSelectQry = "AND `message_type` = '{$current_class}'";
197 201
 
198
-        $user[$sn_message_class_list[MSG_TYPE_NEW]['name']] -= $user[$sn_message_class_list[$current_class]['name']];
199
-        $user[$sn_message_class_list[$current_class]['name']] = 0;
202
+        db_user_set_by_id($user['id'], $SubUpdateQry);
203
+        $message_query = db_message_list_by_owner_and_string($user, $SubSelectQry);
200 204
       }
201 205
 
202
-      db_user_set_by_id($user['id'], $SubUpdateQry);
203
-      $message_query = db_message_list_by_owner_and_string($user, $SubSelectQry);
204
-    }
205
-
206
-    if(sys_get_param_int('return')) {
207
-      header('Location: messages.php');
208
-      die();
209
-    }
206
+      if(sys_get_param_int('return')) {
207
+        header('Location: messages.php');
208
+        die();
209
+      }
210 210
 
211
-    $template = gettemplate('msg_message_list', true);
212
-    while($message_row = db_fetch($message_query)) {
213
-      $template->assign_block_vars('messages', array(
214
-        'ID'   => $message_row['message_id'],
215
-        'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
216
-        'FROM' => htmlspecialchars($message_row['message_from']),
217
-        'SUBJ' => htmlspecialchars($message_row['message_subject']),
218
-        'TEXT' => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
219
-
220
-        'FROM_ID'        => $message_row['message_sender'],
221
-        'SUBJ_SANITIZED' => htmlspecialchars($message_row['message_subject']),
222
-        'STYLE'          => $current_class == MSG_TYPE_OUTBOX ? $sn_message_class_list[MSG_TYPE_OUTBOX]['name'] : $sn_message_class_list[$message_row['message_type']]['name'],
223
-      ));
224
-    }
211
+      $template = gettemplate('msg_message_list', true);
212
+      while($message_row = db_fetch($message_query)) {
213
+        $template->assign_block_vars('messages', array(
214
+          'ID'   => $message_row['message_id'],
215
+          'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
216
+          'FROM' => htmlspecialchars($message_row['message_from']),
217
+          'SUBJ' => htmlspecialchars($message_row['message_subject']),
218
+          'TEXT' => in_array($message_row['message_type'], array(MSG_TYPE_PLAYER, MSG_TYPE_ALLIANCE)) && $message_row['message_sender'] ? nl2br(htmlspecialchars($message_row['message_text'])) : nl2br($message_row['message_text']),
219
+
220
+          'FROM_ID'        => $message_row['message_sender'],
221
+          'SUBJ_SANITIZED' => htmlspecialchars($message_row['message_subject']),
222
+          'STYLE'          => $current_class == MSG_TYPE_OUTBOX ? $sn_message_class_list[MSG_TYPE_OUTBOX]['name'] : $sn_message_class_list[$message_row['message_type']]['name'],
223
+        ));
224
+      }
225 225
 
226
-    $current_class_text = $lang['msg_class'][$current_class];
226
+      $current_class_text = $lang['msg_class'][$current_class];
227 227
 
228
-    $template->assign_vars(array(
229
-      "MESSAGE_CLASS"      => $current_class,
230
-      "MESSAGE_CLASS_TEXT" => $current_class_text,
231
-    ));
232
-  break;
228
+      $template->assign_vars(array(
229
+        "MESSAGE_CLASS"      => $current_class,
230
+        "MESSAGE_CLASS_TEXT" => $current_class_text,
231
+      ));
232
+    break;
233 233
 }
234 234
 
235 235
 if(!$template) {
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -42,59 +42,59 @@  discard block
 block discarded – undo
42 42
 
43 43
 $mode = sys_get_param_str('msg_delete') ? 'delete' : sys_get_param_str('mode');
44 44
 $current_class = sys_get_param_int('message_class');
45
-if(!isset($sn_message_class_list[$current_class])) {
45
+if (!isset($sn_message_class_list[$current_class])) {
46 46
   $current_class = 0;
47 47
   $mode = '';
48 48
 }
49 49
 
50
-switch($mode) {
50
+switch ($mode) {
51 51
   case 'write':
52 52
     $error_list = array();
53 53
     $template = gettemplate('msg_message_compose', true);
54 54
 
55 55
     $recipient_name = sys_get_param_str_unsafe('recipient_name');
56
-    if($recipient_name) {
56
+    if ($recipient_name) {
57 57
       $recipient_row = db_user_by_username($recipient_name);
58 58
     }
59 59
 
60
-    if(!$recipient_row) {
60
+    if (!$recipient_row) {
61 61
       $recipient_id = sys_get_param_id('id');
62 62
       $recipient_row = db_user_by_id($recipient_id);
63
-      if(!$recipient_row) {
63
+      if (!$recipient_row) {
64 64
         $recipient_id = 0;
65 65
       }
66 66
     }
67 67
 
68
-    if($recipient_row) {
68
+    if ($recipient_row) {
69 69
       $recipient_id = $recipient_row['id'];
70 70
       $recipient_name = $recipient_row['username'];
71 71
     }
72 72
 
73
-    if($recipient_id == $user['id']) {
73
+    if ($recipient_id == $user['id']) {
74 74
       $error_list[] = array('MESSAGE' => $lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
75 75
     }
76 76
 
77 77
     $re = 0;
78 78
     $subject = sys_get_param_str('subject');
79
-    while(strpos($subject, $lang['msg_answer_prefix']) !== false) {
79
+    while (strpos($subject, $lang['msg_answer_prefix']) !== false) {
80 80
       $subject = substr($subject, strlen($lang['msg_answer_prefix']));
81 81
       $re++;
82 82
     }
83 83
     $re ? $subject = $lang['msg_answer_prefix'] . $subject : false;
84 84
 
85
-    if(sys_get_param_str('msg_send')) {
85
+    if (sys_get_param_str('msg_send')) {
86 86
       $subject = $subject ? $subject : $lang['msg_subject_default'];
87 87
 
88
-      if(!$recipient_id) {
88
+      if (!$recipient_id) {
89 89
         $error_list[] = array('MESSAGE' => $lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
90 90
       }
91 91
 
92 92
       $text = sys_get_param_str('text');
93
-      if(!$text) {
93
+      if (!$text) {
94 94
         $error_list[] = array('MESSAGE' => $lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
95 95
       }
96 96
 
97
-      if(empty($error_list)) {
97
+      if (empty($error_list)) {
98 98
         $error_list[] = array('MESSAGE' => $lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
99 99
 
100 100
         $user_safe_name = db_escape($user['username']);
@@ -123,12 +123,12 @@  discard block
 block discarded – undo
123 123
       'TEXT'           => htmlspecialchars($text),
124 124
     ));
125 125
 
126
-    foreach($error_list as $error_message) {
126
+    foreach ($error_list as $error_message) {
127 127
       $template->assign_block_vars('result', $error_message);
128 128
     }
129 129
 
130 130
     $message_query = db_message_list_get_last_20($user, $recipient_id);
131
-    while($message_row = db_fetch($message_query)) {
131
+    while ($message_row = db_fetch($message_query)) {
132 132
       $template->assign_block_vars('messages', array(
133 133
         'ID'   => $message_row['message_id'],
134 134
         'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
@@ -147,25 +147,25 @@  discard block
 block discarded – undo
147 147
 
148 148
     $message_range = sys_get_param_str('message_range');
149 149
 
150
-    switch($message_range) {
150
+    switch ($message_range) {
151 151
       case 'unchecked':
152 152
       case 'checked':
153 153
         $marked_message_list = sys_get_param('mark', array());
154
-        if($message_range == 'checked' && empty($marked_message_list)) {
154
+        if ($message_range == 'checked' && empty($marked_message_list)) {
155 155
           break;
156 156
         }
157 157
 
158 158
         $query_add = implode(',', $marked_message_list);
159
-        if($query_add) {
159
+        if ($query_add) {
160 160
           $query_add = "IN ({$query_add})";
161
-          if($message_range == 'unchecked') {
161
+          if ($message_range == 'unchecked') {
162 162
             $query_add = "NOT {$query_add}";
163 163
           }
164 164
           $query_add = " AND `message_id` {$query_add}";
165 165
         }
166 166
 
167 167
       case 'class':
168
-        if($current_class != MSG_TYPE_OUTBOX && $current_class != MSG_TYPE_NEW) {
168
+        if ($current_class != MSG_TYPE_OUTBOX && $current_class != MSG_TYPE_NEW) {
169 169
           $query_add .= " AND `message_type` = {$current_class}";
170 170
         }
171 171
       case 'all':
@@ -173,19 +173,19 @@  discard block
 block discarded – undo
173 173
       break;
174 174
     }
175 175
 
176
-    if($query_add) {
176
+    if ($query_add) {
177 177
       $query_add = $query_add === true ? '' : $query_add;
178 178
       db_message_list_delete($user, $query_add);
179 179
     }
180 180
 
181 181
   case 'show':
182
-    if($current_class == MSG_TYPE_OUTBOX) {
182
+    if ($current_class == MSG_TYPE_OUTBOX) {
183 183
       $message_query = db_message_list_outbox_by_user_id($user['id']);
184 184
     } else {
185
-      if($current_class == MSG_TYPE_NEW) {
185
+      if ($current_class == MSG_TYPE_NEW) {
186 186
         $SubUpdateQry = array();
187
-        foreach($sn_message_class_list as $message_class_id => $message_class) {
188
-          if($message_class_id != MSG_TYPE_OUTBOX) {
187
+        foreach ($sn_message_class_list as $message_class_id => $message_class) {
188
+          if ($message_class_id != MSG_TYPE_OUTBOX) {
189 189
             $SubUpdateQry[] = "`{$message_class['name']}` = '0'";
190 190
             $user[$message_class['name']] = 0;
191 191
           }
@@ -203,13 +203,13 @@  discard block
 block discarded – undo
203 203
       $message_query = db_message_list_by_owner_and_string($user, $SubSelectQry);
204 204
     }
205 205
 
206
-    if(sys_get_param_int('return')) {
206
+    if (sys_get_param_int('return')) {
207 207
       header('Location: messages.php');
208 208
       die();
209 209
     }
210 210
 
211 211
     $template = gettemplate('msg_message_list', true);
212
-    while($message_row = db_fetch($message_query)) {
212
+    while ($message_row = db_fetch($message_query)) {
213 213
       $template->assign_block_vars('messages', array(
214 214
         'ID'   => $message_row['message_id'],
215 215
         'DATE' => date(FMT_DATE_TIME, $message_row['message_time'] + SN_CLIENT_TIME_DIFF),
@@ -232,18 +232,18 @@  discard block
 block discarded – undo
232 232
   break;
233 233
 }
234 234
 
235
-if(!$template) {
235
+if (!$template) {
236 236
   $template = gettemplate('msg_message_class', true);
237 237
 
238 238
   $query = db_message_count_by_owner_and_type($user);
239
-  while($message_row = db_fetch($query)) {
239
+  while ($message_row = db_fetch($query)) {
240 240
     $messages_total[$message_row['message_type']] = $message_row['message_count'];
241 241
     $messages_total[MSG_TYPE_NEW] += $message_row['message_count'];
242 242
   }
243 243
 
244 244
   $messages_total[MSG_TYPE_OUTBOX] = db_message_count_outbox($user);
245 245
 
246
-  foreach($sn_message_class_list as $message_class_id => $message_class) {
246
+  foreach ($sn_message_class_list as $message_class_id => $message_class) {
247 247
     $template->assign_block_vars('message_class', array(
248 248
       'ID'     => $message_class_id,
249 249
       'STYLE'  => $message_class['name'],
Please login to merge, or discard this patch.