Completed
Push — work-fleets ( 069d1a...74a0d7 )
by SuperNova.WS
04:58
created
notes.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -15,34 +15,34 @@  discard block
 block discarded – undo
15 15
 $template = gettemplate('notes', true);
16 16
 
17 17
 $result = array();
18
-if(($result_message = sys_get_param_str('MESSAGE')) && isset(classLocale::$lang[$result_message])) {
18
+if (($result_message = sys_get_param_str('MESSAGE')) && isset(classLocale::$lang[$result_message])) {
19 19
   $result[] = array('STATUS' => sys_get_param_int('STATUS'), 'MESSAGE' => classLocale::$lang[$result_message]);
20 20
 }
21 21
 
22 22
 $note_id_edit = sys_get_param_id('note_id_edit');
23
-if(sys_get_param('note_delete')) {
23
+if (sys_get_param('note_delete')) {
24 24
   try {
25 25
     $not = '';
26 26
     $query_where = '';
27
-    switch(sys_get_param_str('note_delete_range')) {
27
+    switch (sys_get_param_str('note_delete_range')) {
28 28
       case 'all':
29 29
       break;
30 30
 
31 31
       case 'marked_not':
32 32
         $not = 'NOT';
33 33
       case 'marked':
34
-        if(!is_array($notes_marked = sys_get_param('note'))) {
34
+        if (!is_array($notes_marked = sys_get_param('note'))) {
35 35
           throw new Exception('note_err_none_selected', ERR_WARNING);
36 36
         }
37 37
 
38 38
         $notes_marked_filtered = array();
39
-        foreach($notes_marked as $note_id => $note_select) {
40
-          if($note_select == 'on' && $note_id = idval($note_id)) {
39
+        foreach ($notes_marked as $note_id => $note_select) {
40
+          if ($note_select == 'on' && $note_id = idval($note_id)) {
41 41
             $notes_marked_filtered[] = $note_id;
42 42
           }
43 43
         }
44 44
 
45
-        if(empty($notes_marked_filtered)) {
45
+        if (empty($notes_marked_filtered)) {
46 46
           throw new Exception('note_err_none_selected', ERR_WARNING);
47 47
         }
48 48
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     db_note_list_delete($user, $query_where);
60 60
     sn_db_transaction_commit();
61 61
     throw new Exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
62
-  } catch(Exception $e) {
62
+  } catch (Exception $e) {
63 63
     $note_id_edit = 0;
64 64
     sn_db_transaction_rollback();
65 65
     $result[] = array(
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
       'MESSAGE' => classLocale::$lang[$e->getMessage()],
68 68
     );
69 69
   }
70
-} elseif(($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
70
+} elseif (($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
71 71
   $note_title == db_escape(classLocale::$lang['note_new_title']) ? $note_title = '' : false;
72 72
   ($note_text = sys_get_param_str('note_text')) == db_escape(classLocale::$lang['note_new_text']) ? $note_text = '' : false;
73 73
 
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
     $note_system = max(0, min(sys_get_param_id('note_system'), $config->game_maxSystem));
77 77
     $note_planet = max(0, min(sys_get_param_id('note_planet'), $config->game_maxPlanet + 1));
78 78
 
79
-    if(!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
79
+    if (!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
80 80
       throw new exception('note_err_note_empty', ERR_WARNING);
81 81
     }
82 82
 
@@ -85,15 +85,15 @@  discard block
 block discarded – undo
85 85
     $note_sticky = intval(sys_get_param_id('note_sticky')) ? 1 : 0;
86 86
 
87 87
     sn_db_transaction_start();
88
-    if($note_id_edit) {
88
+    if ($note_id_edit) {
89 89
       $check_note_id = db_note_get_id_and_owner($note_id_edit);
90
-      if(!$check_note_id) {
90
+      if (!$check_note_id) {
91 91
         throw new Exception('note_err_note_not_found', ERR_ERROR);
92 92
       }
93 93
     }
94 94
 
95
-    if($note_id_edit) {
96
-      if($check_note_id['owner'] != $user['id']) {
95
+    if ($note_id_edit) {
96
+      if ($check_note_id['owner'] != $user['id']) {
97 97
         throw new Exception('note_err_owner_wrong', ERR_ERROR);
98 98
       }
99 99
 
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
     sn_db_transaction_commit();
106 106
     sys_redirect('notes.php?STATUS=' . ERR_NONE . '&MESSAGE=' . ($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added'));
107 107
 //    throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
108
-  } catch(Exception $e) {
108
+  } catch (Exception $e) {
109 109
     $note_id_edit = 0;
110 110
     sn_db_transaction_rollback();
111 111
     $result[] = array(
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
   }
116 116
 }
117 117
 
118
-if(!$note_id_edit) {
118
+if (!$note_id_edit) {
119 119
   note_assign($template, array(
120 120
     'id'          => 0,
121 121
     'time'        => SN_TIME_NOW,
@@ -128,13 +128,13 @@  discard block
 block discarded – undo
128 128
 
129 129
 $note_exist = false;
130 130
 $notes_query = db_note_list_by_owner($user['id']);
131
-while($note_row = db_fetch($notes_query)) {
131
+while ($note_row = db_fetch($notes_query)) {
132 132
   note_assign($template, $note_row);
133 133
   $note_exist = $note_exist || $note_row['id'] == $note_id_edit;
134 134
 }
135 135
 $note_id_edit = $note_exist ? $note_id_edit : 0;
136 136
 
137
-foreach($note_priority_classes as $note_priority_id => $note_priority_class) {
137
+foreach ($note_priority_classes as $note_priority_id => $note_priority_class) {
138 138
   $template->assign_block_vars('note_priority', array(
139 139
     'ID'    => $note_priority_id,
140 140
     'CLASS' => $note_priority_classes[$note_priority_id],
@@ -142,14 +142,14 @@  discard block
 block discarded – undo
142 142
   ));
143 143
 }
144 144
 
145
-foreach(classLocale::$lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
145
+foreach (classLocale::$lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
146 146
   $template->assign_block_vars('planet_type', array(
147 147
     'ID'   => $planet_type_id,
148 148
     'TEXT' => $planet_type_string,
149 149
   ));
150 150
 }
151 151
 
152
-foreach($result as $result_data) {
152
+foreach ($result as $result_data) {
153 153
   $template->assign_block_vars('result', $result_data);
154 154
 }
155 155
 
Please login to merge, or discard this patch.
metamatter.php 1 patch
Spacing   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 include_once('common.' . substr(strrchr(__FILE__, '.'), 1));
10 10
 
11
-if(!sn_module_get_active_count('payment')) {
11
+if (!sn_module_get_active_count('payment')) {
12 12
   sys_redirect('dark_matter.php');
13 13
   die();
14 14
 }
@@ -65,9 +65,9 @@  discard block
 block discarded – undo
65 65
 
66 66
 // Таблица скидок
67 67
 $prev_discount = 0;
68
-if(isset(sn_module_payment::$bonus_table) && is_array(sn_module_payment::$bonus_table)) {
69
-  foreach(sn_module_payment::$bonus_table as $sum => $discount) {
70
-    if($discount && $discount != $prev_discount) {
68
+if (isset(sn_module_payment::$bonus_table) && is_array(sn_module_payment::$bonus_table)) {
69
+  foreach (sn_module_payment::$bonus_table as $sum => $discount) {
70
+    if ($discount && $discount != $prev_discount) {
71 71
       $template->assign_block_vars('discount', array(
72 72
         'SUM'          => $sum,
73 73
         'DISCOUNT'     => $discount * 100,
@@ -80,19 +80,19 @@  discard block
 block discarded – undo
80 80
 }
81 81
 
82 82
 // Результат платежа
83
-if($payment_id = sys_get_param_id('payment_id')) {
83
+if ($payment_id = sys_get_param_id('payment_id')) {
84 84
   $payment = db_payment_get($payment_id);
85
-  if($payment && $payment['payment_user_id'] == $user['id']) {
86
-    if($payment['payment_status'] == PAYMENT_STATUS_COMPLETE) {
85
+  if ($payment && $payment['payment_user_id'] == $user['id']) {
86
+    if ($payment['payment_status'] == PAYMENT_STATUS_COMPLETE) {
87 87
       $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['pay_msg_mm_purchase_complete'], $payment['payment_dark_matter_paid'], $payment['payment_module_name'], $payment['payment_dark_matter_gained'])));
88 88
     }
89
-    if($payment['payment_status'] == PAYMENT_STATUS_NONE) {
89
+    if ($payment['payment_status'] == PAYMENT_STATUS_NONE) {
90 90
       $template->assign_block_vars('result', array(
91 91
         'MESSAGE' => sprintf(classLocale::$lang['pay_msg_mm_purchase_incomplete'], $payment['payment_dark_matter_paid'], $payment['payment_module_name']),
92 92
         'STATUS'  => 1,
93 93
       ));
94 94
     }
95
-    if($payment['payment_test']) {
95
+    if ($payment['payment_test']) {
96 96
       $template->assign_block_vars('result', array(
97 97
         'MESSAGE' => sprintf(classLocale::$lang['pay_msg_mm_purchase_test']),
98 98
         'STATUS'  => -1,
@@ -107,28 +107,28 @@  discard block
 block discarded – undo
107 107
   'metamatter' => sys_get_param_float('metamatter'),
108 108
 );
109 109
 
110
-if(!$request['metamatter']) {
110
+if (!$request['metamatter']) {
111 111
   unset($_POST);
112 112
 }
113 113
 
114 114
 $payment_methods_available = array_combine(array_keys(sn_module_payment::$payment_methods), array_fill(0, count(sn_module_payment::$payment_methods), null));
115
-array_walk($payment_methods_available, function (&$value, $index) {
115
+array_walk($payment_methods_available, function(&$value, $index) {
116 116
   $value = !empty(sn_module_payment::$payment_methods[$index]) ? array_combine(array_keys(sn_module_payment::$payment_methods[$index]), array_fill(0, count(sn_module_payment::$payment_methods[$index]), null)) : $value;
117 117
 });
118 118
 
119 119
 // pdump($payment_methods_available);
120 120
 $payment_module_valid = false;
121 121
 $payment_module = sys_get_param_str('payment_module');
122
-foreach(sn_module::$sn_module_list['payment'] as $module_name => $module) {
123
-  if(!is_object($module) || !$module->manifest['active']) {
122
+foreach (sn_module::$sn_module_list['payment'] as $module_name => $module) {
123
+  if (!is_object($module) || !$module->manifest['active']) {
124 124
     continue;
125 125
   }
126 126
 
127 127
   lng_include($module_name, $module->manifest['root_relative']);
128 128
 
129
-  foreach(sn_module_payment::$payment_methods as $payment_type_id => $available_methods) {
130
-    foreach($available_methods as $payment_method => $payment_currency) {
131
-      if(isset($module->manifest['payment_method'][$payment_method])) {
129
+  foreach (sn_module_payment::$payment_methods as $payment_type_id => $available_methods) {
130
+    foreach ($available_methods as $payment_method => $payment_currency) {
131
+      if (isset($module->manifest['payment_method'][$payment_method])) {
132 132
         $payment_methods_available[$payment_type_id][$payment_method][$module_name] = $module->manifest['payment_method'][$payment_method];
133 133
       }
134 134
     }
@@ -139,8 +139,8 @@  discard block
 block discarded – undo
139 139
 
140 140
 global $template_result;
141 141
 // Доступные платежные методы
142
-foreach($payment_methods_available as $payment_type_id => $payment_methods) {
143
-  if(empty($payment_methods)) {
142
+foreach ($payment_methods_available as $payment_type_id => $payment_methods) {
143
+  if (empty($payment_methods)) {
144 144
     continue;
145 145
   }
146 146
 
@@ -148,8 +148,8 @@  discard block
 block discarded – undo
148 148
     'ID'   => $payment_type_id,
149 149
     'NAME' => classLocale::$lang['pay_methods'][$payment_type_id],
150 150
   );
151
-  foreach($payment_methods as $payment_method_id => $module_list) {
152
-    if(empty($module_list)) {
151
+  foreach ($payment_methods as $payment_method_id => $module_list) {
152
+    if (empty($module_list)) {
153 153
       continue;
154 154
     }
155 155
     $template_result['.']['payment'][$payment_type_id]['.']['method'][$payment_method_id] = array(
@@ -160,14 +160,14 @@  discard block
 block discarded – undo
160 160
       'NAME_FORCE' => isset(sn_module_payment::$payment_methods[$payment_type_id][$payment_method_id]['name']),
161 161
       'BUTTON'     => isset(sn_module_payment::$payment_methods[$payment_type_id][$payment_method_id]['button']),
162 162
     );
163
-    foreach($module_list as $payment_module_name => $payment_module_method_details) {
163
+    foreach ($module_list as $payment_module_name => $payment_module_method_details) {
164 164
       $template_result['.']['payment'][$payment_type_id]['.']['method'][$payment_method_id]['.']['module'][] = array(
165 165
         'MODULE' => $payment_module_name,
166 166
       );
167 167
     }
168 168
   }
169 169
 
170
-  if(empty($template_result['.']['payment'][$payment_type_id]['.'])) {
170
+  if (empty($template_result['.']['payment'][$payment_type_id]['.'])) {
171 171
     unset($template_result['.']['payment'][$payment_type_id]);
172 172
   }
173 173
 }
@@ -180,19 +180,19 @@  discard block
 block discarded – undo
180 180
 $payment_module_valid = $payment_module_valid && (!$payment_method_selected || isset($payment_methods_available[$payment_type_selected][$payment_method_selected][$module_name]));
181 181
 
182 182
 // If payment_module invalid - making it empty OR if there is only one payment_module - selecting it
183
-if($payment_module_valid) {
183
+if ($payment_module_valid) {
184 184
   // $payment_module = $payment_module; // Really - do nothing
185
-} elseif($payment_type_selected && count($payment_methods_available[$payment_type_selected][$payment_method_selected]) == 1) {
185
+} elseif ($payment_type_selected && count($payment_methods_available[$payment_type_selected][$payment_method_selected]) == 1) {
186 186
   reset($payment_methods_available[$payment_type_selected][$payment_method_selected]);
187 187
   $payment_module = key($payment_methods_available[$payment_type_selected][$payment_method_selected]);
188
-} elseif(count(sn_module::$sn_module_list['payment']) == 1) {
188
+} elseif (count(sn_module::$sn_module_list['payment']) == 1) {
189 189
   $payment_module = $module_name;
190 190
 } else {
191 191
   $payment_module = '';
192 192
 }
193 193
 
194
-if($payment_type_selected && $payment_method_selected) {
195
-  foreach($payment_methods_available[$payment_type_selected][$payment_method_selected] as $module_name => $temp) {
194
+if ($payment_type_selected && $payment_method_selected) {
195
+  foreach ($payment_methods_available[$payment_type_selected][$payment_method_selected] as $module_name => $temp) {
196 196
     $template->assign_block_vars('payment_module', array(
197 197
       'ID'          => $module_name,
198 198
       'NAME'        => classLocale::$lang["module_{$module_name}_name"],
@@ -201,10 +201,10 @@  discard block
 block discarded – undo
201 201
   }
202 202
 }
203 203
 
204
-foreach(classLocale::$lang['pay_currency_list'] as $key => $value) {
204
+foreach (classLocale::$lang['pay_currency_list'] as $key => $value) {
205 205
   $course = get_exchange_rate($key);
206 206
 //  if(!$course || $key == $config->payment_currency_default) {
207
-  if(!$course) {
207
+  if (!$course) {
208 208
     continue;
209 209
   }
210 210
   $template->assign_block_vars('exchange', array(
@@ -219,17 +219,17 @@  discard block
 block discarded – undo
219 219
   ));
220 220
 }
221 221
 
222
-if($request['metamatter'] && $payment_module) {
222
+if ($request['metamatter'] && $payment_module) {
223 223
   try {
224 224
     // Any possible errors about generating paylink should be raised in module!
225 225
     $pay_link = sn_module::$sn_module[$payment_module]->compile_request($request);
226 226
 
227 227
     // Поддержка дополнительной информации
228
-    if(is_array($pay_link['RENDER'])) {
229
-      foreach($pay_link['RENDER'] as $html_data) {
228
+    if (is_array($pay_link['RENDER'])) {
229
+      foreach ($pay_link['RENDER'] as $html_data) {
230 230
         $template->assign_block_vars('render', $html_data);
231
-        if(isset($html_data['VALUE']) && is_array($html_data['VALUE'])) {
232
-          foreach($html_data['VALUE'] as $value_id => $value_value) {
231
+        if (isset($html_data['VALUE']) && is_array($html_data['VALUE'])) {
232
+          foreach ($html_data['VALUE'] as $value_id => $value_value) {
233 233
             $template->assign_block_vars('render.value', array(
234 234
               'FIELD' => $value_id,
235 235
               'VALUE' => $value_value,
@@ -240,8 +240,8 @@  discard block
 block discarded – undo
240 240
     }
241 241
 
242 242
     // Поддержка передачи данных для многошаговых платежных систем
243
-    if(is_array($pay_link['DATA'])) {
244
-      foreach($pay_link['DATA'] as $key => $value) {
243
+    if (is_array($pay_link['DATA'])) {
244
+      foreach ($pay_link['DATA'] as $key => $value) {
245 245
         $template->assign_block_vars('pay_link_data', array(
246 246
           'FIELD' => $key,
247 247
           'VALUE' => $value,
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
       }
250 250
     }
251 251
 
252
-    if(is_array($pay_link) && in_array($pay_link['PAY_LINK_METHOD'], array('POST', 'GET', 'LINK', 'STEP'))) {
252
+    if (is_array($pay_link) && in_array($pay_link['PAY_LINK_METHOD'], array('POST', 'GET', 'LINK', 'STEP'))) {
253 253
       // TODO Переделать это под assign_vars_recursive и возвращать пустые строки если нет платежного метода - для унификации формы в темплейте
254 254
       $template->assign_vars(array(
255 255
         'PAY_LINK_METHOD' => $pay_link['PAY_LINK_METHOD'],
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
     } else {
259 259
       throw new exception(classLocale::$lang['pay_msg_request_paylink_unsupported'], ERR_ERROR);
260 260
     }
261
-  } catch(exception $e) {
261
+  } catch (exception $e) {
262 262
     $template->assign_block_vars('result', $response = array(
263 263
       'STATUS'  => $e->getCode(),
264 264
       'MESSAGE' => $e->getMessage(),
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 }
269 269
 
270 270
 // Прегенерированные пакеты
271
-foreach($unit_available_amount_list as $unit_amount => $discount) {
271
+foreach ($unit_available_amount_list as $unit_amount => $discount) {
272 272
   $temp = sn_module_payment::currency_convert($unit_amount, 'MM_', $player_currency);
273 273
   $template->assign_block_vars('mm_amount', array(
274 274
     'VALUE'            => $unit_amount,
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
   'PLAYER_CURRENCY'              => $player_currency,
304 304
   'PLAYER_CURRENCY_PRICE_PER_MM' => sn_module_payment::currency_convert(1, $player_currency, 'MM_', 10),
305 305
 
306
-  'UNIT_AMOUNT'                 => (float)$request['metamatter'],
306
+  'UNIT_AMOUNT'                 => (float) $request['metamatter'],
307 307
   'UNIT_AMOUNT_TEXT'            => pretty_number($request['metamatter']),
308 308
   'UNIT_AMOUNT_BONUS_PERCENT'   => $bonus_percent,
309 309
   'UNIT_AMOUNT_TEXT_DISCOUNTED' => $income_metamatter_text,
Please login to merge, or discard this patch.
jumpgate.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -14,39 +14,39 @@  discard block
 block discarded – undo
14 14
 
15 15
 lng_include('fleet');
16 16
 
17
-if($TargetPlanet = sys_get_param_id('jmpto'))
17
+if ($TargetPlanet = sys_get_param_id('jmpto'))
18 18
 {
19 19
   sn_db_transaction_start();
20 20
   db_user_by_id($user['id'], true, 'id');
21 21
   $planetrow = db_planet_by_id($planetrow['id'], true);
22
-  if(!($NextJumpTime = uni_get_time_to_jump($planetrow)))
22
+  if (!($NextJumpTime = uni_get_time_to_jump($planetrow)))
23 23
   {
24 24
     $TargetGate = db_planet_by_id($TargetPlanet, true, '`id`, `last_jump_time`');
25
-    if(mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
25
+    if (mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
26 26
     {
27
-      $NextDestTime = uni_get_time_to_jump ( $TargetGate );
28
-      if(!$NextDestTime)
27
+      $NextDestTime = uni_get_time_to_jump($TargetGate);
28
+      if (!$NextDestTime)
29 29
       {
30 30
         // $SubQueryOri = "";
31 31
         // $SubQueryDes = "";
32 32
         $ship_list = sys_get_param('ships');
33 33
         $db_changeset = array();
34
-        foreach($ship_list as $ship_id => $ship_count)
34
+        foreach ($ship_list as $ship_id => $ship_count)
35 35
         {
36
-          if(!in_array($ship_id, sn_get_groups('fleet')))
36
+          if (!in_array($ship_id, sn_get_groups('fleet')))
37 37
           {
38 38
             continue;
39 39
           }
40 40
 
41 41
           $ship_count = max(0, min(floor($ship_count), mrc_get_level($user, $planetrow, $ship_id)));
42
-          if($ship_count)
42
+          if ($ship_count)
43 43
           {
44 44
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, -$ship_count, $user, $planetrow['id']);
45 45
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, $ship_count, $user, $TargetGate['id']);
46 46
           }
47 47
         }
48 48
         // Dit monsieur, y avait quelque chose a envoyer ???
49
-        if(!empty($db_changeset))
49
+        if (!empty($db_changeset))
50 50
         {
51 51
           db_planet_set_by_id($TargetGate['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
52 52
           db_planet_set_by_id($planetrow['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
@@ -55,31 +55,31 @@  discard block
 block discarded – undo
55 55
           db_user_set_by_id($user['id'], "`current_planet` = '{$TargetGate['id']}'");
56 56
 
57 57
           $planetrow['last_jump_time'] = SN_TIME_NOW;
58
-          $RetMessage = classLocale::$lang['gate_jump_done'] ." - ". pretty_time(uni_get_time_to_jump($planetrow));
58
+          $RetMessage = classLocale::$lang['gate_jump_done'] . " - " . pretty_time(uni_get_time_to_jump($planetrow));
59 59
         } else {
60 60
           $RetMessage = classLocale::$lang['gate_wait_data'];
61 61
         }
62 62
       } else {
63
-        $RetMessage = classLocale::$lang['gate_wait_dest'] ." - ". pretty_time($NextDestTime);
63
+        $RetMessage = classLocale::$lang['gate_wait_dest'] . " - " . pretty_time($NextDestTime);
64 64
       }
65 65
     } else {
66 66
       $RetMessage = classLocale::$lang['gate_no_dest_g'];
67 67
     }
68 68
   } else {
69
-    $RetMessage = classLocale::$lang['gate_wait_star'] ." - ". pretty_time($NextJumpTime);
69
+    $RetMessage = classLocale::$lang['gate_wait_star'] . " - " . pretty_time($NextJumpTime);
70 70
   }
71 71
   sn_db_transaction_commit();
72 72
   message($RetMessage, classLocale::$lang['tech'][STRUC_MOON_GATE], "jumpgate.php", 10);
73 73
 } else {
74 74
   $template = gettemplate('jumpgate', true);
75
-  if(mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
75
+  if (mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
76 76
   {
77 77
     $Combo = '';
78 78
     $MoonList = db_planet_list_moon_other($user['id'], $planetrow['id']);
79 79
     // while($CurMoon = db_fetch($MoonList))
80
-    foreach($MoonList as $CurMoon)
80
+    foreach ($MoonList as $CurMoon)
81 81
     {
82
-      if(mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
82
+      if (mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
83 83
       {
84 84
         $NextJumpTime = uni_get_time_to_jump($CurMoon);
85 85
         $template->assign_block_vars('moon', array(
@@ -93,9 +93,9 @@  discard block
 block discarded – undo
93 93
       }
94 94
     }
95 95
 
96
-    foreach(sn_get_groups('fleet') as $Ship)
96
+    foreach (sn_get_groups('fleet') as $Ship)
97 97
     {
98
-      if(($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
98
+      if (($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
99 99
       {
100 100
         continue;
101 101
       }
Please login to merge, or discard this patch.
overview.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
 $result = array();
80 80
 
81
-switch($mode = sys_get_param_str('mode')) {
81
+switch ($mode = sys_get_param_str('mode')) {
82 82
   case 'manage':
83 83
     sn_sys_sector_buy('overview.php?mode=manage');
84 84
 
@@ -88,11 +88,11 @@  discard block
 block discarded – undo
88 88
     $template  = gettemplate('planet_manage', true);
89 89
     $planet_id = sys_get_param_id('planet_id');
90 90
 
91
-    if(sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
91
+    if (sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
92 92
       $planetrow['name'] = $new_name;
93 93
 //      $new_name = db_escape($new_name);
94 94
       db_planet_set_by_id($planetrow['id'], "`name` = '{$new_name}'");
95
-    } elseif(sys_get_param_str('action') == 'make_capital') {
95
+    } elseif (sys_get_param_str('action') == 'make_capital') {
96 96
       try {
97 97
         sn_db_transaction_start();
98 98
         $user = db_user_by_id($user['id'], true, '*');
@@ -101,15 +101,15 @@  discard block
 block discarded – undo
101 101
 //        $user = $global_data['user'];
102 102
 //        $planetrow = $global_data['planet'];
103 103
 
104
-        if($planetrow['planet_type'] != PT_PLANET) {
104
+        if ($planetrow['planet_type'] != PT_PLANET) {
105 105
           throw new exception(classLocale::$lang['ov_capital_err_not_a_planet'], ERR_ERROR);
106 106
         }
107 107
 
108
-        if($planetrow['id'] == $user['id_planet']) {
108
+        if ($planetrow['id'] == $user['id_planet']) {
109 109
           throw new exception(classLocale::$lang['ov_capital_err_capital_already'], ERR_ERROR);
110 110
         }
111 111
 
112
-        if($user_dark_matter < $config->planet_capital_cost) {
112
+        if ($user_dark_matter < $config->planet_capital_cost) {
113 113
           throw new exception(classLocale::$lang['ov_capital_err_no_dark_matter'], ERR_ERROR);
114 114
         }
115 115
 
@@ -126,16 +126,16 @@  discard block
 block discarded – undo
126 126
         );
127 127
         sn_db_transaction_commit();
128 128
         sys_redirect('overview.php?mode=manage');
129
-      } catch(exception $e) {
129
+      } catch (exception $e) {
130 130
         sn_db_transaction_rollback();
131 131
         $result[] = array(
132 132
           'STATUS'  => $e->getCode(),
133 133
           'MESSAGE' => $e->getMessage(),
134 134
         );
135 135
       }
136
-    } elseif(sys_get_param_str('action') == 'planet_teleport') {
136
+    } elseif (sys_get_param_str('action') == 'planet_teleport') {
137 137
       try {
138
-        if(!uni_coordinates_valid($new_coordinates = array(
138
+        if (!uni_coordinates_valid($new_coordinates = array(
139 139
           'galaxy' => sys_get_param_int('new_galaxy'),
140 140
           'system' => sys_get_param_int('new_system'),
141 141
           'planet' => sys_get_param_int('new_planet')))
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 //        $planetrow = $global_data['planet'];
153 153
 
154 154
         $can_teleport = uni_planet_teleport_check($user, $planetrow, $new_coordinates);
155
-        if($can_teleport['result'] != ERR_NONE) {
155
+        if ($can_teleport['result'] != ERR_NONE) {
156 156
           throw new exception($can_teleport['message'], $can_teleport['result']);
157 157
         }
158 158
 
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
         db_planet_set_by_gspt($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], PT_ALL,
164 164
           "galaxy = {$new_coordinates['galaxy']}, system = {$new_coordinates['system']}, planet = {$new_coordinates['planet']}, planet_teleport_next = {$planet_teleport_next}");
165 165
 
166
-        if($planetrow['id'] == $user['id_planet']) {
166
+        if ($planetrow['id'] == $user['id_planet']) {
167 167
           db_user_set_by_id($user['id'], "galaxy = {$new_coordinates['galaxy']}, system = {$new_coordinates['system']}, planet = {$new_coordinates['planet']}");
168 168
         }
169 169
 
@@ -176,17 +176,17 @@  discard block
 block discarded – undo
176 176
           'MESSAGE' => classLocale::$lang['ov_teleport_err_none'],
177 177
         );
178 178
         sys_redirect('overview.php?mode=manage');
179
-      } catch(exception $e) {
179
+      } catch (exception $e) {
180 180
         sn_db_transaction_rollback();
181 181
         $result[] = array(
182 182
           'STATUS'  => $e->getCode(),
183 183
           'MESSAGE' => $e->getMessage(),
184 184
         );
185 185
       }
186
-    } elseif(sys_get_param_str('action') == 'planet_abandon') {
186
+    } elseif (sys_get_param_str('action') == 'planet_abandon') {
187 187
       // if(sec_password_check($user['id'], sys_get_param('abandon_confirm'))) {
188
-      if(classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
189
-        if($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
188
+      if (classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
189
+        if ($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
190 190
           $destroyed = SN_TIME_NOW + 60 * 60 * 24;
191 191
           db_planet_set_by_id($user['current_planet'], "`destruyed`='{$destroyed}', `id_owner`=0");
192 192
           db_planet_set_by_parent($user['current_planet'], "`destruyed`='{$destroyed}', `id_owner`=0");
@@ -196,9 +196,9 @@  discard block
 block discarded – undo
196 196
           message(classLocale::$lang['ov_delete_wrong_planet'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
197 197
         }
198 198
       } else {
199
-        message(classLocale::$lang['ov_delete_wrong_pass'] , classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
199
+        message(classLocale::$lang['ov_delete_wrong_pass'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
200 200
       }
201
-    } elseif(
201
+    } elseif (
202 202
       ($hire = sys_get_param_int('hire')) && in_array($hire, sn_get_groups('governors'))
203 203
       && (
204 204
         !get_unit_param($hire, P_MAX_STACK) ||
@@ -213,8 +213,8 @@  discard block
 block discarded – undo
213 213
       $user = db_user_by_id($user['id'], true);
214 214
       $planetrow = db_planet_by_id($planetrow['id'], true);
215 215
       $build_data = eco_get_build_data($user, $planetrow, $hire, $planetrow['PLANET_GOVERNOR_ID'] == $hire ? $planetrow['PLANET_GOVERNOR_LEVEL'] : 0);
216
-      if($build_data['CAN'][BUILD_CREATE]) {
217
-        if($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
216
+      if ($build_data['CAN'][BUILD_CREATE]) {
217
+        if ($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
218 218
           $planetrow['PLANET_GOVERNOR_LEVEL']++;
219 219
           $query = '`PLANET_GOVERNOR_LEVEL` + 1';
220 220
         } else {
@@ -240,8 +240,8 @@  discard block
 block discarded – undo
240 240
 
241 241
     lng_include('mrc_mercenary');
242 242
     int_planet_pretemplate($planetrow, $template);
243
-    foreach(sn_get_groups('governors') as $governor_id) {
244
-      if($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
243
+    foreach (sn_get_groups('governors') as $governor_id) {
244
+      if ($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
245 245
         continue;
246 246
       }
247 247
 
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
       'PAGE_HINT'   => classLocale::$lang['ov_manage_page_hint'],
294 294
     ));
295 295
 
296
-    foreach($result as &$a_result) {
296
+    foreach ($result as &$a_result) {
297 297
       $template->assign_block_vars('result', $a_result);
298 298
     }
299 299
 
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
   default:
304 304
     sn_sys_sector_buy();
305 305
 
306
-    if(sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
306
+    if (sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
307 307
       $planetrow['name'] = $new_name;
308 308
       $new_name_safe = db_escape($new_name);
309 309
       db_planet_set_by_id($planetrow['id'], "`name` = '{$new_name_safe}'");
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 
334 334
     $planet_count = 0;
335 335
     $planets_query = db_planet_list_sorted($user, false, '*');
336
-    foreach($planets_query as $an_id => $UserPlanet) {
336
+    foreach ($planets_query as $an_id => $UserPlanet) {
337 337
       sn_db_transaction_start();
338 338
       $UserPlanet = sys_o_get_updated($user, $UserPlanet['id'], SN_TIME_NOW, false, true);
339 339
       sn_db_transaction_commit();
@@ -344,16 +344,16 @@  discard block
 block discarded – undo
344 344
 
345 345
       $planet_fleet_id = 0;
346 346
       $fleet_list = $template_planet['fleet_list'];
347
-      if($fleet_list['own']['count']) {
347
+      if ($fleet_list['own']['count']) {
348 348
         $planet_fleet_id = "p{$UserPlanet['id']}";
349 349
         $fleets_to_planet[$UserPlanet['id']] = tpl_parse_fleet_sn($fleet_list['own']['total'], $planet_fleet_id);
350 350
 //        $fleet_id++;tpl_parse_fleet_sn
351 351
       }
352
-      if($UserPlanet['planet_type'] == PT_MOON) {
352
+      if ($UserPlanet['planet_type'] == PT_MOON) {
353 353
         continue;
354 354
       }
355 355
       $moon = db_planet_by_parent($UserPlanet['id']);
356
-      if($moon) {
356
+      if ($moon) {
357 357
         $moon_fill = min(100, floor($moon['field_current'] / eco_planet_fields_max($moon) * 100));
358 358
       } else {
359 359
         $moon_fill = 0;
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
     tpl_assign_fleet($template, $fleets);
394 394
 
395 395
     $lune = $planetrow['planet_type'] == PT_PLANET ? db_planet_by_parent($planetrow['id']) : db_planet_by_id($planetrow['parent_planet']);
396
-    if($lune) {
396
+    if ($lune) {
397 397
       $template->assign_vars(array(
398 398
         'MOON_ID' => $lune['id'],
399 399
         'MOON_IMG' => $lune['image'],
@@ -405,15 +405,15 @@  discard block
 block discarded – undo
405 405
     $planet_fill = $planet_fill > 100 ? 100 : $planet_fill;
406 406
 
407 407
     $planet_recyclers_orbiting = 0;
408
-    foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
408
+    foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
409 409
       $planet_recyclers_orbiting += mrc_get_level($user, $planetrow, $recycler_id);
410 410
     }
411 411
 
412 412
     int_planet_pretemplate($planetrow, $template);
413 413
 
414 414
     $sn_group_ques = sn_get_groups('ques');
415
-    if(!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
416
-      foreach(array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
415
+    if (!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
416
+      foreach (array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
417 417
         $this_que = $que['ques'][$que_id][$user['id']][$planetrow['id']];
418 418
         $template->assign_block_vars('ques', array(
419 419
           'ID'     => $que_id,
@@ -421,8 +421,8 @@  discard block
 block discarded – undo
421 421
           'LENGTH' => empty($this_que) ? 0 : count($this_que),
422 422
         ));
423 423
 
424
-        if(!empty($this_que)) {
425
-          foreach($this_que as $que_item) {
424
+        if (!empty($this_que)) {
425
+          foreach ($this_que as $que_item) {
426 426
             $template->assign_block_vars('que', que_tpl_parse_element($que_item));
427 427
           }
428 428
         }
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
436 436
       'LENGTH' => $que_hangar_length,
437 437
     ));
438 438
 
439
-    if(!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
439
+    if (!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
440 440
       $que_hangar_length = tpl_assign_hangar($template, $planetrow, SUBQUE_DEFENSE);
441 441
       $template->assign_block_vars('ques', array(
442 442
         'ID'     => SUBQUE_DEFENSE,
@@ -448,12 +448,12 @@  discard block
 block discarded – undo
448 448
     $overview_planet_rows = $user['opt_int_overview_planet_rows'];
449 449
     $overview_planet_columns = $user['opt_int_overview_planet_columns'];
450 450
 
451
-    if($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
451
+    if ($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
452 452
       $overview_planet_rows = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_rows'];
453 453
       $overview_planet_columns = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_columns'];
454 454
     }
455 455
 
456
-    if($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
456
+    if ($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
457 457
       $overview_planet_columns = ceil($planet_count / $overview_planet_rows);
458 458
     }
459 459
 
@@ -510,7 +510,7 @@  discard block
 block discarded – undo
510 510
     ));
511 511
     tpl_set_resource_info($template, $planetrow, $fleets_to_planet, 2);
512 512
 
513
-    foreach($result as &$a_result) {
513
+    foreach ($result as &$a_result) {
514 514
       $template->assign_block_vars('result', $a_result);
515 515
     }
516 516
 
Please login to merge, or discard this patch.
infos.php 1 patch
Spacing   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -12,16 +12,16 @@  discard block
 block discarded – undo
12 12
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
13 13
 
14 14
 $unit_id = sys_get_param_id('gid');
15
-if($unit_id == RES_DARK_MATTER) {
15
+if ($unit_id == RES_DARK_MATTER) {
16 16
   sys_redirect('dark_matter.php');
17 17
 }
18 18
 
19
-if($unit_id == RES_METAMATTER) {
19
+if ($unit_id == RES_METAMATTER) {
20 20
   sys_redirect('metamatter.php');
21 21
 }
22 22
 
23 23
 lng_include('infos');
24
-if(!$unit_id || (!get_unit_param($unit_id) && !isset(classLocale::$lang['info'][$unit_id]))) {
24
+if (!$unit_id || (!get_unit_param($unit_id) && !isset(classLocale::$lang['info'][$unit_id]))) {
25 25
   sys_redirect('index.php?page=techtree');
26 26
 }
27 27
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 $unit_data = get_unit_param($unit_id);
31 31
 $unit_type = $unit_data['type'];
32 32
 
33
-if($unit_type == UNIT_SHIPS) {
33
+if ($unit_type == UNIT_SHIPS) {
34 34
   $template_result['UNIT_IS_SHIP'] = true;
35 35
 
36 36
   $ship_data = get_ship_data($unit_id, $user);
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
   );
47 47
 
48 48
   $engine_template_info = array();
49
-  foreach($unit_data['engine'] as $unit_engine_data) {
49
+  foreach ($unit_data['engine'] as $unit_engine_data) {
50 50
     $unit_engine_data = get_engine_data($user, $unit_engine_data);
51 51
 
52 52
     $engine_template_info[] = array(
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 
66 66
 
67 67
 $sn_data_group_combat = sn_get_groups('combat');
68
-if(in_array($unit_id, $sn_data_group_combat)) {
68
+if (in_array($unit_id, $sn_data_group_combat)) {
69 69
   $template_result['UNIT_IS_COMBAT'] = true;
70 70
 
71 71
   $unit_durability = $unit_data['shield'] + $unit_data['armor'];
@@ -73,21 +73,21 @@  discard block
 block discarded – undo
73 73
   $volley_arr = $rapid_to = $rapid_from = array();
74 74
   $str_rapid_from = '';
75 75
   $str_rapid_to = '';
76
-  foreach($sn_data_group_combat as $enemy_id) {
76
+  foreach ($sn_data_group_combat as $enemy_id) {
77 77
     $enemy_data = get_unit_param($enemy_id);
78 78
     $enemy_durability = $enemy_data['shield'] + $enemy_data['armor'];
79 79
 
80 80
     $rapid = $unit_data['attack'] * (isset($unit_data['amplify'][$enemy_id]) ? $unit_data['amplify'][$enemy_id] : 1) / $enemy_durability;
81
-    if($rapid >= 1) {
81
+    if ($rapid >= 1) {
82 82
       $volley_arr[$enemy_id]['TO'] = floor($rapid);
83 83
     }
84 84
 
85 85
     $rapid = $enemy_data['attack'] * (isset($enemy_data['amplify'][$unit_id]) ? $enemy_data['amplify'][$unit_id] : 1) / $unit_durability;
86
-    if($rapid >= 1) {
86
+    if ($rapid >= 1) {
87 87
       $volley_arr[$enemy_id]['FROM'] = floor($rapid);
88 88
     }
89 89
   }
90
-  foreach($volley_arr as $enemy_id => &$rapid) {
90
+  foreach ($volley_arr as $enemy_id => &$rapid) {
91 91
     $rapid['ENEMY_ID'] = $enemy_id;
92 92
     $rapid['ENEMY_NAME'] = classLocale::$lang['tech'][$enemy_id];
93 93
   }
@@ -105,11 +105,11 @@  discard block
 block discarded – undo
105 105
 
106 106
 }
107 107
 
108
-if(classLocale::$lang['info'][$unit_id]['effect']) {
108
+if (classLocale::$lang['info'][$unit_id]['effect']) {
109 109
   $template_result['UNIT_EFFECT'] = classLocale::$lang['info'][$unit_id]['effect'];
110 110
 }
111 111
 
112
-if($unit_data['bonus']) {
112
+if ($unit_data['bonus']) {
113 113
   $unit_bonus = !$unit_data['bonus'] || $unit_data['bonus_type'] == BONUS_ABILITY ? '' : (
114 114
     ($unit_data['bonus'] >= 0 ? '+' : '') . $unit_data['bonus'] . ($unit_data['bonus_type'] == BONUS_PERCENT ? '%' : '')
115 115
   );
@@ -174,20 +174,20 @@  discard block
 block discarded – undo
174 174
   ));
175 175
 
176 176
   $ActualProd = floor($Prod[$BuildID]);
177
-  if($BuildID != STRUC_MINE_FUSION) {
177
+  if ($BuildID != STRUC_MINE_FUSION) {
178 178
     $ActualNeed = floor($Prod[STRUC_MINE_SOLAR]);
179 179
   } else {
180 180
     $ActualNeed = floor($Prod[STRUC_MINE_DEUTERIUM]);
181 181
   }
182 182
 
183 183
   $BuildStartLvl = $CurrentBuildtLvl - 2;
184
-  if($BuildStartLvl < 1) {
184
+  if ($BuildStartLvl < 1) {
185 185
     $BuildStartLvl = 1;
186 186
   }
187 187
   $Table = '';
188 188
   $ProdFirst = 0;
189
-  for($BuildLevel = $BuildStartLvl; $BuildLevel < $BuildStartLvl + 10; $BuildLevel++) {
190
-    if($BuildID != STRUC_MOON_PHALANX) {
189
+  for ($BuildLevel = $BuildStartLvl; $BuildLevel < $BuildStartLvl + 10; $BuildLevel++) {
190
+    if ($BuildID != STRUC_MOON_PHALANX) {
191 191
       $Prod[STRUC_MINE_METAL] = floor(mrc_modify_value(
192 192
         $CurrentUser,
193 193
         $CurrentPlanet,
@@ -214,8 +214,8 @@  discard block
 block discarded – undo
214 214
       ));
215 215
 
216 216
       $bloc['build_lvl'] = ($CurrentBuildtLvl == $BuildLevel) ? "<font color=\"#ff0000\">" . $BuildLevel . "</font>" : $BuildLevel;
217
-      if($ProdFirst > 0) {
218
-        if($BuildID != STRUC_MINE_FUSION) {
217
+      if ($ProdFirst > 0) {
218
+        if ($BuildID != STRUC_MINE_FUSION) {
219 219
           $bloc['build_gain'] = "<font color=\"lime\">(" . pretty_number(floor($Prod[$BuildID] - $ProdFirst)) . ")</font>";
220 220
         } else {
221 221
           $bloc['build_gain'] = "<font color=\"lime\">(" . pretty_number(floor($Prod[STRUC_MINE_SOLAR] - $ProdFirst)) . ")</font>";
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
       } else {
224 224
         $bloc['build_gain'] = '';
225 225
       }
226
-      if($BuildID != STRUC_MINE_FUSION) {
226
+      if ($BuildID != STRUC_MINE_FUSION) {
227 227
         $bloc['build_prod'] = pretty_number(floor($Prod[$BuildID]));
228 228
         $bloc['build_prod_diff'] = pretty_number(floor($Prod[$BuildID] - $ActualProd), true, true);
229 229
         $bloc['build_need'] = pretty_number(floor($Prod[STRUC_MINE_SOLAR]), true, true);
@@ -234,8 +234,8 @@  discard block
 block discarded – undo
234 234
         $bloc['build_need'] = pretty_number(floor($Prod[STRUC_MINE_DEUTERIUM]), true, true);
235 235
         $bloc['build_need_diff'] = pretty_number(floor($Prod[STRUC_MINE_DEUTERIUM] - $ActualNeed), true, true);
236 236
       }
237
-      if($ProdFirst == 0) {
238
-        if($BuildID != STRUC_MINE_FUSION) {
237
+      if ($ProdFirst == 0) {
238
+        if ($BuildID != STRUC_MINE_FUSION) {
239 239
           $ProdFirst = floor($Prod[$BuildID]);
240 240
         } else {
241 241
           $ProdFirst = floor($Prod[STRUC_MINE_SOLAR]);
@@ -260,22 +260,22 @@  discard block
 block discarded – undo
260 260
 
261 261
   $str_rapid_from = '';
262 262
   $str_rapid_to = '';
263
-  foreach(sn_get_groups(array('fleet', 'defense_active')) as $enemy_id) {
263
+  foreach (sn_get_groups(array('fleet', 'defense_active')) as $enemy_id) {
264 264
     $enemy_data = get_unit_param($enemy_id);
265 265
     $enemy_durability = $enemy_data['shield'] + $enemy_data['armor'];
266 266
 
267 267
     $rapid = floor($unit_data['attack'] * (isset($unit_data['amplify'][$enemy_id]) ? $unit_data['amplify'][$enemy_id] : 1) / $enemy_durability);
268
-    if($rapid >= 1) {
268
+    if ($rapid >= 1) {
269 269
       $str_rapid_to .= "{$lang['nfo_rf_again']} {$lang['tech'][$enemy_id]} <font color=\"#00ff00\">{$rapid}</font><br>";
270 270
     }
271 271
 
272 272
     $rapid = floor($enemy_data['attack'] * (isset($enemy_data['amplify'][$unit_id]) ? $enemy_data['amplify'][$unit_id] : 1) / $unit_durability);
273
-    if($rapid >= 1) {
273
+    if ($rapid >= 1) {
274 274
       $str_rapid_from .= "{$lang['tech'][$enemy_id]} {$lang['nfo_rf_from']} <font color=\"#ff0000\">{$rapid}</font><br>";
275 275
     }
276 276
   }
277 277
 
278
-  if($str_rapid_to && $str_rapid_from) {
278
+  if ($str_rapid_to && $str_rapid_from) {
279 279
     $str_rapid_to .= '<hr>';
280 280
   }
281 281
 
@@ -304,75 +304,75 @@  discard block
 block discarded – undo
304 304
 
305 305
 $unit_info = get_unit_param($unit_id);
306 306
 
307
-if($unit_id >= 1 && $unit_id <= 3) {
307
+if ($unit_id >= 1 && $unit_id <= 3) {
308 308
   // Cas des mines
309 309
   $PageTPL = gettemplate('info_buildings_table');
310 310
   $DestroyTPL = gettemplate('info_buildings_destroy');
311 311
   $TableHeadTPL = "<tr><td class=\"c\">{nfo_level}</td><td class=\"c\">{nfo_prod_p_hour}</td><td class=\"c\">{nfo_difference}</td><td class=\"c\">{nfo_used_energy}</td><td class=\"c\">{nfo_difference}</td></tr>";
312 312
   $TableTPL = "<tr><th>{build_lvl}</th><th>{build_prod} {build_gain}</th><th>{build_prod_diff}</th><th>{build_need}</th><th>{build_need_diff}</th></tr>";
313
-} elseif($unit_id == 4) {
313
+} elseif ($unit_id == 4) {
314 314
   // Centrale Solaire
315 315
   $PageTPL = gettemplate('info_buildings_table');
316 316
   $DestroyTPL = gettemplate('info_buildings_destroy');
317 317
   $TableHeadTPL = "<tr><td class=\"c\">{nfo_level}</td><td class=\"c\">{nfo_prod_energy}</td><td class=\"c\">{nfo_difference}</td></tr>";
318 318
   $TableTPL = "<tr><th>{build_lvl}</th><th>{build_prod} {build_gain}</th><th>{build_prod_diff}</th></tr>";
319
-} elseif($unit_id == STRUC_MINE_FUSION) {
319
+} elseif ($unit_id == STRUC_MINE_FUSION) {
320 320
   // Centrale Fusion
321 321
   $PageTPL = gettemplate('info_buildings_table');
322 322
   $DestroyTPL = gettemplate('info_buildings_destroy');
323 323
   $TableHeadTPL = "<tr><td class=\"c\">{nfo_level}</td><td class=\"c\">{nfo_prod_energy}</td><td class=\"c\">{nfo_difference}</td><td class=\"c\">{nfo_used_deuter}</td><td class=\"c\">{nfo_difference}</td></tr>";
324 324
   $TableTPL = "<tr><th>{build_lvl}</th><th>{build_prod} {build_gain}</th><th>{build_prod_diff}</th><th>{build_need}</th><th>{build_need_diff}</th></tr>";
325
-} elseif($unit_id >= STRUC_FACTORY_ROBOT && $unit_id <= 32) {
325
+} elseif ($unit_id >= STRUC_FACTORY_ROBOT && $unit_id <= 32) {
326 326
   // Batiments Generaux
327 327
   $PageTPL = gettemplate('info_buildings_general');
328 328
   $DestroyTPL = gettemplate('info_buildings_destroy');
329
-} elseif($unit_id == STRUC_TERRAFORMER) {
329
+} elseif ($unit_id == STRUC_TERRAFORMER) {
330 330
   // Batiments Terraformer
331 331
   $PageTPL = gettemplate('info_buildings_general');
332
-} elseif($unit_id == STRUC_ALLY_DEPOSIT) {
332
+} elseif ($unit_id == STRUC_ALLY_DEPOSIT) {
333 333
   // Dépot d'alliance
334 334
   $PageTPL = gettemplate('info_buildings_general');
335 335
   $DestroyTPL = gettemplate('info_buildings_destroy');
336
-} elseif($unit_id == STRUC_LABORATORY_NANO) {
336
+} elseif ($unit_id == STRUC_LABORATORY_NANO) {
337 337
   // nano
338 338
   $PageTPL = gettemplate('info_buildings_general');
339 339
   $DestroyTPL = gettemplate('info_buildings_destroy');
340
-} elseif($unit_id == STRUC_SILO) {
340
+} elseif ($unit_id == STRUC_SILO) {
341 341
   // Silo de missiles
342 342
   $PageTPL = gettemplate('info_buildings_general');
343 343
   $DestroyTPL = gettemplate('info_buildings_destroy');
344
-} elseif($unit_id == STRUC_MOON_STATION) {
344
+} elseif ($unit_id == STRUC_MOON_STATION) {
345 345
   // Batiments lunaires
346 346
   $PageTPL = gettemplate('info_buildings_general');
347
-} elseif($unit_id == STRUC_MOON_PHALANX) {
347
+} elseif ($unit_id == STRUC_MOON_PHALANX) {
348 348
   // Phalange
349 349
   $PageTPL = gettemplate('info_buildings_table');
350 350
   $TableHeadTPL = "<tr><td class=\"c\">{nfo_level}</td><td class=\"c\">{nfo_range}</td></tr>";
351 351
   $TableTPL = "<tr><th>{build_lvl}</th><th>{build_range}</th></tr>";
352 352
   $DestroyTPL = gettemplate('info_buildings_destroy');
353
-} elseif($unit_id == STRUC_MOON_GATE) {
353
+} elseif ($unit_id == STRUC_MOON_GATE) {
354 354
   // Porte de Saut
355 355
   $PageTPL = gettemplate('info_buildings_general');
356 356
   $DestroyTPL = gettemplate('info_buildings_destroy');
357
-} elseif(in_array($unit_id, sn_get_groups('tech'))) {
357
+} elseif (in_array($unit_id, sn_get_groups('tech'))) {
358 358
   // Laboratoire
359 359
   $PageTPL = gettemplate('info_buildings_general');
360
-} elseif(in_array($unit_id, sn_get_groups('fleet'))) {
360
+} elseif (in_array($unit_id, sn_get_groups('fleet'))) {
361 361
   // Flotte
362 362
 
363 363
   $PageTPL = gettemplate('info_buildings_fleet');
364 364
 
365 365
   $parse['element_typ'] = classLocale::$lang['tech'][UNIT_SHIPS];
366 366
   $rapid_fire = eco_render_rapid_fire($unit_id);
367
-  $parse['rf_info_to'] = $rapid_fire['to'];   // Rapid Fire vers
367
+  $parse['rf_info_to'] = $rapid_fire['to']; // Rapid Fire vers
368 368
   $parse['rf_info_fr'] = $rapid_fire['from']; // Rapid Fire de
369 369
 
370 370
   $parse['hull_pt'] = pretty_number(($unit_info['metal'] + $unit_info['crystal']) / 10); // Points de Structure
371
-  $parse['shield_pt'] = pretty_number($unit_info['shield']);  // Points de Bouclier
372
-  $parse['attack_pt'] = pretty_number($unit_info['attack']);  // Points d'Attaque
371
+  $parse['shield_pt'] = pretty_number($unit_info['shield']); // Points de Bouclier
372
+  $parse['attack_pt'] = pretty_number($unit_info['attack']); // Points d'Attaque
373 373
   $parse['capacity_pt'] = pretty_number($unit_info['capacity']); // Capacitée de fret
374
-  $parse['base_speed'] = pretty_number($unit_info['engine'][0]['speed']);    // Vitesse de base
375
-  $parse['base_conso'] = pretty_number($unit_info['engine'][0]['consumption']);  // Consommation de base
374
+  $parse['base_speed'] = pretty_number($unit_info['engine'][0]['speed']); // Vitesse de base
375
+  $parse['base_conso'] = pretty_number($unit_info['engine'][0]['consumption']); // Consommation de base
376 376
 
377 377
   $parse['ACTUAL_ARMOR'] = pretty_number(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_ARMOR), ($unit_info['metal'] + $unit_info['crystal']) / 10));
378 378
   $parse['ACTUAL_SHIELD'] = pretty_number(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_SHIELD), $unit_info['shield']));
@@ -382,37 +382,37 @@  discard block
 block discarded – undo
382 382
   $parse['ACTUAL_CAPACITY'] = pretty_number($ship_data['capacity']);
383 383
   $parse['ACTUAL_SPEED'] = pretty_number($ship_data['speed']);
384 384
   $parse['ACTUAL_CONSUMPTION'] = pretty_number($ship_data['consumption']);
385
-  if(count($unit_info['engine']) > 1) {
386
-    $parse['upd_speed'] = "<font color=\"yellow\">(" . pretty_number($unit_info['engine'][1]['speed']) . ")</font>";       // Vitesse rééquipée
385
+  if (count($unit_info['engine']) > 1) {
386
+    $parse['upd_speed'] = "<font color=\"yellow\">(" . pretty_number($unit_info['engine'][1]['speed']) . ")</font>"; // Vitesse rééquipée
387 387
     $parse['upd_conso'] = "<font color=\"yellow\">(" . pretty_number($unit_info['engine'][1]['consumption']) . ")</font>"; // Consommation apres rééquipement
388 388
   }
389
-} elseif(in_array($unit_id, sn_get_groups('defense_active'))) {
389
+} elseif (in_array($unit_id, sn_get_groups('defense_active'))) {
390 390
   // Defenses
391 391
   $PageTPL = gettemplate('info_buildings_defense');
392 392
   $parse['element_typ'] = classLocale::$lang['tech'][UNIT_DEFENCE];
393 393
 
394 394
   $rapid_fire = eco_render_rapid_fire($unit_id);
395
-  $parse['rf_info_to'] = $rapid_fire['to'];   // Rapid Fire vers
395
+  $parse['rf_info_to'] = $rapid_fire['to']; // Rapid Fire vers
396 396
   $parse['rf_info_fr'] = $rapid_fire['from']; // Rapid Fire de
397 397
 
398 398
   $parse['hull_pt'] = pretty_number(($unit_info['metal'] + $unit_info['crystal']) / 10); // Points de Structure
399
-  $parse['shield_pt'] = pretty_number($unit_info['shield']);  // Points de Bouclier
400
-  $parse['attack_pt'] = pretty_number($unit_info['attack']);  // Points d'Attaque
401
-} elseif(in_array($unit_id, sn_get_groups('missile'))) {
399
+  $parse['shield_pt'] = pretty_number($unit_info['shield']); // Points de Bouclier
400
+  $parse['attack_pt'] = pretty_number($unit_info['attack']); // Points d'Attaque
401
+} elseif (in_array($unit_id, sn_get_groups('missile'))) {
402 402
   // Misilles
403 403
   $PageTPL = gettemplate('info_buildings_defense');
404 404
   $parse['element_typ'] = classLocale::$lang['tech'][UNIT_DEFENCE];
405 405
   $parse['hull_pt'] = pretty_number($unit_info['metal'] + $unit_info['crystal']); // Points de Structure
406
-  $parse['shield_pt'] = pretty_number($unit_info['shield']);  // Points de Bouclier
407
-  $parse['attack_pt'] = pretty_number($unit_info['attack']);  // Points d'Attaque
408
-} elseif(in_array($unit_id, sn_get_groups(array('mercenaries', 'governors', 'artifacts', 'resources_all')))) {
406
+  $parse['shield_pt'] = pretty_number($unit_info['shield']); // Points de Bouclier
407
+  $parse['attack_pt'] = pretty_number($unit_info['attack']); // Points d'Attaque
408
+} elseif (in_array($unit_id, sn_get_groups(array('mercenaries', 'governors', 'artifacts', 'resources_all')))) {
409 409
   // Officiers
410 410
   $PageTPL = gettemplate('info_officiers_general');
411 411
 
412 412
   $mercenary = $unit_info;
413 413
   $mercenary_bonus = $mercenary['bonus'];
414 414
   $mercenary_bonus = $mercenary_bonus >= 0 ? "+{$mercenary_bonus}" : "{$mercenary_bonus}";
415
-  switch($mercenary['bonus_type']) {
415
+  switch ($mercenary['bonus_type']) {
416 416
     case BONUS_PERCENT:
417 417
       $mercenary_bonus = "{$mercenary_bonus}%";
418 418
       break;
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
 
431 431
   $parse['EFFECT'] = classLocale::$lang['info'][$unit_id]['effect'];
432 432
   $parse['mercenary_bonus'] = $mercenary_bonus;
433
-  if(!in_array($unit_id, sn_get_groups(array('artifacts', 'resources_all')))) {
433
+  if (!in_array($unit_id, sn_get_groups(array('artifacts', 'resources_all')))) {
434 434
     $parse['max_level'] = classLocale::$lang['sys_level'] . ' ' .
435 435
       (in_array($unit_id, sn_get_groups('mercenaries')) ? mrc_get_level($user, $planetrow, $unit_id) : ($mercenary['location'] == LOC_USER ? mrc_get_level($user, null, $unit_id) : ($planetrow['PLANET_GOVERNOR_ID'] == $unit_id ? $planetrow['PLANET_GOVERNOR_LEVEL'] : 0)))
436 436
       . (isset($mercenary['max']) ? "/{$mercenary['max']}" : '');
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 }
439 439
 
440 440
 // ---- Tableau d'evolution
441
-if($TableHeadTPL != '') {
441
+if ($TableHeadTPL != '') {
442 442
   $parse['table_head'] = parsetemplate($TableHeadTPL, classLocale::$lang);
443 443
   $parse['table_data'] = ShowProductionTable($user, $planetrow, $unit_id, $TableTPL);
444 444
 }
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' => classLocale::$lang['msg_err_self_send'], 'STATUS' => ERR_ERROR);
75
-    }
76
-
77
-    $re = 0;
78
-    $subject = sys_get_param_str('subject');
79
-    while(strpos($subject, classLocale::$lang['msg_answer_prefix']) !== false) {
80
-      $subject = substr($subject, strlen(classLocale::$lang['msg_answer_prefix']));
81
-      $re++;
82
-    }
83
-    $re ? $subject = classLocale::$lang['msg_answer_prefix'] . $subject : false;
84 67
 
85
-    if(sys_get_param_str('msg_send')) {
86
-      $subject = $subject ? $subject : classLocale::$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' => classLocale::$lang['msg_err_player_not_found'], 'STATUS' => ERR_ERROR);
73
+      if($recipient_id == $user['id']) {
74
+        $error_list[] = array('MESSAGE' => classLocale::$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' => classLocale::$lang['msg_err_no_text'], 'STATUS' => ERR_ERROR);
77
+      $re = 0;
78
+      $subject = sys_get_param_str('subject');
79
+      while(strpos($subject, classLocale::$lang['msg_answer_prefix']) !== false) {
80
+        $subject = substr($subject, strlen(classLocale::$lang['msg_answer_prefix']));
81
+        $re++;
95 82
       }
83
+      $re ? $subject = classLocale::$lang['msg_answer_prefix'] . $subject : false;
96 84
 
97
-      if(empty($error_list)) {
98
-        $error_list[] = array('MESSAGE' => classLocale::$lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
85
+      if(sys_get_param_str('msg_send')) {
86
+        $subject = $subject ? $subject : classLocale::$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' => classLocale::$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' => classLocale::$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' => classLocale::$lang['msg_not_message_sent'], 'STATUS' => ERR_NONE);
116 99
 
117
-    $subject = $subject ? $subject : classLocale::$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 : classLocale::$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 = classLocale::$lang['msg_class'][$current_class];
226
+      $current_class_text = classLocale::$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' => classLocale::$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, classLocale::$lang['msg_answer_prefix']) !== false) {
79
+    while (strpos($subject, classLocale::$lang['msg_answer_prefix']) !== false) {
80 80
       $subject = substr($subject, strlen(classLocale::$lang['msg_answer_prefix']));
81 81
       $re++;
82 82
     }
83 83
     $re ? $subject = classLocale::$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 : classLocale::$lang['msg_subject_default'];
87 87
 
88
-      if(!$recipient_id) {
88
+      if (!$recipient_id) {
89 89
         $error_list[] = array('MESSAGE' => classLocale::$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' => classLocale::$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' => classLocale::$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.
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] = classLocale::$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] = classLocale::$lang['type_mission'][MT_COLONIZE];
108
-          $target_mission = MT_COLONIZE;
109
-          $planet_type = PT_PLANET;
110
-        } else {
111
-          message ("<font color=\"red\"><b>". classLocale::$lang['fl_no_planet_type'] ."</b></font>", classLocale::$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] = classLocale::$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] = classLocale::$lang['type_mission'][MT_RECYCLE];
121
-        } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
122
-          if ($YourPlanet) {
123
-            $missiontype[MT_RELOCATE] = classLocale::$lang['type_mission'][MT_RELOCATE];
124
-            $missiontype[MT_TRANSPORT] = classLocale::$lang['type_mission'][MT_TRANSPORT];
104
+
105
+        if (!$UsedPlanet) {
106
+          if ($fleetarray[SHIP_COLONIZER]) {
107
+            $missiontype[MT_COLONIZE] = classLocale::$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] = classLocale::$lang['type_mission'][MT_SPY];
111
+            message ("<font color=\"red\"><b>". classLocale::$lang['fl_no_planet_type'] ."</b></font>", classLocale::$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] = classLocale::$lang['type_mission'][MT_RECYCLE];
121
+          } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
122
+            if ($YourPlanet) {
123
+              $missiontype[MT_RELOCATE] = classLocale::$lang['type_mission'][MT_RELOCATE];
124
+              $missiontype[MT_TRANSPORT] = classLocale::$lang['type_mission'][MT_TRANSPORT];
130 125
             } else {
131
-              // If no spies...
132
-              if ($fleet_group_mr) {
133
-                $missiontype[MT_AKS] = classLocale::$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] = classLocale::$lang['type_mission'][MT_SPY];
134 130
               } else {
135
-                $missiontype[MT_ATTACK] = classLocale::$lang['type_mission'][MT_ATTACK];
136
-                $missiontype[MT_TRANSPORT] = classLocale::$lang['type_mission'][MT_TRANSPORT];
137
-
138
-                $missiontype[MT_HOLD] = classLocale::$lang['type_mission'][MT_HOLD];
139
-
140
-                if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
141
-                  $missiontype[MT_DESTROY] = classLocale::$lang['type_mission'][MT_DESTROY];
131
+                // If no spies...
132
+                if ($fleet_group_mr) {
133
+                  $missiontype[MT_AKS] = classLocale::$lang['type_mission'][MT_AKS];
134
+                } else {
135
+                  $missiontype[MT_ATTACK] = classLocale::$lang['type_mission'][MT_ATTACK];
136
+                  $missiontype[MT_TRANSPORT] = classLocale::$lang['type_mission'][MT_TRANSPORT];
137
+
138
+                  $missiontype[MT_HOLD] = classLocale::$lang['type_mission'][MT_HOLD];
139
+
140
+                  if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
141
+                    $missiontype[MT_DESTROY] = classLocale::$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(classLocale::$lang['fl_noslotfree'], classLocale::$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>". classLocale::$lang['fl_no_planet_type'] ."</b></font>", classLocale::$lang['fl_error']);
111
+          message("<font color=\"red\"><b>" . classLocale::$lang['fl_no_planet_type'] . "</b></font>", classLocale::$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] = classLocale::$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] = classLocale::$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.
buildings.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@
 block discarded – undo
21 21
 $mode = sys_get_param_escaped('mode');
22 22
 $mode = (!$mode || $mode == 'buildings') ? QUE_STRUCTURES : ($mode == 'fleet' ? SUBQUE_FLEET : ($mode == 'defense' ? SUBQUE_DEFENSE : ($mode == 'research' ? QUE_RESEARCH : $mode)));
23 23
 
24
-if($building_sort = sys_get_param_id('sort_elements')) {
25
-  if(!empty(classLocale::$lang['player_option_building_sort'][$building_sort])) {
24
+if ($building_sort = sys_get_param_id('sort_elements')) {
25
+  if (!empty(classLocale::$lang['player_option_building_sort'][$building_sort])) {
26 26
     classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT, $mode)] = $building_sort;
27 27
     classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT_INVERSE, $mode)] = sys_get_param_id('sort_elements_inverse', 0);
28 28
   }
Please login to merge, or discard this patch.