@@ -250,16 +250,17 @@ discard block |
||
250 | 250 | if(($selected_planet = sys_get_param_id('cp')) && $selected_planet != $user['current_planet']) |
251 | 251 | { |
252 | 252 | $planet_row = db_planet_by_id_and_owner($selected_planet, $user['id'], false, 'id'); |
253 | - } |
|
254 | - else |
|
253 | + } else |
|
255 | 254 | { |
256 | 255 | $planet_row = db_planet_by_id($planet_row['id']); |
257 | 256 | } |
258 | 257 | |
259 | 258 | // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету |
260 | - if(!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet'] |
|
259 | + if(!isset($planet_row['id'])) { |
|
260 | + // || $planet_row['id'] != $user['current_planet'] |
|
261 | 261 | { |
262 | 262 | $planet_row = db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id'); |
263 | + } |
|
263 | 264 | // Если текущей планеты не существует - выставляем Столицу |
264 | 265 | if(!isset($planet_row['id'])) |
265 | 266 | { |
@@ -301,8 +302,7 @@ discard block |
||
301 | 302 | if(!$from['id']) |
302 | 303 | { |
303 | 304 | $result = $lang['sys_planet_expedition']; |
304 | - } |
|
305 | - else |
|
305 | + } else |
|
306 | 306 | { |
307 | 307 | $from_planet_id = $include_id ? ( |
308 | 308 | 'ID {' . ($from['id'] ? $from['id'] : ($from[$prefix . 'planet_id'] ? $from[$prefix . 'planet_id'] : 0)) . '} ' |
@@ -38,8 +38,7 @@ discard block |
||
38 | 38 | if($user['user_as_ally']) |
39 | 39 | { |
40 | 40 | $lab_level = doquery("SELECT ally_members AS effective_level FROM {{alliance}} WHERE id = {$user['user_as_ally']} LIMIT 1", true); |
41 | - } |
|
42 | - else |
|
41 | + } else |
|
43 | 42 | { |
44 | 43 | $tech_intergalactic = mrc_get_level($user, false, TECH_RESEARCH) + 1; |
45 | 44 | $lab_level['effective_level'] = 0; |
@@ -238,8 +237,7 @@ discard block |
||
238 | 237 | //{ |
239 | 238 | // $result = true; |
240 | 239 | //} |
241 | - } |
|
242 | - elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que']) |
|
240 | + } elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que']) |
|
243 | 241 | { |
244 | 242 | $result = eco_is_builds_in_que($planet['que'], array(STRUC_LABORATORY, STRUC_LABORATORY_NANO)); |
245 | 243 | } |
@@ -41,12 +41,10 @@ |
||
41 | 41 | if(!$check_result) |
42 | 42 | { |
43 | 43 | $version_check = SNC_VER_ERROR_CONNECT; |
44 | -} |
|
45 | -elseif(($version_check = intval($check_result)) && $version_check == $check_result) |
|
44 | +} elseif(($version_check = intval($check_result)) && $version_check == $check_result) |
|
46 | 45 | { |
47 | 46 | $version_check = $check_result; |
48 | -} |
|
49 | -else |
|
47 | +} else |
|
50 | 48 | { |
51 | 49 | // JSON decode if string |
52 | 50 | $check_result = json_decode($check_result, true); |
@@ -115,8 +115,7 @@ |
||
115 | 115 | )); |
116 | 116 | |
117 | 117 | display($template, $lang['tech'][STRUC_MOON_GATE]); |
118 | - } |
|
119 | - else |
|
118 | + } else |
|
120 | 119 | { |
121 | 120 | message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10); |
122 | 121 | } |
@@ -21,8 +21,7 @@ discard block |
||
21 | 21 | |
22 | 22 | $sym_defender = $unpacked['D']; |
23 | 23 | $sym_attacker = $unpacked['A']; |
24 | -} |
|
25 | -else |
|
24 | +} else |
|
26 | 25 | { |
27 | 26 | $sym_defender = array(0 => $sym_defender); |
28 | 27 | $sym_attacker = array(1 => $sym_attacker); |
@@ -56,8 +55,7 @@ discard block |
||
56 | 55 | $template = gettemplate('ube_combat_report', true); |
57 | 56 | $template->assign_recursive($template_result); |
58 | 57 | display($template, '', false, '', false, false, true); |
59 | -} |
|
60 | -else |
|
58 | +} else |
|
61 | 59 | { |
62 | 60 | $template = gettemplate('simulator', true); |
63 | 61 | $techs_and_officers = array(TECH_WEAPON, TECH_SHIELD, TECH_ARMOR, MRC_ADMIRAL); |
@@ -43,8 +43,7 @@ |
||
43 | 43 | doquery("UPDATE {{alliance}} SET ally_user_id = {$ally_user_id} WHERE id = {$ally_id} LIMIT 1;"); |
44 | 44 | |
45 | 45 | message(str_replace('%s', $ally_tag_raw, $lang['ally_been_maked']), str_replace('%s', $ally_tag_raw, $lang['ally_maked'])); |
46 | -} |
|
47 | -else |
|
46 | +} else |
|
48 | 47 | { |
49 | 48 | $page .= parsetemplate(gettemplate('ali_external_make'), $lang); |
50 | 49 | } |
@@ -115,8 +115,7 @@ |
||
115 | 115 | )); |
116 | 116 | |
117 | 117 | display($template, $lang['tech'][STRUC_MOON_GATE]); |
118 | - } |
|
119 | - else |
|
118 | + } else |
|
120 | 119 | { |
121 | 120 | message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10); |
122 | 121 | } |
@@ -115,8 +115,7 @@ |
||
115 | 115 | )); |
116 | 116 | |
117 | 117 | display($template, $lang['tech'][STRUC_MOON_GATE]); |
118 | - } |
|
119 | - else |
|
118 | + } else |
|
120 | 119 | { |
121 | 120 | message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10); |
122 | 121 | } |
@@ -115,8 +115,7 @@ |
||
115 | 115 | )); |
116 | 116 | |
117 | 117 | display($template, $lang['tech'][STRUC_MOON_GATE]); |
118 | - } |
|
119 | - else |
|
118 | + } else |
|
120 | 119 | { |
121 | 120 | message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10); |
122 | 121 | } |