From 9f1302afe9a8c3deb9bae32a581376a55ab8286a Mon Sep 17 00:00:00 2001
From: Leonard Jonathan Oh <leonardjonathanoh@live.com>
Date: Fri, 23 Feb 2024 15:05:34 +0000
Subject: [PATCH] Enhancement (bf2sclone): Add environment variable to hide
 country flags

---
 docker-compose.yml                        | 1 +
 src/bf2sclone/config.inc.php              | 5 ++++-
 src/bf2sclone/template/leaderboard.php    | 2 +-
 src/bf2sclone/template/my-leaderboard.php | 2 +-
 src/bf2sclone/template/playerstats.php    | 2 +-
 src/bf2sclone/template/search.php         | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4897afd..3b0f16d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -147,6 +147,7 @@ services:
       # - TITLE=BF2S Clone
       - RANKING_REFRESH_TIME=0
       # - RANKING_HIDE_BOTS=false
+      # - RANKING_HIDE_COUNTRY=false
       # - RANKING_HIDE_HIDDEN_PLAYERS=false
       # - RANKING_HIDE_PIDS_START=1
       # - RANKING_HIDE_PIDS_END=999999999
diff --git a/src/bf2sclone/config.inc.php b/src/bf2sclone/config.inc.php
index b62a7b3..158abb2 100644
--- a/src/bf2sclone/config.inc.php
+++ b/src/bf2sclone/config.inc.php
@@ -30,6 +30,9 @@ function defineVar($name, $default) {
 // Whether to hide bots from rankings
 defineVar('RANKING_HIDE_BOTS', false);
 
+// Whether to hide player country flag from rankings
+defineVar('RANKING_HIDE_COUNTRY', false);
+
 // Whether to hide hidden players from rankings
 defineVar('RANKING_HIDE_HIDDEN_PLAYERS', false);
 
@@ -37,7 +40,7 @@ function defineVar($name, $default) {
 defineVar('RANKING_HIDE_PIDS_START', 1);
 defineVar('RANKING_HIDE_PIDS_END', 999999999);
 
-// Whether to show PIDs instead of player names hidden players from rankings
+// Whether to show PIDs instead of player names in rankings
 defineVar('RANKING_PIDS_AS_NAMES', false);
 
 // Number of players to show on the leaderboard frontpage
diff --git a/src/bf2sclone/template/leaderboard.php b/src/bf2sclone/template/leaderboard.php
index 71465ca..10bb447 100644
--- a/src/bf2sclone/template/leaderboard.php
+++ b/src/bf2sclone/template/leaderboard.php
@@ -64,7 +64,7 @@
 										</td>
 										<td>'.$value['score'].'</td>
 										<td>
-											<img src="'.$ROOT.'game-images/flags/'.strtoupper($value['country']).'.png" height="12" width="16">
+											<img src="'.$ROOT.'game-images/flags/' . esc_attr(RANKING_HIDE_COUNTRY ? 'xx' : strtoupper($value['country'])) . '.png" height="12" width="16">
 										</td>
 										<td>'.intToTime($value['time']).'</td>
 										<!--
diff --git a/src/bf2sclone/template/my-leaderboard.php b/src/bf2sclone/template/my-leaderboard.php
index e8fa136..1566d1f 100644
--- a/src/bf2sclone/template/my-leaderboard.php
+++ b/src/bf2sclone/template/my-leaderboard.php
@@ -79,7 +79,7 @@
 					<tr>
 						<td>
 							<img src="'.$ROOT.'game-images/ranks/icon/rank_'.$value['rank'].'.gif" alt="" style="border: 0pt none ;"> 
-							<a href="'.$ROOT.'?pid='.$value['id'].'">&nbsp;' . esc_attr(RANKING_PIDS_AS_NAMES ? $value['id'] : $value['name']) . '&nbsp;<img src="'.$ROOT.'game-images/flags/'.strtoupper($value['country']).'.png" width="16" height="12"></a>
+							<a href="'.$ROOT.'?pid='.$value['id'].'">&nbsp;' . esc_attr(RANKING_PIDS_AS_NAMES ? $value['id'] : $value['name']) . '&nbsp;<img src="'.$ROOT.'game-images/flags/' . esc_attr(RANKING_HIDE_COUNTRY ? 'xx' : strtoupper($value['country'])) . '.png" width="16" height="12"></a>
 						</td>
 						<td>'.$value['score'].'</td>
 						<td>'.$value['spm'].'</td>
diff --git a/src/bf2sclone/template/playerstats.php b/src/bf2sclone/template/playerstats.php
index d70f53e..a957d89 100644
--- a/src/bf2sclone/template/playerstats.php
+++ b/src/bf2sclone/template/playerstats.php
@@ -48,7 +48,7 @@
 					<img class="vehicle" src="' . $ROOT . 'game-images/vehicles/vehicles_' . $playerFavorite['vehicle'] . '.jpg" alt="' . getVehicleByID($playerFavorite['vehicle']) . '" />
 					<img class="kit" src="' . $ROOT . 'game-images/kits/kit_' . $playerFavorite['kit'] . '.jpg" alt="' . getKitByID($playerFavorite['kit']) . '" />
 					<img class="map" src="' . $ROOT . 'game-images/maps/map_' . $playerFavorite['map'] . '.jpg" alt="' . getMapByID( $playerFavorite['map'] ) . '" />
-					<img id="flag" src="' . $ROOT . 'game-images/flags/' . strtoupper($player['country']) . '.png" alt="' . getCountryByCode($player['country']) . '" width="32" height="24" />
+					<img id="flag" src="' . $ROOT . 'game-images/flags/' . esc_attr(RANKING_HIDE_COUNTRY ? 'xx' : strtoupper($player['country'])) . '.png" alt="' . getCountryByCode($player['country']) . '" width="32" height="24" />
 				</div>
 				<a id="add-to-mlb" href="'.$ROOT.'/?go=my-leaderboard&add=' . $PID . '"><img src="' . $ROOT . '/site-images/user_add.png" alt="Add to My Leader Board" /></a>
 			</div>
diff --git a/src/bf2sclone/template/search.php b/src/bf2sclone/template/search.php
index 52486b7..affe08e 100644
--- a/src/bf2sclone/template/search.php
+++ b/src/bf2sclone/template/search.php
@@ -79,7 +79,7 @@
 						<td>
 							<img src="'.$ROOT.'game-images/ranks/icon/rank_'.$searchresults[$i]['rank'].'.gif" alt="" style="border: 0pt none ;"> 
 							<a href="'.$ROOT.'?pid='.$searchresults[$i]['id'].'"> ' . (RANKING_PIDS_AS_NAMES ? $searchresults[$i]['id'] : esc_attr($searchresults[$i]['name'])) . '</a>&nbsp;
-							<img src="'.$ROOT.'game-images/flags/'.strtoupper($searchresults[$i]['country']).'.png" height="12" width = "16">
+							<img src="'.$ROOT.'game-images/flags/' . esc_attr(RANKING_HIDE_COUNTRY ? 'xx' : strtoupper($searchresults[$i]['country'])) .'.png" height="12" width = "16">
 						</td>
 						<td>'.$searchresults[$i]['score'].'</td>
 						<td>'.$searchresults[$i]['spm'].'</td>