@@ -10,9 +10,8 @@ |
||
10 | 10 | |
11 | 11 | /** |
12 | 12 | * @param Mission $objMission |
13 | - * @param array $mission_data |
|
14 | 13 | * |
15 | - * @return array|null |
|
14 | + * @return null|boolean |
|
16 | 15 | */ |
17 | 16 | function flt_mission_attack($objMission) { |
18 | 17 | $objFleet = $objMission->fleet; |
@@ -17,14 +17,14 @@ |
||
17 | 17 | function flt_mission_attack($objMission) { |
18 | 18 | $objFleet = $objMission->fleet; |
19 | 19 | |
20 | - if($objFleet->shipsGetTotal() <= 0) { |
|
20 | + if ($objFleet->shipsGetTotal() <= 0) { |
|
21 | 21 | return null; |
22 | 22 | } |
23 | 23 | |
24 | 24 | $destination_user = $objMission->dst_user; |
25 | 25 | $destination_planet = $objMission->dst_planet; |
26 | 26 | |
27 | - if( |
|
27 | + if ( |
|
28 | 28 | // Нет данных о планете назначения или её владельце |
29 | 29 | empty($destination_user) || empty($destination_planet) || !is_array($destination_user) || !is_array($destination_planet) |
30 | 30 | || |
@@ -31,7 +31,7 @@ |
||
31 | 31 | /** |
32 | 32 | * Fleet mission "Relocate" |
33 | 33 | * |
34 | - * @param $mission_data Mission |
|
34 | + * @param Mission $mission_data Mission |
|
35 | 35 | * |
36 | 36 | * @return int |
37 | 37 | * |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | // TODO - Currently $ship_data is one for all players |
22 | 22 | static $shipCostInMetalPerPiece, $rates; |
23 | 23 | |
24 | - if(empty($mission_data->fleet_event) || $mission_data->fleet_event != EVENT_FLT_ACOMPLISH) { |
|
24 | + if (empty($mission_data->fleet_event) || $mission_data->fleet_event != EVENT_FLT_ACOMPLISH) { |
|
25 | 25 | return CACHE_NONE; |
26 | 26 | } |
27 | 27 | |
@@ -46,12 +46,12 @@ discard block |
||
46 | 46 | $outcome_value = &$result['$outcome_value']; |
47 | 47 | $outcome_list = &$result['$outcome_list']; |
48 | 48 | |
49 | - if(!$shipCostInMetalPerPiece) { |
|
49 | + if (!$shipCostInMetalPerPiece) { |
|
50 | 50 | $rates = get_resource_exchange(); |
51 | 51 | |
52 | - foreach(Fleet::$snGroupFleet as $unit_id) { |
|
52 | + foreach (Fleet::$snGroupFleet as $unit_id) { |
|
53 | 53 | $unit_info = get_unit_param($unit_id); |
54 | - if($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) { |
|
54 | + if ($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) { |
|
55 | 55 | continue; |
56 | 56 | } |
57 | 57 | $shipCostInMetalPerPiece[$unit_id] = get_unit_cost_in($unit_info[P_COST], RES_METAL); |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | $outcome_list[FLT_EXPEDITION_OUTCOME_NONE]['chance'] = ceil(200 / pow($flt_stay_hours, 1 / 1.7)); |
72 | 72 | |
73 | 73 | $chance_max = 0; |
74 | - foreach($outcome_list as $key => &$value) { |
|
75 | - if(!$value['chance']) { |
|
74 | + foreach ($outcome_list as $key => &$value) { |
|
75 | + if (!$value['chance']) { |
|
76 | 76 | unset($outcome_list[$key]); |
77 | 77 | continue; |
78 | 78 | } |
@@ -80,13 +80,13 @@ discard block |
||
80 | 80 | } |
81 | 81 | $outcome_value = mt_rand(0, $chance_max); |
82 | 82 | $outcome_description = &$outcome_list[$mission_outcome = FLT_EXPEDITION_OUTCOME_NONE]; |
83 | - foreach($outcome_list as $key => &$value) { |
|
84 | - if(!$value['chance']) { |
|
83 | + foreach ($outcome_list as $key => &$value) { |
|
84 | + if (!$value['chance']) { |
|
85 | 85 | continue; |
86 | 86 | } |
87 | 87 | $mission_outcome = $key; |
88 | 88 | $outcome_description = $value; |
89 | - if($outcome_value <= $outcome_description['value']) { |
|
89 | + if ($outcome_value <= $outcome_description['value']) { |
|
90 | 90 | break; |
91 | 91 | } |
92 | 92 | } |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | // $outcome_mission_sub = -1; |
104 | 104 | |
105 | 105 | $fleet_found = array(); |
106 | - switch($mission_outcome) { |
|
106 | + switch ($mission_outcome) { |
|
107 | 107 | case FLT_EXPEDITION_OUTCOME_LOST_FLEET: |
108 | 108 | $objFleet->shipsCountApplyLossMultiplier(mt_rand(1, 3) * mt_rand(200000, 300000) / 1000000); |
109 | 109 | break; |
@@ -124,8 +124,8 @@ discard block |
||
124 | 124 | |
125 | 125 | // Ограничиваем корабли только теми, чья стоимость в металле меньше или равно стоимости самого дорогого корабля |
126 | 126 | $can_be_found = array(); |
127 | - foreach($shipCostInMetalPerPiece as $ship_id => $shipMetalCost) { |
|
128 | - if($shipMetalCost < $max_metal_cost) { |
|
127 | + foreach ($shipCostInMetalPerPiece as $ship_id => $shipMetalCost) { |
|
128 | + if ($shipMetalCost < $max_metal_cost) { |
|
129 | 129 | $can_be_found[$ship_id] = $shipMetalCost; |
130 | 130 | } |
131 | 131 | } |
@@ -133,13 +133,13 @@ discard block |
||
133 | 133 | unset($can_be_found[SHIP_COLONIZER]); |
134 | 134 | unset($can_be_found[SHIP_SPY]); |
135 | 135 | |
136 | - while(count($can_be_found) && $found_in_metal >= max($can_be_found)) { |
|
136 | + while (count($can_be_found) && $found_in_metal >= max($can_be_found)) { |
|
137 | 137 | $found_index = mt_rand(1, count($can_be_found)) - 1; |
138 | 138 | $found_ship = array_slice($can_be_found, $found_index, 1, true); |
139 | 139 | $found_ship_cost = reset($found_ship); |
140 | 140 | $found_ship_id = key($found_ship); |
141 | 141 | |
142 | - if($found_ship_cost > $found_in_metal) { |
|
142 | + if ($found_ship_cost > $found_in_metal) { |
|
143 | 143 | unset($can_be_found[$found_ship_id]); |
144 | 144 | } else { |
145 | 145 | $found_ship_count = mt_rand(1, floor($found_in_metal / $found_ship_cost)); |
@@ -148,10 +148,10 @@ discard block |
||
148 | 148 | } |
149 | 149 | } |
150 | 150 | |
151 | - if(empty($fleet_found)) { |
|
151 | + if (empty($fleet_found)) { |
|
152 | 152 | $msg_text_addon = classLocale::$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result']; |
153 | 153 | } else { |
154 | - foreach($fleet_found as $unit_id => $unit_amount) { |
|
154 | + foreach ($fleet_found as $unit_id => $unit_amount) { |
|
155 | 155 | $objFleet->shipAdjustCount($unit_id, $unit_amount); |
156 | 156 | } |
157 | 157 | } |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | |
176 | 176 | $objFleet->resourcesAdjust($resources_found); |
177 | 177 | |
178 | - if(array_sum($resources_found) == 0) { |
|
178 | + if (array_sum($resources_found) == 0) { |
|
179 | 179 | $msg_text_addon = classLocale::$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result']; |
180 | 180 | } |
181 | 181 | break; |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | // Рассчитываем количество найденной ТМ |
187 | 187 | $found_dark_matter = floor(min($outcome_percent * $result['$fleet_metal_points'] / $rates[RES_DARK_MATTER], 10000) * mt_rand(750000, 1000000) / 1000000); |
188 | 188 | |
189 | - if(!$found_dark_matter) { |
|
189 | + if (!$found_dark_matter) { |
|
190 | 190 | $msg_text_addon = classLocale::$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result']; |
191 | 191 | } |
192 | 192 | break; |
@@ -200,46 +200,45 @@ discard block |
||
200 | 200 | |
201 | 201 | mission_expedition_result_adjust($result, $objFleet); |
202 | 202 | |
203 | - if($found_dark_matter) { |
|
203 | + if ($found_dark_matter) { |
|
204 | 204 | rpg_points_change($objFleet->playerOwnerId, RPG_EXPEDITION, $found_dark_matter, 'Expedition Bonus'); |
205 | 205 | $msg_text_addon = sprintf(classLocale::$lang['flt_mission_expedition']['found_dark_matter'], $found_dark_matter); |
206 | 206 | } |
207 | 207 | |
208 | - if(!empty($fleet_lost)) { |
|
208 | + if (!empty($fleet_lost)) { |
|
209 | 209 | $msg_text_addon = classLocale::$lang['flt_mission_expedition']['lost_fleet']; |
210 | - foreach($fleet_lost as $ship_id => $ship_amount) { |
|
211 | - $msg_text_addon .= classLocale::$lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n"; |
|
210 | + foreach ($fleet_lost as $ship_id => $ship_amount) { |
|
211 | + $msg_text_addon .= classLocale::$lang['tech'][$ship_id].' - '.$ship_amount."\r\n"; |
|
212 | 212 | } |
213 | 213 | } |
214 | 214 | |
215 | - if(!empty($fleet_found)) { |
|
215 | + if (!empty($fleet_found)) { |
|
216 | 216 | $msg_text_addon = classLocale::$lang['flt_mission_expedition']['found_fleet']; |
217 | - foreach($fleet_found as $ship_id => $ship_amount) { |
|
218 | - $msg_text_addon .= classLocale::$lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n"; |
|
217 | + foreach ($fleet_found as $ship_id => $ship_amount) { |
|
218 | + $msg_text_addon .= classLocale::$lang['tech'][$ship_id].' - '.$ship_amount."\r\n"; |
|
219 | 219 | } |
220 | 220 | } |
221 | 221 | |
222 | - if(!empty($resources_found) && array_sum($resources_found) > 0) { |
|
222 | + if (!empty($resources_found) && array_sum($resources_found) > 0) { |
|
223 | 223 | $msg_text_addon = classLocale::$lang['flt_mission_expedition']['found_resources']; |
224 | - foreach($resources_found as $resource_id => $resource_amount) { |
|
225 | - $msg_text_addon .= classLocale::$lang['tech'][$resource_id] . ' - ' . $resource_amount . "\r\n"; |
|
224 | + foreach ($resources_found as $resource_id => $resource_amount) { |
|
225 | + $msg_text_addon .= classLocale::$lang['tech'][$resource_id].' - '.$resource_amount."\r\n"; |
|
226 | 226 | } |
227 | 227 | } |
228 | 228 | |
229 | - if(!$msg_text) { |
|
229 | + if (!$msg_text) { |
|
230 | 230 | $messages = &classLocale::$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['messages']; |
231 | - if($outcome_mission_sub >= 0 && is_array($messages)) { |
|
231 | + if ($outcome_mission_sub >= 0 && is_array($messages)) { |
|
232 | 232 | $messages = &$messages[$outcome_mission_sub]; |
233 | 233 | } |
234 | 234 | |
235 | - $msg_text = is_string($messages) ? $messages : |
|
236 | - (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : ''); |
|
235 | + $msg_text = is_string($messages) ? $messages : (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : ''); |
|
237 | 236 | } |
238 | 237 | |
239 | 238 | $fleet_row_end_coordinates_without_type = $objFleet->target_coordinates_without_type(); |
240 | 239 | |
241 | - $msg_text = sprintf($msg_text, $objFleet->dbId, uni_render_coordinates($fleet_row_end_coordinates_without_type)) . |
|
242 | - ($msg_text_addon ? "\r\n" . $msg_text_addon : ''); |
|
240 | + $msg_text = sprintf($msg_text, $objFleet->dbId, uni_render_coordinates($fleet_row_end_coordinates_without_type)). |
|
241 | + ($msg_text_addon ? "\r\n".$msg_text_addon : ''); |
|
243 | 242 | |
244 | 243 | DBStaticMessages::msg_send_simple_message($objFleet->playerOwnerId, '', $objFleet->time_mission_job_complete, MSG_TYPE_EXPLORE, $msg_sender, $msg_title, $msg_text); |
245 | 244 |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | * @param string $title |
35 | 35 | * @param string $dest |
36 | 36 | * @param int $time |
37 | - * @param bool|true $show_header |
|
37 | + * @param boolean $show_header |
|
38 | 38 | */ |
39 | 39 | function message($mes, $title = 'Error', $dest = '', $time = 5, $show_header = true) { |
40 | 40 | $template = gettemplate('message_body', true); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | * @param bool|true $isDisplayTopNav |
196 | 196 | * @param string $metatags |
197 | 197 | * @param bool|false $AdminPage |
198 | - * @param bool|true $isDisplayMenu |
|
198 | + * @param boolean $isDisplayMenu |
|
199 | 199 | * |
200 | 200 | * @return mixed |
201 | 201 | */ |
@@ -208,7 +208,6 @@ discard block |
||
208 | 208 | * @param string $title |
209 | 209 | * @param bool|true $isDisplayTopNav |
210 | 210 | * @param string $metatags |
211 | - * @param bool|false $AdminPage |
|
212 | 211 | * @param bool|true $isDisplayMenu |
213 | 212 | * @param bool|int|string $exitStatus - Код или сообщение выхода |
214 | 213 | */ |
@@ -385,10 +384,10 @@ discard block |
||
385 | 384 | |
386 | 385 | /** |
387 | 386 | * @param $time |
388 | - * @param $event |
|
387 | + * @param integer $event |
|
389 | 388 | * @param $msg |
390 | 389 | * @param $coordinates |
391 | - * @param $is_decrease |
|
390 | + * @param boolean $is_decrease |
|
392 | 391 | * @param Fleet $objFleet |
393 | 392 | * @param $fleet_flying_sorter |
394 | 393 | * @param $fleet_flying_events |
@@ -708,7 +707,7 @@ discard block |
||
708 | 707 | } |
709 | 708 | |
710 | 709 | /** |
711 | - * @param array|string $files |
|
710 | + * @param string $files |
|
712 | 711 | * @param template|bool $template |
713 | 712 | * @param string|bool $template_path |
714 | 713 | * |
@@ -10,8 +10,8 @@ discard block |
||
10 | 10 | function gettemplatename($u_dpath) { |
11 | 11 | static $template_names = array(); |
12 | 12 | |
13 | - if(!isset($template_names[$u_dpath])) { |
|
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; |
|
13 | + if (!isset($template_names[$u_dpath])) { |
|
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 | |
17 | 17 | return $template_names[$u_dpath]; |
@@ -52,12 +52,12 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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; |
@@ -159,10 +159,10 @@ discard block |
||
159 | 159 | 'USER_AUTHLEVEL_NAME' => classLocale::$lang['user_level'][$user['authlevel']], |
160 | 160 | // 'USER_IMPERSONATOR' => $template_result[F_IMPERSONATE_STATUS] != LOGIN_UNDEFINED, |
161 | 161 | 'PAYMENT' => sn_module_get_active_count('payment'), |
162 | - 'MENU_START_HIDE' => !empty($_COOKIE[SN_COOKIE . '_menu_hidden']) || defined('SN_GOOGLE'), |
|
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], |
@@ -171,12 +171,12 @@ discard block |
||
171 | 171 | 'PLAYER_OPTION_MENU_ITEMS_AS_BUTTONS' => classSupernova::$user_options[PLAYER_OPTION_MENU_ITEMS_AS_BUTTONS], |
172 | 172 | 'PLAYER_OPTION_MENU_WHITE_TEXT' => classSupernova::$user_options[PLAYER_OPTION_MENU_WHITE_TEXT], |
173 | 173 | 'PLAYER_OPTION_MENU_OLD' => classSupernova::$user_options[PLAYER_OPTION_MENU_OLD], |
174 | - 'PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON' => empty($_COOKIE[SN_COOKIE . '_menu_hidden']) && !defined('SN_GOOGLE') |
|
174 | + 'PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON' => empty($_COOKIE[SN_COOKIE.'_menu_hidden']) && !defined('SN_GOOGLE') |
|
175 | 175 | ? classSupernova::$user_options[PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON] : 1, |
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 |
||
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 |
||
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,12 +236,12 @@ discard block |
||
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 | - $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%'; |
|
242 | - } elseif(strpos($font_size, 'px') !== false) { |
|
241 | + $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX).'%'; |
|
242 | + } elseif (strpos($font_size, 'px') !== false) { |
|
243 | 243 | // Размер шрифта в пикселях |
244 | - $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px'; |
|
244 | + $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX).'px'; |
|
245 | 245 | } else { |
246 | 246 | // Не мышонка, не лягушка... |
247 | 247 | $font_size = FONT_SIZE_PERCENT_DEFAULT_STRING; |
@@ -251,10 +251,10 @@ discard block |
||
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, |
@@ -272,17 +272,17 @@ discard block |
||
272 | 272 | $is_login ? $standard_css['design/css/login.min.css'] = '' : false; |
273 | 273 | $standard_css += array( |
274 | 274 | // 'design/css/design/css/global-ie.min.css' => '', // TODO |
275 | - TEMPLATE_PATH . '/_template.min.css' => '', |
|
276 | - ($user['dpath'] ? $user['dpath'] : DEFAULT_SKINPATH) . 'skin.min.css' => '', |
|
275 | + TEMPLATE_PATH.'/_template.min.css' => '', |
|
276 | + ($user['dpath'] ? $user['dpath'] : DEFAULT_SKINPATH).'skin.min.css' => '', |
|
277 | 277 | ); |
278 | 278 | |
279 | 279 | // Prepending standard CSS files |
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, |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | ), // Проводить замер только если не выставлен флаг форсированного замера И (иссяк интервал замера ИЛИ замера еще не было) |
310 | 310 | //'TIME_UTC_OFFSET' => defined('SN_CLIENT_TIME_UTC_OFFSET') ? SN_CLIENT_TIME_UTC_OFFSET : '', |
311 | 311 | |
312 | - 'title' => ($title ? "{$title} - " : '') . classLocale::$lang['sys_server'] . " {$classConfig->game_name} - " . classLocale::$lang['sys_supernova'], |
|
312 | + 'title' => ($title ? "{$title} - " : '').classLocale::$lang['sys_server']." {$classConfig->game_name} - ".classLocale::$lang['sys_supernova'], |
|
313 | 313 | '-meta-' => $metatags, |
314 | 314 | 'ADV_SEO_META_DESCRIPTION' => classSupernova::$config->adv_seo_meta_description, |
315 | 315 | 'ADV_SEO_META_KEYWORDS' => classSupernova::$config->adv_seo_meta_keywords, |
@@ -329,12 +329,12 @@ discard block |
||
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 |
||
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 |
||
366 | 366 | )); |
367 | 367 | displayP(parsetemplate($template)); |
368 | 368 | |
369 | - $user['authlevel'] >= 3 && classSupernova::$config->debug ? classSupernova::$debug->echo_log() : false;; |
|
369 | + $user['authlevel'] >= 3 && classSupernova::$config->debug ? classSupernova::$debug->echo_log() : false; ; |
|
370 | 370 | |
371 | 371 | classSupernova::$db->db_disconnect(); |
372 | 372 | |
@@ -404,7 +404,7 @@ discard block |
||
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 |
||
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,12 +433,12 @@ discard block |
||
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), |
440 | 440 | 'TEXT' => $fleet_flying_count, |
441 | - 'HINT' => date(FMT_DATE_TIME, $fleet_time + SN_CLIENT_TIME_DIFF) . " - {$classLocale['sys_fleet']} {$fleet_event['TEXT']} {$fleet_event['COORDINATES']} {$classLocale['sys_planet_type_sh'][$fleet_event['COORDINATES_TYPE']]} {$classLocale['type_mission'][$fleet_event['OBJECT']->mission_type]}", |
|
441 | + 'HINT' => date(FMT_DATE_TIME, $fleet_time + SN_CLIENT_TIME_DIFF)." - {$classLocale['sys_fleet']} {$fleet_event['TEXT']} {$fleet_event['COORDINATES']} {$classLocale['sys_planet_type_sh'][$fleet_event['COORDINATES_TYPE']]} {$classLocale['type_mission'][$fleet_event['OBJECT']->mission_type]}", |
|
442 | 442 | )); |
443 | 443 | $fleet_event['DECREASE'] ? $fleet_flying_count-- : false; |
444 | 444 | } |
@@ -462,7 +462,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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,8 +713,8 @@ discard block |
||
713 | 713 | |
714 | 714 | $template_ex = '.tpl.html'; |
715 | 715 | |
716 | - if($template === false) { |
|
717 | - return sys_file_read(TEMPLATE_DIR . '/' . $files . $template_ex); |
|
716 | + if ($template === false) { |
|
717 | + return sys_file_read(TEMPLATE_DIR.'/'.$files.$template_ex); |
|
718 | 718 | } |
719 | 719 | |
720 | 720 | is_string($files) ? $files = array(basename($files) => $files) : false; |
@@ -723,7 +723,7 @@ discard block |
||
723 | 723 | //$template->set_custom_template($template_path ? $template_path : TEMPLATE_DIR, TEMPLATE_NAME, TEMPLATE_DIR); |
724 | 724 | |
725 | 725 | $tmpl_name = gettemplatename($user['dpath']); |
726 | - $template->set_custom_template(($template_path ? $template_path : SN_ROOT_PHYSICAL . 'design/templates/') . $tmpl_name . '/', $tmpl_name, TEMPLATE_DIR); |
|
726 | + $template->set_custom_template(($template_path ? $template_path : SN_ROOT_PHYSICAL.'design/templates/').$tmpl_name.'/', $tmpl_name, TEMPLATE_DIR); |
|
727 | 727 | |
728 | 728 | // TODO ГРЯЗНЫЙ ХАК! Это нужно, что бы по возможности перезаписать инфу из языковых пакетов модулей там, где она была перезаписана раньше инфой из основного пакета. Почему? |
729 | 729 | // - сначала грузятся модули и их языковые пакеты |
@@ -733,8 +733,8 @@ discard block |
||
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) { |
|
737 | - $filename = $filename . $template_ex; |
|
736 | + foreach ($files as &$filename) { |
|
737 | + $filename = $filename.$template_ex; |
|
738 | 738 | } |
739 | 739 | |
740 | 740 | $template->set_filenames($files); |
@@ -756,15 +756,15 @@ discard block |
||
756 | 756 | |
757 | 757 | $template->assign_vars($q = array( |
758 | 758 | 'LANG' => $language ? $language : '', |
759 | - 'referral' => $id_ref ? '&id_ref=' . $id_ref : '', |
|
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 |
||
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 |
||
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 |
||
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'), |
@@ -12,25 +12,25 @@ discard block |
||
12 | 12 | global $debug, $sn_mvc, $template_result, $user; |
13 | 13 | |
14 | 14 | // Напоминание для Администрации, что игра отключена |
15 | -if($template_result[F_GAME_DISABLE]) { |
|
15 | +if ($template_result[F_GAME_DISABLE]) { |
|
16 | 16 | // $disable_reason = sys_bbcodeParse($config->game_disable_reason); // Должна быть инициализирована выше по коду - в init.php |
17 | 17 | echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>'; |
18 | 18 | } |
19 | 19 | unset($disable_reason); |
20 | 20 | |
21 | 21 | |
22 | -if(defined('IN_ADMIN') && IN_ADMIN === true) { |
|
22 | +if (defined('IN_ADMIN') && IN_ADMIN === true) { |
|
23 | 23 | lng_include('admin'); |
24 | -} elseif($sys_user_logged_in) { |
|
24 | +} elseif ($sys_user_logged_in) { |
|
25 | 25 | sys_user_vacation($user); |
26 | 26 | |
27 | 27 | $planet_id = SetSelectedPlanet($user); |
28 | 28 | |
29 | 29 | // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!! |
30 | - if($user['ally_id']) { |
|
30 | + if ($user['ally_id']) { |
|
31 | 31 | sn_db_transaction_start(); |
32 | 32 | sn_ali_fill_user_ally($user); |
33 | - if(!$user['ally']['player']['id']) { |
|
33 | + if (!$user['ally']['player']['id']) { |
|
34 | 34 | // sn_sys_logout(false, true); |
35 | 35 | // core_auth::logout(false); |
36 | 36 | classSupernova::$auth->logout(false); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | sn_db_transaction_commit(); |
50 | 50 | |
51 | 51 | $planetrow = $global_data['planet']; |
52 | - if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) { |
|
52 | + if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) { |
|
53 | 53 | // sn_sys_logout(false, true); |
54 | 54 | // core_auth::logout(false); |
55 | 55 | classSupernova::$auth->logout(false); |
@@ -1,10 +1,10 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) { |
|
3 | +if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) { |
|
4 | 4 | $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403); |
5 | 5 | } |
6 | 6 | |
7 | -if(!$user_can_negotiate) { |
|
7 | +if (!$user_can_negotiate) { |
|
8 | 8 | message($lang['Denied_access'], $lang['ali_dip_title']); |
9 | 9 | } |
10 | 10 | |
@@ -15,24 +15,24 @@ discard block |
||
15 | 15 | |
16 | 16 | |
17 | 17 | |
18 | -if(sys_get_param_str('ali_dip_offer_make')) { |
|
18 | +if (sys_get_param_str('ali_dip_offer_make')) { |
|
19 | 19 | $alliance_negotiation_relation = sys_get_param_str('alliance_negotiation_relation'); |
20 | - if(!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list)) { |
|
20 | + if (!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list)) { |
|
21 | 21 | message($lang['ali_dip_err_wrong_offer'], $page_title); |
22 | 22 | } |
23 | 23 | |
24 | 24 | $alliance_negotiation_contr_ally_id = sys_get_param_id('alliance_negotiation_contr_ally_id'); |
25 | - if($alliance_negotiation_contr_ally_id == $user['ally_id']) { |
|
25 | + if ($alliance_negotiation_contr_ally_id == $user['ally_id']) { |
|
26 | 26 | message($lang['ali_dip_err_same_ally'], $page_title); |
27 | 27 | } |
28 | 28 | |
29 | 29 | $contr_ally_row = db_ally_get_by_id($alliance_negotiation_contr_ally_id); |
30 | - if(!$contr_ally_row) { |
|
30 | + if (!$contr_ally_row) { |
|
31 | 31 | message($lang['ali_dip_err_no_ally'], $page_title); |
32 | 32 | } |
33 | 33 | |
34 | 34 | $relation_current_id = ali_relation($user['ally_id'], $alliance_negotiation_contr_ally_id); |
35 | - if($alliance_negotiation_relation == $relation_current_id) { |
|
35 | + if ($alliance_negotiation_relation == $relation_current_id) { |
|
36 | 36 | message(sprintf($lang['ali_dip_err_offer_same'], $lang['ali_dip_relations'][$alliance_negotiation_relation]), $page_title); |
37 | 37 | } |
38 | 38 | |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | |
44 | 44 | $relation_new = $sn_diplomacy_relation_list[$alliance_negotiation_relation]; |
45 | 45 | $relation_current = $sn_diplomacy_relation_list[$relation_current_id]; |
46 | - if($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1) { |
|
46 | + if ($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1) { |
|
47 | 47 | sn_db_perform('{{alliance_negotiation}}', |
48 | 48 | array( |
49 | 49 | 'alliance_negotiation_ally_id' => $user['ally_id'], |
@@ -70,33 +70,33 @@ discard block |
||
70 | 70 | } |
71 | 71 | } else { |
72 | 72 | $offer_id = sys_get_param_id('offer_id'); |
73 | - if($offer_id) { |
|
73 | + if ($offer_id) { |
|
74 | 74 | $offer_answer = sys_get_param_str('answer'); |
75 | 75 | |
76 | 76 | $negotiation = db_ally_negotiation_get_by_offer_id($offer_id); |
77 | - if(!$negotiation) { |
|
77 | + if (!$negotiation) { |
|
78 | 78 | message($lang['ali_dip_err_offer_none'], $page_title); |
79 | - } elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id']) { |
|
79 | + } elseif ($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id']) { |
|
80 | 80 | // TODO: Add log of hack attempt |
81 | 81 | message($lang['ali_dip_err_offer_alien'], $page_title); |
82 | - } elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id']) { |
|
83 | - if($offer_answer == 'accept') { |
|
82 | + } elseif ($negotiation['alliance_negotiation_ally_id'] == $user['ally_id']) { |
|
83 | + if ($offer_answer == 'accept') { |
|
84 | 84 | // TODO: Add log of hack attempt |
85 | 85 | message($lang['ali_dip_err_offer_accept_own'], $page_title); |
86 | - } elseif($offer_answer == 'deny') { |
|
86 | + } elseif ($offer_answer == 'deny') { |
|
87 | 87 | db_ally_negotiation_delete_by_offer_id($offer_id); |
88 | 88 | } |
89 | 89 | } else { |
90 | - if($offer_answer == 'accept') { |
|
90 | + if ($offer_answer == 'accept') { |
|
91 | 91 | $accept_offer = true; |
92 | - } elseif($offer_answer == 'deny') { |
|
92 | + } elseif ($offer_answer == 'deny') { |
|
93 | 93 | db_ally_negotiation_update_status_1($offer_id); |
94 | 94 | } |
95 | 95 | } |
96 | 96 | } |
97 | 97 | } |
98 | 98 | |
99 | -if($accept_offer) { |
|
99 | +if ($accept_offer) { |
|
100 | 100 | sn_db_transaction_start(); |
101 | 101 | |
102 | 102 | // TODO: Make sn_db_perform() multirow |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | sn_db_transaction_commit(); |
126 | 126 | } |
127 | 127 | |
128 | -foreach($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation) { |
|
128 | +foreach ($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation) { |
|
129 | 129 | $template->assign_block_vars('relation', array( |
130 | 130 | 'ID' => $diplomacy_relation_id, |
131 | 131 | 'TEXT' => $lang['ali_dip_relations'][$diplomacy_relation_id], |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | |
135 | 135 | |
136 | 136 | $query = db_ally_list_get_by_not_user_ally($user); |
137 | -while($alliance = db_fetch($query)) { |
|
137 | +while ($alliance = db_fetch($query)) { |
|
138 | 138 | $template->assign_block_vars('alliance', array( |
139 | 139 | 'ID' => $alliance['id'], |
140 | 140 | 'NAME' => js_safe_string($alliance['ally_name']), |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | } |
144 | 144 | |
145 | 145 | $query = db_ally_negotiation_list($user); |
146 | -while($offer = db_fetch($query)) { |
|
146 | +while ($offer = db_fetch($query)) { |
|
147 | 147 | $template->assign_block_vars('offer', array( |
148 | 148 | 'ID' => $offer['alliance_negotiation_id'], |
149 | 149 | 'NAME' => $offer['ally_name'], |
@@ -11,15 +11,15 @@ discard block |
||
11 | 11 | $announce_list = db_news_list_get_by_query($template, $query_where, $query_limit); |
12 | 12 | |
13 | 13 | $users = array(); |
14 | - while($announce = db_fetch($announce_list)) { |
|
15 | - if($announce['user_id'] && !isset($users[$announce['user_id']])) { |
|
14 | + while ($announce = db_fetch($announce_list)) { |
|
15 | + if ($announce['user_id'] && !isset($users[$announce['user_id']])) { |
|
16 | 16 | $users[$announce['user_id']] = db_user_by_id($announce['user_id']); |
17 | 17 | } |
18 | 18 | |
19 | 19 | $survey_vote = array('survey_vote_id' => 1); |
20 | 20 | $survey_complete = strtotime($announce['survey_until']) < SN_TIME_NOW; |
21 | 21 | |
22 | - if($announce['survey_id'] && !empty($user['id'])) { |
|
22 | + if ($announce['survey_id'] && !empty($user['id'])) { |
|
23 | 23 | $survey_vote = !$survey_complete ? db_survey_get_vote($announce, $user) : array(); |
24 | 24 | } |
25 | 25 | |
@@ -31,8 +31,7 @@ discard block |
||
31 | 31 | 'ANNOUNCE' => cht_message_parse($announce['strAnnounce'], false, intval($announce['authlevel'])), |
32 | 32 | 'DETAIL_URL' => $announce['detail_url'], |
33 | 33 | 'USER_NAME' => |
34 | - isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)) : |
|
35 | - js_safe_string($announce['user_name']), |
|
34 | + isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)) : js_safe_string($announce['user_name']), |
|
36 | 35 | 'NEW' => $announce['unix_time'] + $config->game_news_actual >= SN_TIME_NOW, |
37 | 36 | 'FUTURE' => $announce['unix_time'] > SN_TIME_NOW, |
38 | 37 | 'SURVEY_ID' => $announce['survey_id'], |
@@ -42,25 +41,25 @@ discard block |
||
42 | 41 | 'SURVEY_UNTIL' => $announce['survey_until'], |
43 | 42 | )); |
44 | 43 | |
45 | - foreach($announce_exploded as $announce_paragraph) { |
|
44 | + foreach ($announce_exploded as $announce_paragraph) { |
|
46 | 45 | $template->assign_block_vars('announces.paragraph', array( |
47 | 46 | 'TEXT' => $announce_paragraph, |
48 | 47 | )); |
49 | 48 | } |
50 | 49 | |
51 | - if($announce['survey_id']) { |
|
50 | + if ($announce['survey_id']) { |
|
52 | 51 | $survey_query = db_survey_get_answer_texts($announce); |
53 | 52 | $survey_vote_result = array(); |
54 | 53 | $total_votes = 0; |
55 | - while($row = db_fetch($survey_query)) { |
|
54 | + while ($row = db_fetch($survey_query)) { |
|
56 | 55 | $survey_vote_result[] = $row; |
57 | 56 | $total_votes += $row['VOTES']; |
58 | 57 | } |
59 | 58 | |
60 | - if(empty($survey_vote) && !$survey_complete) { |
|
59 | + if (empty($survey_vote) && !$survey_complete) { |
|
61 | 60 | // Can vote |
62 | 61 | $survey_query = db_survey_answers_get_list_by_parent($announce); |
63 | - while($row = db_fetch($survey_query)) { |
|
62 | + while ($row = db_fetch($survey_query)) { |
|
64 | 63 | $template->assign_block_vars('announces.survey_answers', array( |
65 | 64 | 'ID' => $row['survey_answer_id'], |
66 | 65 | 'TEXT' => $row['survey_answer_text'], |
@@ -68,7 +67,7 @@ discard block |
||
68 | 67 | } |
69 | 68 | } else { |
70 | 69 | // Show result |
71 | - foreach($survey_vote_result as &$vote_result) { |
|
70 | + foreach ($survey_vote_result as &$vote_result) { |
|
72 | 71 | $vote_percent = $total_votes ? $vote_result['VOTES'] / $total_votes * 100 : 0; |
73 | 72 | $vote_result['PERCENT'] = $vote_percent; |
74 | 73 | $vote_result['PERCENT_TEXT'] = round($vote_percent, 1); |
@@ -85,7 +84,7 @@ discard block |
||
85 | 84 | } |
86 | 85 | |
87 | 86 | function nws_mark_read(&$user) { |
88 | - if(isset($user['id'])) { |
|
87 | + if (isset($user['id'])) { |
|
89 | 88 | db_user_set_by_id($user['id'], '`news_lastread` = ' . SN_TIME_NOW); |
90 | 89 | $user['news_lastread'] = SN_TIME_NOW; |
91 | 90 | } |
@@ -94,17 +93,17 @@ discard block |
||
94 | 93 | } |
95 | 94 | |
96 | 95 | function survey_vote(&$user) { |
97 | - if(empty($user['id'])) { |
|
96 | + if (empty($user['id'])) { |
|
98 | 97 | return true; |
99 | 98 | } |
100 | 99 | |
101 | 100 | sn_db_transaction_start(); |
102 | 101 | $survey_id = sys_get_param_id('survey_id'); |
103 | 102 | $is_voted = db_survey_vote_get($user, $survey_id); |
104 | - if(empty($is_voted)) { |
|
103 | + if (empty($is_voted)) { |
|
105 | 104 | $survey_vote_id = sys_get_param_id('survey_vote'); |
106 | 105 | $is_answer_exists = db_survey_answer_get($survey_id, $survey_vote_id); |
107 | - if(!empty($is_answer_exists)) { |
|
106 | + if (!empty($is_answer_exists)) { |
|
108 | 107 | $user_name_safe = db_escape($user['username']); |
109 | 108 | db_survey_vote_insert($user, $survey_id, $survey_vote_id, $user_name_safe); |
110 | 109 | } |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -function geoip_status(){return sn_function_call(__FUNCTION__, array(&$result));} |
|
3 | +function geoip_status() {return sn_function_call(__FUNCTION__, array(&$result)); } |
|
4 | 4 | function sn_geoip_status(&$result) { |
5 | 5 | return $result = false; |
6 | 6 | } |
7 | 7 | |
8 | -function geoip_ip_info($ip){return sn_function_call(__FUNCTION__, array($ip, &$result));} |
|
8 | +function geoip_ip_info($ip) {return sn_function_call(__FUNCTION__, array($ip, &$result)); } |
|
9 | 9 | function sn_geoip_ip_info($ip, &$result) { |
10 | 10 | return $result = false; |
11 | 11 | } |
@@ -10,7 +10,7 @@ |
||
10 | 10 | * @copyright 2008 by Gorlum for Project "SuperNova.WS" |
11 | 11 | */ |
12 | 12 | function flt_mission_hold($mission_data) { |
13 | - if($mission_data->fleet->time_mission_job_complete < SN_TIME_NOW) { |
|
13 | + if ($mission_data->fleet->time_mission_job_complete < SN_TIME_NOW) { |
|
14 | 14 | $mission_data->fleet->mark_fleet_as_returned_and_save(); |
15 | 15 | |
16 | 16 | return CACHE_FLEET; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | $source_planet = &$mission_data->src_planet; |
17 | 17 | $destination_planet = &$mission_data->dst_planet; |
18 | 18 | |
19 | - if(!isset($destination_planet['id']) || !$destination_planet['id_owner']) { |
|
19 | + if (!isset($destination_planet['id']) || !$destination_planet['id_owner']) { |
|
20 | 20 | $objFleet->mark_fleet_as_returned_and_save(); |
21 | 21 | |
22 | 22 | return CACHE_FLEET; |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | $fleet_resources[RES_DEUTERIUM], $lang['Deuterium']); |
32 | 32 | msg_send_simple_message($objFleet->target_owner_id, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT, $lang['sys_mess_tower'], $lang['sys_mess_transport'], $Message); |
33 | 33 | |
34 | - if($objFleet->target_owner_id <> $objFleet->playerOwnerId) { |
|
34 | + if ($objFleet->target_owner_id <> $objFleet->playerOwnerId) { |
|
35 | 35 | msg_send_simple_message($objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT, $lang['sys_mess_tower'], $lang['sys_mess_transport'], $Message); |
36 | 36 | } |
37 | 37 |
@@ -31,7 +31,7 @@ |
||
31 | 31 | /** |
32 | 32 | * Fleet mission "Relocate" |
33 | 33 | * |
34 | - * @param $mission_data Mission |
|
34 | + * @param Mission $mission_data Mission |
|
35 | 35 | * |
36 | 36 | * @return int |
37 | 37 | * |