From 38d067415fe7e69040ebe1be19dcbde0eb376f1d Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 5 Jan 2016 15:26:36 +0100
Subject: [PATCH] (trafficshaper) move acl and menu into module

---
 .../mvc/app/models/OPNsense/Base/Menu/Menu.xml        |  3 +--
 .../app/models/OPNsense/Core/ACL_Legacy_Page_Map.json |  8 --------
 .../mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml | 11 +++++++++++
 .../app/models/OPNsense/TrafficShaper/Menu/Menu.xml   |  7 +++++++
 4 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 src/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml
 create mode 100644 src/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index 78262c6a3..85965e58c 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -181,8 +181,7 @@
                 <NPTEdit url="/firewall_nat_npt_edit.php*"/>
             </NPT>
         </NAT>
-        <TrafficShaper order="40" VisibleName="Traffic Shaper" cssClass="fa fa-filter">
-            <Settings url="/ui/trafficshaper/"/>
+        <TrafficShaper>
             <Status url="/diag_limiter_info.php"/>
         </TrafficShaper>
         <VirtualIPs order="50" VisibleName="Virtual IPs" url="/firewall_virtual_ip.php" cssClass="fa fa-clone">
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json b/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json
index d0354bb70..53205b4dc 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json
@@ -410,14 +410,6 @@
             "firewall_schedule_edit.php*"
         ]
     },
-    "page-firewall-trafficshaper": {
-        "name": "WebCfg - Firewall: Traffic Shaper page",
-        "descr": "Allow access to the 'Firewall: Traffic Shaper' page.",
-        "match": [
-            "ui/trafficshaper/*",
-            "api/trafficshaper/*"
-        ]
-    },
     "page-firewall-virtualipaddress-edit": {
         "name": "WebCfg - Firewall: Virtual IP Address: Edit page",
         "descr": "Allow access to the 'Firewall: Virtual IP Address: Edit' page.",
diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml
new file mode 100644
index 000000000..2a2246d9a
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml
@@ -0,0 +1,11 @@
+<acl>
+    <!-- unique acl key, must be globally unique for all acl's  -->
+    <page-firewall-trafficshaper>
+        <name>WebCfg - Firewall: Traffic Shaper page</name>
+        <description>Allow access to the 'Firewall: Traffic Shaper' page.</description>
+        <patterns>
+            <pattern>ui/trafficshaper/*</pattern>
+            <pattern>api/trafficshaper/*</pattern>
+        </patterns>
+    </page-firewall-trafficshaper>
+</acl>
diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml
new file mode 100644
index 000000000..2899d3414
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml
@@ -0,0 +1,7 @@
+<menu>
+    <Firewall>
+        <TrafficShaper order="40" VisibleName="Traffic Shaper" cssClass="fa fa-filter">
+            <Settings url="/ui/trafficshaper/"/>
+        </TrafficShaper>
+    </Firewall>
+</menu>