Skip to content

Revert "Fix queries for MySQL 8.0+" #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: alpha
Choose a base branch
from
Open

Revert "Fix queries for MySQL 8.0+" #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions modules/LevelsRanks/module_block_main_top/forward/data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
if ( ! empty( $Db->db_data['LevelsRanks'] ) ):
for ($d = 0; $d < $Db->table_count['LevelsRanks']; $d++ ):
// Забираем массив даннхы
$data['module_block_main_top'][] = $Db->queryAll( 'LevelsRanks', $Db->db_data['LevelsRanks'][$d]['USER_ID'], $Db->db_data['LevelsRanks'][$d]['DB_num'],'SELECT `name`, `rank`, `steam`, `playtime`, `value`, `kills`, `deaths`, CASE WHEN `deaths` = 0 THEN `deaths` = 1 END, TRUNCATE( `kills`/`deaths`, 2 ) AS `kd` FROM `' . $Db->db_data['LevelsRanks'][ $d ]['Table'] . '` WHERE `lastconnect` > 0 order by `value` desc LIMIT 10' );
$data['module_block_main_top'][] = $Db->queryAll( 'LevelsRanks', $Db->db_data['LevelsRanks'][$d]['USER_ID'], $Db->db_data['LevelsRanks'][$d]['DB_num'],'SELECT name, rank, steam, playtime, value, kills, deaths, CASE WHEN deaths = 0 THEN deaths = 1 END, TRUNCATE( kills/deaths, 2 ) AS kd FROM ' . $Db->db_data['LevelsRanks'][ $d ]['Table'] . ' WHERE lastconnect > 0 order by `value` desc LIMIT 10' );
endfor;
endif;

Expand All @@ -23,17 +23,17 @@
for ($d = 1; $d <= $Db->table_count['FPS']; $d++ ):
// Забираем массив даннхы
$data['module_block_main_top'][] = $Db->queryAll( 'FPS', 0, 0,
'SELECT `fps_players`.`nickname` AS `name`,
`fps_players`.`steam_id` AS `steam`,
`fps_servers_stats`.`points` AS `value`,
`fps_servers_stats`.`kills`,
`fps_servers_stats`.`deaths`,
`fps_servers_stats`.`playtime`,
`fps_servers_stats`.`rank`,
CASE WHEN `fps_servers_stats`.`deaths` = 0 THEN `fps_servers_stats`.`deaths` = 1 END, TRUNCATE( `fps_servers_stats`.`kills`/`fps_servers_stats`.`deaths`, 2 ) AS `kd`
FROM `fps_players`
INNER JOIN `fps_servers_stats` ON `fps_players`.`account_id` = `fps_servers_stats`.`account_id`
WHERE `fps_servers_stats`.`server_id` = ' . $d . ' AND `fps_servers_stats`.`lastconnect` > 0
'SELECT fps_players.nickname AS name,
fps_players.steam_id AS steam,
fps_servers_stats.points AS value,
fps_servers_stats.kills,
fps_servers_stats.deaths,
fps_servers_stats.playtime,
fps_servers_stats.rank,
CASE WHEN fps_servers_stats.deaths = 0 THEN fps_servers_stats.deaths = 1 END, TRUNCATE( fps_servers_stats.kills/fps_servers_stats.deaths, 2 ) AS kd
FROM fps_players
INNER JOIN fps_servers_stats ON fps_players.account_id = fps_servers_stats.account_id
WHERE fps_servers_stats.server_id = ' . $d . ' AND fps_servers_stats.lastconnect > 0
order by `value` desc LIMIT 10' );
endfor;
endif;
Expand All @@ -42,7 +42,7 @@
if ( ! empty( $Db->db_data['RankMeKento'] ) ):
for ($d = 0; $d < $Db->table_count['RankMeKento']; $d++ ):
// Забираем массив даннхы
$data['module_block_main_top'][] = $Db->queryAll( 'RankMeKento', $Db->db_data['RankMeKento'][$d]['USER_ID'], $Db->db_data['RankMeKento'][$d]['DB_num'],'SELECT `name`, `steam`, `connected` AS `playtime`, `score` AS `value`, `kills`, `deaths`, CASE WHEN `deaths` = 0 THEN `deaths` = 1 END, TRUNCATE( `kills`/`deaths`, 2 ) AS `kd` FROM `' . $Db->db_data['RankMeKento'][ $d ]['Table'] . '` WHERE `lastconnect` > 0 order by `value` desc LIMIT 10' );
$data['module_block_main_top'][] = $Db->queryAll( 'RankMeKento', $Db->db_data['RankMeKento'][$d]['USER_ID'], $Db->db_data['RankMeKento'][$d]['DB_num'],'SELECT `name`, steam, connected AS playtime, score AS `value`, kills, deaths, CASE WHEN deaths = 0 THEN deaths = 1 END, TRUNCATE( kills/deaths, 2 ) AS kd FROM ' . $Db->db_data['RankMeKento'][ $d ]['Table'] . ' WHERE lastconnect > 0 order by `value` desc LIMIT 10' );
endfor;
endif;

Expand All @@ -63,7 +63,7 @@
if ( ! empty( $Db->db_data['LevelsRanks'] ) ):
for ($d = 0; $d < $Db->table_count['LevelsRanks']; $d++ ):
// Забираем массив даннхы
$data['module_block_main_top'][] = $Db->queryAll( 'LevelsRanks', $Db->db_data['LevelsRanks'][$d]['USER_ID'], $Db->db_data['LevelsRanks'][$d]['DB_num'],'SELECT `name`, `rank`, `steam`, `playtime`, `value`, `kills`, `deaths`, CASE WHEN `deaths` = 0 THEN `deaths` = 1 END, TRUNCATE( `kills`/`deaths`, 2 ) AS `kd` FROM `' . $Db->db_data['LevelsRanks'][ $d ]['Table'] . '` WHERE `lastconnect` > 0 order by `value` desc LIMIT 10' );
$data['module_block_main_top'][] = $Db->queryAll( 'LevelsRanks', $Db->db_data['LevelsRanks'][$d]['USER_ID'], $Db->db_data['LevelsRanks'][$d]['DB_num'],'SELECT name, rank, steam, playtime, value, kills, deaths, CASE WHEN deaths = 0 THEN deaths = 1 END, TRUNCATE( kills/deaths, 2 ) AS kd FROM ' . $Db->db_data['LevelsRanks'][ $d ]['Table'] . ' WHERE lastconnect > 0 order by `value` desc LIMIT 10' );
endfor;
endif;

Expand All @@ -72,17 +72,17 @@
for ($d = 1; $d <= $Db->table_count['FPS']; $d++ ):
// Забираем массив даннхы
$data['module_block_main_top'][] = $Db->queryAll( 'FPS', 0, 0,
'SELECT `fps_players`.`nickname` AS `name`,
`fps_players`.`steam_id` AS `steam`,
`fps_servers_stats`.`points` AS `value`,
`fps_servers_stats`.`kills`,
`fps_servers_stats`.`deaths`,
`fps_servers_stats`.`playtime`,
`fps_servers_stats`.`rank`,
CASE WHEN `fps_servers_stats`.`deaths` = 0 THEN `fps_servers_stats`.`deaths` = 1 END, TRUNCATE( `fps_servers_stats`.`kills`/`fps_servers_stats`.`deaths`, 2 ) AS `kd`
FROM `fps_players`
INNER JOIN `fps_servers_stats` ON `fps_players`.`account_id` = `fps_servers_stats`.`account_id`
WHERE `fps_servers_stats`.`server_id` = ' . $d . ' AND `fps_servers_stats`.`lastconnect` > 0
'SELECT fps_players.nickname AS name,
fps_players.steam_id AS steam,
fps_servers_stats.points AS value,
fps_servers_stats.kills,
fps_servers_stats.deaths,
fps_servers_stats.playtime,
fps_servers_stats.rank,
CASE WHEN fps_servers_stats.deaths = 0 THEN fps_servers_stats.deaths = 1 END, TRUNCATE( fps_servers_stats.kills/fps_servers_stats.deaths, 2 ) AS kd
FROM fps_players
INNER JOIN fps_servers_stats ON fps_players.account_id = fps_servers_stats.account_id
WHERE fps_servers_stats.server_id = ' . $d . ' AND fps_servers_stats.lastconnect > 0
order by `value` desc LIMIT 10' );
endfor;
endif;
Expand All @@ -91,7 +91,7 @@
if ( ! empty( $Db->db_data['RankMeKento'] ) ):
for ($d = 0; $d < $Db->table_count['RankMeKento']; $d++ ):
// Забираем массив даннхы
$data['module_block_main_top'][] = $Db->queryAll( 'RankMeKento', $Db->db_data['RankMeKento'][$d]['USER_ID'], $Db->db_data['RankMeKento'][$d]['DB_num'],'SELECT `name`, `steam`, `connected` AS `playtime`, `score` AS `value`, `kills`, `deaths`, CASE WHEN `deaths` = 0 THEN `deaths` = 1 END, TRUNCATE( `kills`/`deaths`, 2 ) AS `kd` FROM `' . $Db->db_data['RankMeKento'][ $d ]['Table'] . '` WHERE `lastconnect` > 0 order by `value` desc LIMIT 10' );
$data['module_block_main_top'][] = $Db->queryAll( 'RankMeKento', $Db->db_data['RankMeKento'][$d]['USER_ID'], $Db->db_data['RankMeKento'][$d]['DB_num'],'SELECT `name`, steam, connected AS playtime, score AS `value`, kills, deaths, CASE WHEN deaths = 0 THEN deaths = 1 END, TRUNCATE( kills/deaths, 2 ) AS kd FROM ' . $Db->db_data['RankMeKento'][ $d ]['Table'] . ' WHERE lastconnect > 0 order by `value` desc LIMIT 10' );
endfor;
endif;

Expand Down
Loading