@@ -26,7 +26,9 @@ |
||
26 | 26 | * DO NOT CHANGE |
27 | 27 | */ |
28 | 28 | |
29 | -if (!defined('INSIDE')) die(); |
|
29 | +if (!defined('INSIDE')) { |
|
30 | + die(); |
|
31 | +} |
|
30 | 32 | |
31 | 33 | |
32 | 34 | $a_lang_array = (array( |
@@ -26,7 +26,9 @@ |
||
26 | 26 | * DO NOT CHANGE |
27 | 27 | */ |
28 | 28 | |
29 | -if (!defined('INSIDE')) die(); |
|
29 | +if (!defined('INSIDE')) { |
|
30 | + die(); |
|
31 | +} |
|
30 | 32 | |
31 | 33 | |
32 | 34 | $a_lang_array = (array( |
@@ -26,7 +26,9 @@ |
||
26 | 26 | * DO NOT CHANGE |
27 | 27 | */ |
28 | 28 | |
29 | -if (!defined('INSIDE')) die(); |
|
29 | +if (!defined('INSIDE')) { |
|
30 | + die(); |
|
31 | +} |
|
30 | 32 | |
31 | 33 | |
32 | 34 | $a_lang_array = (array( |
@@ -26,7 +26,9 @@ |
||
26 | 26 | * DO NOT CHANGE |
27 | 27 | */ |
28 | 28 | |
29 | -if (!defined('INSIDE')) die(); |
|
29 | +if (!defined('INSIDE')) { |
|
30 | + die(); |
|
31 | +} |
|
30 | 32 | |
31 | 33 | |
32 | 34 | $a_lang_array = (array( |
@@ -26,7 +26,9 @@ |
||
26 | 26 | * DO NOT CHANGE |
27 | 27 | */ |
28 | 28 | |
29 | -if (!defined('INSIDE')) die(); |
|
29 | +if (!defined('INSIDE')) { |
|
30 | + die(); |
|
31 | +} |
|
30 | 32 | |
31 | 33 | global $config; |
32 | 34 |
@@ -26,7 +26,9 @@ |
||
26 | 26 | * DO NOT CHANGE |
27 | 27 | */ |
28 | 28 | |
29 | -if (!defined('INSIDE')) die(); |
|
29 | +if (!defined('INSIDE')) { |
|
30 | + die(); |
|
31 | +} |
|
30 | 32 | |
31 | 33 | |
32 | 34 | $a_lang_array = (array( |
@@ -23,7 +23,9 @@ |
||
23 | 23 | * DO NOT CHANGE |
24 | 24 | */ |
25 | 25 | |
26 | -if (!defined('INSIDE')) die(); |
|
26 | +if (!defined('INSIDE')) { |
|
27 | + die(); |
|
28 | +} |
|
27 | 29 | |
28 | 30 | $a_lang_array = (array( |
29 | 31 | // Metamatter |
@@ -26,7 +26,9 @@ |
||
26 | 26 | * DO NOT CHANGE |
27 | 27 | */ |
28 | 28 | |
29 | -if (!defined('INSIDE')) die(); |
|
29 | +if (!defined('INSIDE')) { |
|
30 | + die(); |
|
31 | +} |
|
30 | 32 | |
31 | 33 | |
32 | 34 | $a_lang_array = (array( |
@@ -89,18 +89,18 @@ discard block |
||
89 | 89 | case 0: |
90 | 90 | $fleet['event_time'] = $fleet['fleet_start_time']; |
91 | 91 | $is_this_planet = ( |
92 | - ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) AND |
|
93 | - ($planetrow['system'] == $fleet['fleet_end_system']) AND |
|
94 | - ($planetrow['planet'] == $fleet['fleet_end_planet']) AND |
|
92 | + ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) and |
|
93 | + ($planetrow['system'] == $fleet['fleet_end_system']) and |
|
94 | + ($planetrow['planet'] == $fleet['fleet_end_planet']) and |
|
95 | 95 | ($planetrow['planet_type'] == $planet_end_type)); |
96 | 96 | break; |
97 | 97 | |
98 | 98 | case 1: |
99 | 99 | $fleet['event_time'] = $fleet['fleet_end_stay']; |
100 | 100 | $is_this_planet = ( |
101 | - ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) AND |
|
102 | - ($planetrow['system'] == $fleet['fleet_end_system']) AND |
|
103 | - ($planetrow['planet'] == $fleet['fleet_end_planet']) AND |
|
101 | + ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) and |
|
102 | + ($planetrow['system'] == $fleet['fleet_end_system']) and |
|
103 | + ($planetrow['planet'] == $fleet['fleet_end_planet']) and |
|
104 | 104 | ($planetrow['planet_type'] == $planet_end_type)); |
105 | 105 | break; |
106 | 106 | |
@@ -108,9 +108,9 @@ discard block |
||
108 | 108 | case 3: |
109 | 109 | $fleet['event_time'] = $fleet['fleet_end_time']; |
110 | 110 | $is_this_planet = ( |
111 | - ($planetrow['galaxy'] == $fleet['fleet_start_galaxy']) AND |
|
112 | - ($planetrow['system'] == $fleet['fleet_start_system']) AND |
|
113 | - ($planetrow['planet'] == $fleet['fleet_start_planet']) AND |
|
111 | + ($planetrow['galaxy'] == $fleet['fleet_start_galaxy']) and |
|
112 | + ($planetrow['system'] == $fleet['fleet_start_system']) and |
|
113 | + ($planetrow['planet'] == $fleet['fleet_start_planet']) and |
|
114 | 114 | ($planetrow['planet_type'] == $fleet['fleet_start_type'])); |
115 | 115 | break; |
116 | 116 |
@@ -10,23 +10,23 @@ discard block |
||
10 | 10 | $fleet_events = array(); |
11 | 11 | $fleet_number = 0; |
12 | 12 | |
13 | - if(empty($fleet_list)) |
|
13 | + if (empty($fleet_list)) |
|
14 | 14 | { |
15 | 15 | return; |
16 | 16 | } |
17 | 17 | |
18 | - foreach($fleet_list as $fleet) |
|
18 | + foreach ($fleet_list as $fleet) |
|
19 | 19 | { |
20 | 20 | $planet_start_type = $fleet['fleet_start_type'] == PT_MOON ? PT_MOON : PT_PLANET; |
21 | 21 | $planet_start = DBStaticPlanet::db_planet_by_gspt($fleet['fleet_start_galaxy'], $fleet['fleet_start_system'], $fleet['fleet_start_planet'], $planet_start_type); |
22 | 22 | $fleet['fleet_start_name'] = $planet_start['name']; |
23 | 23 | |
24 | 24 | $planet_end_type = $fleet['fleet_end_type'] == PT_MOON ? PT_MOON : PT_PLANET; |
25 | - if($fleet['fleet_end_planet'] > $config->game_maxPlanet) |
|
25 | + if ($fleet['fleet_end_planet'] > $config->game_maxPlanet) |
|
26 | 26 | { |
27 | 27 | $fleet['fleet_end_name'] = $lang['ov_fleet_exploration']; |
28 | 28 | } |
29 | - elseif($fleet['fleet_mission'] == MT_COLONIZE) |
|
29 | + elseif ($fleet['fleet_mission'] == MT_COLONIZE) |
|
30 | 30 | { |
31 | 31 | $fleet['fleet_end_name'] = $lang['ov_fleet_colonization']; |
32 | 32 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | $fleet['fleet_end_name'] = $planet_end['name']; |
37 | 37 | } |
38 | 38 | |
39 | - if($fleet['fleet_start_time'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] != MT_MISSILE && |
|
39 | + if ($fleet['fleet_start_time'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] != MT_MISSILE && |
|
40 | 40 | ($planet_scanned === false |
41 | 41 | || |
42 | 42 | ( |
@@ -51,12 +51,12 @@ discard block |
||
51 | 51 | $fleet_events[] = flt_register_fleet_event($fleet, 0, $planet_end_type); |
52 | 52 | } |
53 | 53 | |
54 | - if($fleet['fleet_end_stay'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $planet_scanned === false && $fleet['fleet_mission'] != MT_MISSILE) |
|
54 | + if ($fleet['fleet_end_stay'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $planet_scanned === false && $fleet['fleet_mission'] != MT_MISSILE) |
|
55 | 55 | { |
56 | 56 | $fleet_events[] = flt_register_fleet_event($fleet, 1, $planet_end_type); |
57 | 57 | } |
58 | 58 | |
59 | - if( |
|
59 | + if ( |
|
60 | 60 | $fleet['fleet_end_time'] > SN_TIME_NOW && $fleet['fleet_mission'] != MT_MISSILE && ($fleet['fleet_mess'] == 1 || ($fleet['fleet_mission'] != MT_RELOCATE && $fleet['fleet_mission'] != MT_COLONIZE)) && |
61 | 61 | ( |
62 | 62 | ($planet_scanned === false && $fleet['fleet_owner'] == $user['id']) |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $fleet_events[] = flt_register_fleet_event($fleet, 2, $planet_end_type); |
74 | 74 | } |
75 | 75 | |
76 | - if($fleet['fleet_mission'] == MT_MISSILE) |
|
76 | + if ($fleet['fleet_mission'] == MT_MISSILE) |
|
77 | 77 | { |
78 | 78 | $fleet_events[] = flt_register_fleet_event($fleet, 3, $planet_end_type); |
79 | 79 | } |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | { |
87 | 87 | global $user, $planetrow, $fleet_number; |
88 | 88 | |
89 | - switch($fleet['ov_label'] = $ov_label) |
|
89 | + switch ($fleet['ov_label'] = $ov_label) |
|
90 | 90 | { |
91 | 91 | case 0: |
92 | 92 | $fleet['event_time'] = $fleet['fleet_start_time']; |
@@ -118,9 +118,9 @@ discard block |
||
118 | 118 | |
119 | 119 | } |
120 | 120 | |
121 | - $fleet['ov_this_planet'] = $is_this_planet;// || $planet_scanned != false; |
|
121 | + $fleet['ov_this_planet'] = $is_this_planet; // || $planet_scanned != false; |
|
122 | 122 | |
123 | - if($fleet['fleet_owner'] == $user['id']) |
|
123 | + if ($fleet['fleet_owner'] == $user['id']) |
|
124 | 124 | { |
125 | 125 | $user_data = $user; |
126 | 126 | } |
@@ -3,8 +3,7 @@ discard block |
||
3 | 3 | |
4 | 4 | use Planet\DBStaticPlanet; |
5 | 5 | |
6 | -function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false) |
|
7 | -{ |
|
6 | +function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false) { |
|
8 | 7 | global $config, $user, $fleet_number, $lang; |
9 | 8 | |
10 | 9 | $fleet_events = array(); |
@@ -25,12 +24,10 @@ discard block |
||
25 | 24 | if($fleet['fleet_end_planet'] > $config->game_maxPlanet) |
26 | 25 | { |
27 | 26 | $fleet['fleet_end_name'] = $lang['ov_fleet_exploration']; |
28 | - } |
|
29 | - elseif($fleet['fleet_mission'] == MT_COLONIZE) |
|
27 | + } elseif($fleet['fleet_mission'] == MT_COLONIZE) |
|
30 | 28 | { |
31 | 29 | $fleet['fleet_end_name'] = $lang['ov_fleet_colonization']; |
32 | - } |
|
33 | - else |
|
30 | + } else |
|
34 | 31 | { |
35 | 32 | $planet_end = DBStaticPlanet::db_planet_by_gspt($fleet['fleet_end_galaxy'], $fleet['fleet_end_system'], $fleet['fleet_end_planet'], $planet_end_type); |
36 | 33 | $fleet['fleet_end_name'] = $planet_end['name']; |
@@ -82,8 +79,7 @@ discard block |
||
82 | 79 | return $fleet_events; |
83 | 80 | } |
84 | 81 | |
85 | -function flt_register_fleet_event($fleet, $ov_label, $planet_end_type) |
|
86 | -{ |
|
82 | +function flt_register_fleet_event($fleet, $ov_label, $planet_end_type) { |
|
87 | 83 | global $user, $planetrow, $fleet_number; |
88 | 84 | |
89 | 85 | switch($fleet['ov_label'] = $ov_label) |
@@ -123,8 +119,7 @@ discard block |
||
123 | 119 | if($fleet['fleet_owner'] == $user['id']) |
124 | 120 | { |
125 | 121 | $user_data = $user; |
126 | - } |
|
127 | - else |
|
122 | + } else |
|
128 | 123 | { |
129 | 124 | $user_data = db_user_by_id($fleet['fleet_owner']); |
130 | 125 | } |
@@ -136,8 +131,7 @@ discard block |
||
136 | 131 | * @param array $planetrow |
137 | 132 | * @param template $template |
138 | 133 | */ |
139 | -function int_planet_pretemplate($planetrow, &$template) |
|
140 | -{ |
|
134 | +function int_planet_pretemplate($planetrow, &$template) { |
|
141 | 135 | global $lang, $user; |
142 | 136 | |
143 | 137 | $governor_id = $planetrow['PLANET_GOVERNOR_ID']; |