Completed
Push — work-fleets ( 1735a9...f6000a )
by SuperNova.WS
06:05
created
overview.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 
31 31
 //define('SN_RENDER_NAVBAR_PLANET', false);
32 32
 
33
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
33
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
34 34
 
35 35
 //
36 36
 ////$player = new Player();
@@ -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 < classSupernova::$config->planet_capital_cost) {
112
+        if ($user_dark_matter < classSupernova::$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.
reg.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 $id_ref = $_GET['id_ref'] ? intval($_GET['id_ref']) : 0;
4
-$id_ref = $id_ref ? '?id_ref=' . $id_ref : '';
4
+$id_ref = $id_ref ? '?id_ref='.$id_ref : '';
5 5
 
6 6
 header('HTTP/1.1 301 Moved Permanently');
7 7
 header("Location: login.php{$id_ref}#tab_password_reset");
Please login to merge, or discard this patch.
artifacts.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
 global $user, $planetrow;
17 17
 
18
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
18
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
19 19
 
20 20
 lng_include('infos');
21 21
 lng_include('artifacts');
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
       die();
66 66
     break;
67 67
   }
68
-  message($Message, classLocale::$lang['tech'][UNIT_ARTIFACTS], 'artifacts.' . PHP_EX, 5);
68
+  message($Message, classLocale::$lang['tech'][UNIT_ARTIFACTS], 'artifacts.'.PHP_EX, 5);
69 69
 }
70 70
 
71 71
 $template = gettemplate('artifacts', true);
Please login to merge, or discard this patch.
includes/general.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
     }
37 37
   } else {
38 38
     // TODO: This is left for backward compatibility. Appropriate code should be rewrote!
39
-    $func_name = isset(classSupernova::$functions[$func_name]) && is_callable(classSupernova::$functions[$func_name]) ? classSupernova::$functions[$func_name] : ('sn_' . $func_name);
39
+    $func_name = isset(classSupernova::$functions[$func_name]) && is_callable(classSupernova::$functions[$func_name]) ? classSupernova::$functions[$func_name] : ('sn_'.$func_name);
40 40
     if (is_callable($func_name)) {
41 41
       $result = call_user_func_array($func_name, $func_arg);
42 42
     }
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
  */
112 112
 function get_exchange_rate($currency_symbol) {
113 113
   $currency_symbol = strtolower($currency_symbol);
114
-  $config_field = 'payment_currency_exchange_' . $currency_symbol;
114
+  $config_field = 'payment_currency_exchange_'.$currency_symbol;
115 115
 
116 116
   // Заворачиваем получение стоимости ММ через перекрываемую процедуру
117 117
   $exchange_rate = floatval($currency_symbol == 'mm_' ? get_mm_cost() : classSupernova::$config->$config_field);
@@ -623,8 +623,8 @@  discard block
 block discarded – undo
623 623
   $from = trim($from ? $from : classSupernova::$config->game_adminEmail);
624 624
 
625 625
   $head = '';
626
-  $head .= "Content-Type: text/" . ($html ? 'html' : 'plain') . "; charset=utf-8 \r\n";
627
-  $head .= "Date: " . date('r') . " \r\n";
626
+  $head .= "Content-Type: text/".($html ? 'html' : 'plain')."; charset=utf-8 \r\n";
627
+  $head .= "Date: ".date('r')." \r\n";
628 628
   $classConfig = classSupernova::$config;
629 629
   $head .= "Return-Path: {$classConfig->game_adminEmail} \r\n";
630 630
   $head .= "From: {$from} \r\n";
@@ -637,10 +637,10 @@  discard block
 block discarded – undo
637 637
   $body = str_replace("\n", "\r\n", $body);
638 638
 
639 639
   if ($html) {
640
-    $body = '<html><head><base href="' . SN_ROOT_VIRTUAL . '"></head><body>' . nl2br($body) . '</body></html>';
640
+    $body = '<html><head><base href="'.SN_ROOT_VIRTUAL.'"></head><body>'.nl2br($body).'</body></html>';
641 641
   }
642 642
 
643
-  $title = '=?UTF-8?B?' . base64_encode($title) . '?=';
643
+  $title = '=?UTF-8?B?'.base64_encode($title).'?=';
644 644
 
645 645
   return @mail($email_unsafe, $title, $body, $head);
646 646
 }
@@ -656,14 +656,14 @@  discard block
 block discarded – undo
656 656
   $classLocale = classLocale::$lang;
657 657
 
658 658
   return
659
-    ($full || $time ? "{$time} {$classLocale['sys_day']}&nbsp;" : '') .
660
-    ($full || $hours ? "{$hours} {$classLocale['sys_hrs']}&nbsp;" : '') .
661
-    ($full || $minutes ? "{$minutes} {$classLocale['sys_min']}&nbsp;" : '') .
659
+    ($full || $time ? "{$time} {$classLocale['sys_day']}&nbsp;" : '').
660
+    ($full || $hours ? "{$hours} {$classLocale['sys_hrs']}&nbsp;" : '').
661
+    ($full || $minutes ? "{$minutes} {$classLocale['sys_min']}&nbsp;" : '').
662 662
     ($full || !$time || $seconds ? "{$seconds} {$classLocale['sys_sec']}" : '');
663 663
 }
664 664
 
665 665
 function sys_time_human_system($time) {
666
-  return $time ? date(FMT_DATE_TIME_SQL, $time) . " ({$time}), " . sys_time_human(SN_TIME_NOW - $time) : '{NEVER}';
666
+  return $time ? date(FMT_DATE_TIME_SQL, $time)." ({$time}), ".sys_time_human(SN_TIME_NOW - $time) : '{NEVER}';
667 667
 }
668 668
 
669 669
 function sys_redirect($url) {
@@ -756,13 +756,13 @@  discard block
 block discarded – undo
756 756
       // usw..
757 757
     );
758 758
 
759
-    $rexep = "#" . strtr(preg_quote($format), $masks) . "#";
759
+    $rexep = "#".strtr(preg_quote($format), $masks)."#";
760 760
     if (preg_match($rexep, $date, $out)) {
761 761
       $ret = array(
762
-        "tm_sec"  => (int)$out['S'],
763
-        "tm_min"  => (int)$out['M'],
764
-        "tm_hour" => (int)$out['H'],
765
-        "tm_mday" => (int)$out['d'],
762
+        "tm_sec"  => (int) $out['S'],
763
+        "tm_min"  => (int) $out['M'],
764
+        "tm_hour" => (int) $out['H'],
765
+        "tm_mday" => (int) $out['d'],
766 766
         "tm_mon"  => $out['m'] ? $out['m'] - 1 : 0,
767 767
         "tm_year" => $out['Y'] > 1900 ? $out['Y'] - 1900 : 0,
768 768
       );
@@ -832,7 +832,7 @@  discard block
 block discarded – undo
832 832
         $functions[$function_name] = array();
833 833
       } elseif (!isset($functions[$function_name])) {
834 834
         $functions[$function_name] = array();
835
-        $sn_function_name = 'sn_' . $function_name . ($sub_type ? '_' . $sub_type : '');
835
+        $sn_function_name = 'sn_'.$function_name.($sub_type ? '_'.$sub_type : '');
836 836
         $functions[$function_name][] = $sn_function_name;
837 837
       }
838 838
 
@@ -899,7 +899,7 @@  discard block
 block discarded – undo
899 899
   }
900 900
 
901 901
   if (isset($nick_array[NICK_GENDER])) {
902
-    $result[NICK_GENDER] = '<img src="' . ($user['dpath'] ? $user['dpath'] : DEFAULT_SKINPATH) . 'images/gender_' . $nick_array[NICK_GENDER] . '.png" />';
902
+    $result[NICK_GENDER] = '<img src="'.($user['dpath'] ? $user['dpath'] : DEFAULT_SKINPATH).'images/gender_'.$nick_array[NICK_GENDER].'.png" />';
903 903
   }
904 904
 
905 905
   if (isset($nick_array[NICK_AUTH_LEVEL]) || isset($nick_array[NICK_PREMIUM])) {
@@ -931,14 +931,14 @@  discard block
 block discarded – undo
931 931
   }
932 932
 
933 933
   if (isset($nick_array[NICK_CLASS])) {
934
-    $result[NICK_CLASS] = '<span ' . $nick_array[NICK_CLASS] . '>';
934
+    $result[NICK_CLASS] = '<span '.$nick_array[NICK_CLASS].'>';
935 935
     $result[NICK_CLASS_END] = '</span>';
936 936
   }
937 937
 
938 938
   $result[NICK_NICK] = sys_safe_output($nick_array[NICK_NICK]);
939 939
 
940 940
   if (isset($nick_array[NICK_ALLY])) {
941
-    $result[NICK_ALLY] = '[' . sys_safe_output($nick_array[NICK_ALLY]) . ']';
941
+    $result[NICK_ALLY] = '['.sys_safe_output($nick_array[NICK_ALLY]).']';
942 942
   }
943 943
 
944 944
   $result[NICK_HTML] = true;
@@ -961,7 +961,7 @@  discard block
 block discarded – undo
961 961
   */
962 962
 
963 963
 
964
-  if ($render_user['user_birthday'] && ($options === true || isset($options['icons']) || isset($options['birthday'])) && (date('Y', SN_TIME_NOW) . date('-m-d', strtotime($render_user['user_birthday'])) == date('Y-m-d', SN_TIME_NOW))) {
964
+  if ($render_user['user_birthday'] && ($options === true || isset($options['icons']) || isset($options['birthday'])) && (date('Y', SN_TIME_NOW).date('-m-d', strtotime($render_user['user_birthday'])) == date('Y-m-d', SN_TIME_NOW))) {
965 965
     $result[NICK_BIRTHSDAY] = '';
966 966
   }
967 967
 
@@ -983,7 +983,7 @@  discard block
 block discarded – undo
983 983
   }
984 984
 
985 985
   if ((isset($options['class']) && $options['class'])) {
986
-    $result[NICK_CLASS] = (isset($result_options[NICK_CLASS]) ? ' ' . $result_options[NICK_CLASS] : '') . $options['class'];
986
+    $result[NICK_CLASS] = (isset($result_options[NICK_CLASS]) ? ' '.$result_options[NICK_CLASS] : '').$options['class'];
987 987
   }
988 988
 
989 989
   if ($render_user['ally_tag'] && ($options === true || (isset($options['ally']) && $options['ally']))) {
@@ -1011,7 +1011,7 @@  discard block
 block discarded – undo
1011 1011
     foreach ($temp as $user_id) {
1012 1012
       $user_id = floatval($user_id);
1013 1013
       if ($user_id) {
1014
-        $user_skip_list[] = '`id` = ' . $user_id;
1014
+        $user_skip_list[] = '`id` = '.$user_id;
1015 1015
       }
1016 1016
     }
1017 1017
   }
@@ -1410,7 +1410,7 @@  discard block
 block discarded – undo
1410 1410
     $time_left = min(floor($time_left / PERIOD_DAY), $term_original);
1411 1411
     $cost_left = $term_original > 0 ? ceil($time_left / $term_original * $original_cost) : 0;
1412 1412
 
1413
-    array_walk_recursive($result, function (&$value) use ($cost_left) {
1413
+    array_walk_recursive($result, function(&$value) use ($cost_left) {
1414 1414
       $value -= $cost_left;
1415 1415
     });
1416 1416
   }
@@ -1465,7 +1465,7 @@  discard block
 block discarded – undo
1465 1465
 }
1466 1466
 
1467 1467
 function print_rr($var, $capture = false) {
1468
-  $print = '<pre>' . htmlspecialchars(print_r($var, true)) . '</pre>';
1468
+  $print = '<pre>'.htmlspecialchars(print_r($var, true)).'</pre>';
1469 1469
   if ($capture) {
1470 1470
     return $print;
1471 1471
   } else {
@@ -1567,7 +1567,7 @@  discard block
 block discarded – undo
1567 1567
       break;
1568 1568
     }
1569 1569
     $sort_option_inverse_closure = $sort_option_inverse ? -1 : 1;
1570
-    usort($ListToSort, function ($a, $b) use ($sort_option_field, $sort_option_inverse_closure) {
1570
+    usort($ListToSort, function($a, $b) use ($sort_option_field, $sort_option_inverse_closure) {
1571 1571
       return $a[$sort_option_field] < $b[$sort_option_field] ? -1 * $sort_option_inverse_closure : (
1572 1572
       $a[$sort_option_field] > $b[$sort_option_field] ? 1 * $sort_option_inverse_closure : 0
1573 1573
       );
Please login to merge, or discard this patch.
officer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
3
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
4 4
 
5 5
 $template = gettemplate('viewreport', true);
6 6
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);
Please login to merge, or discard this patch.
logout.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
3
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
4 4
 
5 5
 $template = gettemplate('viewreport', true);
6 6
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);
Please login to merge, or discard this patch.
admin/adm_metamatter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,10 +13,10 @@
 block discarded – undo
13 13
 define('INSTALL', false);
14 14
 define('IN_ADMIN', true);
15 15
 
16
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
16
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
17 17
 
18 18
 if (!sn_module_get_active_count('payment')) {
19
-  sys_redirect(SN_ROOT_VIRTUAL . 'admin/overview.php');
19
+  sys_redirect(SN_ROOT_VIRTUAL.'admin/overview.php');
20 20
 }
21 21
 
22 22
 if ($user['authlevel'] < 3) {
Please login to merge, or discard this patch.
server_info.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
3
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
4 4
 
5 5
 $template = gettemplate('viewreport', true);
6 6
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);
Please login to merge, or discard this patch.
includes/includes/flt_flying_fleet_handler2.php 1 patch
Spacing   +6 added lines, -10 removed lines patch added patch discarded remove patch
@@ -19,15 +19,11 @@  discard block
 block discarded – undo
19 19
 // ------------------------------------------------------------------
20 20
 function flt_flyingFleetsSort($a, $b) {
21 21
   // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
22
-  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
23
-    // Если время - одинаковое, сравниваем события флотов
22
+  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 : // Если время - одинаковое, сравниваем события флотов
24 23
     // Если события - одинаковые, то флоты равны
25
-    ($a['fleet_event'] == $b['fleet_event'] ? 0 :
26
-      // Если события разные - первыми считаем прибывающие флоты
27
-      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 :
28
-        // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
29
-        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 :
30
-          // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
24
+    ($a['fleet_event'] == $b['fleet_event'] ? 0 : // Если события разные - первыми считаем прибывающие флоты
25
+      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
26
+        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
31 27
           // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
32 28
           (
33 29
           0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -45,7 +41,7 @@  discard block
 block discarded – undo
45 41
     $handler = fopen('event.log', 'a+');
46 42
   }
47 43
 
48
-  fwrite($handler, date(FMT_DATE_TIME_SQL, time()) . ' ' . $msg . "\r\n");
44
+  fwrite($handler, date(FMT_DATE_TIME_SQL, time()).' '.$msg."\r\n");
49 45
 }
50 46
 
51 47
 // ------------------------------------------------------------------
@@ -174,7 +170,7 @@  discard block
 block discarded – undo
174 170
     MT_EXPLORE   => 'flt_mission_explore',
175 171
   );
176 172
   foreach ($missions_used as $mission_id => $cork) {
177
-    require_once(SN_ROOT_PHYSICAL . "includes/includes/{$mission_files[$mission_id]}" . DOT_PHP_EX);
173
+    require_once(SN_ROOT_PHYSICAL."includes/includes/{$mission_files[$mission_id]}".DOT_PHP_EX);
178 174
   }
179 175
 
180 176
 //log_file('Обработка миссий');
Please login to merge, or discard this patch.