Completed
Push — work-fleets ( 97ddcc...b06a00 )
by SuperNova.WS
05:03
created
flotenajax.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
  * @copyright 2008 By Chlorel for XNova
15 15
  **/
16 16
 
17
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
17
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
18 18
 
19 19
 define('IN_AJAX', true);
20 20
 
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
   $target_mission = sys_get_param_int('mission');
40 40
   $sn_group_missions = sn_get_groups('missions');
41
-  if(empty($sn_group_missions[$target_mission]['AJAX'])) {
41
+  if (empty($sn_group_missions[$target_mission]['AJAX'])) {
42 42
     die(classLocale::$lang['gs_c00']);
43 43
   }
44 44
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
   );
54 54
   // fleet_ajax now can send fleets only to existing planets/moons
55 55
   // TODO - sending colonization and expeditions in 1 click
56
-  if(!uni_coordinates_valid($target_coord)) {
56
+  if (!uni_coordinates_valid($target_coord)) {
57 57
     die(classLocale::$lang['gs_c02']);
58 58
   }
59 59
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
   // TODO - DEADLOCK CAN BE HERE!!!! We should lock SOURCE and TARGET owners in one query
66 66
   $target_row = db_planet_by_vector($target_coord);
67
-  if(empty($target_row)) {
67
+  if (empty($target_row)) {
68 68
     $target_row = $target_coord;
69 69
     $target_row['id_owner'] = 0;
70 70
     // If fleet destination is PT_DEBRIS - then it's actually destination is PT_PLANET // TODO - REMOVE! Debris should be valid DESTINATION planet_type!
@@ -75,15 +75,15 @@  discard block
 block discarded – undo
75 75
   }
76 76
 
77 77
   $fleet_array = array();
78
-  switch($target_mission) {
78
+  switch ($target_mission) {
79 79
     case MT_SPY:
80 80
       $fleet_array[SHIP_SPY] = min(mrc_get_level($user, $planetrow, SHIP_SPY), abs(classSupernova::$user_options[PLAYER_OPTION_FLEET_SPY_DEFAULT]));
81 81
       $unit_group = 'flt_spies';
82 82
     break;
83 83
 
84 84
     case MT_RECYCLE:
85
-      foreach(sn_get_groups('flt_recyclers') as $unit_id) {
86
-        if($unit_count = mrc_get_level($user, $planetrow, $unit_id)) {
85
+      foreach (sn_get_groups('flt_recyclers') as $unit_id) {
86
+        if ($unit_count = mrc_get_level($user, $planetrow, $unit_id)) {
87 87
           $fleet_array[$unit_id] = $unit_count;
88 88
         }
89 89
       }
@@ -108,16 +108,16 @@  discard block
 block discarded – undo
108 108
       'target_structure' => $target_structure = sys_get_param_int('structures'),
109 109
     )
110 110
   );
111
-  if($isAttackAllowed != FLIGHT_ALLOWED) {
111
+  if ($isAttackAllowed != FLIGHT_ALLOWED) {
112 112
     die(classLocale::$lang['fl_attack_error'][$isAttackAllowed]);
113 113
   }
114 114
 
115 115
   $db_changeset = array();
116
-  foreach($fleet_array as $unit_id => $unit_count) {
116
+  foreach ($fleet_array as $unit_id => $unit_count) {
117 117
     $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, -$unit_count, $user, $planetrow);
118 118
   }
119 119
 
120
-  if($target_mission == MT_MISSILE) {
120
+  if ($target_mission == MT_MISSILE) {
121 121
     $distance = abs($target_coord['system'] - $planetrow['system']);
122 122
     $duration = round((30 + (60 * $distance)) / flt_server_flight_speed_multiplier());
123 123
     $arrival = SN_TIME_NOW + $duration;
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
   } else {
128 128
     $travel_data = flt_travel_data($user, $planetrow, $target_coord, $fleet_array, 10);
129 129
 
130
-    if($planetrow['deuterium'] < $travel_data['consumption']) {
130
+    if ($planetrow['deuterium'] < $travel_data['consumption']) {
131 131
       die(classLocale::$lang['gs_c13']);
132 132
     }
133 133
 
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 
149 149
   $ships_sent = array();
150 150
   $ships_sent_js = 0;
151
-  foreach($fleet_array as $unit_id => $unit_count) {
151
+  foreach ($fleet_array as $unit_id => $unit_count) {
152 152
     $ships_sent[] = "{$unit_count} {$classLocale['tech'][$unit_id]}";
153 153
     $ships_sent_js += mrc_get_level($user, $planetrow, $unit_id, false, true);
154 154
   }
Please login to merge, or discard this patch.
dark_matter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once('common.' . substr(strrchr(__FILE__, '.'), 1));
3
+include_once('common.'.substr(strrchr(__FILE__, '.'), 1));
4 4
 
5
-if(sn_module_get_active_count('payment') && !defined('SN_GOOGLE')) {
5
+if (sn_module_get_active_count('payment') && !defined('SN_GOOGLE')) {
6 6
   sys_redirect('metamatter.php');
7 7
 }
8 8
 
Please login to merge, or discard this patch.
quest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,10 +7,10 @@
 block discarded – undo
7 7
  *
8 8
  */
9 9
 
10
-define('INSIDE'  , true);
11
-define('INSTALL' , false);
10
+define('INSIDE', true);
11
+define('INSTALL', false);
12 12
 
13
-require('common.' . substr(strrchr(__FILE__, '.'), 1));
13
+require('common.'.substr(strrchr(__FILE__, '.'), 1));
14 14
 
15 15
 lng_include('quest');
16 16
 $template = gettemplate('quest', true);
Please login to merge, or discard this patch.
fleet.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -3,13 +3,13 @@  discard block
 block discarded – undo
3 3
 define('SN_IN_FLEET', true);
4 4
 define('SN_RENDER_NAVBAR_PLANET', true);
5 5
 
6
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
6
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
7 7
 
8 8
 // TODO - Переместить это куда-нибудь
9 9
 $fleet_page = sys_get_param_int('fleet_page', sys_get_param_int('mode'));
10
-if($fleet_ship_sort = sys_get_param_id('sort_elements') && $fleet_page == 0) {
10
+if ($fleet_ship_sort = sys_get_param_id('sort_elements') && $fleet_page == 0) {
11 11
   define('IN_AJAX', true);
12
-  if(!empty(classLocale::$lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
12
+  if (!empty(classLocale::$lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
13 13
     classSupernova::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT] = $fleet_ship_sort;
14 14
     classSupernova::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT_INVERSE] = sys_get_param_id('sort_elements_inverse', 0);
15 15
   }
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 $objFleet5->initDefaults($user, $planetrow, $targetVector, $target_mission, $ships, $fleet_group_mr, $speed_percent, 0, $captainId, $resources);
46 46
 
47 47
 
48
-switch($fleet_page) {
48
+switch ($fleet_page) {
49 49
   case 1:
50 50
     $objFleet5->fleetPage1();
51 51
   break;
Please login to merge, or discard this patch.
alliance.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 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
-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.
resources.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
  *
23 23
  **/
24 24
 
25
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
25
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
26 26
 
27 27
 /**
28 28
  * @param          $resource_id
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
   $storage_fill = $caps_real['total_storage'][$resource_id] ? floor(mrc_get_level($user, $planetrow, $resource_id) / $caps_real['total_storage'][$resource_id] * 100) : 0;
37 37
 
38 38
   $template->assign_block_vars('resources', array(
39
-    'NAME' => classLocale::$lang["sys_" . pname_resource_name($resource_id)],
39
+    'NAME' => classLocale::$lang["sys_".pname_resource_name($resource_id)],
40 40
 
41 41
     'HOURLY'  => pretty_number($totalProduction, true, true),
42 42
     'WEEKLY'  => pretty_number($totalProduction * 24 * 7, true, true),
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
       //$SubQry                 .= "`{$field_name}` = '{$percent}',";
78 78
       $SubQry[] = "`{$field_name}` = '{$percent}'";
79 79
     } else {
80
-      classSupernova::$debug->warning('Supplying wrong ID in production array - attempt to change some field - ID' . $prod_id, 'Resource Page', 301);
80
+      classSupernova::$debug->warning('Supplying wrong ID in production array - attempt to change some field - ID'.$prod_id, 'Resource Page', 301);
81 81
       continue;
82 82
     }
83 83
   }
Please login to merge, or discard this patch.
viewreport.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.
lostpassword.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.
login.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,10 +13,10 @@
 block discarded – undo
13 13
 
14 14
 $allow_anonymous = true;
15 15
 
16
-include('includes/init.' . substr(strrchr(__FILE__, '.'), 1));
16
+include('includes/init.'.substr(strrchr(__FILE__, '.'), 1));
17 17
 // die();
18
-if($template_result[F_USER_IS_AUTHORIZED]) {
19
-  sys_redirect('index' . DOT_PHP_EX);
18
+if ($template_result[F_USER_IS_AUTHORIZED]) {
19
+  sys_redirect('index'.DOT_PHP_EX);
20 20
 }
21 21
 lng_include('login');
22 22
 lng_include('admin');
Please login to merge, or discard this patch.