@@ -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 | 'art_use' => 'Использовать артефакт', |
@@ -24,7 +24,9 @@ |
||
24 | 24 | * DO NOT CHANGE |
25 | 25 | */ |
26 | 26 | |
27 | -if (!defined('INSIDE')) die(); |
|
27 | +if (!defined('INSIDE')) { |
|
28 | + die(); |
|
29 | +} |
|
28 | 30 | |
29 | 31 | $a_lang_array = (array( |
30 | 32 | 'msg_page_header' => 'Личные сообщения', |
@@ -24,7 +24,9 @@ |
||
24 | 24 | * DO NOT CHANGE |
25 | 25 | */ |
26 | 26 | |
27 | -if (!defined('INSIDE')) die(); |
|
27 | +if (!defined('INSIDE')) { |
|
28 | + die(); |
|
29 | +} |
|
28 | 30 | |
29 | 31 | $a_lang_array = (array( |
30 | 32 | 'eco_mrk_title' => 'Чёрный Рынок', |
@@ -24,7 +24,9 @@ |
||
24 | 24 | * DO NOT CHANGE |
25 | 25 | */ |
26 | 26 | |
27 | -if (!defined('INSIDE')) die(); |
|
27 | +if (!defined('INSIDE')) { |
|
28 | + die(); |
|
29 | +} |
|
28 | 30 | |
29 | 31 | $a_lang_array = (array( |
30 | 32 | 'flt_page2_title' => 'Выбор задания', |
@@ -34,15 +34,16 @@ discard block |
||
34 | 34 | { |
35 | 35 | $sort2s = "DESC"; |
36 | 36 | $sort2 = 0; |
37 | -} |
|
38 | -else |
|
37 | +} else |
|
39 | 38 | { |
40 | 39 | $sort2s = "ASC"; |
41 | 40 | $sort2 = 1; |
42 | 41 | } |
43 | 42 | |
44 | 43 | $sort1 = sys_get_param_int('sort1'); |
45 | -if($sort1>5 || $sort1<0) $sort1 = 0; |
|
44 | +if($sort1>5 || $sort1<0) { |
|
45 | + $sort1 = 0; |
|
46 | +} |
|
46 | 47 | $sort1s = array( |
47 | 48 | 0 => '`ally_rank_id` %1$s;', |
48 | 49 | 1 => '`username` %1$s;', |
@@ -69,8 +70,7 @@ discard block |
||
69 | 70 | if ($ally['ally_owner'] == $userRow['id']) |
70 | 71 | { |
71 | 72 | $ally_range = ($ally['ally_owner_range'])?$ally['ally_owner_range']:$lang['Founder']; |
72 | - } |
|
73 | - else |
|
73 | + } else |
|
74 | 74 | { |
75 | 75 | if($user_admin) |
76 | 76 | { |
@@ -78,14 +78,14 @@ discard block |
||
78 | 78 | |
79 | 79 | foreach($ranks as $rankID => $rankArray){ |
80 | 80 | $ally_range .= '<option value="' . $rankID . '"'; |
81 | - if($rankID == $userRow['ally_rank_id']) |
|
82 | - $ally_range .= " selected"; |
|
81 | + if($rankID == $userRow['ally_rank_id']) { |
|
82 | + $ally_range .= " selected"; |
|
83 | + } |
|
83 | 84 | $ally_range .= '>' . $rankArray['name']; |
84 | 85 | $ally_range .= '</option>'; |
85 | 86 | } |
86 | 87 | $ally_range .= '</select>'; |
87 | - } |
|
88 | - else |
|
88 | + } else |
|
89 | 89 | { |
90 | 90 | $ally_range = $ranks[$userRow['ally_rank_id']]['name']; |
91 | 91 | } |
@@ -97,53 +97,44 @@ discard block |
||
97 | 97 | if ( $last_active < 60 ) |
98 | 98 | { |
99 | 99 | $tmp = "lime>{$lang['On']}"; |
100 | - } |
|
101 | - elseif ($last_active < 60 * 60) |
|
100 | + } elseif ($last_active < 60 * 60) |
|
102 | 101 | { |
103 | 102 | $last_active = round($last_active / 60); |
104 | 103 | $tmp = "lime>{$last_active} {$lang['sys_min_short']}"; |
105 | - } |
|
106 | - elseif ($last_active < 60 * 60 * 24) |
|
104 | + } elseif ($last_active < 60 * 60 * 24) |
|
107 | 105 | { |
108 | 106 | $last_active = round( $last_active / (60 * 60)); |
109 | 107 | $tmp = "green>{$last_active} {$lang['sys_hrs_short']}"; |
110 | - } |
|
111 | - else |
|
108 | + } else |
|
112 | 109 | { |
113 | 110 | $last_active = round( $last_active / (60 * 60 * 24)); |
114 | 111 | if ($last_active < 7) |
115 | 112 | { |
116 | 113 | $tmp = "yellow"; |
117 | - } |
|
118 | - elseif ($last_active < 30) |
|
114 | + } elseif ($last_active < 30) |
|
119 | 115 | { |
120 | 116 | $tmp = "orange"; |
121 | - } |
|
122 | - else |
|
117 | + } else |
|
123 | 118 | { |
124 | 119 | $tmp = "red"; |
125 | 120 | } |
126 | 121 | $tmp .= ">{$last_active} {$lang['sys_day_short']}"; |
127 | 122 | } |
128 | - } |
|
129 | - else |
|
123 | + } else |
|
130 | 124 | { |
131 | 125 | if($user_onlinestatus) |
132 | 126 | { |
133 | 127 | if ( $last_active < 60 * 5 ) |
134 | 128 | { |
135 | 129 | $tmp = "lime>{$lang['On']}"; |
136 | - } |
|
137 | - elseif ($last_active < 60 * 15) |
|
130 | + } elseif ($last_active < 60 * 15) |
|
138 | 131 | { |
139 | 132 | $tmp = "yellow>{$lang['ali_lessThen15min']}"; |
140 | - } |
|
141 | - else |
|
133 | + } else |
|
142 | 134 | { |
143 | 135 | $tmp = "red>{$lang['Off']}"; |
144 | 136 | } |
145 | - } |
|
146 | - else |
|
137 | + } else |
|
147 | 138 | { |
148 | 139 | $sort1 = max($sort1, 4); |
149 | 140 | $tmp = "orange>-"; |
@@ -23,8 +23,7 @@ |
||
23 | 23 | if($user_request['request_denied']) |
24 | 24 | { |
25 | 25 | $lang['request_text'] = sprintf($lang['ali_req_deny_msg'], $ally['ally_tag'], $user_request['request_text']); |
26 | - } |
|
27 | - else |
|
26 | + } else |
|
28 | 27 | { |
29 | 28 | $lang['request_text'] = sprintf($lang['ali_req_waiting'], $ally['ally_tag']); |
30 | 29 | } |
@@ -46,8 +46,7 @@ |
||
46 | 46 | sn_db_transaction_commit(); |
47 | 47 | sys_redirect("galaxy.php?mode=name&galaxy={$uni_galaxy}&system={$uni_system}"); |
48 | 48 | } |
49 | - } |
|
50 | - catch (exception $e) |
|
49 | + } catch (exception $e) |
|
51 | 50 | { |
52 | 51 | sn_db_transaction_rollback(); |
53 | 52 | $template->assign_block_vars('result', array( |
@@ -18,18 +18,24 @@ discard block |
||
18 | 18 | |
19 | 19 | // Test de coherance de la destination (voir si elle se trouve dans les limites de l'univers connu |
20 | 20 | $errorlist = ''; |
21 | - if (!$galaxy || $galaxy > $config->game_maxGalaxy || $galaxy < 1) |
|
22 | - $errorlist .= $lang['fl_limit_galaxy']; |
|
23 | - if (!$system || $system > $config->game_maxSystem || $system < 1) |
|
24 | - $errorlist .= $lang['fl_limit_system']; |
|
25 | - if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE )) |
|
26 | - $errorlist .= $lang['fl_limit_planet']; |
|
27 | - if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type) |
|
28 | - $errorlist .= $lang['fl_ownpl_err']; |
|
29 | - if (!$planet_type) |
|
30 | - $errorlist .= $lang['fl_no_planettype']; |
|
31 | - if ($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON) |
|
32 | - $errorlist .= $lang['fl_fleet_err_pl']; |
|
21 | + if (!$galaxy || $galaxy > $config->game_maxGalaxy || $galaxy < 1) { |
|
22 | + $errorlist .= $lang['fl_limit_galaxy']; |
|
23 | + } |
|
24 | + if (!$system || $system > $config->game_maxSystem || $system < 1) { |
|
25 | + $errorlist .= $lang['fl_limit_system']; |
|
26 | + } |
|
27 | + if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE )) { |
|
28 | + $errorlist .= $lang['fl_limit_planet']; |
|
29 | + } |
|
30 | + if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type) { |
|
31 | + $errorlist .= $lang['fl_ownpl_err']; |
|
32 | + } |
|
33 | + if (!$planet_type) { |
|
34 | + $errorlist .= $lang['fl_no_planettype']; |
|
35 | + } |
|
36 | + if ($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON) { |
|
37 | + $errorlist .= $lang['fl_fleet_err_pl']; |
|
38 | + } |
|
33 | 39 | if (empty($missiontype[$target_mission])) { |
34 | 40 | $errorlist .= $lang['fl_bad_mission']; |
35 | 41 | } |
@@ -56,29 +62,35 @@ discard block |
||
56 | 62 | } |
57 | 63 | } else { |
58 | 64 | if ($TargetPlanet['id_owner']){ |
59 | - if ($target_mission == MT_COLONIZE) |
|
60 | - $errorlist .= $lang['fl_colonized']; |
|
65 | + if ($target_mission == MT_COLONIZE) { |
|
66 | + $errorlist .= $lang['fl_colonized']; |
|
67 | + } |
|
61 | 68 | |
62 | 69 | if ($TargetPlanet['id_owner'] == $planetrow['id_owner']){ |
63 | - if ($target_mission == MT_ATTACK) |
|
64 | - $errorlist .= $lang['fl_no_self_attack']; |
|
65 | - |
|
66 | - if ($target_mission == MT_SPY) |
|
67 | - $errorlist .= $lang['fl_no_self_spy']; |
|
68 | - }else{ |
|
69 | - if ($target_mission == MT_RELOCATE) |
|
70 | - $errorlist .= $lang['fl_only_stay_at_home']; |
|
70 | + if ($target_mission == MT_ATTACK) { |
|
71 | + $errorlist .= $lang['fl_no_self_attack']; |
|
72 | + } |
|
73 | + |
|
74 | + if ($target_mission == MT_SPY) { |
|
75 | + $errorlist .= $lang['fl_no_self_spy']; |
|
76 | + } |
|
77 | + } else{ |
|
78 | + if ($target_mission == MT_RELOCATE) { |
|
79 | + $errorlist .= $lang['fl_only_stay_at_home']; |
|
80 | + } |
|
71 | 81 | } |
72 | - }else{ |
|
82 | + } else{ |
|
73 | 83 | if ($target_mission < MT_COLONIZE){ |
74 | 84 | $errorlist .= $lang['fl_unknow_target']; |
75 | - }else{ |
|
76 | - if ($target_mission == MT_DESTROY) |
|
77 | - $errorlist .= $lang['fl_nomoon']; |
|
85 | + } else{ |
|
86 | + if ($target_mission == MT_DESTROY) { |
|
87 | + $errorlist .= $lang['fl_nomoon']; |
|
88 | + } |
|
78 | 89 | |
79 | 90 | if ($target_mission == MT_RECYCLE){ |
80 | - if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0) |
|
81 | - $errorlist .= $lang['fl_nodebris']; |
|
91 | + if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0) { |
|
92 | + $errorlist .= $lang['fl_nodebris']; |
|
93 | + } |
|
82 | 94 | } |
83 | 95 | } |
84 | 96 | } |
@@ -126,8 +138,7 @@ discard block |
||
126 | 138 | $aks = doquery("SELECT * FROM {{aks}} WHERE id = '{$fleet_group}' LIMIT 1;", true); |
127 | 139 | if (!$aks) { |
128 | 140 | $fleet_group = 0; |
129 | - } |
|
130 | - else |
|
141 | + } else |
|
131 | 142 | { |
132 | 143 | $galaxy = $aks['galaxy']; |
133 | 144 | $system = $aks['system']; |
@@ -79,8 +79,7 @@ |
||
79 | 79 | |
80 | 80 | sn_db_transaction_commit(); |
81 | 81 | throw new Exception($info_action, ERR_NONE); |
82 | - } |
|
83 | - catch (Exception $e) |
|
82 | + } catch (Exception $e) |
|
84 | 83 | { |
85 | 84 | sn_db_transaction_rollback(); |
86 | 85 |