Various updates to privileges and related metadata

13 files changed, 31 insertions, 23 deletions

diff --git a/src/usr/local/www/diag_logs.php b/src/usr/local/www/diag_logs.php
index f4e0d10..4dd6f90 100755
--- a/src/usr/local/www/diag_logs.php
+++ b/src/usr/local/www/diag_logs.php
@@ -62,9 +62,9 @@
 
 ##|+PRIV
 ##|*IDENT=page-diagnostics-logs-system
-##|*NAME=Diagnostics: Logs: System page
-##|*DESCR=Allow access to the 'Diagnostics: Logs: System' page.
-##|*MATCH=diag_logs.php*
+##|*NAME=Status: Logs: System page
+##|*DESCR=Allow access to the 'Status: System Logs: General' page.
+##|*MATCH=diag_logs.php
 ##|-PRIV
 
 require("guiconfig.inc");
diff --git a/src/usr/local/www/diag_logs_filter_dynamic.php b/src/usr/local/www/diag_logs_filter_dynamic.php
index 448f945..8dd74db 100755
--- a/src/usr/local/www/diag_logs_filter_dynamic.php
+++ b/src/usr/local/www/diag_logs_filter_dynamic.php
@@ -62,8 +62,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-diagnostics-logs-firewall-dynamic
-##|*NAME=Diagnostics: Logs: Firewall (Dynamic View)
-##|*DESCR=Allow access to the 'Diagnostics: Logs: Firewall (Dynamic View)' page.
+##|*NAME=Status: System Logs: Firewall (Dynamic View)
+##|*DESCR=Allow access to the 'Status: System Logs: Firewall (Dynamic View)' page
 ##|*MATCH=diag_logs_filter_dynamic.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_igmpproxy.php b/src/usr/local/www/services_igmpproxy.php
index 423b432..b0c4c00 100644
--- a/src/usr/local/www/services_igmpproxy.php
+++ b/src/usr/local/www/services_igmpproxy.php
@@ -61,8 +61,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-igmpproxy
-##|*NAME=Services: Igmpproxy page
-##|*DESCR=Allow access to the 'Services: Igmpproxy' page.
+##|*NAME=Services: IGMP Proxy page
+##|*DESCR=Allow access to the 'Services: IGMP Proxy' page.
 ##|*MATCH=services_igmpproxy.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_igmpproxy_edit.php b/src/usr/local/www/services_igmpproxy_edit.php
index 920e702..3f6076e 100644
--- a/src/usr/local/www/services_igmpproxy_edit.php
+++ b/src/usr/local/www/services_igmpproxy_edit.php
@@ -61,8 +61,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-igmpproxy-edit
-##|*NAME=Firewall: Igmpproxy: Edit page
-##|*DESCR=Allow access to the 'Services: Igmpproxy: Edit' page.
+##|*NAME=Services: IGMP Proxy: Edit page
+##|*DESCR=Allow access to the 'Services: IGMP Proxy: Edit' page.
 ##|*MATCH=services_igmpproxy_edit.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php
index 1e75866..805d610 100644
--- a/src/usr/local/www/services_router_advertisements.php
+++ b/src/usr/local/www/services_router_advertisements.php
@@ -63,7 +63,7 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-router-advertisements
-##|*NAME=Services: Router advertisementspage
+##|*NAME=Services: Router Advertisements page
 ##|*DESCR=Allow access to the 'Services: Router Advertisements' page.
 ##|*MATCH=services_router_advertisements.php*
 ##|-PRIV
diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php
index f6f4a16..64c5799 100644
--- a/src/usr/local/www/services_unbound.php
+++ b/src/usr/local/www/services_unbound.php
@@ -58,7 +58,7 @@
 */
 
 ##|+PRIV
-##|*IDENT=page-services-unbound
+##|*IDENT=page-services-dnsresolver
 ##|*NAME=Services: DNS Resolver page
 ##|*DESCR=Allow access to the 'Services: DNS Resolver' page.
 ##|*MATCH=services_unbound.php*
diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php
index 40b65ba..676afff 100644
--- a/src/usr/local/www/services_unbound_acls.php
+++ b/src/usr/local/www/services_unbound_acls.php
@@ -54,6 +54,13 @@
  *
  */
 
+##|+PRIV
+##|*IDENT=page-services-dnsresolver-acls
+##|*NAME=Services: DNS Resolver: Access Lists page
+##|*DESCR=Allow access to the 'Services: DNS Resolver: Access Lists' page.
+##|*MATCH=services_unbound_acls.php*
+##|-PRIV
+
 require("guiconfig.inc");
 require("unbound.inc");
 
diff --git a/src/usr/local/www/services_unbound_advanced.php b/src/usr/local/www/services_unbound_advanced.php
index 451e60e..5779970 100644
--- a/src/usr/local/www/services_unbound_advanced.php
+++ b/src/usr/local/www/services_unbound_advanced.php
@@ -58,10 +58,10 @@
 */
 
 ##|+PRIV
-##|*IDENT=page-services-unbound
-##|*NAME=Services: DNS Resolver Advanced page
-##|*DESCR=Allow access to the 'Services: DNS Resolver Advanced' page.
-##|*MATCH=services_unbound.php*
+##|*IDENT=page-services-dnsresolver-advanced
+##|*NAME=Services: DNS Resolver: Advanced page
+##|*DESCR=Allow access to the 'Services: DNS Resolver: Advanced' page.
+##|*MATCH=services_unbound_advanced.php*
 ##|-PRIV
 
 require_once("guiconfig.inc");
diff --git a/src/usr/local/www/status_captiveportal_expire.php b/src/usr/local/www/status_captiveportal_expire.php
index 79cf621..12c2ebe 100644
--- a/src/usr/local/www/status_captiveportal_expire.php
+++ b/src/usr/local/www/status_captiveportal_expire.php
@@ -59,8 +59,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-status-captiveportal-expire
-##|*NAME=Status: Captive portal Expire Vouchers page
-##|*DESCR=Allow access to the 'Status: Captive portal Expire Vouchers' page.
+##|*NAME=Status: Captive Portal: Expire Vouchers page
+##|*DESCR=Allow access to the 'Status: Captive Portal: Expire Vouchers' page.
 ##|*MATCH=status_captiveportal_expire.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/status_captiveportal_test.php b/src/usr/local/www/status_captiveportal_test.php
index faac9ff..d3f916b 100644
--- a/src/usr/local/www/status_captiveportal_test.php
+++ b/src/usr/local/www/status_captiveportal_test.php
@@ -59,8 +59,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-status-captiveportal-test
-##|*NAME=Status: Captive portal test Vouchers page
-##|*DESCR=Allow access to the 'Status: Captive portal Test Vouchers' page.
+##|*NAME=Status: Captive Portal: Test Vouchers page
+##|*DESCR=Allow access to the 'Status: Captive Portal: Test Vouchers' page.
 ##|*MATCH=status_captiveportal_test.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/status_rrd_graph.php b/src/usr/local/www/status_rrd_graph.php
index d90c75a..d24f6cc 100644
--- a/src/usr/local/www/status_rrd_graph.php
+++ b/src/usr/local/www/status_rrd_graph.php
@@ -62,6 +62,7 @@
 ##|*NAME=Status: RRD Graphs page
 ##|*DESCR=Allow access to the 'Status: RRD Graphs' page.
 ##|*MATCH=status_rrd_graph.php*
+##|*MATCH=status_rrd_graph_img.php*
 ##|-PRIV
 
 require("guiconfig.inc");
diff --git a/src/usr/local/www/system_advanced_network.php b/src/usr/local/www/system_advanced_network.php
index c2d1720..3fd485c 100644
--- a/src/usr/local/www/system_advanced_network.php
+++ b/src/usr/local/www/system_advanced_network.php
@@ -62,7 +62,7 @@
 
 ##|+PRIV
 ##|*IDENT=page-system-advanced-network
-##|*NAME=System: Advanced: Network page
+##|*NAME=System: Advanced: Networking page
 ##|*DESCR=Allow access to the 'System: Advanced: Networking' page.
 ##|*MATCH=system_advanced_network.php*
 ##|-PRIV
diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php
index 76355f0..1927c99 100644
--- a/src/usr/local/www/system_update_settings.php
+++ b/src/usr/local/www/system_update_settings.php
@@ -59,9 +59,9 @@
 */
 
 ##|+PRIV
-##|*IDENT=page-system-firmware-settings
-##|*NAME=System: Firmware: Settings page
-##|*DESCR=Allow access to the 'System: Firmware: Settings' page.
+##|*IDENT=page-system-update-settings
+##|*NAME=System: Update: Settings page
+##|*DESCR=Allow access to the 'System: Update: Settings' page.
 ##|*MATCH=system_update_settings.php*
 ##|-PRIV