From ffbbfc9635009384c4ddc995e0029d1965976996 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 23 Nov 2016 21:52:16 +0100
Subject: [PATCH] acl: prune plugin files for #1037

---
 .../models/OPNsense/CaptivePortal/ACL/ACL.xml |  4 +--
 .../mvc/app/models/OPNsense/Cron/ACL/ACL.xml  |  4 +--
 .../models/OPNsense/Diagnostics/ACL/ACL.xml   | 22 +++++---------
 .../mvc/app/models/OPNsense/IDS/ACL/ACL.xml   |  4 +--
 .../app/models/OPNsense/IGMPProxy/ACL/ACL.xml |  6 ++--
 .../mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml  | 15 ++++------
 .../mvc/app/models/OPNsense/Proxy/ACL/ACL.xml |  4 +--
 .../app/models/OPNsense/Relayd/ACL/ACL.xml    | 30 +++++++------------
 .../mvc/app/models/OPNsense/SNMP/ACL/ACL.xml  |  3 +-
 .../models/OPNsense/TrafficShaper/ACL/ACL.xml |  4 +--
 .../mvc/app/models/OPNsense/UPnP/ACL/ACL.xml  |  6 ++--
 .../mvc/app/models/OPNsense/WOL/ACL/ACL.xml   |  6 ++--
 12 files changed, 34 insertions(+), 74 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/ACL/ACL.xml
index 0081f338d..cf4f16817 100644
--- a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/ACL/ACL.xml
@@ -1,8 +1,6 @@
 <acl>
-    <!-- unique acl key, must be globally unique for all acl's  -->
     <page-services-captiveportal>
-        <name>WebCfg - Services: Captive Portal</name>
-        <description>Allow access to the 'Services: Captive Portal' page.</description>
+        <name>Services: Captive Portal</name>
         <patterns>
             <pattern>ui/captiveportal/*</pattern>
             <pattern>api/captiveportal/*</pattern>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Cron/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Cron/ACL/ACL.xml
index 19bc6d51c..96d4879fd 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Cron/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Cron/ACL/ACL.xml
@@ -1,8 +1,6 @@
 <acl>
-    <!-- unique acl key, must be globally unique for all acl's  -->
     <page-system-cron>
-        <name>WebCfg - System: Settings: Cron page</name>
-        <description>Allow access to the 'System: Settings: Cron' page.</description>
+        <name>System: Settings: Cron</name>
         <patterns>
             <pattern>ui/cron/*</pattern>
             <pattern>api/cron/*</pattern>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/ACL/ACL.xml
index 589960b5b..6d33adeeb 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/ACL/ACL.xml
@@ -1,40 +1,34 @@
 <acl>
-    <!-- unique acl key, must be globally unique for all acl's  -->
     <page-diagnostics-arptable>
-        <name>WebCfg - Diagnostics: ARP Table page</name>
-        <description>Allow access to the 'Diagnostics: ARP Table' page.</description>
+        <name>Diagnostics: ARP Table</name>
         <patterns>
             <pattern>ui/diagnostics/interface/arp/*</pattern>
             <pattern>api/diagnostics/interface/getArp*</pattern>
         </patterns>
     </page-diagnostics-arptable>
     <page-diagnostics-ndptable>
-        <name>Webcfg - Diagnostics: NDP Table page</name>
-        <description>Allow access to the 'Diagnostics: NDP Table' page.</description>
+        <name>Diagnostics: NDP Table</name>
         <patterns>
             <pattern>ui/diagnostics/interface/ndp/*</pattern>
             <pattern>api/diagnostics/interface/getNdp*</pattern>
         </patterns>
     </page-diagnostics-ndptable>
     <page-diagnostics-routingtables>
-        <name>WebCfg - Diagnostics: Routing tables page</name>
-        <description>Allow access to the 'Diagnostics: Routing tables' page.</description>
+        <name>Diagnostics: Routing tables</name>
         <patterns>
             <pattern>ui/diagnostics/interface/routes/*</pattern>
             <pattern>api/diagnostics/interface/getRoutes*</pattern>
         </patterns>
     </page-diagnostics-routingtables>
     <page-diagnostics-system-activity>
-        <name>WebCfg - Diagnostics: System Activity</name>
-        <description>Allows access to the 'Diagnostics: System Activity' page</description>
+        <name>Diagnostics: System Activity</name>
         <patterns>
             <pattern>ui/diagnostics/activity/*</pattern>
             <pattern>api/diagnostics/activity/*</pattern>
         </patterns>
     </page-diagnostics-system-activity>
     <page-diagnostics-health>
-        <name>WebCfg - Diagnostics: System Health</name>
-        <description>Allows access to the 'Diagnostics: System Health' page</description>
+        <name>Diagnostics: System Health</name>
         <patterns>
             <pattern>ui/diagnostics/systemhealth/*</pattern>
             <pattern>api/diagnostics/systemhealth/*</pattern>
@@ -42,16 +36,14 @@
         </patterns>
     </page-diagnostics-health>
     <page-diagnostics-networkinsight>
-        <name>WebCfg - Diagnostics: Network Insight</name>
-        <description>Allows access to the 'Diagnostics: Network Insight' page</description>
+        <name>Diagnostics: Network Insight</name>
         <patterns>
             <pattern>ui/diagnostics/networkinsight/*</pattern>
             <pattern>api/diagnostics/networkinsight/*</pattern>
         </patterns>
     </page-diagnostics-networkinsight>
     <page-diagnostics-netflow>
-        <name>WebCfg - Diagnostics: Netflow configuration</name>
-        <description>Allows access to the Netflow configuration</description>
+        <name>Diagnostics: Netflow configuration</name>
         <patterns>
             <pattern>ui/diagnostics/netflow/*</pattern>
             <pattern>api/diagnostics/netflow/*</pattern>
diff --git a/src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml
index f7a00a976..ff99b23d2 100644
--- a/src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml
@@ -1,8 +1,6 @@
 <acl>
-    <!-- unique acl key, must be globally unique for all acl's  -->
     <page-services-ids>
-        <name>WebCfg - Services: Intrusion Detection page</name>
-        <description>Allow access to the 'Services: Intrusion Detection' page.</description>
+        <name>Services: Intrusion Detection</name>
         <patterns>
             <pattern>ui/ids/*</pattern>
             <pattern>api/ids/*</pattern>
diff --git a/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/ACL/ACL.xml
index 2b2a30323..c3b68abc4 100644
--- a/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/ACL/ACL.xml
@@ -1,14 +1,12 @@
 <acl>
     <page-services-igmpproxy>
-        <name>WebCfg - Services: Igmpproxy page</name>
-        <description>Allow access to the 'Services: Igmpproxy' page.</description>
+        <name>Services: Igmpproxy</name>
         <patterns>
             <pattern>services_igmpproxy.php*</pattern>
         </patterns>
     </page-services-igmpproxy>
     <page-services-igmpproxy-edit>
-        <name>WebCfg - Services: Igmpproxy: Edit page</name>
-        <description>Allow access to the 'Services: Igmpproxy: Edit' page.</description>
+        <name>Services: Igmpproxy: Edit</name>
         <patterns>
             <pattern>services_igmpproxy_edit.php*</pattern>
         </patterns>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml
index 689add8d2..16f0c5b48 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml
@@ -1,35 +1,30 @@
 <acl>
     <page-services-ntpd>
-        <name>WebCfg - Services: NTP</name>
-        <description>Allow access to the 'Services: NTP' page.</description>
+        <name>Services: NTP</name>
         <patterns>
             <pattern>services_ntpd.php*</pattern>
         </patterns>
     </page-services-ntpd>
     <page-services-ntp-gps>
-        <name>WebCfg - Status: NTP GPS page</name>
-        <description>Allow access to the 'Status: NTP Serial GPS' page.</description>
+        <name>Status: NTP GPS</name>
         <patterns>
             <pattern>status_ntpd_gps.php*</pattern>
         </patterns>
     </page-services-ntp-gps>
     <page-status-ntp>
-        <name>WebCfg - Status: NTP page</name>
-        <description>Allow access to the 'Status: NTP' page.</description>
+        <name>Status: NTP</name>
         <patterns>
             <pattern>status_ntpd.php*</pattern>
         </patterns>
     </page-status-ntp>
     <page-services-ntp-pps>
-        <name>WebCfg - Status: NTP PPS page</name>
-        <description>Allow access to the 'Status: NTP PPS' page.</description>
+        <name>Status: NTP PPS</name>
         <patterns>
             <pattern>status_ntpd_pps.php*</pattern>
         </patterns>
     </page-services-ntp-pps>
     <page-status-systemlogs-ntpd>
-        <name>WebCfg - Status: System logs: NTP page</name>
-        <description>Allow access to the 'Status: System logs: NTP' page.</description>
+        <name>Status: System logs: NTP</name>
         <patterns>
             <pattern>diag_logs_ntpd.php*</pattern>
         </patterns>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/ACL/ACL.xml
index 814215285..97ab62dec 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/ACL/ACL.xml
@@ -1,8 +1,6 @@
 <acl>
-    <!-- unique acl key, must be globally unique for all acl's  -->
     <page-services-proxy>
-        <name>WebCfg - Services: Proxy page</name>
-        <description>Allow access to the 'Services: Proxy' page.</description>
+        <name>Services: Proxy</name>
         <patterns>
             <pattern>ui/proxy/*</pattern>
             <pattern>api/proxy/*</pattern>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml
index 4c37c1fee..305cf9b02 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml
@@ -1,70 +1,60 @@
 <acl>
     <page-services-loadbalancer-monitor-edit>
-        <name>WebCfg - Services: Load Balancer: Monitor: Edit page</name>
-        <description>Allow access to the 'Services: Load Balancer: Monitor: Edit' page.</description>
+        <name>Services: Load Balancer: Monitor: Edit</name>
         <patterns>
             <pattern>load_balancer_monitor_edit.php*</pattern>
         </patterns>
     </page-services-loadbalancer-monitor-edit>
     <page-services-loadbalancer-monitor>
-        <name>WebCfg - Services: Load Balancer: Monitors page</name>
-        <description>Allow access to the 'Services: Load Balancer: Monitors' page.</description>
+        <name>Services: Load Balancer: Monitors</name>
         <patterns>
             <pattern>load_balancer_monitor.php*</pattern>
         </patterns>
     </page-services-loadbalancer-monitor>
     <page-services-loadbalancer-setting>
-        <name>WebCfg - Services: Load Balancer: setting page</name>
-        <description>Allow access to the 'Settings: Load Balancer: Settings' page.</description>
+        <name>Services: Load Balancer: setting</name>
         <patterns>
             <pattern>load_balancer_setting.php*</pattern>
         </patterns>
     </page-services-loadbalancer-setting>
     <page-services-loadbalancer-virtualservers>
-        <name>WebCfg - Services: Load Balancer: Virtual Servers page</name>
-        <description>Allow access to the 'Services: Load Balancer: Virtual Servers' page.</description>
+        <name>Services: Load Balancer: Virtual Servers</name>
         <patterns>
             <pattern>load_balancer_virtual_server.php*</pattern>
         </patterns>
     </page-services-loadbalancer-virtualservers>
     <page-status-loadbalancer-pool>
-        <name>WebCfg - Status: Load Balancer: Pool page</name>
-        <description>Allow access to the 'Status: Load Balancer: Pool' page.</description>
+        <name>Status: Load Balancer: Pool</name>
         <patterns>
             <pattern>status_lb_pool.php*</pattern>
         </patterns>
     </page-status-loadbalancer-pool>
     <page-status-loadbalancer-virtualserver>
-        <name>WebCfg - Status: Load Balancer: Virtual Server page</name>
-        <description>Allow access to the 'Status: Load Balancer: Virtual Server' page.</description>
+        <name>Status: Load Balancer: Virtual Server</name>
         <patterns>
             <pattern>status_lb_vs.php*</pattern>
         </patterns>
     </page-status-loadbalancer-virtualserver>
     <page-status-systemlogs-loadbalancer>
-        <name>WebCfg - Status: System logs: Load Balancer page</name>
-        <description>Allow access to the 'Status: System logs: Load Balancer' page.</description>
+        <name>Status: System logs: Load Balancer</name>
         <patterns>
             <pattern>diag_logs_relayd.php*</pattern>
         </patterns>
     </page-status-systemlogs-loadbalancer>
     <page-loadbalancer-pool>
-        <name>WebCfg - Load Balancer: Pool page</name>
-        <description>Allow access to the 'Load Balancer: Pool' page.</description>
+        <name>Load Balancer: Pool</name>
         <patterns>
             <pattern>load_balancer_pool.php*</pattern>
         </patterns>
     </page-loadbalancer-pool>
     <page-loadbalancer-pool-edit>
-        <name>WebCfg - Load Balancer: Pool: Edit page</name>
-        <description>Allow access to the 'Load Balancer: Pool: Edit' page.</description>
+        <name>Load Balancer: Pool: Edit</name>
         <patterns>
             <pattern>load_balancer_pool_edit.php*</pattern>
         </patterns>
     </page-loadbalancer-pool-edit>
     <page-loadbalancer-virtualserver-edit>
-        <name>WebCfg - Load Balancer: Virtual Server: Edit page</name>
-        <description>Allow access to the 'Load Balancer: Virtual Server: Edit' page.</description>
+        <name>Load Balancer: Virtual Server: Edit</name>
         <patterns>
             <pattern>load_balancer_virtual_server_edit.php*</pattern>
         </patterns>
diff --git a/src/opnsense/mvc/app/models/OPNsense/SNMP/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/SNMP/ACL/ACL.xml
index c63641ef8..cc7a1d79b 100644
--- a/src/opnsense/mvc/app/models/OPNsense/SNMP/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/SNMP/ACL/ACL.xml
@@ -1,7 +1,6 @@
 <acl>
     <page-services-snmp>
-        <name>WebCfg - Services: SNMP page</name>
-        <description>Allow access to the 'Services: SNMP' page.</description>
+        <name>Services: SNMP</name>
         <patterns>
             <pattern>services_snmp.php*</pattern>
         </patterns>
diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml
index 2a2246d9a..344974b1a 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml
@@ -1,8 +1,6 @@
 <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>
+        <name>Firewall: Traffic Shaper</name>
         <patterns>
             <pattern>ui/trafficshaper/*</pattern>
             <pattern>api/trafficshaper/*</pattern>
diff --git a/src/opnsense/mvc/app/models/OPNsense/UPnP/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/UPnP/ACL/ACL.xml
index 554f304ec..cc93dde4a 100644
--- a/src/opnsense/mvc/app/models/OPNsense/UPnP/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/UPnP/ACL/ACL.xml
@@ -1,14 +1,12 @@
 <acl>
     <page-service-upnp>
-        <name>WebCfg - Service: Universal Plug and Play page</name>
-        <description>Allow access to the 'Service: Universal Plug and Play' page.</description>
+        <name>Service: Universal Plug and Play</name>
         <patterns>
             <pattern>services_upnp.php*</pattern>
         </patterns>
     </page-service-upnp>
     <page-status-upnpstatus>
-        <name>WebCfg - Status: Universal Plug and Play page</name>
-        <description>Allow access to the 'Status: Universal Plug and Play' page.</description>
+        <name>Status: Universal Plug and Play</name>
         <patterns>
             <pattern>status_upnp.php*</pattern>
         </patterns>
diff --git a/src/opnsense/mvc/app/models/OPNsense/WOL/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/WOL/ACL/ACL.xml
index de2f9039a..2f1c403c0 100644
--- a/src/opnsense/mvc/app/models/OPNsense/WOL/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/WOL/ACL/ACL.xml
@@ -1,14 +1,12 @@
 <acl>
     <page-services-wakeonlan>
-        <name>WebCfg - Services: Wake on LAN page</name>
-        <description>Allow access to the 'Services: Wake on LAN' page.</description>
+        <name>Services: Wake on LAN</name>
         <patterns>
             <pattern>services_wol.php*</pattern>
         </patterns>
     </page-services-wakeonlan>
     <page-services-wakeonlan-edit>
-        <name>WebCfg - Services: Wake on LAN: Edit page</name>
-        <description>Allow access to the 'Services: Wake on LAN: Edit' page.</description>
+        <name>Services: Wake on LAN: Edit</name>
         <patterns>
             <pattern>services_wol_edit.php*</pattern>
         </patterns>