@@ -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( |
@@ -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 | |
@@ -35,8 +35,7 @@ |
||
| 35 | 35 | if($planetrow['id_owner']) { |
| 36 | 36 | $global_data = sys_o_get_updated($user, $planetrow, SN_TIME_NOW); |
| 37 | 37 | $planetrow = $global_data['planet']; |
| 38 | - } |
|
| 39 | - else { |
|
| 38 | + } else { |
|
| 40 | 39 | // Locking user record |
| 41 | 40 | $user = db_user_by_id($user['id'], true); |
| 42 | 41 | } |
@@ -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 | } |
@@ -253,9 +253,11 @@ |
||
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету |
| 256 | - if(!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet'] |
|
| 256 | + if(!isset($planet_row['id'])) { |
|
| 257 | + // || $planet_row['id'] != $user['current_planet'] |
|
| 257 | 258 | { |
| 258 | 259 | $planet_row = db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id'); |
| 260 | + } |
|
| 259 | 261 | // Если текущей планеты не существует - выставляем Столицу |
| 260 | 262 | if(!isset($planet_row['id'])) { |
| 261 | 263 | $planet_row = db_planet_by_id_and_owner($user['id_planet'], $user['id'], false, 'id'); |
@@ -756,9 +756,11 @@ |
||
| 756 | 756 | !empty($strings) ? doquery($query_string . implode(',', $strings)) : false; |
| 757 | 757 | } |
| 758 | 758 | |
| 759 | - if(isset($update_tables['counter']['page'])) // TODO REMOVE |
|
| 759 | + if(isset($update_tables['counter']['page'])) { |
|
| 760 | + // TODO REMOVE |
|
| 760 | 761 | { |
| 761 | 762 | update_security_url("SELECT DISTINCT `page` AS url FROM {{counter}}"); |
| 763 | + } |
|
| 762 | 764 | update_security_url("SELECT DISTINCT `url` AS url FROM {{counter}}"); |
| 763 | 765 | } |
| 764 | 766 | } |