From 31f6e89d38dc33d847e5ca37797b32fb14af2e97 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 12 Feb 2026 12:09:38 +0100
Subject: [PATCH] firewall: override "Rules" name when we hide the old one

---
 .../models/OPNsense/Base/Menu/MenuItem.php    | 21 ++++++++++++++++++-
 .../models/OPNsense/Base/Menu/MenuSystem.php  | 12 +++--------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuItem.php b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuItem.php
index 7c099dc018..9268601091 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuItem.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuItem.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2015-2025 Deciso B.V.
+ * Copyright (C) 2015-2026 Deciso B.V.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -445,4 +445,23 @@ class MenuItem
         }
         return null;
     }
+
+    /**
+     * find node by id/tag path, ignore case.
+     * @param $id id / tagname path
+     * @return null|MenuItem
+     */
+    public function findNodeByPath($path)
+    {
+        $node = $this;
+
+        foreach (explode('.', $path) as $key) {
+            $node = $node->findNodeById($key);
+            if ($node == null) {
+                return null;
+            }
+        }
+
+        return $node;
+    }
 }
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php
index 9a5bdcd725..e1a66d4366 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php
@@ -85,15 +85,7 @@ class MenuSystem
      */
     public function appendItem($root, $id, $properties)
     {
-        $node = $this->root;
-        foreach (explode(".", $root) as $key) {
-            $node = $node->findNodeById($key);
-            if ($node == null) {
-                return null;
-            }
-        }
-
-        return $node->append($id, $properties);
+        return $this->root->findNodeByPath($root)?->append($id, $properties);
     }
 
     /**
@@ -338,6 +330,8 @@ class MenuSystem
                     'order' => 0,
             ]);
             $iftargets['fw'] = array_merge(['FloatingRules' => gettext('Floating')], $iftargets['fw']);
+        } elseif ($has_mvc_fw) {
+            $this->root->findNodeByPath('Firewall.Rule')?->setVisibleName(gettext('Rules'));
         }
         $ordid = 1;
         foreach ($iftargets['fw'] as $key => $descr) {