Completed
Push — work-fleets ( 1ceb9c...9cd586 )
by SuperNova.WS
04:56
created
includes/init/init_functions.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -2,25 +2,25 @@  discard block
 block discarded – undo
2 2
 
3 3
 // ------------------------------------------------------------------------------------------------------------------------------
4 4
 function sn_sys_load_php_files($dir_name, $load_extension = 'php', $modules = false) {
5
-  if(file_exists($dir_name)) {
5
+  if (file_exists($dir_name)) {
6 6
     $dir = opendir($dir_name);
7
-    while(($file = readdir($dir)) !== false) {
8
-      if($file == '..' || $file == '.') {
7
+    while (($file = readdir($dir)) !== false) {
8
+      if ($file == '..' || $file == '.') {
9 9
         continue;
10 10
       }
11 11
 
12 12
       $full_filename = $dir_name . $file;
13
-      if($modules && is_dir($full_filename)) {
14
-        if(file_exists($full_filename = "{$full_filename}/{$file}.{$load_extension}")) {
13
+      if ($modules && is_dir($full_filename)) {
14
+        if (file_exists($full_filename = "{$full_filename}/{$file}.{$load_extension}")) {
15 15
           require_once($full_filename);
16 16
           // Registering module
17
-          if(class_exists($file)) {
17
+          if (class_exists($file)) {
18 18
             new $file($full_filename);
19 19
           }
20 20
         }
21 21
       } else {
22 22
         $extension = substr($full_filename, -strlen($load_extension));
23
-        if($extension == $load_extension) {
23
+        if ($extension == $load_extension) {
24 24
           require_once($full_filename);
25 25
         }
26 26
       }
@@ -39,11 +39,11 @@  discard block
 block discarded – undo
39 39
  */
40 40
 function init_update() {
41 41
   $update_file = SN_ROOT_PHYSICAL . "includes/update" . DOT_PHP_EX;
42
-  if(file_exists($update_file)) {
43
-    if(filemtime($update_file) > classSupernova::$config->db_loadItem('var_db_update') || classSupernova::$config->db_loadItem('db_version') < DB_VERSION) {
44
-      if(defined('IN_ADMIN')) {
42
+  if (file_exists($update_file)) {
43
+    if (filemtime($update_file) > classSupernova::$config->db_loadItem('var_db_update') || classSupernova::$config->db_loadItem('db_version') < DB_VERSION) {
44
+      if (defined('IN_ADMIN')) {
45 45
         sn_db_transaction_start(); // Для защиты от двойного запуска апдейта - начинаем транзакцию. Так запись в базе будет блокирована
46
-        if(SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_db_update_end')) {
46
+        if (SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_db_update_end')) {
47 47
           classSupernova::$config->db_saveItem('var_db_update_end', SN_TIME_NOW + (classSupernova::$config->upd_lock_time ? classSupernova::$config->upd_lock_time : 300));
48 48
           sn_db_transaction_commit();
49 49
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
           $current_time = time();
54 54
           classSupernova::$config->db_saveItem('var_db_update', $current_time);
55 55
           classSupernova::$config->db_saveItem('var_db_update_end', $current_time);
56
-        } elseif(filemtime($update_file) > classSupernova::$config->var_db_update) {
56
+        } elseif (filemtime($update_file) > classSupernova::$config->var_db_update) {
57 57
           $timeout = classSupernova::$config->var_db_update_end - SN_TIME_NOW;
58 58
           die(
59 59
             "Обновляется база данных. Рассчетное время окончания - {$timeout} секунд (время обновления может увеличиваться). Пожалуйста, подождите...<br />
Please login to merge, or discard this patch.
includes/template.php 1 patch
Spacing   +70 added lines, -70 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 function gettemplatename($u_dpath) {
11 11
   static $template_names = array();
12 12
 
13
-  if(!isset($template_names[$u_dpath])) {
13
+  if (!isset($template_names[$u_dpath])) {
14 14
     $template_names[$u_dpath] = file_exists(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') ? sys_file_read(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') : TEMPLATE_NAME;
15 15
   }
16 16
 
@@ -52,12 +52,12 @@  discard block
 block discarded – undo
52 52
  * @param $sn_menu_extra
53 53
  */
54 54
 function tpl_menu_merge_extra(&$sn_menu, &$sn_menu_extra) {
55
-  if(empty($sn_menu) || empty($sn_menu_extra)) {
55
+  if (empty($sn_menu) || empty($sn_menu_extra)) {
56 56
     return;
57 57
   }
58 58
 
59
-  foreach($sn_menu_extra as $menu_item_id => $menu_item) {
60
-    if(empty($menu_item['LOCATION'])) {
59
+  foreach ($sn_menu_extra as $menu_item_id => $menu_item) {
60
+    if (empty($menu_item['LOCATION'])) {
61 61
       $sn_menu[$menu_item_id] = $menu_item;
62 62
       continue;
63 63
     }
@@ -66,16 +66,16 @@  discard block
 block discarded – undo
66 66
     unset($menu_item['LOCATION']);
67 67
 
68 68
     $is_positioned = $item_location[0];
69
-    if($is_positioned == '+' || $is_positioned == '-') {
69
+    if ($is_positioned == '+' || $is_positioned == '-') {
70 70
       $item_location = substr($item_location, 1);
71 71
     } else {
72 72
       $is_positioned = '';
73 73
     }
74 74
 
75
-    if($item_location) {
75
+    if ($item_location) {
76 76
       $menu_keys = array_keys($sn_menu);
77 77
       $insert_position = array_search($item_location, $menu_keys);
78
-      if($insert_position === false) {
78
+      if ($insert_position === false) {
79 79
         $insert_position = count($sn_menu) - 1;
80 80
         $is_positioned = '+';
81 81
         $item_location = '';
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     $spliced = array_splice($sn_menu, $insert_position, count($sn_menu) - $insert_position);
89 89
     $sn_menu[$menu_item_id] = $menu_item;
90 90
 
91
-    if(!$is_positioned && $item_location) {
91
+    if (!$is_positioned && $item_location) {
92 92
       unset($spliced[$item_location]);
93 93
     }
94 94
     $sn_menu = array_merge($sn_menu, $spliced);
@@ -102,24 +102,24 @@  discard block
 block discarded – undo
102 102
  * @param template $template
103 103
  */
104 104
 function tpl_menu_assign_to_template(&$sn_menu, &$template) {
105
-  if(empty($sn_menu) || !is_array($sn_menu)) {
105
+  if (empty($sn_menu) || !is_array($sn_menu)) {
106 106
     return;
107 107
   }
108 108
 
109
-  foreach($sn_menu as $menu_item_id => $menu_item) {
110
-    if(!$menu_item) {
109
+  foreach ($sn_menu as $menu_item_id => $menu_item) {
110
+    if (!$menu_item) {
111 111
       continue;
112 112
     }
113 113
 
114
-    if(is_string($menu_item_id)) {
114
+    if (is_string($menu_item_id)) {
115 115
       $menu_item['ID'] = $menu_item_id;
116 116
     }
117 117
 
118
-    if($menu_item['TYPE'] == 'lang') {
118
+    if ($menu_item['TYPE'] == 'lang') {
119 119
       $lang_string = &classLocale::$lang;
120
-      if(preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) {
121
-        for($i = 1; $i < count($matches); $i++) {
122
-          if(defined($matches[$i])) {
120
+      if (preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) {
121
+        for ($i = 1; $i < count($matches); $i++) {
122
+          if (defined($matches[$i])) {
123 123
             $matches[$i] = constant($matches[$i]);
124 124
           }
125 125
           $lang_string = &$lang_string[$matches[$i]];
@@ -131,8 +131,8 @@  discard block
 block discarded – undo
131 131
     $menu_item['ALT'] = htmlentities($menu_item['ALT']);
132 132
     $menu_item['TITLE'] = htmlentities($menu_item['TITLE']);
133 133
 
134
-    if(!empty($menu_item['ICON'])) {
135
-      if(is_string($menu_item['ICON'])) {
134
+    if (!empty($menu_item['ICON'])) {
135
+      if (is_string($menu_item['ICON'])) {
136 136
         $menu_item['ICON_PATH'] = $menu_item['ICON'];
137 137
       } else {
138 138
         $menu_item['ICON'] = $menu_item_id;
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
     'MENU_START_HIDE'     => !empty($_COOKIE[SN_COOKIE . '_menu_hidden']) || defined('SN_GOOGLE'),
163 163
   ));
164 164
 
165
-  if(isset($template_result['MENU_CUSTOMIZE'])) {
165
+  if (isset($template_result['MENU_CUSTOMIZE'])) {
166 166
     $template->assign_vars(array(
167 167
       'PLAYER_OPTION_MENU_SHOW_ON_BUTTON'   => classSupernova::$user_options[PLAYER_OPTION_MENU_SHOW_ON_BUTTON],
168 168
       'PLAYER_OPTION_MENU_HIDE_ON_BUTTON'   => classSupernova::$user_options[PLAYER_OPTION_MENU_HIDE_ON_BUTTON],
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
     ));
177 177
   }
178 178
 
179
-  if(defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) {
179
+  if (defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) {
180 180
     tpl_menu_merge_extra($sn_menu_admin, $sn_menu_admin_extra);
181 181
     tpl_menu_assign_to_template($sn_menu_admin, $template);
182 182
   } else {
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
   $in_admin = defined('IN_ADMIN') && IN_ADMIN === true;
217 217
   $is_login = defined('LOGIN_LOGOUT') && LOGIN_LOGOUT === true;
218 218
 
219
-  if(is_object($page)) {
219
+  if (is_object($page)) {
220 220
     isset($page->_rootref['MENU']) ? $isDisplayMenu = $page->_rootref['MENU'] : false;
221 221
     isset($page->_rootref['NAVBAR']) ? $isDisplayTopNav = $page->_rootref['NAVBAR'] : false;
222 222
 
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
     !isset($page->_rootref['PAGE_HEADER']) && $title ? $page->assign_var('PAGE_HEADER', $title) : false;
225 225
   }
226 226
 
227
-  if(empty($user['id']) || !is_numeric($user['id'])) {
227
+  if (empty($user['id']) || !is_numeric($user['id'])) {
228 228
     $isDisplayMenu = false;
229 229
     $isDisplayTopNav = false;
230 230
   }
@@ -236,10 +236,10 @@  discard block
 block discarded – undo
236 236
   $user_time_measured_unix = intval(isset($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) ? strtotime($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) : 0);
237 237
 
238 238
   $font_size = !empty($_COOKIE[SN_COOKIE_F]) ? $_COOKIE[SN_COOKIE_F] : classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE];
239
-  if(strpos($font_size, '%') !== false) {
239
+  if (strpos($font_size, '%') !== false) {
240 240
     // Размер шрифта в процентах
241 241
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
242
-  } elseif(strpos($font_size, 'px') !== false) {
242
+  } elseif (strpos($font_size, 'px') !== false) {
243 243
     // Размер шрифта в пикселях
244 244
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
245 245
   } else {
@@ -251,10 +251,10 @@  discard block
 block discarded – undo
251 251
 
252 252
   $template = gettemplate('_global_header', true);
253 253
 
254
-  if(!empty(classSupernova::$sn_mvc['javascript'])) {
255
-    foreach(classSupernova::$sn_mvc['javascript'] as $page_name => $script_list) {
256
-      if(empty($page_name) || $page_name == $sn_page_name) {
257
-        foreach($script_list as $filename => $content) {
254
+  if (!empty(classSupernova::$sn_mvc['javascript'])) {
255
+    foreach (classSupernova::$sn_mvc['javascript'] as $page_name => $script_list) {
256
+      if (empty($page_name) || $page_name == $sn_page_name) {
257
+        foreach ($script_list as $filename => $content) {
258 258
           $template_result['.']['javascript'][] = array(
259 259
             'FILE'    => $filename,
260 260
             'CONTENT' => $content,
@@ -280,9 +280,9 @@  discard block
 block discarded – undo
280 280
   classSupernova::$sn_mvc['css'][''] = array_merge($standard_css, classSupernova::$sn_mvc['css']['']);
281 281
 
282 282
 
283
-  foreach(classSupernova::$sn_mvc['css'] as $page_name => $script_list) {
284
-    if(empty($page_name) || $page_name == $sn_page_name) {
285
-      foreach($script_list as $filename => $content) {
283
+  foreach (classSupernova::$sn_mvc['css'] as $page_name => $script_list) {
284
+    if (empty($page_name) || $page_name == $sn_page_name) {
285
+      foreach ($script_list as $filename => $content) {
286 286
         $template_result['.']['css'][] = array(
287 287
           'FILE'    => $filename,
288 288
           'CONTENT' => $content,
@@ -329,12 +329,12 @@  discard block
 block discarded – undo
329 329
   $template->assign_recursive($template_result);
330 330
   displayP(parsetemplate($template));
331 331
 
332
-  if(($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) {
332
+  if (($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) {
333 333
     // $AdminPage = $AdminPage ? $user['authlevel'] : 0;
334 334
     displayP(parsetemplate(tpl_render_menu()));
335 335
   }
336 336
 
337
-  if($isDisplayTopNav && !$in_admin) {
337
+  if ($isDisplayTopNav && !$in_admin) {
338 338
     displayP(parsetemplate(tpl_render_topnav($user, $planetrow)));
339 339
   }
340 340
 
@@ -342,8 +342,8 @@  discard block
 block discarded – undo
342 342
 
343 343
   !is_array($page) ? $page = array($page) : false;
344 344
   $result_added = false;
345
-  foreach($page as $page_item) {
346
-    if(!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) {
345
+  foreach ($page as $page_item) {
346
+    if (!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) {
347 347
       $page_item = gettemplate('_result_message', $page_item);
348 348
       $temp = $page_item->files['_result_message'];
349 349
       unset($page_item->files['_result_message']);
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
   ));
367 367
   displayP(parsetemplate($template));
368 368
 
369
-  $user['authlevel'] >= 3 && classSupernova::$config->debug ? $debug->echo_log() : false;;
369
+  $user['authlevel'] >= 3 && classSupernova::$config->debug ? $debug->echo_log() : false; ;
370 370
 
371 371
   sn_db_disconnect();
372 372
 
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
  * @param string         $type
405 405
  */
406 406
 function tpl_topnav_event_build(&$template, $FleetList, $type = 'fleet') {
407
-  if(empty($FleetList)) {
407
+  if (empty($FleetList)) {
408 408
     return;
409 409
   }
410 410
 
@@ -413,19 +413,19 @@  discard block
 block discarded – undo
413 413
   $fleet_event_count = 0;
414 414
   $fleet_flying_sorter = array();
415 415
   $fleet_flying_events = array();
416
-  foreach($FleetList->_container as $objFleet) {
416
+  foreach ($FleetList->_container as $objFleet) {
417 417
     $will_return = true;
418
-    if(!$objFleet->isReturning()) {
418
+    if (!$objFleet->isReturning()) {
419 419
       // cut fleets on Hold and Expedition
420
-      if($objFleet->time_arrive_to_target >= SN_TIME_NOW) {
420
+      if ($objFleet->time_arrive_to_target >= SN_TIME_NOW) {
421 421
         $objFleet->mission_type == MT_RELOCATE ? $will_return = false : false;
422 422
         tpl_topnav_event_build_helper($objFleet->time_arrive_to_target, EVENT_FLEET_ARRIVE, classLocale::$lang['sys_event_arrive'], $objFleet->target_coordinates_typed(), !$will_return, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
423 423
       }
424
-      if($objFleet->time_mission_job_complete) {
424
+      if ($objFleet->time_mission_job_complete) {
425 425
         tpl_topnav_event_build_helper($objFleet->time_mission_job_complete, EVENT_FLEET_STAY, classLocale::$lang['sys_event_stay'], $objFleet->target_coordinates_typed(), false, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
426 426
       }
427 427
     }
428
-    if($will_return) {
428
+    if ($will_return) {
429 429
       tpl_topnav_event_build_helper($objFleet->time_return_to_source, EVENT_FLEET_RETURN, classLocale::$lang['sys_event_return'], $objFleet->launch_coordinates_typed(), true, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
430 430
     }
431 431
   }
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
   asort($fleet_flying_sorter);
434 434
 
435 435
   $fleet_flying_count = $FleetList->count();
436
-  foreach($fleet_flying_sorter as $fleet_event_id => $fleet_time) {
436
+  foreach ($fleet_flying_sorter as $fleet_event_id => $fleet_time) {
437 437
     $fleet_event = &$fleet_flying_events[$fleet_event_id];
438 438
     $template->assign_block_vars("flying_{$type}s", array(
439 439
       'TIME' => max(0, $fleet_time - SN_TIME_NOW),
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
462 462
   global $template_result;
463 463
   $classLocale = classLocale::$lang;
464 464
 
465
-  if(!is_array($user)) {
465
+  if (!is_array($user)) {
466 466
     return '';
467 467
   }
468 468
 
@@ -483,8 +483,8 @@  discard block
 block discarded – undo
483 483
 
484 484
   $ThisUsersPlanets = db_planet_list_sorted($user);
485 485
   // while ($CurPlanet = db_fetch($ThisUsersPlanets))
486
-  foreach($ThisUsersPlanets as $CurPlanet) {
487
-    if($CurPlanet['destruyed']) {
486
+  foreach ($ThisUsersPlanets as $CurPlanet) {
487
+    if ($CurPlanet['destruyed']) {
488 488
       continue;
489 489
     }
490 490
 
@@ -508,8 +508,8 @@  discard block
 block discarded – undo
508 508
    */
509 509
   $fleet_flying_list = array();
510 510
   $fleet_flying_list[0] = FleetList::dbGetFleetListByOwnerId($user['id']);
511
-  foreach($fleet_flying_list[0]->_container as $fleet_id => $objFleet) {
512
-    if(empty($fleet_flying_list[$objFleet->mission_type])) {
511
+  foreach ($fleet_flying_list[0]->_container as $fleet_id => $objFleet) {
512
+    if (empty($fleet_flying_list[$objFleet->mission_type])) {
513 513
       $fleet_flying_list[$objFleet->mission_type] = new FleetList();
514 514
     }
515 515
     $fleet_flying_list[$objFleet->mission_type][$fleet_id] = $objFleet;
@@ -521,8 +521,8 @@  discard block
 block discarded – undo
521 521
   que_tpl_parse($template, QUE_RESEARCH, $user, array(), null, !classSupernova::$user_options[PLAYER_OPTION_NAVBAR_RESEARCH_WIDE]);
522 522
   que_tpl_parse($template, SUBQUE_FLEET, $user, $planetrow, null, true);
523 523
 
524
-  if(!empty(classSupernova::$sn_mvc['navbar_prefix_button']) && is_array(classSupernova::$sn_mvc['navbar_prefix_button'])) {
525
-    foreach(classSupernova::$sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) {
524
+  if (!empty(classSupernova::$sn_mvc['navbar_prefix_button']) && is_array(classSupernova::$sn_mvc['navbar_prefix_button'])) {
525
+    foreach (classSupernova::$sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) {
526 526
       $template->assign_block_vars('navbar_prefix_button', array(
527 527
         'IMAGE'        => $navbar_button_image,
528 528
         'URL_RELATIVE' => $navbar_button_url,
@@ -536,13 +536,13 @@  discard block
 block discarded – undo
536 536
   $time_now_parsed = getdate(SN_TIME_NOW);
537 537
   $time_local_parsed = getdate(defined('SN_CLIENT_TIME_LOCAL') ? SN_CLIENT_TIME_LOCAL : SN_TIME_NOW);
538 538
 
539
-  if(classSupernova::$config->game_news_overview) {
539
+  if (classSupernova::$config->game_news_overview) {
540 540
     $user_last_read_safe = intval($user['news_lastread']);
541 541
     nws_render($template, "WHERE UNIX_TIMESTAMP(`tsTimeStamp`) >= {$user_last_read_safe}", classSupernova::$config->game_news_overview);
542 542
   }
543 543
 
544 544
   $notes_query = db_note_list_by_owner($user['id'], true);
545
-  while($note_row = db_fetch($notes_query)) {
545
+  while ($note_row = db_fetch($notes_query)) {
546 546
     note_assign($template, $note_row);
547 547
   }
548 548
 
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
     'QUE_ID'   => QUE_RESEARCH,
557 557
     'QUE_HTML' => 'topnav',
558 558
 
559
-    'RESEARCH_ONGOING' => (boolean)$user['que'],
559
+    'RESEARCH_ONGOING' => (boolean) $user['que'],
560 560
 
561 561
     'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], classLocale::$lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
562 562
       $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
     'QUE_STRUCTURES' => QUE_STRUCTURES,
634 634
   ));
635 635
 
636
-  if((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) {
636
+  if ((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) {
637 637
     tpl_set_resource_info($template, $planetrow);
638 638
     $template->assign_vars(array(
639 639
       'SN_RENDER_NAVBAR_PLANET' => true,
@@ -648,12 +648,12 @@  discard block
 block discarded – undo
648 648
  * @param template|string $template
649 649
  */
650 650
 function displayP($template) {
651
-  if(is_object($template)) {
652
-    if(empty($template->parsed)) {
651
+  if (is_object($template)) {
652
+    if (empty($template->parsed)) {
653 653
       parsetemplate($template);
654 654
     }
655 655
 
656
-    foreach($template->files as $section => $filename) {
656
+    foreach ($template->files as $section => $filename) {
657 657
       $template->display($section);
658 658
     }
659 659
   } else {
@@ -668,11 +668,11 @@  discard block
 block discarded – undo
668 668
  * @return mixed
669 669
  */
670 670
 function parsetemplate($template, $array = false) {
671
-  if(is_object($template)) {
671
+  if (is_object($template)) {
672 672
     global $user;
673 673
 
674
-    if(!empty($array) && is_array($array)) {
675
-      foreach($array as $key => $data) {
674
+    if (!empty($array) && is_array($array)) {
675
+      foreach ($array as $key => $data) {
676 676
         $template->assign_var($key, $data);
677 677
       }
678 678
     }
@@ -713,7 +713,7 @@  discard block
 block discarded – undo
713 713
 
714 714
   $template_ex = '.tpl.html';
715 715
 
716
-  if($template === false) {
716
+  if ($template === false) {
717 717
     return sys_file_read(TEMPLATE_DIR . '/' . $files . $template_ex);
718 718
   }
719 719
 
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
   !empty(classSupernova::$sn_mvc['i18n']['']) ? lng_load_i18n(classSupernova::$sn_mvc['i18n']['']) : false;
734 734
   $sn_page_name ? lng_load_i18n(classSupernova::$sn_mvc['i18n'][$sn_page_name]) : false;
735 735
 
736
-  foreach($files as &$filename) {
736
+  foreach ($files as &$filename) {
737 737
     $filename = $filename . $template_ex;
738 738
   }
739 739
 
@@ -758,13 +758,13 @@  discard block
 block discarded – undo
758 758
     'LANG'     => $language ? $language : '',
759 759
     'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
760 760
 
761
-    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
761
+    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
762 762
     'FILENAME'       => basename($_SERVER['PHP_SELF']),
763 763
   ));
764 764
 
765
-  foreach(lng_get_list() as $lng_id => $lng_data) {
766
-    if(isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) {
767
-      foreach($lng_data['LANG_VARIANTS'] as $lang_variant) {
765
+  foreach (lng_get_list() as $lng_id => $lng_data) {
766
+    if (isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) {
767
+      foreach ($lng_data['LANG_VARIANTS'] as $lang_variant) {
768 768
         $lng_data1 = $lng_data;
769 769
         $lng_data1 = array_merge($lng_data1, $lang_variant);
770 770
         $template->assign_block_vars('language', $lng_data1);
@@ -787,8 +787,8 @@  discard block
 block discarded – undo
787 787
   $que = $que['ques'][$que_type][$planet['id_owner']][$planet['id']];
788 788
 
789 789
   $que_length = 0;
790
-  if(!empty($que)) {
791
-    foreach($que as $que_item) {
790
+  if (!empty($que)) {
791
+    foreach ($que as $que_item) {
792 792
       $template->assign_block_vars('que', que_tpl_parse_element($que_item));
793 793
     }
794 794
     $que_length = count($que);
@@ -803,7 +803,7 @@  discard block
 block discarded – undo
803 803
  * @param int      $user_dark_matter
804 804
  */
805 805
 function tpl_planet_density_info(&$template, &$density_price_chart, $user_dark_matter) {
806
-  foreach($density_price_chart as $density_price_index => &$density_price_data) {
806
+  foreach ($density_price_chart as $density_price_index => &$density_price_data) {
807 807
     $density_cost = $density_price_data;
808 808
     $density_number_style = pretty_number($density_cost, true, $user_dark_matter, false, false);
809 809
 
@@ -827,7 +827,7 @@  discard block
 block discarded – undo
827 827
 function tpl_assign_select(&$template, $name, $values) {
828 828
   !is_array($values) ? $values = array($values => $values) : false;
829 829
 
830
-  foreach($values as $key => $value) {
830
+  foreach ($values as $key => $value) {
831 831
     $template->assign_block_vars($name, array(
832 832
       'KEY'   => htmlentities($key, ENT_COMPAT, 'UTF-8'),
833 833
       'VALUE' => htmlentities($value, ENT_COMPAT, 'UTF-8'),
Please login to merge, or discard this patch.
alliance.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
4 4
 
5
-if(classSupernova::$config->game_mode == GAME_BLITZ) {
5
+if (classSupernova::$config->game_mode == GAME_BLITZ) {
6 6
   message(classLocale::$lang['sys_blitz_page_disabled'], classLocale::$lang['sys_error'], 'overview.php', 10);
7 7
   die();
8 8
 }
@@ -14,16 +14,16 @@  discard block
 block discarded – undo
14 14
 
15 15
 $mode = sys_get_param_str('mode');
16 16
 
17
-if($mode == 'ainfo') {
17
+if ($mode == 'ainfo') {
18 18
   include('includes/alliance/ali_info.inc');
19 19
 }
20 20
 
21
-if(!$user['ally_id']) {
21
+if (!$user['ally_id']) {
22 22
   $user_request = db_ally_request_get_by_user_id($user['id']);
23
-  if($user_request['id_user']) {
23
+  if ($user_request['id_user']) {
24 24
     require('includes/alliance/ali_external_request.inc');
25 25
   } else {
26
-    switch($mode) {
26
+    switch ($mode) {
27 27
       case 'search':
28 28
         require('includes/alliance/ali_external_search.inc');
29 29
       break;
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 }
45 45
 
46 46
 sn_ali_fill_user_ally($user);
47
-if(!isset($user['ally'])) {
47
+if (!isset($user['ally'])) {
48 48
   db_user_set_by_id($user['id'], "`ally_id` = null, `ally_name` = null, `ally_register_time` = 0, `ally_rank_id` = 0");
49 49
   message(classLocale::$lang['ali_sys_notFound'], classLocale::$lang['your_alliance'], 'alliance.php');
50 50
 }
@@ -72,18 +72,18 @@  discard block
 block discarded – undo
72 72
 
73 73
 // This piece converting old ally data to new one
74 74
 //  unset($ally['ranklist']);
75
-if(!$ally['ranklist'] && $ally['ally_ranks']) {
75
+if (!$ally['ranklist'] && $ally['ally_ranks']) {
76 76
   $ally_ranks = unserialize($ally['ally_ranks']);
77 77
   $i = 0;
78
-  foreach($ally_ranks as $rank_id => $rank) {
79
-    foreach($ally_rights as $key => $value) {
78
+  foreach ($ally_ranks as $rank_id => $rank) {
79
+    foreach ($ally_rights as $key => $value) {
80 80
       $ranks[$i][$value] = $rank[$rights_old[$key]];
81 81
     }
82 82
     db_user_list_set_ally_deprecated_convert_ranks($user['ally_id'], $i, $rank_id);
83 83
     $i++;
84 84
   }
85 85
 
86
-  if(!empty($ranks)) {
86
+  if (!empty($ranks)) {
87 87
     ali_rank_list_save($ranks);
88 88
   }
89 89
 }
@@ -101,15 +101,15 @@  discard block
 block discarded – undo
101 101
 
102 102
 $edit = sys_get_param_str('edit');
103 103
 ally_pre_call();
104
-switch($mode) {
104
+switch ($mode) {
105 105
   case 'admin':
106
-    if(!array_key_exists($edit, $sn_ali_admin_internal)) {
106
+    if (!array_key_exists($edit, $sn_ali_admin_internal)) {
107 107
       $edit = 'default';
108 108
     }
109
-    if($sn_ali_admin_internal[$edit]['include']) {
109
+    if ($sn_ali_admin_internal[$edit]['include']) {
110 110
       require("includes/{$sn_ali_admin_internal[$edit]['include']}");
111 111
     }
112
-    if(isset($sn_ali_admin_internal[$edit]['function']) && is_callable($sn_ali_admin_internal[$edit]['function'])) {
112
+    if (isset($sn_ali_admin_internal[$edit]['function']) && is_callable($sn_ali_admin_internal[$edit]['function'])) {
113 113
       call_user_func($sn_ali_admin_internal[$edit]['function']);
114 114
     }
115 115
   break;
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 < 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.
blitz_register.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -2,12 +2,12 @@  discard block
 block discarded – undo
2 2
 
3 3
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
4 4
 
5
-if($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
5
+if ($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
6 6
   $error_message = classSupernova::$config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : (
7 7
   !classSupernova::$config->game_blitz_register ? 'sys_blitz_registration_disabled' : ''
8 8
   );
9 9
 
10
-  if($error_message) {
10
+  if ($error_message) {
11 11
     message(classLocale::$lang[$error_message], classLocale::$lang['sys_error'], 'overview.php', 10);
12 12
     die();
13 13
   }
@@ -16,16 +16,16 @@  discard block
 block discarded – undo
16 16
 $current_round = intval(classSupernova::$config->db_loadItem('game_blitz_register_round'));
17 17
 $current_price = intval(classSupernova::$config->db_loadItem('game_blitz_register_price'));
18 18
 
19
-if(classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
19
+if (classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
20 20
   sn_db_transaction_start();
21 21
   $user = db_user_by_id($user['id'], true);
22 22
   $is_registered = db_blitz_reg_get_id_by_player_and_round($user, $current_round);
23
-  if(sys_get_param_str('register_me')) {
24
-    if(empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
23
+  if (sys_get_param_str('register_me')) {
24
+    if (empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
25 25
       db_blitz_reg_insert($user, $current_round);
26 26
       classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
27 27
     }
28
-  } elseif(sys_get_param_str('register_me_not') && !empty($is_registered)) {
28
+  } elseif (sys_get_param_str('register_me_not') && !empty($is_registered)) {
29 29
     db_blitz_reg_delete($user, $current_round);
30 30
     classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION_CANCEL, $current_price, "Отмена регистрации в раунде {$current_round} Блица");
31 31
   }
@@ -40,17 +40,17 @@  discard block
 block discarded – undo
40 40
 $blitz_players = 0;
41 41
 $blitz_prize_dark_matter = 0;
42 42
 $blitz_prize_places = 0;
43
-if($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
44
-  if(sys_get_param_str('generate')) {
43
+if ($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
44
+  if (sys_get_param_str('generate')) {
45 45
     $next_id = 0;
46 46
     $query = db_blitz_reg_get_random_id($current_round);
47
-    while($row = db_fetch($query)) {
47
+    while ($row = db_fetch($query)) {
48 48
       $next_id++;
49 49
       $blitz_name = 'Игрок' . $next_id;
50 50
       $blitz_password = sys_random_string(8);
51 51
       db_blitz_reg_update_with_name_and_password($blitz_name, $blitz_password, $row, $current_round);
52 52
     }
53
-  } elseif(sys_get_param_str('import_generated')) {
53
+  } elseif (sys_get_param_str('import_generated')) {
54 54
     // ЭТО НА БЛИЦЕ!!!
55 55
     db_player_list_blitz_delete_players();
56 56
     db_planets_purge();
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
     $system = $system_step;
73 73
     $planet = round(classSupernova::$config->game_maxPlanet / 2);
74 74
 
75
-    foreach($imported_string as &$string_data) {
75
+    foreach ($imported_string as &$string_data) {
76 76
       $string_data = explode(',', $string_data);
77 77
       $username_safe = $string_data[0];
78 78
 
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 
93 93
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], 30, '', false);
94 94
 
95
-      if(($system += $system_step) >= classSupernova::$config->game_maxSystem) {
95
+      if (($system += $system_step) >= classSupernova::$config->game_maxSystem) {
96 96
         $galaxy++;
97 97
         $system = $system_step;
98 98
       }
@@ -102,13 +102,13 @@  discard block
 block discarded – undo
102 102
     classSupernova::$config->db_saveItem('users_amount', classSupernova::$config->users_amount + $new_players);
103 103
     // pdump($imported_string);
104 104
     // generated_string
105
-  } elseif(sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
105
+  } elseif (sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
106 106
     $blitz_result = explode(';', $blitz_result_string);
107 107
     $blitz_last_update = $blitz_result[0]; // Пока не используется
108 108
     unset($blitz_result[0]);
109
-    foreach($blitz_result as $blitz_result_data) {
109
+    foreach ($blitz_result as $blitz_result_data) {
110 110
       $blitz_result_data = explode(',', $blitz_result_data);
111
-      if(count($blitz_result_data) == 5) {
111
+      if (count($blitz_result_data) == 5) {
112 112
         $blitz_result_data[1] = db_escape($blitz_result_data[1]);
113 113
         db_blitz_reg_update_results($blitz_result_data, $current_round);
114 114
       }
@@ -116,15 +116,15 @@  discard block
 block discarded – undo
116 116
     $blitz_result = array();
117 117
   }
118 118
 
119
-  if(classSupernova::$config->game_mode == GAME_BLITZ) {
119
+  if (classSupernova::$config->game_mode == GAME_BLITZ) {
120 120
     $blitz_result = array(classSupernova::$config->db_loadItem('var_stat_update'));
121 121
     $query = db_player_list_export_blitz_info();
122
-    while($row = db_fetch($query)) {
122
+    while ($row = db_fetch($query)) {
123 123
       $blitz_result[] = "{$row['id']},{$row['username']},{$row['onlinetime']},{$row['total_rank']},{$row['total_points']}";
124 124
     }
125 125
   } else {
126 126
     $query = db_blitz_reg_get_player_list($current_round);
127
-    while($row = db_fetch($query)) {
127
+    while ($row = db_fetch($query)) {
128 128
       $blitz_generated[] = "{$row['blitz_name']},{$row['blitz_password']}";
129 129
       $row['blitz_online'] ? $blitz_prize_players_active++ : false;
130 130
       $blitz_players++;
@@ -132,13 +132,13 @@  discard block
 block discarded – undo
132 132
     $blitz_prize_dark_matter = $blitz_prize_players_active * 20000;
133 133
     $blitz_prize_places = ceil($blitz_prize_players_active / 5);
134 134
 
135
-    if(sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
135
+    if (sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
136 136
       // $blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter');
137 137
       $blitz_prize_places_actual = sys_get_param_int('blitz_prize_places');
138 138
       sn_db_transaction_start();
139 139
       $query = db_blitz_reg_get_player_list_order_by_place($current_round);
140
-      while($row = db_fetch($query)) {
141
-        if(!$row['blitz_place']) {
140
+      while ($row = db_fetch($query)) {
141
+        if (!$row['blitz_place']) {
142 142
           continue;
143 143
         }
144 144
 
@@ -147,14 +147,14 @@  discard block
 block discarded – undo
147 147
 
148 148
         $reward = $blitz_prize_dark_matter_actual - $row['blitz_reward_dark_matter'];
149 149
         pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}", $row['id']);
150
-        if($reward) {
150
+        if ($reward) {
151 151
           rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf(
152 152
             classLocale::$lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name']
153 153
           ));
154 154
           db_blitz_reg_update_apply_results($reward, $row, $current_round);
155 155
         }
156 156
 
157
-        if(!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
157
+        if (!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
158 158
           break;
159 159
         }
160 160
       }
@@ -169,12 +169,12 @@  discard block
 block discarded – undo
169 169
 
170 170
 $player_registered = false;
171 171
 $query = db_blitz_reg_get_player_list_and_users($current_round);
172
-while($row = db_fetch($query)) {
172
+while ($row = db_fetch($query)) {
173 173
   $tpl_player_data = array(
174 174
     'NAME' => player_nick_render_to_html($row, array('icons' => true, 'color' => true, 'ally' => true)),
175 175
   );
176 176
 
177
-  if(classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
177
+  if (classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
178 178
     // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда
179 179
     $tpl_player_data = array_merge($tpl_player_data, array(
180 180
       'ID'                       => $row['id'],
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
   }
188 188
 
189 189
   $template->assign_block_vars('registrations', $tpl_player_data);
190
-  if($row['id'] == $user['id']) {
190
+  if ($row['id'] == $user['id']) {
191 191
     $player_registered = $row;
192 192
   }
193 193
 }
Please login to merge, or discard this patch.
admin/tools.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,19 +12,19 @@  discard block
 block discarded – undo
12 12
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
13 13
 
14 14
 // if($user['authlevel'] < 1)
15
-if($user['authlevel'] < 3) {
15
+if ($user['authlevel'] < 3) {
16 16
   AdminMessage(classLocale::$lang['adm_err_denied']);
17 17
 }
18 18
 
19 19
 $mode = sys_get_param_int('mode');
20 20
 
21
-switch($mode) {
21
+switch ($mode) {
22 22
   case ADM_TOOL_CONFIG_RELOAD:
23 23
     classSupernova::$config->db_loadAll();
24 24
     sys_refresh_tablelist();
25 25
 
26 26
     classSupernova::$config->db_loadItem('game_watchlist');
27
-    if(classSupernova::$config->game_watchlist) {
27
+    if (classSupernova::$config->game_watchlist) {
28 28
       classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
29 29
     } else {
30 30
       unset(classSupernova::$config->game_watchlist_array);
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
       classLocale::$lang['adm_tool_sql_client_version'] => db_get_client_info(),
70 70
       classLocale::$lang['adm_tool_sql_host_info']      => db_get_host_info(),
71 71
     );
72
-    foreach($status as $key => $value) {
72
+    foreach ($status as $key => $value) {
73 73
       $template->assign_block_vars('table.row', array(
74 74
         'VALUE_1' => $key,
75 75
         'VALUE_2' => $value,
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
     $template->assign_block_vars('table', classLocale::$lang['adm_tool_sql_table']['status']);
80 80
     $status = explode('  ', db_server_stat());
81
-    foreach($status as $value) {
81
+    foreach ($status as $value) {
82 82
       $row = explode(': ', $value);
83 83
       $template->assign_block_vars('table.row', array(
84 84
         'VALUE_1' => $row[0],
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 
90 90
     $template->assign_block_vars('table', classLocale::$lang['adm_tool_sql_table']['params']);
91 91
     $result = db_core_show_status();
92
-    while($row = db_fetch($result)) {
92
+    while ($row = db_fetch($result)) {
93 93
       $template->assign_block_vars('table.row', array(
94 94
         'VALUE_1' => $row['Variable_name'],
95 95
         'VALUE_2' => $row['Value'],
Please login to merge, or discard this patch.
admin/statbuilder.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,18 +9,18 @@
 block discarded – undo
9 9
  * @copyright 2008 by Chlorel for XNova
10 10
  */
11 11
 
12
-define('INSIDE'  , true);
13
-define('INSTALL' , false);
12
+define('INSIDE', true);
13
+define('INSTALL', false);
14 14
 define('IN_ADMIN', true);
15 15
 require_once('../common.' . substr(strrchr(__FILE__, '.'), 1));
16 16
 
17 17
 // if($user['authlevel'] < 1)
18
-if($user['authlevel'] < 3)
18
+if ($user['authlevel'] < 3)
19 19
 {
20 20
   AdminMessage(classLocale::$lang['adm_err_denied']);
21 21
 }
22 22
 
23
-if(SN_TIME_NOW >= classSupernova::$config->db_loadAll('var_stat_update_admin_forced') && SN_TIME_NOW >= classSupernova::$config->db_loadAll('var_stat_update_end'))
23
+if (SN_TIME_NOW >= classSupernova::$config->db_loadAll('var_stat_update_admin_forced') && SN_TIME_NOW >= classSupernova::$config->db_loadAll('var_stat_update_end'))
24 24
 {
25 25
   classSupernova::$config->db_saveItem('var_stat_update_admin_forced', SN_TIME_NOW + 120);
26 26
 
Please login to merge, or discard this patch.
admin/settings.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -8,18 +8,18 @@  discard block
 block discarded – undo
8 8
  * @copyright 2008 by ??????? for XNova
9 9
  */
10 10
 
11
-define('INSIDE'  , true);
12
-define('INSTALL' , false);
11
+define('INSIDE', true);
12
+define('INSTALL', false);
13 13
 define('IN_ADMIN', true);
14 14
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
15 15
 
16
-if($user['authlevel'] < 3) {
16
+if ($user['authlevel'] < 3) {
17 17
   AdminMessage(classLocale::$lang['adm_err_denied']);
18 18
 }
19 19
 
20 20
 $template = gettemplate('admin/settings', true);
21 21
 
22
-if(sys_get_param('save')) {
22
+if (sys_get_param('save')) {
23 23
   classSupernova::$config->game_name               = sys_get_param_str_unsafe('game_name');
24 24
   classSupernova::$config->game_mode               = sys_get_param_int('game_mode');
25 25
   classSupernova::$config->game_speed              = sys_get_param_float('game_speed', 1);
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
   classSupernova::$config->url_faq                 = sys_get_param_str_unsafe('url_faq');
30 30
   classSupernova::$config->url_forum               = sys_get_param_str_unsafe('url_forum');
31 31
   classSupernova::$config->url_rules               = sys_get_param_str_unsafe('url_rules');
32
-  classSupernova::$config->url_purchase_metamatter         = sys_get_param_str_unsafe('url_purchase_metamatter');
32
+  classSupernova::$config->url_purchase_metamatter = sys_get_param_str_unsafe('url_purchase_metamatter');
33 33
   classSupernova::$config->game_disable            = sys_get_param_int('game_disable');
34 34
   classSupernova::$config->game_disable_reason     = sys_get_param_str_unsafe('game_disable_reason');
35 35
   classSupernova::$config->server_updater_check_auto = sys_get_param_int('server_updater_check_auto');
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
   classSupernova::$config->stats_schedule          = sys_get_param_str('stats_schedule');
97 97
 
98 98
   classSupernova::$config->empire_mercenary_base_period = sys_get_param_int('empire_mercenary_base_period');
99
-  if(classSupernova::$config->empire_mercenary_temporary != sys_get_param_int('empire_mercenary_temporary')) {
100
-    if(classSupernova::$config->empire_mercenary_temporary) {
99
+  if (classSupernova::$config->empire_mercenary_temporary != sys_get_param_int('empire_mercenary_temporary')) {
100
+    if (classSupernova::$config->empire_mercenary_temporary) {
101 101
       db_unit_list_admin_delete_mercenaries_finished();
102 102
     } else {
103 103
       db_unit_list_admin_set_mercenaries_expire_time(classSupernova::$config->empire_mercenary_base_period);
@@ -138,21 +138,21 @@  discard block
 block discarded – undo
138 138
   'STATS_HIDE_PM_LINK' => classSupernova::$config->stats_hide_pm_link,
139 139
 ));
140 140
 
141
-foreach(classLocale::$lang['sys_game_disable_reason'] as $id => $name) {
141
+foreach (classLocale::$lang['sys_game_disable_reason'] as $id => $name) {
142 142
   $template->assign_block_vars('sys_game_disable_reason', array(
143 143
     'ID'   => $id,
144 144
     'NAME' => $name,
145 145
   ));
146 146
 }
147 147
 
148
-foreach(classLocale::$lang['sys_game_mode'] as $mode_id => $mode_name) {
148
+foreach (classLocale::$lang['sys_game_mode'] as $mode_id => $mode_name) {
149 149
   $template->assign_block_vars('game_modes', array(
150 150
     'ID'   => $mode_id,
151 151
     'NAME' => $mode_name,
152 152
   ));
153 153
 }
154 154
 
155
-foreach(classLocale::$lang['adm_opt_ver_response'] as $ver_id => $ver_response) {
155
+foreach (classLocale::$lang['adm_opt_ver_response'] as $ver_id => $ver_response) {
156 156
   $template->assign_block_vars('ver_response', array(
157 157
     'ID'   => $ver_id,
158 158
     'NAME' => js_safe_string($ver_response),
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 }
161 161
 
162 162
 $lang_list = lng_get_list();
163
-foreach($lang_list as $lang_id => $lang_data) {
163
+foreach ($lang_list as $lang_id => $lang_data) {
164 164
   $template->assign_block_vars('game_languages', array(
165 165
     'ID'   => $lang_id,
166 166
     'NAME' => "{$lang_data['LANG_NAME_NATIVE']} ({$lang_data['LANG_NAME_ENGLISH']})",
Please login to merge, or discard this patch.
ajax_version_check.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -12,10 +12,10 @@  discard block
 block discarded – undo
12 12
   . '&key=' . urlencode(classSupernova::$config->server_updater_key)
13 13
   . '&id=' . urlencode(classSupernova::$config->server_updater_id);
14 14
 
15
-switch($mode) {
15
+switch ($mode) {
16 16
   case SNC_MODE_REGISTER:
17
-    if(classSupernova::$config->server_updater_key || classSupernova::$config->server_updater_id) {
18
-      if($ajax) {
17
+    if (classSupernova::$config->server_updater_key || classSupernova::$config->server_updater_id) {
18
+      if ($ajax) {
19 19
         print(SNC_VER_REGISTER_ERROR_REGISTERED);
20 20
       }
21 21
       die();
@@ -25,18 +25,18 @@  discard block
 block discarded – undo
25 25
 }
26 26
 
27 27
 $check_result = sn_get_url_contents($url);
28
-if(!$check_result) {
28
+if (!$check_result) {
29 29
   $version_check = SNC_VER_ERROR_CONNECT;
30
-} elseif(($version_check = intval($check_result)) && $version_check == $check_result) {
30
+} elseif (($version_check = intval($check_result)) && $version_check == $check_result) {
31 31
   $version_check = $check_result;
32 32
 } else {
33 33
   // JSON decode if string
34 34
   $check_result = json_decode($check_result, true);
35 35
   $version_check = $check_result === null ? SNC_VER_UNKNOWN_RESPONSE : $check_result['version_check'];
36 36
 
37
-  switch($mode) {
37
+  switch ($mode) {
38 38
     case SNC_MODE_REGISTER:
39
-      if($check_result['site']['site_key'] && $check_result['site']['site_id'] && $check_result['site']['result'] == SNC_VER_REGISTER_REGISTERED) {
39
+      if ($check_result['site']['site_key'] && $check_result['site']['site_id'] && $check_result['site']['result'] == SNC_VER_REGISTER_REGISTERED) {
40 40
         classSupernova::$config->db_saveItem('server_updater_key', $check_result['site']['site_key']);
41 41
         classSupernova::$config->db_saveItem('server_updater_id', $check_result['site']['site_id']);
42 42
       }
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 classSupernova::$config->db_saveItem('server_updater_check_last', SN_TIME_NOW);
50 50
 classSupernova::$config->db_saveItem('server_updater_check_result', $version_check);
51 51
 
52
-if($ajax) {
52
+if ($ajax) {
53 53
   define('IN_AJAX', true);
54 54
   print($version_check);
55 55
 }
Please login to merge, or discard this patch.