From 6957b19ec8c14d91f10c13b47109678831660495 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 23 Nov 2016 22:05:07 +0100
Subject: [PATCH] warp ACL translations

PR: https://github.com/opnsense/core/issues/1037
---
 .../mvc/app/models/OPNsense/HelloWorld/ACL/ACL.xml  |  4 +---
 .../mvc/app/models/OPNsense/FtpProxy/ACL/ACL.xml    |  3 +--
 .../mvc/app/models/OPNsense/HAProxy/ACL/ACL.xml     |  4 +---
 .../mvc/app/models/OPNsense/L2TP/ACL/ACL.xml        | 13 ++++---------
 .../mvc/app/models/OPNsense/PPPoE/ACL/ACL.xml       | 10 +++-------
 .../mvc/app/models/OPNsense/PPTP/ACL/ACL.xml        | 13 ++++---------
 .../mvc/app/models/OPNsense/Tinc/ACL/ACL.xml        |  4 +---
 .../mvc/app/models/OPNsense/Smart/ACL/ACL.xml       |  4 +---
 .../mvc/app/models/OPNsense/SSOProxyAD/ACL/ACL.xml  |  4 +---
 9 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/ACL/ACL.xml b/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/ACL/ACL.xml
index db591695c..c5978d0cc 100644
--- a/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/ACL/ACL.xml
+++ b/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/ACL/ACL.xml
@@ -1,8 +1,6 @@
 <acl>
-    <!-- unique acl key, must be globally unique for all acl's  -->
     <page-user-helloworld>
-        <name>WebCfg - Users: Hello World! </name>
-        <description>Allow access to the Hello World! module</description>
+        <name>Lobby: Hello World!</name>
         <patterns>
             <pattern>ui/helloworld/*</pattern>
             <pattern>api/helloworld/*</pattern>
diff --git a/net/ftp-proxy/src/opnsense/mvc/app/models/OPNsense/FtpProxy/ACL/ACL.xml b/net/ftp-proxy/src/opnsense/mvc/app/models/OPNsense/FtpProxy/ACL/ACL.xml
index d3f3dec1c..cc01b3e90 100644
--- a/net/ftp-proxy/src/opnsense/mvc/app/models/OPNsense/FtpProxy/ACL/ACL.xml
+++ b/net/ftp-proxy/src/opnsense/mvc/app/models/OPNsense/FtpProxy/ACL/ACL.xml
@@ -1,7 +1,6 @@
 <acl>
    <page-services-ftpproxy>
-      <name>WebCfg - Services: FTP Proxy page</name>
-      <description>Allow access to the 'Services: FTP Proxy' page.</description>
+      <name>Services: FTP Proxy</name>
       <patterns>
          <pattern>ui/ftpproxy/*</pattern>
          <pattern>api/ftpproxy/*</pattern>
diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/ACL/ACL.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/ACL/ACL.xml
index 01d17baf8..e05fc25d6 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/ACL/ACL.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/ACL/ACL.xml
@@ -1,8 +1,6 @@
 <acl>
-    <!-- unique acl key, must be globally unique for all acl's  -->
     <page-services-haproxy>
-        <name>WebCfg - Services: HAProxy page</name>
-        <description>Allow access to the 'Services: HAProxy' page.</description>
+        <name>Services: HAProxy</name>
         <patterns>
             <pattern>ui/haproxy/*</pattern>
             <pattern>api/haproxy/*</pattern>
diff --git a/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/ACL/ACL.xml b/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/ACL/ACL.xml
index 46fd8a6c7..24ea3d3e1 100644
--- a/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/ACL/ACL.xml
+++ b/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/ACL/ACL.xml
@@ -1,29 +1,24 @@
 <acl>
-    <!-- unique acl key, must be globally unique for all acl's  -->
     <page-diagnostics-logs-l2tp>
-        <name>WebCfg - Diagnostics: Logs: L2TP page</name>
-        <description>Allow access to the 'Diagnostics: Logs: L2TP' page.</description>
+        <name>Diagnostics: Logs: L2TP</name>
         <patterns>
             <pattern>vpn_l2tp_log.php*</pattern>
         </patterns>
     </page-diagnostics-logs-l2tp>
     <page-vpn-vpnl2tp>
-        <name>WebCfg - VPN: L2TP page</name>
-        <description>Allow access to the 'VPN: L2TP' page.</description>
+        <name>VPN: L2TP</name>
         <patterns>
             <pattern>vpn_l2tp.php*</pattern>
         </patterns>
     </page-vpn-vpnl2tp>
     <page-vpn-vpnl2tp-users-edit>
-        <name>WebCfg - VPN: L2TP: Users : Edit page</name>
-        <description>Allow access to the 'VPN: L2TP: Users : Edit' page.</description>
+        <name>VPN: L2TP: Users: Edit</name>
         <patterns>
             <pattern>vpn_l2tp_users_edit.php*</pattern>
         </patterns>
     </page-vpn-vpnl2tp-users-edit>
     <page-vpn-vpnl2tp-users>
-        <name>WebCfg - VPN: L2TP: Users page</name>
-        <description>Allow access to the 'VPN: L2TP : Users' page.</description>
+        <name>VPN: L2TP: Users</name>
         <patterns>
             <pattern>vpn_l2tp_users.php*</pattern>
         </patterns>
diff --git a/net/pppoe/src/opnsense/mvc/app/models/OPNsense/PPPoE/ACL/ACL.xml b/net/pppoe/src/opnsense/mvc/app/models/OPNsense/PPPoE/ACL/ACL.xml
index 2c3f08f66..782e5c9d8 100644
--- a/net/pppoe/src/opnsense/mvc/app/models/OPNsense/PPPoE/ACL/ACL.xml
+++ b/net/pppoe/src/opnsense/mvc/app/models/OPNsense/PPPoE/ACL/ACL.xml
@@ -1,22 +1,18 @@
 <acl>
-    <!-- unique acl key, must be globally unique for all acl's  -->
     <page-diagnostics-logs-poes>
-        <name>WebCfg - Diagnostics: Logs: PPPoE page</name>
-        <description>Allow access to the 'Diagnostics: Logs: PPPoE' page.</description>
+        <name>Diagnostics: Logs: PPPoE</name>
         <patterns>
             <pattern>vpn_pppoe_log.php*</pattern>
         </patterns>
     </page-diagnostics-logs-poes>
     <page-services-pppoeserver>
-        <name>WebCfg - Services: PPPoE Server page</name>
-        <description>Allow access to the 'Services: PPPoE Server' page.</description>
+        <name>Services: PPPoE Server</name>
         <patterns>
             <pattern>vpn_pppoe.php*</pattern>
         </patterns>
     </page-services-pppoeserver>
     <page-services-pppoeserver-edit>
-        <name>WebCfg - Services: PPPoE Server: Edit page</name>
-        <description>Allow access to the 'Services: PPPoE Server: Edit' page.</description>
+        <name>Services: PPPoE Server: Edit</name>
         <patterns>
             <pattern>vpn_pppoe_edit.php*</pattern>
         </patterns>
diff --git a/net/pptp/src/opnsense/mvc/app/models/OPNsense/PPTP/ACL/ACL.xml b/net/pptp/src/opnsense/mvc/app/models/OPNsense/PPTP/ACL/ACL.xml
index e0bd4443a..fc66ffa68 100644
--- a/net/pptp/src/opnsense/mvc/app/models/OPNsense/PPTP/ACL/ACL.xml
+++ b/net/pptp/src/opnsense/mvc/app/models/OPNsense/PPTP/ACL/ACL.xml
@@ -1,29 +1,24 @@
 <acl>
-    <!-- unique acl key, must be globally unique for all acl's  -->
     <page-diagnostics-logs-pptp>
-        <name>WebCfg - Diagnostics: Logs: PPTP page</name>
-        <description>Allow access to the 'Diagnostics: Logs: PPTP' page.</description>
+        <name>Diagnostics: Logs: PPTP</name>
         <patterns>
             <pattern>vpn_pptp_log.php*</pattern>
         </patterns>
     </page-diagnostics-logs-pptp>
     <page-vpn-vpnpptp>
-        <name>WebCfg - VPN: PPTP page</name>
-        <description>Allow access to the 'VPN: PPTP' page.</description>
+        <name>VPN: PPTP</name>
         <patterns>
             <pattern>vpn_pptp.php*</pattern>
         </patterns>
     </page-vpn-vpnpptp>
     <page-vpn-vpnpptp-user-edit>
-        <name>WebCfg - VPN: PPTP: User: Edit page</name>
-        <description>Allow access to the 'VPN: PPTP: User: Edit' page.</description>
+        <name>VPN: PPTP: User: Edit</name>
         <patterns>
             <pattern>vpn_pptp_users_edit.php*</pattern>
         </patterns>
     </page-vpn-vpnpptp-user-edit>
     <page-vpn-vpnpptp-users>
-        <name>WebCfg - VPN: PPTP: Users page</name>
-        <description>Allow access to the 'VPN: PPTP: Users' page.</description>
+        <name>VPN: PPTP: Users</name>
         <patterns>
             <pattern>vpn_pptp_users.php*</pattern>
         </patterns>
diff --git a/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/ACL/ACL.xml b/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/ACL/ACL.xml
index 91fe58bcd..ca3734bd7 100644
--- a/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/ACL/ACL.xml
+++ b/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/ACL/ACL.xml
@@ -1,8 +1,6 @@
 <acl>
-    <!-- unique acl key, must be globally unique for all acl's  -->
     <page-tinc-config>
-        <name>WebCfg - VPN: Tinc configuration</name>
-        <description>Allow access to the 'VPN: Tinc' page.</description>
+        <name>VPN: Tinc configuration</name>
         <patterns>
             <pattern>ui/tinc/*</pattern>
             <pattern>api/tinc/*</pattern>
diff --git a/sysutils/smart/src/opnsense/mvc/app/models/OPNsense/Smart/ACL/ACL.xml b/sysutils/smart/src/opnsense/mvc/app/models/OPNsense/Smart/ACL/ACL.xml
index b8845cb8f..b6f6ad617 100644
--- a/sysutils/smart/src/opnsense/mvc/app/models/OPNsense/Smart/ACL/ACL.xml
+++ b/sysutils/smart/src/opnsense/mvc/app/models/OPNsense/Smart/ACL/ACL.xml
@@ -1,8 +1,6 @@
 <acl>
-    <!-- unique acl key, must be globally unique for all acl's  -->
     <page-services-smart>
-        <name>WebCfg - Services: SMART</name>
-        <description>Allow access to the 'Services: SMART' page.</description>
+        <name>Services: SMART</name>
         <patterns>
             <pattern>diag_smart.php*</pattern>
         </patterns>
diff --git a/www/web-proxy-sso/src/opnsense/mvc/app/models/OPNsense/SSOProxyAD/ACL/ACL.xml b/www/web-proxy-sso/src/opnsense/mvc/app/models/OPNsense/SSOProxyAD/ACL/ACL.xml
index 548e3a664..1e1778625 100644
--- a/www/web-proxy-sso/src/opnsense/mvc/app/models/OPNsense/SSOProxyAD/ACL/ACL.xml
+++ b/www/web-proxy-sso/src/opnsense/mvc/app/models/OPNsense/SSOProxyAD/ACL/ACL.xml
@@ -1,8 +1,6 @@
 <acl>
-    <!-- unique acl key, must be globally unique for all acl's  -->
     <page-user-ssoproxyad>
-        <name>WebCfg - Users: SSO Proxy AD</name>
-        <description>Allow access to the SSO Proxy AD module</description>
+        <name>Services: Web Proxy: SSO</name>
         <patterns>
             <pattern>ui/ssoproxyad/*</pattern>
             <pattern>api/ssoproxyad/*</pattern>