X-Git-Url: https://jfr.im/git/irc/unrealircd/unrealircd-webpanel.git/blobdiff_plain/a2712ef5d3094a874ea3d967b350540e15ba4862..ea27475b363f4dd337b5bbee5ec0961fecce1bf1:/header.php

diff --git a/header.php b/header.php
index d249dc4..0401f29 100644
--- a/header.php
+++ b/header.php
@@ -12,7 +12,10 @@
 <!-- Latest compiled JavaScript -->
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"></script>
 
-<script src="js/unrealircd-admin.js"></script>
+<!-- Font Awesome icons -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.1/css/all.min.css">
+
+<script src="<?php echo BASE_URL; ?>js/unrealircd-admin.js"></script>
 <title>UnrealIRCd Panel</title>
 <link rel="icon" type="image/x-icon" href="<?php echo BASE_URL; ?>img/favicon.ico">
 <link href="<?php echo BASE_URL; ?>css/unrealircd-admin.css" rel="stylesheet">
@@ -23,19 +26,22 @@
 	<!-- Fixed navbar -->
 	<nav class="navbar navbar-expand-sm navbar-dark bg-dark fixed-top">
 		<ul class="nav navbar-nav">
-			<a class="navbar-brand" href="index.php"><img src="<?php echo BASE_URL; ?>img/favicon.ico" height="25" width="25"> UnrealIRCd Admin Panel</a>
+			<a class="navbar-brand" href="<?php echo BASE_URL; ?>/index.php"><img src="<?php echo BASE_URL; ?>img/favicon.ico" height="25" width="25"> UnrealIRCd Admin Panel</a>
 <?php
 
-$active_page = false;
-/* Needs to be a separate step due to multiple matches */
+$active_page = NULL;
+
 foreach ($pages as $name => $page)
 {
 	$script = $_SERVER['SCRIPT_FILENAME'];
-	
-	if (str_ends_with($script, BASE_URL . "index.php") || !strlen($page))
-	{
+	$tok = split($script, "/");
+	if (strlen($page) == 0) {
 		$active_page = "";
 	}
+	else if (str_ends_with($script, BASE_URL . "index.php") && BASE_URL != "/" && !strlen($tok[0]))
+	{
+		$active_page = $tok[0];
+	}
 	else if (!str_ends_with($page, ".php"))
 	{
 		$script2 = rtrim($script, "/index.php");
@@ -45,12 +51,13 @@ foreach ($pages as $name => $page)
 	else if (str_ends_with($script, $page))
 	{
 		$active_page = $page;
-	}
+	} elseif (!$active_page)
+		$active_page = false;
 }
 foreach($pages as $name=>$page)
 {
 	$class = "class=\"nav-item\"";
-	if ($page == $active_page)
+	if (is_string($active_page) && $page == $active_page)
 		$class = str_replace("\"nav-item\"", "\"nav-item active\"", $class);
 	
 	echo "			<li $class><a class=\"nav-link\" href=\"".BASE_URL.$page."\">$name</a></li> \n";