From a9cb017defcedb2d6f3b25aaa0e2470b4568a0cd Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 21 Jul 2023 21:21:59 +0200
Subject: [PATCH 1/2] Fix menu highlighting & opening

---
 admin/template/template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/template/template.php b/admin/template/template.php
index 70ed5174..9620dd70 100644
--- a/admin/template/template.php
+++ b/admin/template/template.php
@@ -76,9 +76,9 @@
 							} else if ($has_child) {
 								$used_menu = null;
 								$nav_construct = '';
-								foreach ($menu['link'] as $category => $sub_menu) {
+								foreach ($menu['link'] as $sub_category => $sub_menu) {
 									$nav_construct .= '<li class="nav-item"><a href="?p=' . $sub_menu['link'] . '" class="nav-link';
-									if ($page == $sub_menu['link']) {
+									if ($_SERVER['QUERY_STRING'] == 'p=' . $sub_menu['link']) {
 										$nav_construct .= ' active';
 										$used_menu = true;
 									}

From 5791d1e7f92e65b2966dadcfce226e833f21f920 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 21 Jul 2023 21:22:06 +0200
Subject: [PATCH 2/2] Update template.php

---
 admin/template/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/template/template.php b/admin/template/template.php
index 9620dd70..d147053f 100644
--- a/admin/template/template.php
+++ b/admin/template/template.php
@@ -68,7 +68,7 @@
 							if (!$has_child) { ?>
 								<li class="nav-item">
 									<a class="nav-link<?php echo(strpos($menu['link'], $page) !== false ? ' active' : '') ?>" href="?p=<?php echo $menu['link'] ?>">
-										<i class="nav-icon fas fa-<?php echo(isset($menu['icon']) ? $menu['icon'] : 'link') ?>"></i>
+										<i class="nav-icon fas fa-<?php echo($menu['icon'] ?? 'link') ?>"></i>
 										<p><?php echo $menu['name'] ?></p>
 									</a>
 								</li>