Enhancement (bf2sclone/config): Add HOME_PAGE env var to control ho…

…me page
startersclan · Dec 20, 2023 · e79f428 · e79f428
1 parent 23a38ef
commit e79f428
Show file tree

Hide file tree

Showing 23 changed files with 130 additions and 88 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+/.*
+!/.github
+!/.vscode
 /src/ASP/system/config/config.php.bak
 /src/python/bf2/logs/*.log
 /src/python/bf2/logs/snapshots/sent/*.txt

diff --git a/config/bf2sclone/etc/nginx/nginx.conf b/config/bf2sclone/etc/nginx/nginx.conf
@@ -82,7 +82,7 @@ http {
             return 401;
         }
         # Deny access to certain files
-        location ~ \.inc.php$ {
+        location ~ \.inc\.php$ {
             return 401;
         }
         # Deny access certain directories

diff --git a/src/bf2sclone/config.inc.php b/src/bf2sclone/config.inc.php
@@ -18,8 +18,11 @@ function defineVar($name, $default) {
 defineVar('DBLOGIN', 'admin');
 defineVar('DBPASSWORD', 'admin');
 
+// Home page. Possible values: 'currentranking', 'leaderboard', 'my-leaderboard', 'search', 'servers', 'ubar'
+defineVar('HOME_PAGE', 'leaderboard');
+
 // Leader board title
-defineVar('TITLE', 'BF2S Clone2');
+defineVar('TITLE', 'BF2S Clone');
 
 // Refresh time in seconds for stats
 defineVar('RANKING_REFRESH_TIME', 600); // -> default: 600 seconds (10 minutes)

diff --git a/src/bf2sclone/css/two-tiers.css b/src/bf2sclone/css/two-tiers.css
@@ -309,11 +309,16 @@ float: left;
 }
 
 body.inner #navitems li a {
-padding: 0 4px;
+margin: 0 2px;
+padding: 0 2px;
 font-weight: bold;
 font-size: 10px;
 }
 
+body.inner #navitems li.current a {
+border-bottom: 1px dotted #FFEE40;
+}
+
 body.inner #getstats {
 position: absolute;
 top: 33px;

diff --git a/src/bf2sclone/index.php b/src/bf2sclone/index.php
@@ -39,7 +39,8 @@
 // IFF PID -> go show stats!
 $PID = isset($_GET["pid"]) ? mysqli_real_escape_string($GLOBALS['link'], $_GET["pid"]) : "0";
 $SID = isset($_GET["sid"]) ? mysqli_real_escape_string($GLOBALS['link'], $_GET["sid"]) : "0";
-$GO = isset($_GET["go"]) ? $_GET["go"] : "0";
+$GO = HOME_PAGE;
+$GO = isset($_GET["go"]) ? $_GET["go"] : $GO;
 $GET = isset($_POST["get"]) ? $_POST["get"] : 0;
 $SET = isset($_POST["set"]) ? $_POST["set"] : 0;
 $ADD = isset($_GET["add"]) ? $_GET["add"] : 0;
@@ -342,7 +343,7 @@
 /***************************************************************
  * SHOW TOP TEN - default
  ***************************************************************/
-else
+elseif(!$GO || strcasecmp($GO, 'leaderboard') == 0)
 {  // show the top ten
 
 	$LASTUPDATE = 0;
@@ -356,7 +357,7 @@
 	else
 	{
 		$leaders = getTopPlayers();
-		include( TEMPLATE_PATH .'home.php');
+		include( TEMPLATE_PATH .'leaderboard.php');
 
 		// write cache file
 		if (isCachedEnabled()) {
@@ -368,6 +369,9 @@
 	$template = str_replace('{:LASTUPDATE:}', $LASTUPDATE, $template);
 	$template = str_replace('{:NEXTUPDATE:}', $NEXTUPDATE, $template);
 
+}else {
+	http_response_code(404);
+	die('Invalid page.');
 }
 
 // Closing connection

diff --git a/src/bf2sclone/template/current-ranking.php b/src/bf2sclone/template/current-ranking.php
@@ -86,11 +86,11 @@
 	This page was processed in {:PROCESSED:} seconds.</div>
 	
 	<ul id="navitems">
-		<li><a href="'. $ROOT .'">Home</a></li>
-		<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-		<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-		<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-		<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+		<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+		<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+		<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+		<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+		<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 		<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 	</ul>
 	

diff --git a/src/bf2sclone/template/home.php → src/bf2sclone/template/leaderboard.php b/src/bf2sclone/template/home.php → src/bf2sclone/template/leaderboard.php
@@ -3,7 +3,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" class="inner">
 <head>
-	<title>' . esc_attr(TITLE) . '</title>
+	<title>Leaderboard, ' . esc_attr(TITLE) . '</title>
 
 	<link rel="icon" href="'.$ROOT.'favicon.ico" type="image/x-icon">
 	<link rel="shortcut icon" href="'.$ROOT.'favicon.ico" type="image/x-icon">
@@ -93,11 +93,11 @@
 		This page was processed in {:PROCESSED:} seconds.</div>
 	
 		<ul id="navitems">
-			<li><a href="'. $ROOT .'">Home</a></li>
-			<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-			<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-			<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-			<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+			<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+			<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+			<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+			<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+			<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 			<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 		</ul>
 		

diff --git a/src/bf2sclone/template/my-leaderboard.php b/src/bf2sclone/template/my-leaderboard.php
@@ -125,11 +125,11 @@
 	<div id="footer">This page was processed in {:PROCESSED:} seconds.</div>
 	
 	<ul id="navitems">
-		<li><a href="'. $ROOT .'">Home</a></li>
-		<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-		<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-		<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-		<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+		<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+		<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+		<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+		<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+		<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 		<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 	</ul>
 	

diff --git a/src/bf2sclone/template/playerstats.php b/src/bf2sclone/template/playerstats.php
@@ -1132,11 +1132,11 @@
 		This page was processed in {:PROCESSED:} seconds.</div>
 	
 		<ul id="navitems">
-			<li><a href="'. $ROOT .'">Home</a></li>
-			<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-			<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-			<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-			<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+			<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+			<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+			<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+			<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+			<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 			<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 		</ul>
 		

diff --git a/src/bf2sclone/template/search.php b/src/bf2sclone/template/search.php
@@ -120,11 +120,11 @@
 	<div id="footer">This page was processed in {:PROCESSED:} seconds.</div>
 
 	<ul id="navitems">
-		<li><a href="'. $ROOT .'">Home</a></li>
-		<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-		<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-		<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-		<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+		<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+		<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+		<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+		<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+		<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 		<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 	</ul>
 	

diff --git a/src/bf2sclone/template/server.php b/src/bf2sclone/template/server.php
@@ -243,12 +243,11 @@
 		This page was processed in {:PROCESSED:} seconds.</div>
 	
 		<ul id="navitems">
-			<li><a href="'. $ROOT .'">Home</a></li>
-			<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-		<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-
-			<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-			<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+			<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+			<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+			<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+			<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+			<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 			<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 		</ul>
 		

diff --git a/src/bf2sclone/template/servers.php b/src/bf2sclone/template/servers.php
@@ -151,11 +151,11 @@
 		This page was processed in {:PROCESSED:} seconds.</div>
 	
 		<ul id="navitems">
-			<li><a href="'. $ROOT .'">Home</a></li>
-			<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-			<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-			<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-			<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+			<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+			<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+			<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+			<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+			<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 			<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 		</ul>
 		

diff --git a/src/bf2sclone/template/ubar-badges-sf.php b/src/bf2sclone/template/ubar-badges-sf.php
@@ -455,11 +455,11 @@
 		</div>	<!-- Page 3 -->
 	
 		<ul id="navitems">
-			<li><a href="'. $ROOT .'">Home</a></li>
-			<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-			<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-			<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-			<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+			<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+			<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+			<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+			<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+			<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 			<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 		</ul>
 		

diff --git a/src/bf2sclone/template/ubar-badges.php b/src/bf2sclone/template/ubar-badges.php
@@ -886,11 +886,11 @@
 		</div>	<!-- Page 3 -->
 	
 		<ul id="navitems">
-			<li><a href="'. $ROOT .'">Home</a></li>
-			<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-			<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-			<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-			<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+			<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+			<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+			<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+			<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+			<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 			<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 		</ul>
 		

diff --git a/src/bf2sclone/template/ubar-index.php b/src/bf2sclone/template/ubar-index.php
@@ -132,11 +132,11 @@
 		</div>	<!-- Page 3 -->
 	
 		<ul id="navitems">
-			<li><a href="'. $ROOT .'">Home</a></li>
-			<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-			<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-			<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-			<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+			<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+			<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+			<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+			<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+			<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 			<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 		</ul>
 		

diff --git a/src/bf2sclone/template/ubar-medals-sf.php b/src/bf2sclone/template/ubar-medals-sf.php
@@ -153,11 +153,11 @@
 		</div>	<!-- Page 3 -->
 	
 		<ul id="navitems">
-			<li><a href="'. $ROOT .'">Home</a></li>
-			<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-			<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-			<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-			<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+			<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+			<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+			<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+			<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+			<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 			<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 		</ul>
 		

diff --git a/src/bf2sclone/template/ubar-medals.php b/src/bf2sclone/template/ubar-medals.php
@@ -427,11 +427,11 @@
 		</div>	<!-- Page 3 -->
 	
 		<ul id="navitems">
-			<li><a href="'. $ROOT .'">Home</a></li>
-			<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-			<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-			<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-			<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+			<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+			<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+			<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+			<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+			<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 			<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 		</ul>
 		

diff --git a/src/bf2sclone/template/ubar-ranks.php b/src/bf2sclone/template/ubar-ranks.php
@@ -461,11 +461,11 @@
 		</div>	<!-- Page 3 -->
 	
 		<ul id="navitems">
-			<li><a href="'. $ROOT .'">Home</a></li>
-			<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-			<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-			<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-			<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+			<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+			<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+			<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+			<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+			<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 			<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 		</ul>
 		

diff --git a/src/bf2sclone/template/ubar-ribbons-sf.php b/src/bf2sclone/template/ubar-ribbons-sf.php
@@ -221,11 +221,11 @@
 		</div>	<!-- Page 3 -->
 	
 		<ul id="navitems">
-			<li><a href="'. $ROOT .'">Home</a></li>
-			<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-			<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-			<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-			<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+			<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+			<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+			<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+			<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+			<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 			<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 		</ul>
 		

diff --git a/src/bf2sclone/template/ubar-ribbons.php b/src/bf2sclone/template/ubar-ribbons.php
@@ -394,11 +394,11 @@
 		</div>	<!-- Page 3 -->
 	
 		<ul id="navitems">
-			<li><a href="'. $ROOT .'">Home</a></li>
-			<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-			<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-			<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-			<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+			<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+			<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+			<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+			<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+			<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 			<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 		</ul>
 		

diff --git a/src/bf2sclone/template/ubar-template.php b/src/bf2sclone/template/ubar-template.php
@@ -55,11 +55,11 @@
 		</div>	<!-- Page 3 -->
 	
 		<ul id="navitems">
-			<li><a href="'. $ROOT .'">Home</a></li>
-			<li><a href="'. $ROOT .'?go=servers">Servers</a></li>
-			<li><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
-			<li><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
-			<li><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
+			<li class="' . ($GO == 'leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'">Leaderboard</a></li>
+			<li class="' . ($GO == 'servers' ? 'current' : '') . '"><a href="'. $ROOT .'?go=servers">Servers</a></li>
+			<li class="' . ($GO == 'my-leaderboard' ? 'current' : '') . '"><a href="'. $ROOT .'?go=my-leaderboard">My Leader Board</a></li>
+			<li class="' . ($GO == 'currentranking' ? 'current' : '') . '"><a href="'. $ROOT .'?go=currentranking">Rankings</a></li>
+			<li class="' . ($GO == 'ubar' ? 'current' : '') . '"><a href="'. $ROOT .'?go=ubar">UBAR</a></li>
 			<li><a href="http://wiki.bf2s.com/">Wiki</a></li>
 		</ul>
 		

diff --git a/test/test-endpoints.sh b/test/test-endpoints.sh
@@ -53,6 +53,20 @@ bf2web.gamespy.com/ASP/searchforplayers.aspx 200
 bf2web.gamespy.com/ASP/selectunlock.aspx 200
 
 bf2sclone.example.com/ 200
+bf2sclone.example.com/?go= 200
+bf2sclone.example.com/?go=currentranking 200
+bf2sclone.example.com/?go=leaderboard 200
+bf2sclone.example.com/?go=my-leaderboard 200
+bf2sclone.example.com/?go=servers 200
+bf2sclone.example.com/?go=ubar 200
+bf2sclone.example.com/?go=ubar&p=ribbons 200
+bf2sclone.example.com/?go=ubar&p=ribbons-sf 200
+bf2sclone.example.com/?go=ubar&p=badges 200
+bf2sclone.example.com/?go=ubar&p=badges-sf 200
+bf2sclone.example.com/?go=ubar&p=medals 200
+bf2sclone.example.com/?go=ubar&p=medals-sf 200
+bf2sclone.example.com/?go=ubar&p=ranks 200
+bf2sclone.example.com/?go=foo 404
 bf2sclone.example.com/.htaccess 401
 bf2sclone.example.com/cache 401
 bf2sclone.example.com/css/default.css 200