@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | require('../common.' . substr(strrchr(__FILE__, '.'), 1)); |
18 | 18 | |
19 | -if($user['authlevel'] < 1) { |
|
19 | +if ($user['authlevel'] < 1) { |
|
20 | 20 | AdminMessage(classLocale::$lang['adm_err_denied']); |
21 | 21 | } |
22 | 22 | |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | $template = gettemplate("admin/admin_ban", true); |
29 | 29 | |
30 | 30 | $player_banned_row = db_user_by_username($name_unsafe); |
31 | -if($mode == 'banit' && $action) { |
|
32 | - if($player_banned_row) { |
|
31 | +if ($mode == 'banit' && $action) { |
|
32 | + if ($player_banned_row) { |
|
33 | 33 | $reas = $_POST['why']; |
34 | 34 | $days = $_POST['days']; |
35 | 35 | $hour = $_POST['hour']; |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $adm_bn_thpl = classLocale::$lang['adm_bn_thpl']; |
50 | 50 | $DoneMessage = "{$adm_bn_thpl} {$name_output} {$adm_bn_isbn}"; |
51 | 51 | |
52 | - if($is_vacation) { |
|
52 | + if ($is_vacation) { |
|
53 | 53 | $DoneMessage .= classLocale::$lang['adm_bn_vctn']; |
54 | 54 | } |
55 | 55 | |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | } |
60 | 60 | |
61 | 61 | AdminMessage($DoneMessage, classLocale::$lang['adm_ban_title']); |
62 | -} elseif($mode == 'unbanit' && $action) { |
|
62 | +} elseif ($mode == 'unbanit' && $action) { |
|
63 | 63 | sys_admin_player_ban_unset($user, $player_banned_row, ($reason = sys_get_param_str('why')) ? $reason : classLocale::$lang['sys_unbanned']); |
64 | 64 | |
65 | 65 | $DoneMessage = classLocale::$lang['adm_unbn_thpl'] . " " . $name_output . " " . classLocale::$lang['adm_unbn_isbn']; |
@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | -define('INSIDE' , true); |
|
3 | -define('INSTALL' , false); |
|
2 | +define('INSIDE', true); |
|
3 | +define('INSTALL', false); |
|
4 | 4 | define('IN_ADMIN', true); |
5 | 5 | |
6 | 6 | require('../common.' . substr(strrchr(__FILE__, '.'), 1)); |
7 | 7 | |
8 | -if($user['authlevel'] < 3) |
|
8 | +if ($user['authlevel'] < 3) |
|
9 | 9 | { |
10 | 10 | AdminMessage(classLocale::$lang['adm_err_denied']); |
11 | 11 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $username_unsafe = sys_get_param_str_unsafe('username'); |
26 | 26 | $username = sys_get_param_escaped('username'); |
27 | 27 | |
28 | -if($galaxy_src) |
|
28 | +if ($galaxy_src) |
|
29 | 29 | { |
30 | 30 | sn_db_transaction_start(); |
31 | 31 | $errors = array(); |
@@ -35,41 +35,41 @@ discard block |
||
35 | 35 | $planet = sys_o_get_updated($owner, array('galaxy' => $galaxy_src, 'system' => $system_src, 'planet' => $planet_src, 'planet_type' => 1), SN_TIME_NOW); |
36 | 36 | $que = $planet['que']; |
37 | 37 | $planet = $planet['planet']; |
38 | - if(!$planet) |
|
38 | + if (!$planet) |
|
39 | 39 | { |
40 | 40 | $errors[] = classLocale::$lang['adm_pl_comp_err_0']; |
41 | 41 | } |
42 | 42 | |
43 | - if($planet['destruyed']) |
|
43 | + if ($planet['destruyed']) |
|
44 | 44 | { |
45 | 45 | $errors[] = classLocale::$lang['adm_pl_comp_err_1']; |
46 | 46 | } |
47 | 47 | |
48 | - if($planet['id_owner'] != $owner['id'] || !$username) |
|
48 | + if ($planet['id_owner'] != $owner['id'] || !$username) |
|
49 | 49 | { |
50 | 50 | $errors[] = classLocale::$lang['adm_pl_comp_err_4']; |
51 | 51 | } |
52 | 52 | |
53 | 53 | $destination = sys_o_get_updated($owner, array('galaxy' => $galaxy_dst, 'system' => $system_dst, 'planet' => $planet_dst, 'planet_type' => 1), SN_TIME_NOW); |
54 | 54 | $destination = $destination['planet']; |
55 | - if(!$destination) |
|
55 | + if (!$destination) |
|
56 | 56 | { |
57 | 57 | $errors[] = classLocale::$lang['adm_pl_comp_err_2']; |
58 | 58 | } |
59 | 59 | |
60 | - if($planet['id'] == $destination['id']) |
|
60 | + if ($planet['id'] == $destination['id']) |
|
61 | 61 | { |
62 | 62 | $errors[] = classLocale::$lang['adm_pl_comp_err_5']; |
63 | 63 | } |
64 | 64 | |
65 | - if($planet['id_owner'] != $destination['id_owner']) |
|
65 | + if ($planet['id_owner'] != $destination['id_owner']) |
|
66 | 66 | { |
67 | 67 | $errors[] = classLocale::$lang['adm_pl_comp_err_3']; |
68 | 68 | } |
69 | 69 | |
70 | - if(!empty($errors)) |
|
70 | + if (!empty($errors)) |
|
71 | 71 | { |
72 | - foreach($errors as $error) |
|
72 | + foreach ($errors as $error) |
|
73 | 73 | { |
74 | 74 | $template->assign_block_vars('error', array( |
75 | 75 | 'TEXT' => $error, |
@@ -83,14 +83,14 @@ discard block |
||
83 | 83 | killer_add_planet($planet); |
84 | 84 | |
85 | 85 | $moon = db_planet_by_gspt($galaxy_src, $system_src, $planet_src, PT_MOON, true); |
86 | - if($moon) |
|
86 | + if ($moon) |
|
87 | 87 | { |
88 | 88 | $moon = sys_o_get_updated($owner, $moon, SN_TIME_NOW); |
89 | 89 | $moon = $moon['planet']; |
90 | 90 | killer_add_planet($moon); |
91 | 91 | } |
92 | 92 | |
93 | - foreach(sn_get_groups('resources_loot') as $resource_id) |
|
93 | + foreach (sn_get_groups('resources_loot') as $resource_id) |
|
94 | 94 | { |
95 | 95 | $resource_name = pname_resource_name($resource_id); |
96 | 96 | $template->assign_var("{$resource_name}_cost", $final_cost[$resource_id]); |
@@ -98,13 +98,13 @@ discard block |
||
98 | 98 | $template->assign_var("{$resource_name}_bonus", $final_cost[$resource_id]); |
99 | 99 | } |
100 | 100 | |
101 | - if($_GET['btn_confirm']) |
|
101 | + if ($_GET['btn_confirm']) |
|
102 | 102 | { |
103 | 103 | $time = SN_TIME_NOW + PERIOD_DAY; |
104 | 104 | |
105 | 105 | db_unit_list_delete($planet['id_owner'], LOC_PLANET, $planet['id']); |
106 | 106 | db_planet_set_by_id($planet['id'], "id_owner = 0, destruyed = {$time}"); |
107 | - if($moon) |
|
107 | + if ($moon) |
|
108 | 108 | { |
109 | 109 | db_unit_list_delete($planet['id_owner'], LOC_PLANET, $moon['id']); |
110 | 110 | db_planet_set_by_id($moon['id'], "id_owner = 0, destruyed = {$time}"); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | 'username' => $username, |
132 | 132 | )); |
133 | 133 | |
134 | -display(parsetemplate($template), classLocale::$lang['adm_pl_comp_title'], false, '', true ); |
|
134 | +display(parsetemplate($template), classLocale::$lang['adm_pl_comp_title'], false, '', true); |
|
135 | 135 | |
136 | 136 | function killer_add_planet($planet) |
137 | 137 | { |
@@ -146,34 +146,34 @@ discard block |
||
146 | 146 | } |
147 | 147 | */ |
148 | 148 | |
149 | - foreach(sn_get_groups('structures') as $unit_id) |
|
149 | + foreach (sn_get_groups('structures') as $unit_id) |
|
150 | 150 | { |
151 | 151 | $build_level = mrc_get_level($user, $planet, $unit_id, true, true); |
152 | - if($build_level > 0) |
|
152 | + if ($build_level > 0) |
|
153 | 153 | { |
154 | 154 | $unit_cost = get_unit_param($unit_id, 'cost'); |
155 | 155 | $build_factor = $unit_cost['factor'] != 1 ? (1 - pow($unit_cost['factor'], $build_level)) / (1 - $unit_cost['factor']) : $unit_cost['factor']; |
156 | - foreach($sn_group_resources_loot as $resource_id) |
|
156 | + foreach ($sn_group_resources_loot as $resource_id) |
|
157 | 157 | { |
158 | 158 | $final_cost[$resource_id] += isset($unit_cost[$resource_id]) && $unit_cost[$resource_id] > 0 ? floor($unit_cost[$resource_id] * $build_factor) : 0; |
159 | 159 | } |
160 | 160 | } |
161 | 161 | } |
162 | 162 | |
163 | - foreach(sn_get_groups(array('defense', 'fleet')) as $unit_id) |
|
163 | + foreach (sn_get_groups(array('defense', 'fleet')) as $unit_id) |
|
164 | 164 | { |
165 | 165 | $unit_count = mrc_get_level($user, $planet, $unit_id, true, true); |
166 | - if($unit_count > 0) |
|
166 | + if ($unit_count > 0) |
|
167 | 167 | { |
168 | 168 | $unit_cost = get_unit_param($unit_id, 'cost'); |
169 | - foreach($sn_group_resources_loot as $resource_id) |
|
169 | + foreach ($sn_group_resources_loot as $resource_id) |
|
170 | 170 | { |
171 | 171 | $final_cost[$resource_id] += isset($unit_cost[$resource_id]) && $unit_cost[$resource_id] > 0 ? floor($unit_cost[$resource_id] * $unit_count) : 0; |
172 | 172 | } |
173 | 173 | } |
174 | 174 | } |
175 | 175 | |
176 | - foreach($sn_group_resources_loot as $resource_id) |
|
176 | + foreach ($sn_group_resources_loot as $resource_id) |
|
177 | 177 | { |
178 | 178 | $final_cost[$resource_id] += floor(mrc_get_level($user, $planet, $resource_id, true, true)); |
179 | 179 | } |
@@ -30,11 +30,11 @@ discard block |
||
30 | 30 | |
31 | 31 | static $need_keys = array('server', 'user', 'pass', 'name', 'prefix'); |
32 | 32 | |
33 | - if($this->connected) { |
|
33 | + if ($this->connected) { |
|
34 | 34 | return true; |
35 | 35 | } |
36 | 36 | |
37 | - if(empty($settings) || !is_array($settings) || array_intersect($need_keys, array_keys($settings)) != $need_keys) { |
|
37 | + if (empty($settings) || !is_array($settings) || array_intersect($need_keys, array_keys($settings)) != $need_keys) { |
|
38 | 38 | $debug->error_fatal('There is missconfiguration in your config.php. Check it again'); |
39 | 39 | } |
40 | 40 | |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | return mysqli_fetch_assoc($query); |
85 | 85 | } |
86 | 86 | function mysql_fetch_row(&$query) { |
87 | -if(is_bool($query)) { |
|
87 | +if (is_bool($query)) { |
|
88 | 88 | pdump(debug_backtrace()); |
89 | 89 | pdie(); |
90 | 90 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | return mysqli_real_escape_string($this->link, $unescaped_string); |
95 | 95 | } |
96 | 96 | function mysql_close_link() { |
97 | - if(is_object($this->link)) { |
|
97 | + if (is_object($this->link)) { |
|
98 | 98 | $this->link->close(); |
99 | 99 | $this->connected = false; |
100 | 100 | unset($this->link); |
@@ -138,9 +138,9 @@ discard block |
||
138 | 138 | |
139 | 139 | preg_match_all('#<!-- INCLUDE (\{\$?[A-Z0-9\-_]+\}|[a-zA-Z0-9\_\-\+\./]+) -->#', $code, $matches); |
140 | 140 | $include_blocks = $matches[1]; |
141 | - if($include_blocks) |
|
141 | + if ($include_blocks) |
|
142 | 142 | { |
143 | - foreach($include_blocks as &$included_file) |
|
143 | + foreach ($include_blocks as &$included_file) |
|
144 | 144 | { |
145 | 145 | $included_file .= '.tpl.html'; |
146 | 146 | } |
@@ -446,8 +446,8 @@ discard block |
||
446 | 446 | |
447 | 447 | $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){'; |
448 | 448 | // $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;'; |
449 | - $tag_template_php .= '$_'. $tag_args . '_val = &' . $varref . '[$_'. $tag_args. '_i];'; |
|
450 | - $tag_template_php .= '$this->_block_value["'. $tag_args . '"] = &' . $varref . '[$_'. $tag_args. '_i];'; |
|
449 | + $tag_template_php .= '$_' . $tag_args . '_val = &' . $varref . '[$_' . $tag_args . '_i];'; |
|
450 | + $tag_template_php .= '$this->_block_value["' . $tag_args . '"] = &' . $varref . '[$_' . $tag_args . '_i];'; |
|
451 | 451 | |
452 | 452 | return $tag_template_php; |
453 | 453 | } |
@@ -551,10 +551,10 @@ discard block |
||
551 | 551 | break; |
552 | 552 | |
553 | 553 | case 'is': |
554 | - $is_arg_start = ($tokens[$i-1] == ')') ? array_pop($is_arg_stack) : $i-1; |
|
554 | + $is_arg_start = ($tokens[$i - 1] == ')') ? array_pop($is_arg_stack) : $i - 1; |
|
555 | 555 | $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start)); |
556 | 556 | |
557 | - $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1)); |
|
557 | + $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i + 1)); |
|
558 | 558 | |
559 | 559 | array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens); |
560 | 560 | |
@@ -814,11 +814,11 @@ discard block |
||
814 | 814 | } |
815 | 815 | else if ($include_last_iterator) |
816 | 816 | { |
817 | - return '$_'. $blocks[$blockcount] . '_val'; |
|
817 | + return '$_' . $blocks[$blockcount] . '_val'; |
|
818 | 818 | } |
819 | 819 | else |
820 | 820 | { |
821 | - return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']'; |
|
821 | + return '$_' . $blocks[$blockcount - 1] . '_val[\'' . $blocks[$blockcount] . '\']'; |
|
822 | 822 | } |
823 | 823 | } |
824 | 824 | |
@@ -835,7 +835,7 @@ discard block |
||
835 | 835 | if ($fp = @fopen($filename, 'wb')) |
836 | 836 | { |
837 | 837 | @flock($fp, LOCK_EX); |
838 | - @fwrite ($fp, $data); |
|
838 | + @fwrite($fp, $data); |
|
839 | 839 | @flock($fp, LOCK_UN); |
840 | 840 | @fclose($fp); |
841 | 841 | |
@@ -852,7 +852,7 @@ discard block |
||
852 | 852 | */ |
853 | 853 | private function minify($html) |
854 | 854 | { |
855 | - if(!classSupernova::$config->tpl_minifier) |
|
855 | + if (!classSupernova::$config->tpl_minifier) |
|
856 | 856 | { |
857 | 857 | return $html; |
858 | 858 | } |
@@ -862,14 +862,14 @@ discard block |
||
862 | 862 | $html = preg_replace('/(<script[^>]*?>.*?<\/script>)/si', '#pre#', $html); |
863 | 863 | $html = preg_replace('/>[\s]*</', '><', $html); // Strip spacechars between tags |
864 | 864 | $html = preg_replace('/[\s]+/', ' ', $html); // Replace several spacechars with one space |
865 | - if(!empty($pre[0])) |
|
865 | + if (!empty($pre[0])) |
|
866 | 866 | { |
867 | - foreach($pre[0] as $tag) |
|
867 | + foreach ($pre[0] as $tag) |
|
868 | 868 | { |
869 | 869 | $tag = preg_replace('/^\ *\/\/[^\<]*?$/m', ' ', $tag); // Strips comments - except those that contains HTML comment inside |
870 | 870 | $tag = preg_replace('/[\ \t]{2,}/', ' ', $tag); // Replace several spaces by one |
871 | 871 | $tag = preg_replace('/\s{2,}/', "\r\n", $tag); // Replace several linefeeds by one |
872 | - $html = preg_replace('/#pre#/', $tag, $html,1); |
|
872 | + $html = preg_replace('/#pre#/', $tag, $html, 1); |
|
873 | 873 | } |
874 | 874 | } |
875 | 875 |
@@ -2,28 +2,28 @@ discard block |
||
2 | 2 | |
3 | 3 | $classLocale = classLocale::$lang; |
4 | 4 | |
5 | -if(SN_IN_FLEET !== true) { |
|
5 | +if (SN_IN_FLEET !== true) { |
|
6 | 6 | $debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403); |
7 | 7 | } |
8 | 8 | |
9 | 9 | $fleetid = sys_get_param_id('fleetid'); |
10 | 10 | |
11 | -if(!is_numeric($fleetid) || empty($fleetid)) { |
|
11 | +if (!is_numeric($fleetid) || empty($fleetid)) { |
|
12 | 12 | header("Location: fleet.php"); |
13 | 13 | exit(); |
14 | 14 | } |
15 | 15 | |
16 | 16 | $objFleet = new Fleet(); |
17 | 17 | $objFleet->dbLoad($fleetid); |
18 | -if(!$objFleet->dbId) { |
|
18 | +if (!$objFleet->dbId) { |
|
19 | 19 | message(classLocale::$lang['fl_fleet_not_exists'], classLocale::$lang['fl_error']); |
20 | 20 | } |
21 | 21 | |
22 | -if($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) { |
|
22 | +if ($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) { |
|
23 | 23 | message(classLocale::$lang['fl_isback'], classLocale::$lang['fl_error']); |
24 | 24 | } |
25 | 25 | |
26 | -if($objFleet->playerOwnerId != $user['id']) { |
|
26 | +if ($objFleet->playerOwnerId != $user['id']) { |
|
27 | 27 | $debug->warning(classLocale::$lang['fl_aks_hack_wrong_fleet'], 'Wrong Fleet Owner', 301); |
28 | 28 | message(classLocale::$lang['fl_aks_hack_wrong_fleet'], classLocale::$lang['fl_error']); |
29 | 29 | } |
@@ -34,19 +34,19 @@ discard block |
||
34 | 34 | |
35 | 35 | !$aks && !$userToAdd_unsafe ? $userToAdd_unsafe = $user['username'] : false; |
36 | 36 | |
37 | -if($userToAdd_unsafe) { |
|
37 | +if ($userToAdd_unsafe) { |
|
38 | 38 | $userToAdd = db_escape($userToAdd_unsafe); |
39 | 39 | $userToAddID = db_user_by_username($userToAdd_unsafe, false, 'id', true, true); |
40 | 40 | $userToAddID = $userToAddID['id']; |
41 | 41 | |
42 | - if($objFleet->target_owner_id == $userToAddID) { |
|
42 | + if ($objFleet->target_owner_id == $userToAddID) { |
|
43 | 43 | message(classLocale::$lang['flt_aks_player_same'], classLocale::$lang['fl_error']); |
44 | 44 | } |
45 | 45 | |
46 | - if($userToAddID) { |
|
47 | - if(!$aks) { |
|
46 | + if ($userToAddID) { |
|
47 | + if (!$aks) { |
|
48 | 48 | // No AСS exists - making one |
49 | - if(!$objFleet->group_id) { |
|
49 | + if (!$objFleet->group_id) { |
|
50 | 50 | db_acs_insert($fleetid, $user, $objFleet); |
51 | 51 | |
52 | 52 | $aks = db_acs_get_by_fleet($fleetid); |
@@ -61,17 +61,17 @@ discard block |
||
61 | 61 | |
62 | 62 | $isUserExists = false; |
63 | 63 | $invited_ar = explode(",", $aks['eingeladen']); |
64 | - foreach($invited_ar as $inv) { |
|
65 | - if($userToAddID == $inv) { |
|
64 | + foreach ($invited_ar as $inv) { |
|
65 | + if ($userToAddID == $inv) { |
|
66 | 66 | $isUserExists = true; |
67 | 67 | } |
68 | 68 | } |
69 | 69 | |
70 | - if(count($invited_ar) >= 5) { |
|
70 | + if (count($invited_ar) >= 5) { |
|
71 | 71 | message(classLocale::$lang['flt_aks_error_too_much_players'], classLocale::$lang['fl_error']); |
72 | 72 | } |
73 | 73 | |
74 | - if($isUserExists) { |
|
74 | + if ($isUserExists) { |
|
75 | 75 | $userToAdd_unsafe != $user['username'] ? $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited_already'], $userToAdd) : false; |
76 | 76 | } else { |
77 | 77 | $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited'], $userToAdd); |
@@ -93,8 +93,8 @@ discard block |
||
93 | 93 | 'MISSION_NAME' => classLocale::$lang['type_mission'][MT_AKS], |
94 | 94 | )); |
95 | 95 | |
96 | -if($aks['eingeladen'] && is_array($members = classSupernova::db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) { |
|
97 | - foreach($members as $row) { |
|
96 | +if ($aks['eingeladen'] && is_array($members = classSupernova::db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) { |
|
97 | + foreach ($members as $row) { |
|
98 | 98 | $template->assign_block_vars('invited', array( |
99 | 99 | 'NAME' => $row['username'], |
100 | 100 | )); |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $fleet_data = tplParseFleetObject($objFleet, $i, $user); |
120 | 120 | |
121 | 121 | $template->assign_block_vars('fleets', $fleet_data['fleet']); |
122 | -foreach($fleet_data['ships'] as $ship_data) { |
|
122 | +foreach ($fleet_data['ships'] as $ship_data) { |
|
123 | 123 | $template->assign_block_vars('fleets.ships', $ship_data); |
124 | 124 | } |
125 | 125 |
@@ -47,20 +47,20 @@ discard block |
||
47 | 47 | )); |
48 | 48 | |
49 | 49 | $ActualProd = floor($Prod[$BuildID]); |
50 | - if($BuildID != STRUC_MINE_FUSION) { |
|
50 | + if ($BuildID != STRUC_MINE_FUSION) { |
|
51 | 51 | $ActualNeed = floor($Prod[STRUC_MINE_SOLAR]); |
52 | 52 | } else { |
53 | 53 | $ActualNeed = floor($Prod[STRUC_MINE_DEUTERIUM]); |
54 | 54 | } |
55 | 55 | |
56 | 56 | $BuildStartLvl = $CurrentBuildtLvl - 2; |
57 | - if($BuildStartLvl < 1) { |
|
57 | + if ($BuildStartLvl < 1) { |
|
58 | 58 | $BuildStartLvl = 1; |
59 | 59 | } |
60 | 60 | $Table = ''; |
61 | 61 | $ProdFirst = 0; |
62 | - for($BuildLevel = $BuildStartLvl; $BuildLevel < $BuildStartLvl + 10; $BuildLevel++) { |
|
63 | - if($BuildID != STRUC_MOON_PHALANX) { |
|
62 | + for ($BuildLevel = $BuildStartLvl; $BuildLevel < $BuildStartLvl + 10; $BuildLevel++) { |
|
63 | + if ($BuildID != STRUC_MOON_PHALANX) { |
|
64 | 64 | $Prod[STRUC_MINE_METAL] = floor(mrc_modify_value( |
65 | 65 | $CurrentUser, |
66 | 66 | $CurrentPlanet, |
@@ -87,8 +87,8 @@ discard block |
||
87 | 87 | )); |
88 | 88 | |
89 | 89 | $bloc['build_lvl'] = ($CurrentBuildtLvl == $BuildLevel) ? "<font color=\"#ff0000\">" . $BuildLevel . "</font>" : $BuildLevel; |
90 | - if($ProdFirst > 0) { |
|
91 | - if($BuildID != STRUC_MINE_FUSION) { |
|
90 | + if ($ProdFirst > 0) { |
|
91 | + if ($BuildID != STRUC_MINE_FUSION) { |
|
92 | 92 | $bloc['build_gain'] = "<font color=\"lime\">(" . pretty_number(floor($Prod[$BuildID] - $ProdFirst)) . ")</font>"; |
93 | 93 | } else { |
94 | 94 | $bloc['build_gain'] = "<font color=\"lime\">(" . pretty_number(floor($Prod[STRUC_MINE_SOLAR] - $ProdFirst)) . ")</font>"; |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | } else { |
97 | 97 | $bloc['build_gain'] = ''; |
98 | 98 | } |
99 | - if($BuildID != STRUC_MINE_FUSION) { |
|
99 | + if ($BuildID != STRUC_MINE_FUSION) { |
|
100 | 100 | $bloc['build_prod'] = pretty_number(floor($Prod[$BuildID])); |
101 | 101 | $bloc['build_prod_diff'] = pretty_number(floor($Prod[$BuildID] - $ActualProd), true, true); |
102 | 102 | $bloc['build_need'] = pretty_number(floor($Prod[STRUC_MINE_SOLAR]), true, true); |
@@ -107,8 +107,8 @@ discard block |
||
107 | 107 | $bloc['build_need'] = pretty_number(floor($Prod[STRUC_MINE_DEUTERIUM]), true, true); |
108 | 108 | $bloc['build_need_diff'] = pretty_number(floor($Prod[STRUC_MINE_DEUTERIUM] - $ActualNeed), true, true); |
109 | 109 | } |
110 | - if($ProdFirst == 0) { |
|
111 | - if($BuildID != STRUC_MINE_FUSION) { |
|
110 | + if ($ProdFirst == 0) { |
|
111 | + if ($BuildID != STRUC_MINE_FUSION) { |
|
112 | 112 | $ProdFirst = floor($Prod[$BuildID]); |
113 | 113 | } else { |
114 | 114 | $ProdFirst = floor($Prod[STRUC_MINE_SOLAR]); |
@@ -133,22 +133,22 @@ discard block |
||
133 | 133 | |
134 | 134 | $str_rapid_from = ''; |
135 | 135 | $str_rapid_to = ''; |
136 | - foreach(sn_get_groups(array('fleet', 'defense_active')) as $enemy_id) { |
|
136 | + foreach (sn_get_groups(array('fleet', 'defense_active')) as $enemy_id) { |
|
137 | 137 | $enemy_data = get_unit_param($enemy_id); |
138 | 138 | $enemy_durability = $enemy_data['shield'] + $enemy_data['armor']; |
139 | 139 | |
140 | 140 | $rapid = floor($unit_data['attack'] * (isset($unit_data['amplify'][$enemy_id]) ? $unit_data['amplify'][$enemy_id] : 1) / $enemy_durability); |
141 | - if($rapid >= 1) { |
|
141 | + if ($rapid >= 1) { |
|
142 | 142 | $str_rapid_to .= "{$classLocale['nfo_rf_again']} {$classLocale['tech'][$enemy_id]} <font color=\"#00ff00\">{$rapid}</font><br>"; |
143 | 143 | } |
144 | 144 | |
145 | 145 | $rapid = floor($enemy_data['attack'] * (isset($enemy_data['amplify'][$unit_id]) ? $enemy_data['amplify'][$unit_id] : 1) / $unit_durability); |
146 | - if($rapid >= 1) { |
|
146 | + if ($rapid >= 1) { |
|
147 | 147 | $str_rapid_from .= "{$classLocale['tech'][$enemy_id]} {$classLocale['nfo_rf_from']} <font color=\"#ff0000\">{$rapid}</font><br>"; |
148 | 148 | } |
149 | 149 | } |
150 | 150 | |
151 | - if($str_rapid_to && $str_rapid_from) { |
|
151 | + if ($str_rapid_to && $str_rapid_from) { |
|
152 | 152 | $str_rapid_to .= '<hr>'; |
153 | 153 | } |
154 | 154 | |
@@ -156,16 +156,16 @@ discard block |
||
156 | 156 | } |
157 | 157 | |
158 | 158 | $unit_id = sys_get_param_id('gid'); |
159 | -if($unit_id == RES_DARK_MATTER) { |
|
159 | +if ($unit_id == RES_DARK_MATTER) { |
|
160 | 160 | sys_redirect('dark_matter.php'); |
161 | 161 | } |
162 | 162 | |
163 | -if($unit_id == RES_METAMATTER) { |
|
163 | +if ($unit_id == RES_METAMATTER) { |
|
164 | 164 | sys_redirect('metamatter.php'); |
165 | 165 | } |
166 | 166 | |
167 | 167 | lng_include('infos'); |
168 | -if(!$unit_id || (!get_unit_param($unit_id) && !isset(classLocale::$lang['info'][$unit_id]))) { |
|
168 | +if (!$unit_id || (!get_unit_param($unit_id) && !isset(classLocale::$lang['info'][$unit_id]))) { |
|
169 | 169 | sys_redirect('index.php?page=techtree'); |
170 | 170 | } |
171 | 171 | |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | $unit_data = get_unit_param($unit_id); |
175 | 175 | $unit_type = $unit_data['type']; |
176 | 176 | |
177 | -if($unit_type == UNIT_SHIPS) { |
|
177 | +if ($unit_type == UNIT_SHIPS) { |
|
178 | 178 | $template_result['UNIT_IS_SHIP'] = true; |
179 | 179 | |
180 | 180 | $ship_data = get_ship_data($unit_id, $user); |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | ); |
191 | 191 | |
192 | 192 | $engine_template_info = array(); |
193 | - foreach($unit_data['engine'] as $unit_engine_data) { |
|
193 | + foreach ($unit_data['engine'] as $unit_engine_data) { |
|
194 | 194 | $unit_engine_data = get_engine_data($user, $unit_engine_data); |
195 | 195 | |
196 | 196 | $engine_template_info[] = array( |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | |
210 | 210 | |
211 | 211 | $sn_data_group_combat = sn_get_groups('combat'); |
212 | -if(in_array($unit_id, $sn_data_group_combat)) { |
|
212 | +if (in_array($unit_id, $sn_data_group_combat)) { |
|
213 | 213 | $template_result['UNIT_IS_COMBAT'] = true; |
214 | 214 | |
215 | 215 | $unit_durability = $unit_data['shield'] + $unit_data['armor']; |
@@ -217,21 +217,21 @@ discard block |
||
217 | 217 | $volley_arr = $rapid_to = $rapid_from = array(); |
218 | 218 | $str_rapid_from = ''; |
219 | 219 | $str_rapid_to = ''; |
220 | - foreach($sn_data_group_combat as $enemy_id) { |
|
220 | + foreach ($sn_data_group_combat as $enemy_id) { |
|
221 | 221 | $enemy_data = get_unit_param($enemy_id); |
222 | 222 | $enemy_durability = $enemy_data['shield'] + $enemy_data['armor']; |
223 | 223 | |
224 | 224 | $rapid = $unit_data['attack'] * (isset($unit_data['amplify'][$enemy_id]) ? $unit_data['amplify'][$enemy_id] : 1) / $enemy_durability; |
225 | - if($rapid >= 1) { |
|
225 | + if ($rapid >= 1) { |
|
226 | 226 | $volley_arr[$enemy_id]['TO'] = floor($rapid); |
227 | 227 | } |
228 | 228 | |
229 | 229 | $rapid = $enemy_data['attack'] * (isset($enemy_data['amplify'][$unit_id]) ? $enemy_data['amplify'][$unit_id] : 1) / $unit_durability; |
230 | - if($rapid >= 1) { |
|
230 | + if ($rapid >= 1) { |
|
231 | 231 | $volley_arr[$enemy_id]['FROM'] = floor($rapid); |
232 | 232 | } |
233 | 233 | } |
234 | - foreach($volley_arr as $enemy_id => &$rapid) { |
|
234 | + foreach ($volley_arr as $enemy_id => &$rapid) { |
|
235 | 235 | $rapid['ENEMY_ID'] = $enemy_id; |
236 | 236 | $rapid['ENEMY_NAME'] = classLocale::$lang['tech'][$enemy_id]; |
237 | 237 | } |
@@ -249,11 +249,11 @@ discard block |
||
249 | 249 | |
250 | 250 | } |
251 | 251 | |
252 | -if(classLocale::$lang['info'][$unit_id]['effect']) { |
|
252 | +if (classLocale::$lang['info'][$unit_id]['effect']) { |
|
253 | 253 | $template_result['UNIT_EFFECT'] = classLocale::$lang['info'][$unit_id]['effect']; |
254 | 254 | } |
255 | 255 | |
256 | -if($unit_data['bonus']) { |
|
256 | +if ($unit_data['bonus']) { |
|
257 | 257 | $unit_bonus = !$unit_data['bonus'] || $unit_data['bonus_type'] == BONUS_ABILITY ? '' : ( |
258 | 258 | ($unit_data['bonus'] >= 0 ? '+' : '') . $unit_data['bonus'] . ($unit_data['bonus_type'] == BONUS_PERCENT ? '%' : '') |
259 | 259 | ); |
@@ -15,8 +15,8 @@ discard block |
||
15 | 15 | 'factor' => 1.5, |
16 | 16 | ), |
17 | 17 | P_UNIT_PRODUCTION => array( |
18 | - RES_METAL => function ($level, $production_factor, $user, $planet_row) {return 40 * $level * pow(1.1, $level) * (0.1 * $production_factor);}, |
|
19 | - RES_ENERGY => function ($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor);}, |
|
18 | + RES_METAL => function($level, $production_factor, $user, $planet_row) {return 40 * $level * pow(1.1, $level) * (0.1 * $production_factor); }, |
|
19 | + RES_ENERGY => function($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor); }, |
|
20 | 20 | ), |
21 | 21 | P_MINING_IS_MANAGED => true, |
22 | 22 | ), |
@@ -33,8 +33,8 @@ discard block |
||
33 | 33 | 'factor' => 1.6, |
34 | 34 | ), |
35 | 35 | P_UNIT_PRODUCTION => array( |
36 | - RES_CRYSTAL => function ($level, $production_factor, $user, $planet_row) {return 32 * $level * pow(1.1, $level) * (0.1 * $production_factor);}, |
|
37 | - RES_ENERGY => function ($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor);}, |
|
36 | + RES_CRYSTAL => function($level, $production_factor, $user, $planet_row) {return 32 * $level * pow(1.1, $level) * (0.1 * $production_factor); }, |
|
37 | + RES_ENERGY => function($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor); }, |
|
38 | 38 | ), |
39 | 39 | P_MINING_IS_MANAGED => true, |
40 | 40 | ), |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | 'factor' => 1.5, |
52 | 52 | ), |
53 | 53 | P_UNIT_PRODUCTION => array( |
54 | - RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return 10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28);}, |
|
55 | - RES_ENERGY => function ($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor);}, |
|
54 | + RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return 10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28); }, |
|
55 | + RES_ENERGY => function($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor); }, |
|
56 | 56 | ), |
57 | 57 | P_MINING_IS_MANAGED => true, |
58 | 58 | ), |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | 'factor' => 1.5, |
70 | 70 | ), |
71 | 71 | P_UNIT_PRODUCTION => array( |
72 | - RES_ENERGY => function ($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor);}, |
|
72 | + RES_ENERGY => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor); }, |
|
73 | 73 | ), |
74 | 74 | P_MINING_IS_MANAGED => true, |
75 | 75 | ), |
@@ -87,8 +87,8 @@ discard block |
||
87 | 87 | 'factor' => 1.8, |
88 | 88 | ), |
89 | 89 | P_UNIT_PRODUCTION => array( |
90 | - RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor);}, |
|
91 | - RES_ENERGY => function ($level, $production_factor, $user, $planet_row) {return 30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, null, TECH_ENERGY), $level) * (0.1 * $production_factor);}, |
|
90 | + RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor); }, |
|
91 | + RES_ENERGY => function($level, $production_factor, $user, $planet_row) {return 30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, null, TECH_ENERGY), $level) * (0.1 * $production_factor); }, |
|
92 | 92 | ), |
93 | 93 | P_MINING_IS_MANAGED => true, |
94 | 94 | ), |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | 'factor' => 2, |
106 | 106 | ), |
107 | 107 | 'storage' => array( |
108 | - RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);}, |
|
108 | + RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); }, |
|
109 | 109 | ), |
110 | 110 | ), |
111 | 111 | |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | 'factor' => 2, |
122 | 122 | ), |
123 | 123 | 'storage' => array( |
124 | - RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);}, |
|
124 | + RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); }, |
|
125 | 125 | ), |
126 | 126 | ), |
127 | 127 | |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | 'factor' => 2, |
138 | 138 | ), |
139 | 139 | 'storage' => array( |
140 | - RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);}, |
|
140 | + RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); }, |
|
141 | 141 | ), |
142 | 142 | ), |
143 | 143 |
@@ -36,8 +36,7 @@ discard block |
||
36 | 36 | $galaxy = isset($vector[$prefix . 'galaxy']) ? intval($vector[$prefix . 'galaxy']) : 0; |
37 | 37 | $system = isset($vector[$prefix . 'system']) ? intval($vector[$prefix . 'system']) : 0; |
38 | 38 | $planet = isset($vector[$prefix . 'planet']) ? intval($vector[$prefix . 'planet']) : 0; |
39 | - $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) : |
|
40 | - (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0); |
|
39 | + $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) : (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0); |
|
41 | 40 | $planet_type = $planet_type == PT_DEBRIS ? PT_PLANET : $planet_type; |
42 | 41 | |
43 | 42 | return db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update, $fields); |
@@ -45,7 +44,7 @@ discard block |
||
45 | 44 | |
46 | 45 | function db_planet_by_parent($parent_id, $for_update = false, $fields = '*') { |
47 | 46 | //if(!($parent_id = intval($parent_id))) return false; |
48 | - if(!($parent_id = idval($parent_id))) { |
|
47 | + if (!($parent_id = idval($parent_id))) { |
|
49 | 48 | return false; |
50 | 49 | } |
51 | 50 | |
@@ -55,7 +54,7 @@ discard block |
||
55 | 54 | |
56 | 55 | function db_planet_by_id_and_owner($planet_id, $owner_id, $for_update = false, $fields = '*') { |
57 | 56 | //if(!($planet_id = intval($planet_id)) || !($owner_id = intval($owner_id))) return false; |
58 | - if(!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) { |
|
57 | + if (!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) { |
|
59 | 58 | return false; |
60 | 59 | } |
61 | 60 | |
@@ -66,7 +65,7 @@ discard block |
||
66 | 65 | |
67 | 66 | function db_planet_list_moon_other($user_id, $this_moon_id) { |
68 | 67 | // if(!($user_id = intval($user_id)) || !($this_moon_id = intval($this_moon_id))) return false; |
69 | - if(!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) { |
|
68 | + if (!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) { |
|
70 | 69 | return false; |
71 | 70 | } |
72 | 71 | |
@@ -83,7 +82,7 @@ discard block |
||
83 | 82 | } |
84 | 83 | |
85 | 84 | function db_planet_list_sorted($user_row, $skip_planet_id = false, $field_list = '', $conditions = '') { |
86 | - if(!is_array($user_row)) { |
|
85 | + if (!is_array($user_row)) { |
|
87 | 86 | return false; |
88 | 87 | } |
89 | 88 | // $field_list = $field_list != '*' ? "{{planets}}.`id`, `name`, `image`, {{planets}}.`galaxy`, {{planets}}.`system`, {{planets}}.`planet`, `planet_type`{$field_list}" : $field_list; |
@@ -105,7 +104,7 @@ discard block |
||
105 | 104 | } |
106 | 105 | |
107 | 106 | function db_planet_list_by_user_or_planet($user_id, $planet_id) { |
108 | - if(!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) { |
|
107 | + if (!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) { |
|
109 | 108 | return false; |
110 | 109 | } |
111 | 110 | |
@@ -115,7 +114,7 @@ discard block |
||
115 | 114 | |
116 | 115 | function db_planet_set_by_id($planet_id, $set) { |
117 | 116 | // if(!($planet_id = intval($planet_id))) return false; |
118 | - if(!($planet_id = idval($planet_id))) { |
|
117 | + if (!($planet_id = idval($planet_id))) { |
|
119 | 118 | return false; |
120 | 119 | } |
121 | 120 | |
@@ -123,7 +122,7 @@ discard block |
||
123 | 122 | } |
124 | 123 | |
125 | 124 | function db_planet_set_by_gspt($ui_galaxy, $ui_system, $ui_planet, $ui_planet_type = PT_ALL, $set) { |
126 | - if(!($set = trim($set))) { |
|
125 | + if (!($set = trim($set))) { |
|
127 | 126 | return false; |
128 | 127 | } |
129 | 128 | |
@@ -137,7 +136,7 @@ discard block |
||
137 | 136 | |
138 | 137 | function db_planet_set_by_parent($ui_parent_id, $ss_set) { |
139 | 138 | //if(!($si_parent_id = intval($ui_parent_id)) || !($ss_set = trim($ss_set))) return false; |
140 | - if(!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) { |
|
139 | + if (!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) { |
|
141 | 140 | return false; |
142 | 141 | } |
143 | 142 | |
@@ -146,7 +145,7 @@ discard block |
||
146 | 145 | |
147 | 146 | function db_planet_set_by_owner($ui_owner_id, $ss_set) { |
148 | 147 | //if(!($si_owner_id = intval($ui_owner_id)) || !($ss_set = trim($ss_set))) return false; |
149 | - if(!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) { |
|
148 | + if (!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) { |
|
150 | 149 | return false; |
151 | 150 | } |
152 | 151 | |
@@ -156,7 +155,7 @@ discard block |
||
156 | 155 | |
157 | 156 | function db_planet_delete_by_id($planet_id) { |
158 | 157 | // if(!($planet_id = intval($planet_id))) return false; |
159 | - if(!($planet_id = idval($planet_id))) { |
|
158 | + if (!($planet_id = idval($planet_id))) { |
|
160 | 159 | return false; |
161 | 160 | } |
162 | 161 | classSupernova::db_del_record_by_id(LOC_PLANET, $planet_id); |
@@ -168,7 +167,7 @@ discard block |
||
168 | 167 | |
169 | 168 | function db_planet_list_delete_by_owner($ui_owner_id) { |
170 | 169 | // if(!($si_owner_id = intval($ui_owner_id))) return false; |
171 | - if(!($si_owner_id = idval($ui_owner_id))) { |
|
170 | + if (!($si_owner_id = idval($ui_owner_id))) { |
|
172 | 171 | return false; |
173 | 172 | } |
174 | 173 | classSupernova::db_del_record_list(LOC_PLANET, "`id_owner` = {$si_owner_id}"); |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | |
13 | 13 | include('common.' . substr(strrchr(__FILE__, '.'), 1)); |
14 | 14 | |
15 | -if(classSupernova::$config->game_mode == GAME_BLITZ) { |
|
15 | +if (classSupernova::$config->game_mode == GAME_BLITZ) { |
|
16 | 16 | message(classLocale::$lang['sys_blitz_page_disabled'], classLocale::$lang['sys_error'], 'overview.php', 10); |
17 | 17 | die(); |
18 | 18 | } |
@@ -25,8 +25,8 @@ discard block |
||
25 | 25 | |
26 | 26 | $template = gettemplate('search', true); |
27 | 27 | |
28 | -if($searchtext && $type) { |
|
29 | - switch($type) { |
|
28 | +if ($searchtext && $type) { |
|
29 | + switch ($type) { |
|
30 | 30 | case "planetname": |
31 | 31 | // $search = db_planet_list_search($searchtext); |
32 | 32 | break; |
@@ -41,8 +41,8 @@ discard block |
||
41 | 41 | break; |
42 | 42 | } |
43 | 43 | |
44 | - while($row = db_fetch($search)) { |
|
45 | - if($type == 'playername' || $type == 'planetname') { |
|
44 | + while ($row = db_fetch($search)) { |
|
45 | + if ($type == 'playername' || $type == 'planetname') { |
|
46 | 46 | $template->assign_block_vars('search_result', array( |
47 | 47 | 'PLAYER_ID' => $row['uid'], |
48 | 48 | 'PLAYER_NAME' => htmlentities($row['username'], ENT_COMPAT, 'UTF-8'), |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | 'ALLY_NAME' => htmlentities($row['ally_name'], ENT_COMPAT, 'UTF-8'), |
58 | 58 | 'ALLY_TAG' => htmlentities($row['ally_tag'], ENT_COMPAT, 'UTF-8'), |
59 | 59 | )); |
60 | - } elseif($type == 'ally') { |
|
60 | + } elseif ($type == 'ally') { |
|
61 | 61 | $template->assign_block_vars('search_result', array( |
62 | 62 | 'ALLY_NAME' => htmlentities($row['ally_name'], ENT_COMPAT, 'UTF-8'), |
63 | 63 | 'ALLY_TAG' => htmlentities($row['ally_tag'], ENT_COMPAT, 'UTF-8'), |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | 'ally' => 'sys_alliance', |
76 | 76 | ); |
77 | 77 | |
78 | -foreach($search_type as $type_id => $type_lang) { |
|
78 | +foreach ($search_type as $type_id => $type_lang) { |
|
79 | 79 | $template->assign_block_vars('type', array( |
80 | 80 | 'ID' => $type_id, |
81 | 81 | 'TEXT' => classLocale::$lang[$type_lang], |