Merge pull request #151 from leojonathanoh/feature/bf2sclone-add-envi…

…ronment-variables-to-customize-rankings Feature (bf2sclone): Add environment variables to customize rankings
startersclan · Jan 28, 2024 · 6269050 · 6269050
2 parents f1f8eb1 + 09ecdd4
commit 6269050
Show file tree

Hide file tree

Showing 23 changed files with 171 additions and 39 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -142,6 +142,8 @@ services:
       - RANKING_REFRESH_TIME=0
       # - RANKING_HIDE_BOTS=false
       # - RANKING_HIDE_HIDDEN_PLAYERS=false
+      # - RANKING_HIDE_PIDS_START=1
+      # - RANKING_HIDE_PIDS_END=999999999
       # - LEADERBOARD_COUNT=25
     ports:
       - 8082:80

diff --git a/src/bf2sclone/config.inc.php b/src/bf2sclone/config.inc.php
@@ -33,6 +33,10 @@ function defineVar($name, $default) {
 // Whether to hide hidden players from rankings
 defineVar('RANKING_HIDE_HIDDEN_PLAYERS', false);
 
+// Whether to hide a range of PIDs from rankings
+defineVar('RANKING_HIDE_PIDS_START', 1);
+defineVar('RANKING_HIDE_PIDS_END', 999999999);
+
 // Number of players to show on the leaderboard frontpage
 defineVar('LEADERBOARD_COUNT', 25);
 ?>
diff --git a/src/bf2sclone/queries/getEnemiesByPID.php b/src/bf2sclone/queries/getEnemiesByPID.php
@@ -6,6 +6,12 @@
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
 		$WHERE .= ' AND player.hidden = 0';
 	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
+	}
 
 	$query = "SELECT attacker, count FROM kills INNER JOIN player ON kills.attacker = player.id WHERE victim = $PID $WHERE ORDER BY count DESC LIMIT 11;";
 ?>

diff --git a/src/bf2sclone/queries/getLeaderBoardEntry.php b/src/bf2sclone/queries/getLeaderBoardEntry.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = 'SELECT id,name,kills,rank,score,(score/(time/60)) as spm, (kills/deaths) as kdr, time, country FROM player WHERE (';

diff --git a/src/bf2sclone/queries/getNameFromPID.php b/src/bf2sclone/queries/getNameFromPID.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = "SELECT name FROM player WHERE id = $PID $WHERE;";

diff --git a/src/bf2sclone/queries/getPIDList.php b/src/bf2sclone/queries/getPIDList.php
@@ -1,11 +1,17 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
 	}
-
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
+	}
+
 	$query = "SELECT id,name,rank,score,(score/(time/60)) as spm, (kills/deaths) as kdr, time, country FROM player WHERE (name LIKE '$SEARCHVALUE' OR name LIKE ' $SEARCHVALUE' OR id = '$SEARCHVALUE') $WHERE ORDER BY score DESC LIMIT 30;";
 ?>
diff --git a/src/bf2sclone/queries/getPlayerData.php b/src/bf2sclone/queries/getPlayerData.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = "SELECT * FROM player WHERE id = $PID $WHERE;";

diff --git a/src/bf2sclone/queries/getPlayerDataByName.php b/src/bf2sclone/queries/getPlayerDataByName.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = "SELECT * FROM player WHERE name like '$NICK' $WHERE;";

diff --git a/src/bf2sclone/queries/getRankFromPID.php b/src/bf2sclone/queries/getRankFromPID.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = "SELECT rank FROM player WHERE id = $PID $WHERE;";

diff --git a/src/bf2sclone/queries/getRankingTopCMD.php b/src/bf2sclone/queries/getRankingTopCMD.php
@@ -2,10 +2,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = "SELECT id,name,rank,cmdscore/cmdtime as cmd ,country FROM player WHERE 1=1 $WHERE ORDER BY cmd DESC LIMIT 5;";

diff --git a/src/bf2sclone/queries/getRankingTopCaptures.php b/src/bf2sclone/queries/getRankingTopCaptures.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	#WHERE captures>0 

diff --git a/src/bf2sclone/queries/getRankingTopCmdScore.php b/src/bf2sclone/queries/getRankingTopCmdScore.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = "SELECT id,name,rank,cmdscore,country FROM player WHERE 1=1 $WHERE ORDER BY cmdscore DESC LIMIT 5;";

diff --git a/src/bf2sclone/queries/getRankingTopFlagwork.php b/src/bf2sclone/queries/getRankingTopFlagwork.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = "SELECT id,name,rank,captureassists+captures+neutralizes+defends as flagwork,country FROM player WHERE 1=1 $WHERE ORDER BY flagwork DESC LIMIT 5;";

diff --git a/src/bf2sclone/queries/getRankingTopKDR.php b/src/bf2sclone/queries/getRankingTopKDR.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	#NOTE: minimum 1 death

diff --git a/src/bf2sclone/queries/getRankingTopKills.php b/src/bf2sclone/queries/getRankingTopKills.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = "SELECT id,name,rank,kills,country FROM player WHERE 1=1 $WHERE ORDER BY kills DESC LIMIT 5;";

diff --git a/src/bf2sclone/queries/getRankingTopRndScore.php b/src/bf2sclone/queries/getRankingTopRndScore.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	#NOTE: minimum 1 death

diff --git a/src/bf2sclone/queries/getRankingTopSPM.php b/src/bf2sclone/queries/getRankingTopSPM.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = "SELECT id,name,rank,score/(time/60) as spm,country FROM player WHERE 1=1 $WHERE ORDER BY spm DESC LIMIT 5;";

diff --git a/src/bf2sclone/queries/getRankingTopSani.php b/src/bf2sclone/queries/getRankingTopSani.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = "SELECT id,name,rank,heals+revives as sani ,country FROM player WHERE 1=1 $WHERE ORDER BY sani DESC LIMIT 5;";

diff --git a/src/bf2sclone/queries/getRankingTopScore.php b/src/bf2sclone/queries/getRankingTopScore.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = "SELECT id,name,rank,score,country FROM player WHERE 1=1 $WHERE ORDER BY score DESC LIMIT 5;";

diff --git a/src/bf2sclone/queries/getRankingTopTeamwork.php b/src/bf2sclone/queries/getRankingTopTeamwork.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = "SELECT id,name,rank,teamscore-(teamdamage+teamkills+teamvehicledamage) as teamwork,country FROM player WHERE teamscore>(teamdamage+teamkills+teamvehicledamage) $WHERE ORDER BY teamwork DESC LIMIT 5;";

diff --git a/src/bf2sclone/queries/getRankingTopWLR.php b/src/bf2sclone/queries/getRankingTopWLR.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	#NOTE: minimum 1 death

diff --git a/src/bf2sclone/queries/getTopPlayers.php b/src/bf2sclone/queries/getTopPlayers.php
@@ -1,10 +1,16 @@
 <?php
 	$WHERE = '';
 	if (RANKING_HIDE_BOTS) {
-		$WHERE .= ' AND isbot = 0';
+		$WHERE .= ' AND player.isbot = 0';
 	}
 	if (RANKING_HIDE_HIDDEN_PLAYERS) {
-		$WHERE .= ' AND hidden = 0';
+		$WHERE .= ' AND player.hidden = 0';
+	}
+	if (RANKING_HIDE_PIDS_START) {
+		$WHERE .= ' AND player.id >= ' . RANKING_HIDE_PIDS_START;
+	}
+	if (RANKING_HIDE_PIDS_END) {
+		$WHERE .= ' AND player.id <= ' . RANKING_HIDE_PIDS_END;
 	}
 
 	$query = "SELECT id, rank, country, name, score, time, (score/(time/60)) as spm, (kills/deaths) as kdr FROM player WHERE 1=1 $WHERE ORDER BY score DESC LIMIT ". LEADERBOARD_COUNT .";";