@@ -74,14 +74,12 @@ discard block |
||
| 74 | 74 | doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;"); |
| 75 | 75 | sys_redirect('alliance.php?mode=admin&edit=ally'); |
| 76 | 76 | } |
| 77 | -} |
|
| 78 | -elseif(sys_get_param_str('isSaveText')) |
|
| 77 | +} elseif(sys_get_param_str('isSaveText')) |
|
| 79 | 78 | { |
| 80 | 79 | $text = sys_get_param_str_both('text'); |
| 81 | 80 | doquery("UPDATE {{alliance}} SET `{$text_list[$allyTextID]['db_field']}`='{$text['safe']}' WHERE `id`='{$ally['id']}';"); |
| 82 | 81 | $ally[$text_list[$allyTextID]['db_field']] = $text['unsafe']; |
| 83 | -} |
|
| 84 | -elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) |
|
| 82 | +} elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) |
|
| 85 | 83 | { |
| 86 | 84 | if(!$isAllyOwner) |
| 87 | 85 | { |
@@ -98,8 +96,7 @@ discard block |
||
| 98 | 96 | sn_db_transaction_commit(); |
| 99 | 97 | sys_redirect('alliance.php'); |
| 100 | 98 | } |
| 101 | -} |
|
| 102 | -elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) |
|
| 99 | +} elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) |
|
| 103 | 100 | { |
| 104 | 101 | if(!$isAllyOwner) |
| 105 | 102 | { |
@@ -2,26 +2,26 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | use Alliance\DBStaticAlly; |
| 4 | 4 | |
| 5 | -if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) { |
|
| 5 | +if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) { |
|
| 6 | 6 | $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | -if(!$user_admin) { |
|
| 9 | +if (!$user_admin) { |
|
| 10 | 10 | messageBox($lang['Denied_access'], $lang['ally_admin']); |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | 13 | $template = gettemplate('ali_admin', $template); |
| 14 | 14 | |
| 15 | 15 | $text_list = array( |
| 16 | - 1 => array ('db_field' => 'ally_description', 'text_type' => 'Public_text_of_alliance'), |
|
| 17 | - 2 => array ('db_field' => 'ally_text', 'text_type' => 'Internal_text'), |
|
| 18 | - 3 => array ('db_field' => 'ally_request', 'text_type' => 'Show_of_request_text'), |
|
| 16 | + 1 => array('db_field' => 'ally_description', 'text_type' => 'Public_text_of_alliance'), |
|
| 17 | + 2 => array('db_field' => 'ally_text', 'text_type' => 'Internal_text'), |
|
| 18 | + 3 => array('db_field' => 'ally_request', 'text_type' => 'Show_of_request_text'), |
|
| 19 | 19 | ); |
| 20 | 20 | |
| 21 | 21 | $allyTextID = sys_get_param_int('t', 1); |
| 22 | -$allyTextID = ($allyTextID<1 || $allyTextID>3) ? 1 : $allyTextID; |
|
| 22 | +$allyTextID = ($allyTextID < 1 || $allyTextID > 3) ? 1 : $allyTextID; |
|
| 23 | 23 | |
| 24 | -if(sys_get_param_str('isSaveOptions')) { |
|
| 24 | +if (sys_get_param_str('isSaveOptions')) { |
|
| 25 | 25 | require_once('includes/includes/sys_avatar.php'); |
| 26 | 26 | |
| 27 | 27 | $new_image = $ally['ally_image']; |
@@ -33,32 +33,32 @@ discard block |
||
| 33 | 33 | // $template->assign_block_vars('result', $avatar_upload_result); |
| 34 | 34 | |
| 35 | 35 | $ally_changeset = array(); |
| 36 | - if(($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) { |
|
| 36 | + if (($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) { |
|
| 37 | 37 | $new_tag_unsafe = $new_tag; |
| 38 | 38 | $new_tag = db_escape($new_tag); |
| 39 | 39 | $isTaggedAllyExists = DBStaticAlly::db_ally_get_by_tag($new_tag); |
| 40 | - if(!empty($isTaggedAllyExists)) { |
|
| 40 | + if (!empty($isTaggedAllyExists)) { |
|
| 41 | 41 | messageBox(sprintf($lang['ally_message_tag_exists'], $new_tag_unsafe), '', 'alliance.php?mode=admin&edit=ally'); |
| 42 | 42 | } |
| 43 | 43 | $ally_changeset[] = "`ally_tag`='{$new_tag}'"; |
| 44 | 44 | db_user_set_by_id($ally['ally_user_id'], "`username`='[{$new_tag}]'"); |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - if(($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) { |
|
| 47 | + if (($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) { |
|
| 48 | 48 | $new_name_unsafe = $new_name; |
| 49 | 49 | $new_name = db_escape($new_name); |
| 50 | 50 | $isTaggedAllyExists = DBStaticAlly::db_ally_get_by_name($new_name); |
| 51 | - if(!empty($isTaggedAllyExists)) { |
|
| 51 | + if (!empty($isTaggedAllyExists)) { |
|
| 52 | 52 | messageBox(sprintf($lang['ally_message_name_exists'], $new_name_unsafe), '', 'alliance.php?mode=admin&edit=ally'); |
| 53 | 53 | } |
| 54 | 54 | $ally_changeset[] = "`ally_name`='{$new_name}'"; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - if(($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) { |
|
| 57 | + if (($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) { |
|
| 58 | 58 | $new_owner_rank = db_escape($new_owner_rank); |
| 59 | 59 | $ally_changeset[] = "`ally_owner_range` = '{$new_owner_rank}'"; |
| 60 | 60 | } |
| 61 | - if(($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) { |
|
| 61 | + if (($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) { |
|
| 62 | 62 | $new_web = db_escape($new_web); |
| 63 | 63 | $ally_changeset[] = "`ally_web` = '{$new_web}'"; |
| 64 | 64 | } |
@@ -67,31 +67,31 @@ discard block |
||
| 67 | 67 | // if(($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) && $new_request != $ally['ally_request_notallow']) { |
| 68 | 68 | // $ally_changeset[] = "`ally_request_notallow` = '{$new_request}'"; |
| 69 | 69 | // } |
| 70 | - if($new_image != $ally['ally_image']) { |
|
| 70 | + if ($new_image != $ally['ally_image']) { |
|
| 71 | 71 | $new_image = intval($new_image); |
| 72 | 72 | $ally_changeset[] = "`ally_image` = '{$new_image}'"; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - if(!empty($ally_changeset)) { |
|
| 75 | + if (!empty($ally_changeset)) { |
|
| 76 | 76 | doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;"); |
| 77 | 77 | sys_redirect('alliance.php?mode=admin&edit=ally'); |
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | -elseif(sys_get_param_str('isSaveText')) |
|
| 80 | +elseif (sys_get_param_str('isSaveText')) |
|
| 81 | 81 | { |
| 82 | 82 | $text = sys_get_param_str_both('text'); |
| 83 | 83 | doquery("UPDATE {{alliance}} SET `{$text_list[$allyTextID]['db_field']}`='{$text['safe']}' WHERE `id`='{$ally['id']}';"); |
| 84 | 84 | $ally[$text_list[$allyTextID]['db_field']] = $text['unsafe']; |
| 85 | 85 | } |
| 86 | -elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) |
|
| 86 | +elseif (sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) |
|
| 87 | 87 | { |
| 88 | - if(!$isAllyOwner) |
|
| 88 | + if (!$isAllyOwner) |
|
| 89 | 89 | { |
| 90 | 90 | messageBox($lang['Denied_access'], $lang['ally_admin']); |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | $newLeader = db_user_by_id($idNewLeader, false, `ally_id`); |
| 94 | - if($newLeader['ally_id'] == $user['ally_id']) |
|
| 94 | + if ($newLeader['ally_id'] == $user['ally_id']) |
|
| 95 | 95 | { |
| 96 | 96 | sn_db_transaction_start(); |
| 97 | 97 | db_user_set_by_id($user['id'], "`ally_rank_id`='0'"); |
@@ -101,9 +101,9 @@ discard block |
||
| 101 | 101 | sys_redirect('alliance.php'); |
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | -elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) |
|
| 104 | +elseif (sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) |
|
| 105 | 105 | { |
| 106 | - if(!$isAllyOwner) |
|
| 106 | + if (!$isAllyOwner) |
|
| 107 | 107 | { |
| 108 | 108 | messageBox($lang['Denied_access'], $lang['ally_admin']); |
| 109 | 109 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | 'ally_name' => htmlspecialchars($ally['ally_name']), |
| 127 | 127 | 'ally_tag' => htmlspecialchars($ally['ally_tag']), |
| 128 | 128 | 'ally_web' => htmlspecialchars($ally['ally_web']), |
| 129 | - 'ally_request_notallow_0' => (( $ally['ally_request_notallow']) ? ' SELECTED' : ''), |
|
| 129 | + 'ally_request_notallow_0' => (($ally['ally_request_notallow']) ? ' SELECTED' : ''), |
|
| 130 | 130 | 'ally_request_notallow_1' => ((!$ally['ally_request_notallow']) ? ' SELECTED' : ''), |
| 131 | 131 | 'ally_owner_range' => htmlspecialchars($ally['ally_owner_range']), |
| 132 | 132 | 'hideNotOwner' => $ally['ally_owner'] != $user['id'] ? 'display: hide;' : '', |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | { |
| 136 | 136 | $userAllyAdmins = db_user_list("`ally_id`= {$ally['id']}", false, '`id`, `username`'); |
| 137 | 137 | unset($tmp); |
| 138 | - foreach($userAllyAdmins as $userAllyAdmin) |
|
| 138 | + foreach ($userAllyAdmins as $userAllyAdmin) |
|
| 139 | 139 | { |
| 140 | 140 | $tmp .= "<option value={$userAllyAdmin['id']}>{$userAllyAdmin['username']}</option>"; |
| 141 | 141 | } |
@@ -143,9 +143,9 @@ discard block |
||
| 143 | 143 | $template->assign_var('adminMembers', $tmp); |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | -foreach($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) |
|
| 146 | +foreach ($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) |
|
| 147 | 147 | { |
| 148 | - if(!$sn_ali_admin_action_locale['title']) |
|
| 148 | + if (!$sn_ali_admin_action_locale['title']) |
|
| 149 | 149 | { |
| 150 | 150 | continue; |
| 151 | 151 | } |
@@ -23,16 +23,14 @@ discard block |
||
| 23 | 23 | $lang['Go_out_welldone'] = str_replace("%s", $ally_name, $lang['Go_out_welldone']); |
| 24 | 24 | messageBox(sprintf($lang['ali_info_leave_success'], $ally['ally_name']), $lang['sys_alliance']); |
| 25 | 25 | } |
| 26 | -} |
|
| 27 | -elseif($mode == 'ainfo') |
|
| 26 | +} elseif($mode == 'ainfo') |
|
| 28 | 27 | { |
| 29 | 28 | $tag = sys_get_param_str('tag'); |
| 30 | 29 | $id_ally = sys_get_param_id('a'); |
| 31 | 30 | if($tag) |
| 32 | 31 | { |
| 33 | 32 | $ally = doquery("SELECT * FROM {{alliance}} WHERE ally_tag='{$tag}' LIMIT 1;", '', true); |
| 34 | - } |
|
| 35 | - elseif($id_ally) |
|
| 33 | + } elseif($id_ally) |
|
| 36 | 34 | { |
| 37 | 35 | $ally = doquery("SELECT * FROM {{alliance}} WHERE id='{$id_ally}' LIMIT 1;", '', true); |
| 38 | 36 | } |
@@ -52,20 +50,17 @@ discard block |
||
| 52 | 50 | 'USER_ALLY_ID' => $user['ally_id'], |
| 53 | 51 | )); |
| 54 | 52 | $page_header = $lang['sys_alliance']; |
| 55 | -} |
|
| 56 | -else |
|
| 53 | +} else |
|
| 57 | 54 | { |
| 58 | 55 | $page_header = $lang['your_alliance']; |
| 59 | 56 | |
| 60 | 57 | if($ally['ally_owner'] == $user['id']) |
| 61 | 58 | { |
| 62 | 59 | $range = $ally['ally_owner_range'] ? $ally['ally_owner_range'] : $lang['Founder']; |
| 63 | - } |
|
| 64 | - elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) |
|
| 60 | + } elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) |
|
| 65 | 61 | { |
| 66 | 62 | $range = $ranks[$user['ally_rank_id']]['name']; |
| 67 | - } |
|
| 68 | - else |
|
| 63 | + } else |
|
| 69 | 64 | { |
| 70 | 65 | $range = $lang['member']; |
| 71 | 66 | } |
@@ -3,14 +3,14 @@ discard block |
||
| 3 | 3 | use Alliance\AllianceHelper; |
| 4 | 4 | use Alliance\DBStaticAlly; |
| 5 | 5 | |
| 6 | -if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) |
|
| 6 | +if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) |
|
| 7 | 7 | { |
| 8 | 8 | $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403); |
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | $template = gettemplate('ali_info', true); |
| 12 | 12 | |
| 13 | -if($mode == 'exit') |
|
| 13 | +if ($mode == 'exit') |
|
| 14 | 14 | { |
| 15 | 15 | if ($ally['ally_owner'] == $user['id']) |
| 16 | 16 | { |
@@ -27,25 +27,25 @@ discard block |
||
| 27 | 27 | messageBox(sprintf($lang['ali_info_leave_success'], $ally['ally_name']), $lang['sys_alliance']); |
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | -elseif($mode == 'ainfo') |
|
| 30 | +elseif ($mode == 'ainfo') |
|
| 31 | 31 | { |
| 32 | 32 | $tag = sys_get_param_str('tag'); |
| 33 | 33 | $id_ally = sys_get_param_id('a'); |
| 34 | - if($tag) |
|
| 34 | + if ($tag) |
|
| 35 | 35 | { |
| 36 | 36 | $ally = doquery("SELECT * FROM {{alliance}} WHERE ally_tag='{$tag}' LIMIT 1;", '', true); |
| 37 | 37 | } |
| 38 | - elseif($id_ally) |
|
| 38 | + elseif ($id_ally) |
|
| 39 | 39 | { |
| 40 | 40 | $ally = doquery("SELECT * FROM {{alliance}} WHERE id='{$id_ally}' LIMIT 1;", '', true); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - if(!$ally) |
|
| 43 | + if (!$ally) |
|
| 44 | 44 | { |
| 45 | 45 | messageBox($lang['ali_sys_notFound'], $lang['Ally_info_1']); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - if(!$ally['ally_description']) |
|
| 48 | + if (!$ally['ally_description']) |
|
| 49 | 49 | { |
| 50 | 50 | $ally['ally_description'] = $lang['Ally_nodescription']; |
| 51 | 51 | } |
@@ -54,17 +54,17 @@ discard block |
||
| 54 | 54 | 'EXTERNAL' => true, |
| 55 | 55 | 'USER_ALLY_ID' => $user['ally_id'], |
| 56 | 56 | )); |
| 57 | - $page_header = $lang['sys_alliance']; |
|
| 57 | + $page_header = $lang['sys_alliance']; |
|
| 58 | 58 | } |
| 59 | 59 | else |
| 60 | 60 | { |
| 61 | 61 | $page_header = $lang['your_alliance']; |
| 62 | 62 | |
| 63 | - if($ally['ally_owner'] == $user['id']) |
|
| 63 | + if ($ally['ally_owner'] == $user['id']) |
|
| 64 | 64 | { |
| 65 | 65 | $range = $ally['ally_owner_range'] ? $ally['ally_owner_range'] : $lang['Founder']; |
| 66 | 66 | } |
| 67 | - elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) |
|
| 67 | + elseif ($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) |
|
| 68 | 68 | { |
| 69 | 69 | $range = $ranks[$user['ally_rank_id']]['name']; |
| 70 | 70 | } |
@@ -99,9 +99,9 @@ discard block |
||
| 99 | 99 | ]); |
| 100 | 100 | |
| 101 | 101 | $relations = ali_relations($ally['id']); |
| 102 | -foreach($relations as $relation) |
|
| 102 | +foreach ($relations as $relation) |
|
| 103 | 103 | { |
| 104 | - if($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id']) |
|
| 104 | + if ($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id']) |
|
| 105 | 105 | { |
| 106 | 106 | $template->assign_block_vars('relation', array( |
| 107 | 107 | 'NAME' => $relation['alliance_diplomacy_contr_ally_name'], |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | // Pretty Safe |
| 3 | 3 | // TODO: Add ally_tag to usertable |
| 4 | 4 | |
| 5 | -if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) |
|
| 5 | +if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) |
|
| 6 | 6 | { |
| 7 | 7 | $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403); |
| 8 | 8 | } |
@@ -12,15 +12,15 @@ discard block |
||
| 12 | 12 | $ally_name_raw = sys_get_param_str_unsafe('name'); |
| 13 | 13 | $ally_name = db_escape($ally_name_raw); |
| 14 | 14 | |
| 15 | -if($ally_tag) |
|
| 15 | +if ($ally_tag) |
|
| 16 | 16 | { |
| 17 | - if(!$ally_name_raw || !$ally_tag_raw) |
|
| 17 | + if (!$ally_name_raw || !$ally_tag_raw) |
|
| 18 | 18 | { |
| 19 | 19 | messageBox($lang['have_not_name'], $lang['make_alliance']); |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | $query = doquery("SELECT ally_tag FROM {{alliance}} WHERE `ally_tag` = '{$ally_tag}' or `ally_name` = '{$ally_name}' LIMIT 1;", true); |
| 23 | - if($query) |
|
| 23 | + if ($query) |
|
| 24 | 24 | { |
| 25 | 25 | messageBox(str_replace('%s', $query['ally_tag'] == $ally_tag_raw ? $ally_tag_raw : $ally_name_raw, $lang['always_exist']), $lang['make_alliance']); |
| 26 | 26 | } |
@@ -4,6 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | // header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found"); |
| 6 | 6 | // @header("{$serverProtocol} 200 OK"); |
| 7 | -echo "File {$redirectFrom} not found on server. Contact administration if you think that this is error"; |
|
| 7 | +echo "file {$redirectFrom} not found on server. Contact administration if you think that this is error"; |
|
| 8 | 8 | die(); |
| 9 | 9 | ?> */ |
@@ -18,17 +18,17 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | $sensorLevel = mrc_get_level($user, $planetrow, STRUC_MOON_PHALANX); |
| 20 | 20 | if (!intval($sensorLevel)) { |
| 21 | - messageBox ($lang['phalanx_nosensoravailable'], $lang['tech'][STRUC_MOON_PHALANX], '', 3); |
|
| 21 | + messageBox($lang['phalanx_nosensoravailable'], $lang['tech'][STRUC_MOON_PHALANX], '', 3); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | if ($planetrow['planet_type'] != PT_MOON) { |
| 25 | - messageBox ($lang['phalanx_onlyformoons'], $lang['tech'][STRUC_MOON_PHALANX], '', 3); |
|
| 25 | + messageBox($lang['phalanx_onlyformoons'], $lang['tech'][STRUC_MOON_PHALANX], '', 3); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | $scan_galaxy = sys_get_param_int('galaxy'); |
| 29 | 29 | $scan_system = sys_get_param_int('system'); |
| 30 | 30 | $scan_planet = sys_get_param_int('planet'); |
| 31 | -$scan_planet_type = 1; // sys_get_param_int('planettype'); |
|
| 31 | +$scan_planet_type = 1; // sys_get_param_int('planettype'); |
|
| 32 | 32 | $id = sys_get_param_id('id'); |
| 33 | 33 | |
| 34 | 34 | $source_galaxy = $planetrow['galaxy']; |
@@ -38,9 +38,9 @@ discard block |
||
| 38 | 38 | $sensorRange = GetPhalanxRange($sensorLevel); |
| 39 | 39 | |
| 40 | 40 | $system_distance = abs($source_system - $scan_system); |
| 41 | -if($system_distance > $sensorRange || $scan_galaxy != $source_galaxy) |
|
| 41 | +if ($system_distance > $sensorRange || $scan_galaxy != $source_galaxy) |
|
| 42 | 42 | { |
| 43 | - messageBox ($lang['phalanx_rangeerror'], $lang['tech'][STRUC_MOON_PHALANX], '', 3); |
|
| 43 | + messageBox($lang['phalanx_rangeerror'], $lang['tech'][STRUC_MOON_PHALANX], '', 3); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | $cost = $sensorLevel * 1000; |
@@ -51,14 +51,14 @@ discard block |
||
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | $planet_scanned = DBStaticPlanet::db_planet_by_gspt($scan_galaxy, $scan_system, $scan_planet, $scan_planet_type); |
| 54 | -if(!$planet_scanned['id']) |
|
| 54 | +if (!$planet_scanned['id']) |
|
| 55 | 55 | { |
| 56 | 56 | messageBox($lang['phalanx_planet_not_exists'], $lang['tech'][STRUC_MOON_PHALANX], '', 3); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | -if($planet_scanned['destruyed']) |
|
| 59 | +if ($planet_scanned['destruyed']) |
|
| 60 | 60 | { |
| 61 | - messageBox ($lang['phalanx_planet_destroyed'], $lang['tech'][STRUC_MOON_PHALANX], '', 3); |
|
| 61 | + messageBox($lang['phalanx_planet_destroyed'], $lang['tech'][STRUC_MOON_PHALANX], '', 3); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | DBStaticPlanet::db_planet_set_by_id($user['current_planet'], "deuterium = deuterium - {$cost}"); |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -define('INSIDE' , true); |
|
| 4 | -define('INSTALL' , false); |
|
| 3 | +define('INSIDE', true); |
|
| 4 | +define('INSTALL', false); |
|
| 5 | 5 | define('IN_ADMIN', true); |
| 6 | 6 | |
| 7 | 7 | require('../common.' . substr(strrchr(__FILE__, '.'), 1)); |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | messageBoxAdminAccessDenied(AUTH_LEVEL_ADMINISTRATOR); |
| 12 | 12 | |
| 13 | 13 | $planet_active = sys_get_param_int('planet_active'); |
| 14 | -if(!$planet_active) { |
|
| 14 | +if (!$planet_active) { |
|
| 15 | 15 | $planet_type = sys_get_param_int('planet_type', 1); |
| 16 | 16 | $planet_type = $planet_type == 3 ? 3 : 1; |
| 17 | 17 | } else { |
@@ -40,8 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | $page_title = |
| 42 | 42 | $lang['adm_planet_list_title'] . ': ' . |
| 43 | - ($planet_active ? $lang['adm_planet_active'] : |
|
| 44 | - ($planet_type ? ($planet_type == 3 ? $lang['sys_moons'] : $lang['sys_planets']) : '') |
|
| 43 | + ($planet_active ? $lang['adm_planet_active'] : ($planet_type ? ($planet_type == 3 ? $lang['sys_moons'] : $lang['sys_planets']) : '') |
|
| 45 | 44 | ); |
| 46 | 45 | $template->assign_vars(array( |
| 47 | 46 | 'PAGE_TITLE' => $page_title, |
@@ -37,8 +37,7 @@ |
||
| 37 | 37 | </script>'; |
| 38 | 38 | |
| 39 | 39 | messageBoxAdmin("{$script}<img src=\"design/images/progressbar.gif\"><br>{$lang['sys_wait']}", $lang['adm_stat_title'], '', 0); |
| 40 | -} |
|
| 41 | -else |
|
| 40 | +} else |
|
| 42 | 41 | { |
| 43 | 42 | messageBoxAdmin($lang['adm_stat_already_started'], $lang['adm_stat_title'], 'admin/overview.php'); |
| 44 | 43 | } |
@@ -9,8 +9,8 @@ discard block |
||
| 9 | 9 | * @copyright 2008 by Chlorel for XNova |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | -define('INSIDE' , true); |
|
| 13 | -define('INSTALL' , false); |
|
| 12 | +define('INSIDE', true); |
|
| 13 | +define('INSTALL', false); |
|
| 14 | 14 | define('IN_ADMIN', true); |
| 15 | 15 | require_once('../common.' . substr(strrchr(__FILE__, '.'), 1)); |
| 16 | 16 | |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | messageBoxAdminAccessDenied(AUTH_LEVEL_ADMINISTRATOR); |
| 20 | 20 | |
| 21 | -if(SN_TIME_NOW >= SN::$config->pass()->var_stat_update_admin_forced && SN_TIME_NOW >= SN::$config->pass()->var_stat_update_end) |
|
| 21 | +if (SN_TIME_NOW >= SN::$config->pass()->var_stat_update_admin_forced && SN_TIME_NOW >= SN::$config->pass()->var_stat_update_end) |
|
| 22 | 22 | { |
| 23 | 23 | SN::$config->pass()->var_stat_update_admin_forced = SN_TIME_NOW + 120; |
| 24 | 24 | |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | $configValue = $forceLoad ? $this->config->db_loadItem($configName) : $this->config[$configName]; |
| 36 | 36 | $configType == WATCHDOG_TIME_SQL ? $configValue = strtotime($configValue, SN_TIME_NOW) : false; |
| 37 | 37 | |
| 38 | - if(SN_TIME_NOW - $configValue > $timeDiff) { |
|
| 38 | + if (SN_TIME_NOW - $configValue > $timeDiff) { |
|
| 39 | 39 | $callable(); |
| 40 | 40 | } |
| 41 | 41 | |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $this->db_saveItem(array_combine(array_keys($this->defaults), array_fill(0, count($this->defaults), null))); |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - public function db_saveItem($item_list, $value = NULL) { |
|
| 94 | + public function db_saveItem($item_list, $value = null) { |
|
| 95 | 95 | if(empty($item_list)) { |
| 96 | 96 | return; |
| 97 | 97 | } |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | $qry = array(); |
| 103 | 103 | foreach($item_list as $item_name => $item_value) { |
| 104 | 104 | if($item_name) { |
| 105 | - $item_value = db_escape($item_value === NULL ? $this->$item_name : $item_value); |
|
| 105 | + $item_value = db_escape($item_value === null ? $this->$item_name : $item_value); |
|
| 106 | 106 | $item_name = db_escape($item_name); |
| 107 | 107 | $qry[] = "('{$item_name}', '{$item_value}')"; |
| 108 | 108 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | $this->sql_index_field = "{$table_name}_name"; |
| 34 | 34 | $this->sql_value_field = "{$table_name}_value"; |
| 35 | 35 | |
| 36 | - if(!$this->_DB_LOADED) { |
|
| 36 | + if (!$this->_DB_LOADED) { |
|
| 37 | 37 | $this->db_loadAll(); |
| 38 | 38 | } |
| 39 | 39 | } |
@@ -53,10 +53,10 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function db_loadItem($index) { |
| 55 | 55 | $result = null; |
| 56 | - if($index) { |
|
| 56 | + if ($index) { |
|
| 57 | 57 | $index_safe = db_escape($index); |
| 58 | 58 | $queryResult = doquery("SELECT `{$this->sql_value_field}` FROM `{{{$this->table_name}}}` WHERE `{$this->sql_index_field}` = '{$index_safe}' FOR UPDATE", true); |
| 59 | - if(is_array($queryResult) && !empty($queryResult)) { |
|
| 59 | + if (is_array($queryResult) && !empty($queryResult)) { |
|
| 60 | 60 | $this->$index = $result = $queryResult[$this->sql_value_field]; |
| 61 | 61 | } |
| 62 | 62 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | $this->loadDefaults(); |
| 69 | 69 | |
| 70 | 70 | $query = doquery("SELECT * FROM {{{$this->table_name}}} FOR UPDATE;"); |
| 71 | - while($row = db_fetch($query)) { |
|
| 71 | + while ($row = db_fetch($query)) { |
|
| 72 | 72 | $this[$row[$this->sql_index_field]] = $row[$this->sql_value_field]; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | public function loadDefaults() { |
| 79 | - foreach($this->defaults as $defName => $defValue) { |
|
| 79 | + foreach ($this->defaults as $defName => $defValue) { |
|
| 80 | 80 | $this->$defName = $defValue; |
| 81 | 81 | } |
| 82 | 82 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | public function db_saveItem($item_list, $value = NULL) { |
| 89 | - if(empty($item_list)) { |
|
| 89 | + if (empty($item_list)) { |
|
| 90 | 90 | return; |
| 91 | 91 | } |
| 92 | 92 | |
@@ -94,8 +94,8 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | // Сначала записываем данные в базу - что бы поймать все блокировки |
| 96 | 96 | $qry = array(); |
| 97 | - foreach($item_list as $item_name => $item_value) { |
|
| 98 | - if($item_name) { |
|
| 97 | + foreach ($item_list as $item_name => $item_value) { |
|
| 98 | + if ($item_name) { |
|
| 99 | 99 | $item_value = db_escape($item_value === NULL ? $this->$item_name : $item_value); |
| 100 | 100 | $item_name = db_escape($item_name); |
| 101 | 101 | $qry[] = "('{$item_name}', '{$item_value}')"; |
@@ -104,8 +104,8 @@ discard block |
||
| 104 | 104 | doquery("REPLACE INTO `{{" . $this->table_name . "}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES " . implode(',', $qry) . ";"); |
| 105 | 105 | |
| 106 | 106 | // И только после взятия блокировок - меняем значения в кэше |
| 107 | - foreach($item_list as $item_name => $item_value) { |
|
| 108 | - if($item_name && $item_value !== null) { |
|
| 107 | + foreach ($item_list as $item_name => $item_value) { |
|
| 108 | + if ($item_name && $item_value !== null) { |
|
| 109 | 109 | $this->__set($item_name, $item_value); |
| 110 | 110 | } |
| 111 | 111 | } |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | public function __get($name) { |
| 136 | - if($this->force) { |
|
| 136 | + if ($this->force) { |
|
| 137 | 137 | $this->force = false; |
| 138 | 138 | $this->db_loadItem($name); |
| 139 | 139 | } |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | public function __set($name, $value) { |
| 145 | - if($this->force) { |
|
| 145 | + if ($this->force) { |
|
| 146 | 146 | $this->force = false; |
| 147 | 147 | $this->db_saveItem($name, $value); |
| 148 | 148 | } |