Firewall: NAT: Port Forward - refactor to MVC (work in progress) for #8401

update menu and acl.

Author: AdSchellevis

src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml

@@ -215,17 +215,12 @@
             <pattern>firewall_nat_out_edit.php*</pattern>
         </patterns>
     </page-firewall-nat-outbound-edit>
-    <page-firewall-nat-portforward>
-        <name>Firewall: NAT: Port Forward</name>
-        <patterns>
-            <pattern>firewall_nat.php*</pattern>
-            <pattern>api/firewall/category/search_item*</pattern>
-        </patterns>
-    </page-firewall-nat-portforward>
     <page-firewall-nat-portforward-edit>
-        <name>Firewall: NAT: Port Forward: Edit</name>
+        <name>Firewall: NAT: Destination NAT (Port Forward)</name>
         <patterns>
-            <pattern>firewall_nat_edit.php*</pattern>
+            <pattern>ui/firewall/d_nat</pattern>
+            <pattern>api/firewall/d_nat/*</pattern>
+            <pattern>api/firewall/category/search_item*</pattern>
         </patterns>
     </page-firewall-nat-portforward-edit>
     <page-firewall-rules>

src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml

@@ -92,9 +92,6 @@
         <Categories url="/ui/firewall/category" cssClass="fa fa-tags fa-fw"/>
         <Groups url="/ui/firewall/group" cssClass="fa fa-sitemap fa-fw"/>
         <NAT cssClass="fa fa-exchange fa-fw">
-            <PortForward order="100" VisibleName="Port Forward" url="/firewall_nat.php">
-                <Edit url="/firewall_nat_edit.php*" visibility="hidden"/>
-            </PortForward>
             <Outbound order="300" VisibleName="Outbound" url="/firewall_nat_out.php">
                 <Edit url="/firewall_nat_out_edit.php*" visibility="hidden"/>
             </Outbound>

src/opnsense/mvc/app/models/OPNsense/Firewall/Menu/Menu.xml

@@ -4,15 +4,15 @@
             <FilterRef url="/ui/firewall/filter#*" visibility="hidden"/>
         </Rule>
         <NAT>
+            <DNat order="100" VisibleName="Destination NAT" url="/ui/firewall/d_nat/">
+                <FilterRef url="/ui/firewall/d_nat#*" visibility="hidden"/>
+            </DNat>
             <OneToOne order="200" VisibleName="One-to-One" url="/ui/firewall/one_to_one/">
                 <FilterRef url="/ui/firewall/one_to_one#*" visibility="hidden"/>
             </OneToOne>
             <SourceNat order="400" VisibleName="Source NAT" url="/ui/firewall/source_nat/">
                 <FilterRef url="/ui/firewall/source_nat#*" visibility="hidden"/>
             </SourceNat>
-            <DNat order="500" VisibleName="Destination NAT" url="/ui/firewall/d_nat/">
-                <FilterRef url="/ui/firewall/d_nat#*" visibility="hidden"/>
-            </DNat>
             <NPTv6 order="600" url="/ui/firewall/npt/">
                 <FilterRef url="/ui/firewall/npt#*" visibility="hidden"/>
             </NPTv6>