@@ -77,8 +77,8 @@ discard block |
||
77 | 77 | $crystal += $destroyed * $unit_info[P_COST][RES_CRYSTAL] / 4; |
78 | 78 | } |
79 | 79 | |
80 | - $return['structures'] = $structures; // Structures left after attack |
|
81 | - $return['metal'] = floor($metal); // Metal scraps |
|
80 | + $return['structures'] = $structures; // Structures left after attack |
|
81 | + $return['metal'] = floor($metal); // Metal scraps |
|
82 | 82 | $return['crystal'] = floor($crystal); // Crystal scraps |
83 | 83 | |
84 | 84 | return $return; |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | } |
149 | 149 | |
150 | 150 | if (!empty($message)) { |
151 | - $message = classLocale::$lang['mip_defense_destroyed'] . $message . "{$classLocale['mip_recycled']}{$classLocale['Metal']}: {$attackResult['metal']}, {$classLocale['Crystal']}: {$attackResult['crystal']}<br>"; |
|
151 | + $message = classLocale::$lang['mip_defense_destroyed'].$message."{$classLocale['mip_recycled']}{$classLocale['Metal']}: {$attackResult['metal']}, {$classLocale['Crystal']}: {$attackResult['crystal']}<br>"; |
|
152 | 152 | |
153 | 153 | DBStaticPlanet::db_planet_set_by_id($target_planet_row['id'], "`metal` = `metal` + {$attackResult['metal']}, `crystal` = `crystal` + {$attackResult['crystal']}"); |
154 | 154 | } |
@@ -165,8 +165,8 @@ discard block |
||
165 | 165 | |
166 | 166 | empty($message) ? $message = classLocale::$lang['mip_no_defense'] : false; |
167 | 167 | |
168 | - DBStaticMessages::msg_send_simple_message($fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage . $message); |
|
169 | - DBStaticMessages::msg_send_simple_message($fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage . $message); |
|
168 | + DBStaticMessages::msg_send_simple_message($fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage.$message); |
|
169 | + DBStaticMessages::msg_send_simple_message($fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage.$message); |
|
170 | 170 | } |
171 | 171 | DBStaticFleetMissile::db_missile_delete($fleetRow); |
172 | 172 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include('common.' . substr(strrchr(__FILE__, '.'), 1)); |
|
3 | +include('common.'.substr(strrchr(__FILE__, '.'), 1)); |
|
4 | 4 | |
5 | 5 | $template = gettemplate('viewreport', true); |
6 | 6 | $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']); |
@@ -1,15 +1,15 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include('common.' . substr(strrchr(__FILE__, '.'), 1)); |
|
3 | +include('common.'.substr(strrchr(__FILE__, '.'), 1)); |
|
4 | 4 | |
5 | 5 | global $user; |
6 | 6 | |
7 | -if($user['authlevel'] < AUTH_LEVEL_DEVELOPER) { |
|
7 | +if ($user['authlevel'] < AUTH_LEVEL_DEVELOPER) { |
|
8 | 8 | $error_message = classSupernova::$config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : ( |
9 | 9 | !classSupernova::$config->game_blitz_register ? 'sys_blitz_registration_disabled' : '' |
10 | 10 | ); |
11 | 11 | |
12 | - if($error_message) { |
|
12 | + if ($error_message) { |
|
13 | 13 | message(classLocale::$lang[$error_message], classLocale::$lang['sys_error'], 'overview.php', 10); |
14 | 14 | die(); |
15 | 15 | } |
@@ -18,16 +18,16 @@ discard block |
||
18 | 18 | $current_round = intval(classSupernova::$config->db_loadItem('game_blitz_register_round')); |
19 | 19 | $current_price = intval(classSupernova::$config->db_loadItem('game_blitz_register_price')); |
20 | 20 | |
21 | -if(classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) { |
|
21 | +if (classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) { |
|
22 | 22 | sn_db_transaction_start(); |
23 | 23 | $user = DBStaticUser::db_user_by_id($user['id'], true); |
24 | 24 | $is_registered = db_blitz_reg_get_id_by_player_and_round($user, $current_round); |
25 | - if(sys_get_param_str('register_me')) { |
|
26 | - if(empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) { |
|
25 | + if (sys_get_param_str('register_me')) { |
|
26 | + if (empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) { |
|
27 | 27 | db_blitz_reg_insert($user, $current_round); |
28 | 28 | classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица"); |
29 | 29 | } |
30 | - } elseif(sys_get_param_str('register_me_not') && !empty($is_registered)) { |
|
30 | + } elseif (sys_get_param_str('register_me_not') && !empty($is_registered)) { |
|
31 | 31 | db_blitz_reg_delete($user, $current_round); |
32 | 32 | classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION_CANCEL, $current_price, "Отмена регистрации в раунде {$current_round} Блица"); |
33 | 33 | } |
@@ -42,17 +42,17 @@ discard block |
||
42 | 42 | $blitz_players = 0; |
43 | 43 | $blitz_prize_dark_matter = 0; |
44 | 44 | $blitz_prize_places = 0; |
45 | -if($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) { |
|
46 | - if(sys_get_param_str('generate')) { |
|
45 | +if ($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) { |
|
46 | + if (sys_get_param_str('generate')) { |
|
47 | 47 | $next_id = 0; |
48 | 48 | $query = db_blitz_reg_get_random_id($current_round); |
49 | - while($row = db_fetch($query)) { |
|
49 | + while ($row = db_fetch($query)) { |
|
50 | 50 | $next_id++; |
51 | - $blitz_name = 'Игрок' . $next_id; |
|
51 | + $blitz_name = 'Игрок'.$next_id; |
|
52 | 52 | $blitz_password = sys_random_string(8); |
53 | 53 | db_blitz_reg_update_with_name_and_password($blitz_name, $blitz_password, $row, $current_round); |
54 | 54 | } |
55 | - } elseif(sys_get_param_str('import_generated')) { |
|
55 | + } elseif (sys_get_param_str('import_generated')) { |
|
56 | 56 | // ЭТО НА БЛИЦЕ!!! |
57 | 57 | DBStaticUser::db_player_list_blitz_delete_players(); |
58 | 58 | DBStaticPlanet::db_planets_purge(); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $system = $system_step; |
75 | 75 | $planet = round(Vector::$knownPlanets / 2); |
76 | 76 | |
77 | - foreach($imported_string as &$string_data) { |
|
77 | + foreach ($imported_string as &$string_data) { |
|
78 | 78 | $string_data = explode(',', $string_data); |
79 | 79 | $username_safe = $string_data[0]; |
80 | 80 | |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | |
95 | 95 | $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], 30, '', false); |
96 | 96 | |
97 | - if(($system += $system_step) >= Vector::$knownSystems) { |
|
97 | + if (($system += $system_step) >= Vector::$knownSystems) { |
|
98 | 98 | $galaxy++; |
99 | 99 | $system = $system_step; |
100 | 100 | } |
@@ -104,13 +104,13 @@ discard block |
||
104 | 104 | classSupernova::$config->db_saveItem('users_amount', classSupernova::$config->users_amount + $new_players); |
105 | 105 | // pdump($imported_string); |
106 | 106 | // generated_string |
107 | - } elseif(sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) { |
|
107 | + } elseif (sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) { |
|
108 | 108 | $blitz_result = explode(';', $blitz_result_string); |
109 | 109 | $blitz_last_update = $blitz_result[0]; // Пока не используется |
110 | 110 | unset($blitz_result[0]); |
111 | - foreach($blitz_result as $blitz_result_data) { |
|
111 | + foreach ($blitz_result as $blitz_result_data) { |
|
112 | 112 | $blitz_result_data = explode(',', $blitz_result_data); |
113 | - if(count($blitz_result_data) == 5) { |
|
113 | + if (count($blitz_result_data) == 5) { |
|
114 | 114 | $blitz_result_data[1] = db_escape($blitz_result_data[1]); |
115 | 115 | db_blitz_reg_update_results($blitz_result_data, $current_round); |
116 | 116 | } |
@@ -118,14 +118,14 @@ discard block |
||
118 | 118 | $blitz_result = array(); |
119 | 119 | } |
120 | 120 | |
121 | - if(classSupernova::$config->game_mode == GAME_BLITZ) { |
|
121 | + if (classSupernova::$config->game_mode == GAME_BLITZ) { |
|
122 | 122 | $blitz_result = array(classSupernova::$config->db_loadItem('var_stat_update')); |
123 | - foreach(DBStaticUser::db_player_list_export_blitz_info() as $row) { |
|
123 | + foreach (DBStaticUser::db_player_list_export_blitz_info() as $row) { |
|
124 | 124 | $blitz_result[] = "{$row['id']},{$row['username']},{$row['onlinetime']},{$row['total_rank']},{$row['total_points']}"; |
125 | 125 | } |
126 | 126 | } else { |
127 | 127 | $query = db_blitz_reg_get_player_list($current_round); |
128 | - while($row = db_fetch($query)) { |
|
128 | + while ($row = db_fetch($query)) { |
|
129 | 129 | $blitz_generated[] = "{$row['blitz_name']},{$row['blitz_password']}"; |
130 | 130 | $row['blitz_online'] ? $blitz_prize_players_active++ : false; |
131 | 131 | $blitz_players++; |
@@ -133,13 +133,13 @@ discard block |
||
133 | 133 | $blitz_prize_dark_matter = $blitz_prize_players_active * 20000; |
134 | 134 | $blitz_prize_places = ceil($blitz_prize_players_active / 5); |
135 | 135 | |
136 | - if(sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) { |
|
136 | + if (sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) { |
|
137 | 137 | // $blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'); |
138 | 138 | $blitz_prize_places_actual = sys_get_param_int('blitz_prize_places'); |
139 | 139 | sn_db_transaction_start(); |
140 | 140 | $query = db_blitz_reg_get_player_list_order_by_place($current_round); |
141 | - while($row = db_fetch($query)) { |
|
142 | - if(!$row['blitz_place']) { |
|
141 | + while ($row = db_fetch($query)) { |
|
142 | + if (!$row['blitz_place']) { |
|
143 | 143 | continue; |
144 | 144 | } |
145 | 145 | |
@@ -148,14 +148,14 @@ discard block |
||
148 | 148 | |
149 | 149 | $reward = $blitz_prize_dark_matter_actual - $row['blitz_reward_dark_matter']; |
150 | 150 | pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}", $row['id']); |
151 | - if($reward) { |
|
151 | + if ($reward) { |
|
152 | 152 | rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf( |
153 | 153 | classLocale::$lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name'] |
154 | 154 | )); |
155 | 155 | db_blitz_reg_update_apply_results($reward, $row, $current_round); |
156 | 156 | } |
157 | 157 | |
158 | - if(!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) { |
|
158 | + if (!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) { |
|
159 | 159 | break; |
160 | 160 | } |
161 | 161 | } |
@@ -170,12 +170,12 @@ discard block |
||
170 | 170 | |
171 | 171 | $player_registered = false; |
172 | 172 | $query = db_blitz_reg_get_player_list_and_users($current_round); |
173 | -while($row = db_fetch($query)) { |
|
173 | +while ($row = db_fetch($query)) { |
|
174 | 174 | $tpl_player_data = array( |
175 | 175 | 'NAME' => player_nick_render_to_html($row, array('icons' => true, 'color' => true, 'ally' => true)), |
176 | 176 | ); |
177 | 177 | |
178 | - if(classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) { |
|
178 | + if (classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) { |
|
179 | 179 | // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда |
180 | 180 | $tpl_player_data = array_merge($tpl_player_data, array( |
181 | 181 | 'ID' => $row['id'], |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | } |
189 | 189 | |
190 | 190 | $template->assign_block_vars('registrations', $tpl_player_data); |
191 | - if($row['id'] == $user['id']) { |
|
191 | + if ($row['id'] == $user['id']) { |
|
192 | 192 | $player_registered = $row; |
193 | 193 | } |
194 | 194 | } |
@@ -14,7 +14,7 @@ |
||
14 | 14 | |
15 | 15 | $fields[0] = &$this->_result; |
16 | 16 | |
17 | - while($field = mysqli_fetch_field($data)) { |
|
17 | + while ($field = mysqli_fetch_field($data)) { |
|
18 | 18 | $fields[] = &$out[$field->name]; |
19 | 19 | } |
20 | 20 |
@@ -118,7 +118,7 @@ |
||
118 | 118 | * @param mixed $offset <p> |
119 | 119 | * The offset to assign the value to. |
120 | 120 | * </p> |
121 | - * @param mixed $value <p> |
|
121 | + * @param Unit $value <p> |
|
122 | 122 | * The value to set. |
123 | 123 | * </p> |
124 | 124 | * |
@@ -19,8 +19,8 @@ discard block |
||
19 | 19 | * @param array $arguments |
20 | 20 | */ |
21 | 21 | public function __call($method_name, array $arguments) { |
22 | - foreach($this->_container as $object) { |
|
23 | - if(is_object($object) && method_exists($object, $method_name)) { |
|
22 | + foreach ($this->_container as $object) { |
|
23 | + if (is_object($object) && method_exists($object, $method_name)) { |
|
24 | 24 | call_user_func_array(array($object, $method_name), $arguments); |
25 | 25 | } |
26 | 26 | } |
@@ -35,8 +35,8 @@ discard block |
||
35 | 35 | */ |
36 | 36 | public function getSumProperty($property_name) { |
37 | 37 | $result = 0.0; |
38 | - foreach($this->_container as $object) { |
|
39 | - if(is_object($object) && property_exists($object, $property_name)) { |
|
38 | + foreach ($this->_container as $object) { |
|
39 | + if (is_object($object) && property_exists($object, $property_name)) { |
|
40 | 40 | $result += $object->$property_name; |
41 | 41 | } |
42 | 42 | } |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | * @return mixed |
53 | 53 | */ |
54 | 54 | public function aggregateByMethod($method_name, &$result) { |
55 | - foreach($this->_container as $object) { |
|
56 | - if(is_object($object) && method_exists($object, $method_name)) { |
|
55 | + foreach ($this->_container as $object) { |
|
56 | + if (is_object($object) && method_exists($object, $method_name)) { |
|
57 | 57 | call_user_func(array($object, $method_name), $result); |
58 | 58 | } |
59 | 59 | } |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | function flt_mission_recycle($mission_data) { |
13 | 13 | $objFleet = $mission_data->fleet; |
14 | 14 | $destination_planet = &$mission_data->dst_planet; |
15 | - if(empty($destination_planet['id'])) { |
|
15 | + if (empty($destination_planet['id'])) { |
|
16 | 16 | $objFleet->markReturned(); |
17 | 17 | $objFleet->dbSave(); |
18 | 18 | |
@@ -22,10 +22,10 @@ discard block |
||
22 | 22 | $RecyclerCapacity = 0; |
23 | 23 | $OtherFleetCapacity = 0; |
24 | 24 | |
25 | - foreach($objFleet->shipsIterator() as $unit_id => $unit) { |
|
26 | - if(in_array($unit_id, Fleet::$snGroupFleet)) { |
|
25 | + foreach ($objFleet->shipsIterator() as $unit_id => $unit) { |
|
26 | + if (in_array($unit_id, Fleet::$snGroupFleet)) { |
|
27 | 27 | $capacity = get_unit_param($unit_id, P_CAPACITY) * $unit->count; |
28 | - if(in_array($unit_id, Fleet::$snGroupRecyclers)) { |
|
28 | + if (in_array($unit_id, Fleet::$snGroupRecyclers)) { |
|
29 | 29 | $RecyclerCapacity += $capacity; |
30 | 30 | } else { |
31 | 31 | $OtherFleetCapacity += $capacity; |
@@ -34,33 +34,33 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | $fleet_resources_amount = $objFleet->resourcesGetTotal(); |
37 | - if($fleet_resources_amount > $OtherFleetCapacity) { |
|
37 | + if ($fleet_resources_amount > $OtherFleetCapacity) { |
|
38 | 38 | // Если во флоте есть другие корабли И количество ресурсов больше, чем их ёмкость трюмов - значит часть этих ресурсов лежит в трюмах переработчиков |
39 | 39 | // Уменьшаем ёмкость переработчиков на указанную величину |
40 | 40 | $RecyclerCapacity -= ($fleet_resources_amount - $OtherFleetCapacity); |
41 | 41 | } |
42 | 42 | |
43 | 43 | $resources_recycled = array(); |
44 | - if(($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity) { |
|
44 | + if (($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity) { |
|
45 | 45 | $resources_recycled[RES_METAL] = $destination_planet["debris_metal"]; |
46 | 46 | $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"]; |
47 | 47 | } else { |
48 | - if(($destination_planet["debris_metal"] > $RecyclerCapacity / 2) && |
|
48 | + if (($destination_planet["debris_metal"] > $RecyclerCapacity / 2) && |
|
49 | 49 | ($destination_planet["debris_crystal"] > $RecyclerCapacity / 2) |
50 | 50 | ) { |
51 | 51 | $resources_recycled[RES_METAL] = $RecyclerCapacity / 2; |
52 | 52 | $resources_recycled[RES_CRYSTAL] = $RecyclerCapacity / 2; |
53 | 53 | } else { |
54 | - if($destination_planet["debris_metal"] > $destination_planet["debris_crystal"]) { |
|
54 | + if ($destination_planet["debris_metal"] > $destination_planet["debris_crystal"]) { |
|
55 | 55 | $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"]; |
56 | - if($destination_planet["debris_metal"] > ($RecyclerCapacity - $resources_recycled[RES_CRYSTAL])) { |
|
56 | + if ($destination_planet["debris_metal"] > ($RecyclerCapacity - $resources_recycled[RES_CRYSTAL])) { |
|
57 | 57 | $resources_recycled[RES_METAL] = $RecyclerCapacity - $resources_recycled[RES_CRYSTAL]; |
58 | 58 | } else { |
59 | 59 | $resources_recycled[RES_METAL] = $destination_planet["debris_metal"]; |
60 | 60 | } |
61 | 61 | } else { |
62 | 62 | $resources_recycled[RES_METAL] = $destination_planet["debris_metal"]; |
63 | - if($destination_planet["debris_crystal"] > ($RecyclerCapacity - $resources_recycled[RES_METAL])) { |
|
63 | + if ($destination_planet["debris_crystal"] > ($RecyclerCapacity - $resources_recycled[RES_METAL])) { |
|
64 | 64 | $resources_recycled[RES_CRYSTAL] = $RecyclerCapacity - $resources_recycled[RES_METAL]; |
65 | 65 | } else { |
66 | 66 | $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"]; |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | |
15 | 15 | $destination_planet = &$mission_data->dst_planet; |
16 | 16 | |
17 | - if(empty($destination_planet['id_owner']) || $objFleet->playerOwnerId != $destination_planet['id_owner']) { |
|
17 | + if (empty($destination_planet['id_owner']) || $objFleet->playerOwnerId != $destination_planet['id_owner']) { |
|
18 | 18 | $objFleet->markReturnedAndSave(); |
19 | 19 | |
20 | 20 | return CACHE_FLEET; |
@@ -27,9 +27,9 @@ discard block |
||
27 | 27 | $fleet_resources[RES_METAL], classLocale::$lang['Metal'], |
28 | 28 | $fleet_resources[RES_CRYSTAL], classLocale::$lang['Crystal'], |
29 | 29 | $fleet_resources[RES_DEUTERIUM], classLocale::$lang['Deuterium'] |
30 | - ) . '<br />' . classLocale::$lang['sys_relocate_mess_user']; |
|
31 | - foreach($objFleet->shipsIterator() as $ship_id => $ship) { |
|
32 | - $Message .= classLocale::$lang['tech'][$ship_id] . ' - ' . $ship->count . '<br />'; |
|
30 | + ).'<br />'.classLocale::$lang['sys_relocate_mess_user']; |
|
31 | + foreach ($objFleet->shipsIterator() as $ship_id => $ship) { |
|
32 | + $Message .= classLocale::$lang['tech'][$ship_id].' - '.$ship->count.'<br />'; |
|
33 | 33 | } |
34 | 34 | DBStaticMessages::msg_send_simple_message( |
35 | 35 | $objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT, |
@@ -39,23 +39,23 @@ discard block |
||
39 | 39 | |
40 | 40 | $sta_update_msg = db_escape($sta_update_msg); |
41 | 41 | |
42 | - if($next_step) { |
|
42 | + if ($next_step) { |
|
43 | 43 | $sta_update_step++; |
44 | 44 | } |
45 | 45 | $sta_update_msg = "Update in progress. Step {$sta_update_step}/14: {$sta_update_msg}."; |
46 | 46 | |
47 | 47 | classSupernova::$config->db_saveItem('var_stat_update_msg', $sta_update_msg); |
48 | - if($next_step) { |
|
48 | + if ($next_step) { |
|
49 | 49 | classSupernova::$debug->warning($sta_update_msg, 'Stat update', LOG_INFO_STAT_PROCESS); |
50 | 50 | } |
51 | 51 | } |
52 | 52 | |
53 | 53 | function sys_stat_calculate_flush(&$data, $force = false) { |
54 | - if(count($data) < 25 && !$force) { |
|
54 | + if (count($data) < 25 && !$force) { |
|
55 | 55 | return; |
56 | 56 | } |
57 | 57 | |
58 | - if(!empty($data)) { |
|
58 | + if (!empty($data)) { |
|
59 | 59 | doquery('REPLACE INTO {{statpoints}} |
60 | 60 | (`id_owner`, `id_ally`, `stat_type`, `stat_code`, `tech_points`, `tech_count`, `build_points`, `build_count`, |
61 | 61 | `defs_points`, `defs_count`, `fleet_points`, `fleet_count`, `res_points`, `res_count`, `total_points`, |
@@ -95,11 +95,11 @@ discard block |
||
95 | 95 | $user_list = DBStaticUser::db_user_list('', true, 'id, dark_matter, metal, crystal, deuterium, user_as_ally, ally_id'); |
96 | 96 | $row_num = count($user_list); |
97 | 97 | // while($player = db_fetch($query)) |
98 | - foreach($user_list as $player) { |
|
99 | - if($i++ % 100 == 0) { |
|
98 | + foreach ($user_list as $player) { |
|
99 | + if ($i++ % 100 == 0) { |
|
100 | 100 | sta_set_time_limit("calculating players stats (player {$i}/{$row_num})", false); |
101 | 101 | } |
102 | - if(array_key_exists($user_id = $player['id'], $user_skip_list)) { |
|
102 | + if (array_key_exists($user_id = $player['id'], $user_skip_list)) { |
|
103 | 103 | continue; |
104 | 104 | } |
105 | 105 | |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | // $points[$user_id][UNIT_RESOURCES] += $resources; |
110 | 110 | |
111 | 111 | // А здесь мы фильтруем пользователей по $user_skip_list - далее не нужно этого делать, потому что |
112 | - if(!isset($user_skip_list[$user_id])) { |
|
112 | + if (!isset($user_skip_list[$user_id])) { |
|
113 | 113 | $user_allies[$user_id] = $player['ally_id']; |
114 | 114 | } |
115 | 115 | } |
@@ -123,11 +123,11 @@ discard block |
||
123 | 123 | $i = 0; |
124 | 124 | $query = DBStaticPlanet::db_planet_list_resources_by_owner(); |
125 | 125 | $row_num = db_num_rows($query); |
126 | - while($planet = db_fetch($query)) { |
|
127 | - if($i++ % 100 == 0) { |
|
126 | + while ($planet = db_fetch($query)) { |
|
127 | + if ($i++ % 100 == 0) { |
|
128 | 128 | sta_set_time_limit("calculating planets stats (planet {$i}/{$row_num})", false); |
129 | 129 | } |
130 | - if(array_key_exists($user_id = $planet['id_owner'], $user_skip_list)) { |
|
130 | + if (array_key_exists($user_id = $planet['id_owner'], $user_skip_list)) { |
|
131 | 131 | continue; |
132 | 132 | } |
133 | 133 | |
@@ -142,8 +142,8 @@ discard block |
||
142 | 142 | $i = 0; |
143 | 143 | $query = FleetList::dbQueryAllId(); |
144 | 144 | $row_num = db_num_rows($query); |
145 | - while($fleet_row = db_fetch($query)) { |
|
146 | - if($i++ % 100 == 0) { |
|
145 | + while ($fleet_row = db_fetch($query)) { |
|
146 | + if ($i++ % 100 == 0) { |
|
147 | 147 | sta_set_time_limit("calculating flying fleets stats (fleet {$i}/{$row_num})", false); |
148 | 148 | } |
149 | 149 | $objFleet = new Fleet(); |
@@ -151,14 +151,14 @@ discard block |
||
151 | 151 | // К тому же при включённом кэшировании это быстро забъёт кэш холодными данными |
152 | 152 | // $objFleet->_reset(); |
153 | 153 | $objFleet->dbRowParse($fleet_row); |
154 | - if(array_key_exists($user_id = $objFleet->playerOwnerId, $user_skip_list)) { |
|
154 | + if (array_key_exists($user_id = $objFleet->playerOwnerId, $user_skip_list)) { |
|
155 | 155 | continue; |
156 | 156 | } |
157 | 157 | |
158 | - foreach($objFleet->shipsIterator() as $unit_id => $unit) { |
|
158 | + foreach ($objFleet->shipsIterator() as $unit_id => $unit) { |
|
159 | 159 | $counts[$user_id][UNIT_SHIPS] += $unit->count; |
160 | 160 | |
161 | - if(!isset($unit_cost_cache[$unit_id][0])) { |
|
161 | + if (!isset($unit_cost_cache[$unit_id][0])) { |
|
162 | 162 | $unit_cost_cache[$unit_id][0] = get_unit_param($unit_id, P_COST); |
163 | 163 | } |
164 | 164 | $unit_cost_data = &$unit_cost_cache[$unit_id][0]; |
@@ -178,11 +178,11 @@ discard block |
||
178 | 178 | $i = 0; |
179 | 179 | $query = DBStaticUnit::db_unit_list_stat_calculate(); |
180 | 180 | $row_num = db_num_rows($query); |
181 | - while($unit = db_fetch($query)) { |
|
182 | - if($i++ % 100 == 0) { |
|
181 | + while ($unit = db_fetch($query)) { |
|
182 | + if ($i++ % 100 == 0) { |
|
183 | 183 | sta_set_time_limit("calculating unit stats (unit {$i}/{$row_num})", false); |
184 | 184 | } |
185 | - if(array_key_exists($user_id = $unit['unit_player_id'], $user_skip_list)) { |
|
185 | + if (array_key_exists($user_id = $unit['unit_player_id'], $user_skip_list)) { |
|
186 | 186 | continue; |
187 | 187 | } |
188 | 188 | |
@@ -196,11 +196,11 @@ discard block |
||
196 | 196 | $i = 0; |
197 | 197 | $query = DBStaticQue::db_que_list_stat(); |
198 | 198 | $row_num = db_num_rows($query); |
199 | - while($que_item = db_fetch($query)) { |
|
200 | - if($i++ % 100 == 0) { |
|
199 | + while ($que_item = db_fetch($query)) { |
|
200 | + if ($i++ % 100 == 0) { |
|
201 | 201 | sta_set_time_limit("calculating ques stats (que item {$i}/{$row_num})", false); |
202 | 202 | } |
203 | - if(array_key_exists($user_id = $que_item['que_player_id'], $user_skip_list)) { |
|
203 | + if (array_key_exists($user_id = $que_item['que_player_id'], $user_skip_list)) { |
|
204 | 204 | continue; |
205 | 205 | } |
206 | 206 | $que_unit_amount = $que_item['que_unit_amount']; |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | |
220 | 220 | sta_set_time_limit('posting new user stats to DB'); |
221 | 221 | $data = array(); |
222 | - foreach($user_allies as $user_id => $ally_id) { |
|
222 | + foreach ($user_allies as $user_id => $ally_id) { |
|
223 | 223 | // $counts[UNIT_RESOURCES] дублирует $points[UNIT_RESOURCES], поэтому $points не заполняем, а берем $counts и делим на 1000 |
224 | 224 | $points[$user_id][UNIT_RESOURCES] = $counts[$user_id][UNIT_RESOURCES] / 1000; |
225 | 225 | $points[$user_id] = array_map('floor', $points[$user_id]); |
@@ -231,10 +231,10 @@ discard block |
||
231 | 231 | $user_points = array_sum($points[$user_id]); |
232 | 232 | $user_counts = array_sum($counts[$user_id]); |
233 | 233 | |
234 | - $data[] = $q = "({$user_id},{$ally_id},1,1,'{$points[$user_id][UNIT_TECHNOLOGIES]}','{$counts[$user_id][UNIT_TECHNOLOGIES]}'," . |
|
235 | - "'{$points[$user_id][UNIT_STRUCTURES]}','{$counts[$user_id][UNIT_STRUCTURES]}','{$user_defence_points}','{$user_defence_counts}'," . |
|
236 | - "'{$points[$user_id][UNIT_SHIPS]}','{$counts[$user_id][UNIT_SHIPS]}','{$points[$user_id][UNIT_RESOURCES]}','{$counts[$user_id][UNIT_RESOURCES]}'," . |
|
237 | - "{$user_points},{$user_counts}," . SN_TIME_NOW . ")"; |
|
234 | + $data[] = $q = "({$user_id},{$ally_id},1,1,'{$points[$user_id][UNIT_TECHNOLOGIES]}','{$counts[$user_id][UNIT_TECHNOLOGIES]}',". |
|
235 | + "'{$points[$user_id][UNIT_STRUCTURES]}','{$counts[$user_id][UNIT_STRUCTURES]}','{$user_defence_points}','{$user_defence_counts}',". |
|
236 | + "'{$points[$user_id][UNIT_SHIPS]}','{$counts[$user_id][UNIT_SHIPS]}','{$points[$user_id][UNIT_RESOURCES]}','{$counts[$user_id][UNIT_RESOURCES]}',". |
|
237 | + "{$user_points},{$user_counts},".SN_TIME_NOW.")"; |
|
238 | 238 | |
239 | 239 | sys_stat_calculate_flush($data); |
240 | 240 | } |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | SUM(u.`tech_points`)+aus.`tech_points`, SUM(u.`tech_count`)+aus.`tech_count`, SUM(u.`build_points`)+aus.`build_points`, SUM(u.`build_count`)+aus.`build_count`, |
255 | 255 | SUM(u.`defs_points`)+aus.`defs_points`, SUM(u.`defs_count`)+aus.`defs_count`, SUM(u.`fleet_points`)+aus.`fleet_points`, SUM(u.`fleet_count`)+aus.`fleet_count`, |
256 | 256 | SUM(u.`res_points`)+aus.`res_points`, SUM(u.`res_count`)+aus.`res_count`, SUM(u.`total_points`)+aus.`total_points`, SUM(u.`total_count`)+aus.`total_count`, |
257 | - " . SN_TIME_NOW . ", NULL, u.`id_ally`, 2, 1, |
|
257 | + " . SN_TIME_NOW.", NULL, u.`id_ally`, 2, 1, |
|
258 | 258 | a.tech_rank, a.build_rank, a.defs_rank, a.fleet_rank, a.res_rank, a.total_rank |
259 | 259 | FROM {{statpoints}} AS u |
260 | 260 | JOIN {{alliance}} AS al ON al.id = u.id_ally |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | |
276 | 276 | // Updating player's ranks |
277 | 277 | sta_set_time_limit("updating ranks for players"); |
278 | - foreach($rankNames as $rankName) { |
|
278 | + foreach ($rankNames as $rankName) { |
|
279 | 279 | sta_set_time_limit("updating player rank '{$rankName}'", false); |
280 | 280 | doquery($qryResetRowNum); |
281 | 281 | doquery(sprintf($qryFormat, $rankName, 1)); |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | |
284 | 284 | sta_set_time_limit("updating ranks for Alliances"); |
285 | 285 | // --- Updating Allie's ranks |
286 | - foreach($rankNames as $rankName) { |
|
286 | + foreach ($rankNames as $rankName) { |
|
287 | 287 | sta_set_time_limit("updating Alliances rank '{$rankName}'", false); |
288 | 288 | doquery($qryResetRowNum); |
289 | 289 | doquery(sprintf($qryFormat, $rankName, 2)); |