Merge remote-tracking branch 'mainline/master' into inc

Conflicts:
	etc/inc/priv.defs.inc

1 files changed, 366 insertions, 307 deletions

diff --git a/etc/inc/priv.defs.inc b/etc/inc/priv.defs.inc
index c3db0cb..d6d83ce 100644
--- a/etc/inc/priv.defs.inc
+++ b/etc/inc/priv.defs.inc
@@ -18,11 +18,11 @@ $priv_list['page-status-carp']['descr'] = gettext("Allow access to the 'Status:
 $priv_list['page-status-carp']['match'] = array();
 $priv_list['page-status-carp']['match'][] = "carp_status.php*";
 
-$priv_list['page-diagnostics-configurationhistory'] = array();
-$priv_list['page-diagnostics-configurationhistory']['name'] = gettext("WebCfg - Diagnostics: Configuration History page");
-$priv_list['page-diagnostics-configurationhistory']['descr'] = gettext("Allow access to the 'Diagnostics: Configuration History' page.");
-$priv_list['page-diagnostics-configurationhistory']['match'] = array();
-$priv_list['page-diagnostics-configurationhistory']['match'][] = "diag_confbak.php*";
+$priv_list['page-diagnostics-crash-reporter'] = array();
+$priv_list['page-diagnostics-crash-reporter']['name'] = "WebCfg - Crash reporter";
+$priv_list['page-diagnostics-crash-reporter']['descr'] = "Uploads crash reports to pfSense and or deletes crash reports.";
+$priv_list['page-diagnostics-crash-reporter']['match'] = array();
+$priv_list['page-diagnostics-crash-reporter']['match'][] = "crash_reporter.php*";
 
 $priv_list['page-diagnostics-arptable'] = array();
 $priv_list['page-diagnostics-arptable']['name'] = gettext("WebCfg - Diagnostics: ARP Table page");
@@ -30,17 +30,31 @@ $priv_list['page-diagnostics-arptable']['descr'] = gettext("Allow access to the
 $priv_list['page-diagnostics-arptable']['match'] = array();
 $priv_list['page-diagnostics-arptable']['match'][] = "diag_arp.php*";
 
+$priv_list['page-diagnostics-authentication'] = array();
+$priv_list['page-diagnostics-authentication']['name'] = "WebCfg - Diagnostics: Authentication page";
+$priv_list['page-diagnostics-authentication']['descr'] = "Allow access to the 'Diagnostics: Authentication' page.";
+$priv_list['page-diagnostics-authentication']['match'] = array();
+$priv_list['page-diagnostics-authentication']['match'][] = "diag_authentication.php*";
+
 $priv_list['page-diagnostics-backup/restore'] = array();
 $priv_list['page-diagnostics-backup/restore']['name'] = gettext("WebCfg - Diagnostics: Backup/restore page");
 $priv_list['page-diagnostics-backup/restore']['descr'] = gettext("Allow access to the 'Diagnostics: Backup/restore' page.");
 $priv_list['page-diagnostics-backup/restore']['match'] = array();
 $priv_list['page-diagnostics-backup/restore']['match'][] = "diag_backup.php*";
 
+<<<<<<< HEAD
 $priv_list['page-status-dhcpleases'] = array();
 $priv_list['page-status-dhcpleases']['name'] = gettext("WebCfg - Status: DHCP leases page");
 $priv_list['page-status-dhcpleases']['descr'] = gettext("Allow access to the 'Status: DHCP leases' page.");
 $priv_list['page-status-dhcpleases']['match'] = array();
 $priv_list['page-status-dhcpleases']['match'][] = "status_dhcp_leases.php*";
+=======
+$priv_list['page-diagnostics-configurationhistory'] = array();
+$priv_list['page-diagnostics-configurationhistory']['name'] = "WebCfg - Diagnostics: Configuration History page";
+$priv_list['page-diagnostics-configurationhistory']['descr'] = "Allow access to the 'Diagnostics: Configuration History' page.";
+$priv_list['page-diagnostics-configurationhistory']['match'] = array();
+$priv_list['page-diagnostics-configurationhistory']['match'][] = "diag_confbak.php*";
+>>>>>>> mainline/master
 
 $priv_list['page-diagnostics-factorydefaults'] = array();
 $priv_list['page-diagnostics-factorydefaults']['name'] = gettext("WebCfg - Diagnostics: Factory defaults page");
@@ -72,6 +86,18 @@ $priv_list['page-status-ipsec-spd']['descr'] = gettext("Allow access to the 'Sta
 $priv_list['page-status-ipsec-spd']['match'] = array();
 $priv_list['page-status-ipsec-spd']['match'][] = "diag_ipsec_spd.php*";
 
+$priv_list['page-ipsecxml'] = array();
+$priv_list['page-ipsecxml']['name'] = "WebCfg - Diag IPsec XML page";
+$priv_list['page-ipsecxml']['descr'] = "Allow access to the 'Diag IPsec XML' page.";
+$priv_list['page-ipsecxml']['match'] = array();
+$priv_list['page-ipsecxml']['match'][] = "diag_ipsec_xml.php";
+
+$priv_list['page-diag-system-activity'] = array();
+$priv_list['page-diag-system-activity']['name'] = "WebCfg - Diagnostics: System Activity";
+$priv_list['page-diag-system-activity']['descr'] = "Allows access to the 'Diagnostics: System Activity' page";
+$priv_list['page-diag-system-activity']['match'] = array();
+$priv_list['page-diag-system-activity']['match'][] = "diag_system_activity*";
+
 $priv_list['page-diagnostics-logs-system'] = array();
 $priv_list['page-diagnostics-logs-system']['name'] = gettext("WebCfg - Diagnostics: Logs: System page");
 $priv_list['page-diagnostics-logs-system']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: System' page.");
@@ -120,6 +146,12 @@ $priv_list['page-status-systemlogs-openvpn']['descr'] = gettext("Allow access to
 $priv_list['page-status-systemlogs-openvpn']['match'] = array();
 $priv_list['page-status-systemlogs-openvpn']['match'][] = "diag_logs_openvpn.php*";
 
+$priv_list['page-status-systemlogs-ppp'] = array();
+$priv_list['page-status-systemlogs-ppp']['name'] = "WebCfg - Status: System logs: IPsec VPN page";
+$priv_list['page-status-systemlogs-ppp']['descr'] = "Allow access to the 'Status: System logs: IPsec VPN' page.";
+$priv_list['page-status-systemlogs-ppp']['match'] = array();
+$priv_list['page-status-systemlogs-ppp']['match'][] = "diag_logs_ppp.php*";
+
 $priv_list['page-status-systemlogs-loadbalancer'] = array();
 $priv_list['page-status-systemlogs-loadbalancer']['name'] = gettext("WebCfg - Status: System logs: Load Balancer page");
 $priv_list['page-status-systemlogs-loadbalancer']['descr'] = gettext("Allow access to the 'Status: System logs: Load Balancer' page.");
@@ -138,6 +170,12 @@ $priv_list['page-diagnostics-logs-pptpvpn']['descr'] = gettext("Allow access to
 $priv_list['page-diagnostics-logs-pptpvpn']['match'] = array();
 $priv_list['page-diagnostics-logs-pptpvpn']['match'][] = "diag_logs_vpn.php*";
 
+$priv_list['page-diagnostics-nanobsd'] = array();
+$priv_list['page-diagnostics-nanobsd']['name'] = "WebCfg - Diagnostics: NanoBSD";
+$priv_list['page-diagnostics-nanobsd']['descr'] = "Allow access to the 'Diagnostics: NanoBSD' page.";
+$priv_list['page-diagnostics-nanobsd']['match'] = array();
+$priv_list['page-diagnostics-nanobsd']['match'][] = "diag_nanobsd.php*";
+
 $priv_list['page-diagnostics-packetcapture'] = array();
 $priv_list['page-diagnostics-packetcapture']['name'] = gettext("WebCfg - Diagnostics: Packet Capture page");
 $priv_list['page-diagnostics-packetcapture']['descr'] = gettext("Allow access to the 'Diagnostics: Packet Capture' page.");
@@ -150,6 +188,12 @@ $priv_list['page-diagnostics-patters']['descr'] = gettext("Allow access to the '
 $priv_list['page-diagnostics-patters']['match'] = array();
 $priv_list['page-diagnostics-patters']['match'][] = "patterns.php*";
 
+$priv_list['page-diag-system-activity'] = array();
+$priv_list['page-diag-system-activity']['name'] = "WebCfg - Diagnostics: System Activity";
+$priv_list['page-diag-system-activity']['descr'] = "Allows access to the 'Diagnostics: System Activity' page";
+$priv_list['page-diag-system-activity']['match'] = array();
+$priv_list['page-diag-system-activity']['match'][] = "diag_system_activity*";
+
 $priv_list['page-diagnostics-ping'] = array();
 $priv_list['page-diagnostics-ping']['name'] = gettext("WebCfg - Diagnostics: Ping page");
 $priv_list['page-diagnostics-ping']['descr'] = gettext("Allow access to the 'Diagnostics: Ping' page.");
@@ -174,11 +218,11 @@ $priv_list['page-diagnostics-routingtables']['descr'] = gettext("Allow access to
 $priv_list['page-diagnostics-routingtables']['match'] = array();
 $priv_list['page-diagnostics-routingtables']['match'][] = "diag_routes.php*";
 
-$priv_list['page-diagnostics-interfacetraffic'] = array();
-$priv_list['page-diagnostics-interfacetraffic']['name'] = gettext("WebCfg - Diagnostics: Interface Traffic page");
-$priv_list['page-diagnostics-interfacetraffic']['descr'] = gettext("Allow access to the 'Diagnostics: Interface Traffic' page.");
-$priv_list['page-diagnostics-interfacetraffic']['match'] = array();
-$priv_list['page-diagnostics-interfacetraffic']['match'][] = "graph.php*";
+$priv_list['page-diagnostics-statessummary'] = array();
+$priv_list['page-diagnostics-statessummary']['name'] = "WebCfg - Diagnostics: States Summary page";
+$priv_list['page-diagnostics-statessummary']['descr'] = "Allow access to the 'Diagnostics: States Summary' page.";
+$priv_list['page-diagnostics-statessummary']['match'] = array();
+$priv_list['page-diagnostics-statessummary']['match'][] = "diag_states_summary.php*";
 
 $priv_list['page-diag-system-activity'] = array();
 $priv_list['page-diag-system-activity']['name'] = gettext("WebCfg - Diagnostics: System Activity");
@@ -186,11 +230,17 @@ $priv_list['page-diag-system-activity']['descr'] = gettext("Allows access to the
 $priv_list['page-diag-system-activity']['match'] = array();
 $priv_list['page-diag-system-activity']['match'][] = "diag_system_activity*";
 
-$priv_list['page-diag-system-pftop'] = array();
-$priv_list['page-diag-system-pftop']['name'] = gettext("WebCfg - Diagnostics: pfTop");
-$priv_list['page-diag-system-pftop']['descr'] = gettext("Allows access to the 'Diagnostics: pfTop' page");
-$priv_list['page-diag-system-pftop']['match'] = array();
-$priv_list['page-diag-system-pftop']['match'][] = "diag_system_pftop*";
+$priv_list['page-diag-system-activity'] = array();
+$priv_list['page-diag-system-activity']['name'] = "WebCfg - Diagnostics: System Activity";
+$priv_list['page-diag-system-activity']['descr'] = "Allows access to the 'Diagnostics: System Activity' page";
+$priv_list['page-diag-system-activity']['match'] = array();
+$priv_list['page-diag-system-activity']['match'][] = "diag_system_pftop*";
+
+$priv_list['page-diagnostics-tables'] = array();
+$priv_list['page-diagnostics-tables']['name'] = "WebCfg - Diagnostics: PF Table IP addresses";
+$priv_list['page-diagnostics-tables']['descr'] = "Allow access to the 'Diagnostics: Tables' page.";
+$priv_list['page-diagnostics-tables']['match'] = array();
+$priv_list['page-diagnostics-tables']['match'][] = "diag_tables.php*";
 
 $priv_list['page-diagnostics-traceroute'] = array();
 $priv_list['page-diagnostics-traceroute']['name'] = gettext("WebCfg - Diagnostics: Traceroute page");
@@ -198,11 +248,11 @@ $priv_list['page-diagnostics-traceroute']['descr'] = gettext("Allow access to th
 $priv_list['page-diagnostics-traceroute']['match'] = array();
 $priv_list['page-diagnostics-traceroute']['match'][] = "diag_traceroute.php*";
 
-$priv_list['page-diagnostics-tables'] = array();
-$priv_list['page-diagnostics-tables']['name'] = "WebCfg - Diagnostics: Tables page";
-$priv_list['page-diagnostics-tables']['descr'] = "Allow access to the 'Diagnostics: Tables' page.";
-$priv_list['page-diagnostics-tables']['match'] = array();
-$priv_list['page-diagnostics-tables']['match'][] = "diag_tables.php*";
+$priv_list['page-diagnostics-edit'] = array();
+$priv_list['page-diagnostics-edit']['name'] = "WebCfg - Diagnostics: Edit FIle";
+$priv_list['page-diagnostics-edit']['descr'] = "Allow access to the 'Diagnostics: Edit File' page.";
+$priv_list['page-diagnostics-edit']['match'] = array();
+$priv_list['page-diagnostics-edit']['match'][] = "edit.php*";
 
 $priv_list['page-diagnostics-command'] = array();
 $priv_list['page-diagnostics-command']['name'] = gettext("WebCfg - Diagnostics: Command page");
@@ -216,18 +266,18 @@ $priv_list['page-hidden-execraw']['descr'] = gettext("Allow access to the 'Hidde
 $priv_list['page-hidden-execraw']['match'] = array();
 $priv_list['page-hidden-execraw']['match'][] = "exec_raw.php*";
 
-$priv_list['page-firewall-alias-edit'] = array();
-$priv_list['page-firewall-alias-edit']['name'] = gettext("WebCfg - Firewall: Alias: Edit page");
-$priv_list['page-firewall-alias-edit']['descr'] = gettext("Allow access to the 'Firewall: Alias: Edit' page.");
-$priv_list['page-firewall-alias-edit']['match'] = array();
-$priv_list['page-firewall-alias-edit']['match'][] = "firewall_aliases_edit.php*";
-
 $priv_list['page-firewall-aliases'] = array();
 $priv_list['page-firewall-aliases']['name'] = gettext("WebCfg - Firewall: Aliases page");
 $priv_list['page-firewall-aliases']['descr'] = gettext("Allow access to the 'Firewall: Aliases' page.");
 $priv_list['page-firewall-aliases']['match'] = array();
 $priv_list['page-firewall-aliases']['match'][] = "firewall_aliases.php*";
 
+$priv_list['page-firewall-alias-edit'] = array();
+$priv_list['page-firewall-alias-edit']['name'] = "WebCfg - Firewall: Alias: Edit page";
+$priv_list['page-firewall-alias-edit']['descr'] = "Allow access to the 'Firewall: Alias: Edit' page.";
+$priv_list['page-firewall-alias-edit']['match'] = array();
+$priv_list['page-firewall-alias-edit']['match'][] = "firewall_aliases_edit.php*";
+
 $priv_list['page-firewall-alias-import'] = array();
 $priv_list['page-firewall-alias-import']['name'] = gettext("WebCfg - Firewall: Alias: Import page");
 $priv_list['page-firewall-alias-import']['descr'] = gettext("Allow access to the 'Firewall: Alias: Import' page.");
@@ -264,11 +314,23 @@ $priv_list['page-firewall-nat-outbound']['descr'] = gettext("Allow access to the
 $priv_list['page-firewall-nat-outbound']['match'] = array();
 $priv_list['page-firewall-nat-outbound']['match'][] = "firewall_nat_out.php*";
 
-$priv_list['page-services-loadbalancer-relay-protocol-edit'] = array();
-$priv_list['page-services-loadbalancer-relay-protocol-edit']['name'] = gettext("WebCfg - Services: Load Balancer: Relay Protocol: Edit page");
-$priv_list['page-services-loadbalancer-relay-protocol-edit']['descr'] = gettext("Allow access to the 'Services: Load Balancer: Relay Protocol: Edit' page.");
-$priv_list['page-services-loadbalancer-relay-protocol-edit']['match'] = array();
-$priv_list['page-services-loadbalancer-relay-protocol-edit']['match'][] = "load_balancer_relay_protocol_edit.php*";
+$priv_list['page-firewall-nat-outbound-edit'] = array();
+$priv_list['page-firewall-nat-outbound-edit']['name'] = "WebCfg - Firewall: NAT: Outbound: Edit page";
+$priv_list['page-firewall-nat-outbound-edit']['descr'] = "Allow access to the 'Firewall: NAT: Outbound: Edit' page.";
+$priv_list['page-firewall-nat-outbound-edit']['match'] = array();
+$priv_list['page-firewall-nat-outbound-edit']['match'][] = "firewall_nat_out_edit.php*";
+
+$priv_list['page-firewall-rules'] = array();
+$priv_list['page-firewall-rules']['name'] = "WebCfg - Firewall: Rules page";
+$priv_list['page-firewall-rules']['descr'] = "Allow access to the 'Firewall: Rules' page.";
+$priv_list['page-firewall-rules']['match'] = array();
+$priv_list['page-firewall-rules']['match'][] = "firewall_rules.php*";
+
+$priv_list['page-firewall-rules-edit'] = array();
+$priv_list['page-firewall-rules-edit']['name'] = "WebCfg - Firewall: Rules: Edit page";
+$priv_list['page-firewall-rules-edit']['descr'] = "Allow access to the 'Firewall: Rules: Edit' page.";
+$priv_list['page-firewall-rules-edit']['match'] = array();
+$priv_list['page-firewall-rules-edit']['match'][] = "firewall_rules_edit.php*";
 
 $priv_list['page-firewall-schedules'] = array();
 $priv_list['page-firewall-schedules']['name'] = gettext("WebCfg - Firewall: Schedules page");
@@ -276,6 +338,12 @@ $priv_list['page-firewall-schedules']['descr'] = gettext("Allow access to the 'F
 $priv_list['page-firewall-schedules']['match'] = array();
 $priv_list['page-firewall-schedules']['match'][] = "firewall_schedule.php*";
 
+$priv_list['page-firewall-schedules-edit'] = array();
+$priv_list['page-firewall-schedules-edit']['name'] = "WebCfg - Firewall: Schedules: Edit page";
+$priv_list['page-firewall-schedules-edit']['descr'] = "Allow access to the 'Firewall: Schedules: Edit' page.";
+$priv_list['page-firewall-schedules-edit']['match'] = array();
+$priv_list['page-firewall-schedules-edit']['match'][] = "firewall_schedule_edit.php*";
+
 $priv_list['page-firewall-trafficshaper'] = array();
 $priv_list['page-firewall-trafficshaper']['name'] = gettext("WebCfg - Firewall: Traffic Shaper page");
 $priv_list['page-firewall-trafficshaper']['descr'] = gettext("Allow access to the 'Firewall: Traffic Shaper' page.");
@@ -318,35 +386,23 @@ $priv_list['page-firewall-virtualipaddress-edit']['descr'] = gettext("Allow acce
 $priv_list['page-firewall-virtualipaddress-edit']['match'] = array();
 $priv_list['page-firewall-virtualipaddress-edit']['match'][] = "firewall_virtual_ip_edit.php*";
 
+$priv_list['page-getserviceproviders'] = array();
+$priv_list['page-getserviceproviders']['name'] = "WebCfg - AJAX: Get Service Providers";
+$priv_list['page-getserviceproviders']['descr'] = "Allow access to the 'AJAX: Service Providers' page.";
+$priv_list['page-getserviceproviders']['match'] = array();
+$priv_list['page-getserviceproviders']['match'][] = "getserviceproviders.php*";
+
 $priv_list['page-getstats'] = array();
 $priv_list['page-getstats']['name'] = gettext("WebCfg - AJAX: Get Stats");
 $priv_list['page-getstats']['descr'] = gettext("Allow access to the 'AJAX: Get Stats' page.");
 $priv_list['page-getstats']['match'] = array();
 $priv_list['page-getstats']['match'][] = "getstats.php*";
 
-$priv_list['page-status-systemlogs-ppp'] = array();
-$priv_list['page-status-systemlogs-ppp']['name'] = gettext("WebCfg - Status: System logs: IPsec VPN page");
-$priv_list['page-status-systemlogs-ppp']['descr'] = gettext("Allow access to the 'Status: System logs: IPsec VPN' page.");
-$priv_list['page-status-systemlogs-ppp']['match'] = array();
-$priv_list['page-status-systemlogs-ppp']['match'][] = "diag_logs_ppp.php*";
-
-$priv_list['page-diagnostics-nanobsd'] = array();
-$priv_list['page-diagnostics-nanobsd']['name'] = gettext("WebCfg - Diagnostics: Edit file");
-$priv_list['page-diagnostics-nanobsd']['descr'] = gettext("Allow access to the 'Diagnostics: Edit File' page.");
-$priv_list['page-diagnostics-nanobsd']['match'] = array();
-$priv_list['page-diagnostics-nanobsd']['match'][] = "edit.php*";
-
-$priv_list['page-diagnostics-nanobsd'] = array();
-$priv_list['page-diagnostics-nanobsd']['name'] = gettext("WebCfg - Diagnostics: NanoBSD");
-$priv_list['page-diagnostics-nanobsd']['descr'] = gettext("Allow access to the 'Diagnostics: NanoBSD' page.");
-$priv_list['page-diagnostics-nanobsd']['match'] = array();
-$priv_list['page-diagnostics-nanobsd']['match'][] = "diag_nanobsd.php*";
-
-$priv_list['page-interfaces-gif'] = array();
-$priv_list['page-interfaces-gif']['name'] = gettext("WebCfg - Interfaces: GIF page");
-$priv_list['page-interfaces-gif']['descr'] = gettext("Allow access to the 'Interfaces: GIF' page.");
-$priv_list['page-interfaces-gif']['match'] = array();
-$priv_list['page-interfaces-gif']['match'][] = "interfaces_gif.php*";
+$priv_list['page-diagnostics-interfacetraffic'] = array();
+$priv_list['page-diagnostics-interfacetraffic']['name'] = "WebCfg - Diagnostics: Interface Traffic page";
+$priv_list['page-diagnostics-interfacetraffic']['descr'] = "Allow access to the 'Diagnostics: Interface Traffic' page.";
+$priv_list['page-diagnostics-interfacetraffic']['match'] = array();
+$priv_list['page-diagnostics-interfacetraffic']['match'][] = "graph.php*";
 
 $priv_list['page-diagnostics-cpuutilization'] = array();
 $priv_list['page-diagnostics-cpuutilization']['name'] = gettext("WebCfg - Diagnostics: CPU Utilization page");
@@ -354,12 +410,6 @@ $priv_list['page-diagnostics-cpuutilization']['descr'] = gettext("Allow access t
 $priv_list['page-diagnostics-cpuutilization']['match'] = array();
 $priv_list['page-diagnostics-cpuutilization']['match'][] = "graph_cpu.php*";
 
-$priv_list['page-diagnostics-cpuutilization'] = array();
-$priv_list['page-diagnostics-cpuutilization']['name'] = "WebCfg - XMLRPC CPU Utilization page";
-$priv_list['page-diagnostics-cpuutilization']['descr'] = "Allow access to the 'XMLRPC CPU Utilization' page.";
-$priv_list['page-diagnostics-cpuutilization']['match'] = array();
-$priv_list['page-diagnostics-cpuutilization']['match'][] = "stats.php*";
-
 $priv_list['page-diagnostics-haltsystem'] = array();
 $priv_list['page-diagnostics-haltsystem']['name'] = gettext("WebCfg - Diagnostics: Halt system page");
 $priv_list['page-diagnostics-haltsystem']['descr'] = gettext("Allow access to the 'Diagnostics: Halt system' page.");
@@ -408,6 +458,12 @@ $priv_list['page-interfaces-bridge-edit']['descr'] = gettext("Allow access to th
 $priv_list['page-interfaces-bridge-edit']['match'] = array();
 $priv_list['page-interfaces-bridge-edit']['match'][] = "interfaces_bridge_edit.php*";
 
+$priv_list['page-interfaces-gif'] = array();
+$priv_list['page-interfaces-gif']['name'] = "WebCfg - Interfaces: GIF page";
+$priv_list['page-interfaces-gif']['descr'] = "Allow access to the 'Interfaces: GIF' page.";
+$priv_list['page-interfaces-gif']['match'] = array();
+$priv_list['page-interfaces-gif']['match'][] = "interfaces_gif.php*";
+
 $priv_list['page-interfaces-gif-edit'] = array();
 $priv_list['page-interfaces-gif-edit']['name'] = gettext("WebCfg - Interfaces: GIF: Edit page");
 $priv_list['page-interfaces-gif-edit']['descr'] = gettext("Allow access to the 'Interfaces: GIF: Edit' page.");
@@ -420,36 +476,12 @@ $priv_list['page-interfaces-gre']['descr'] = gettext("Allow access to the 'Inter
 $priv_list['page-interfaces-gre']['match'] = array();
 $priv_list['page-interfaces-gre']['match'][] = "interfaces_gre.php*";
 
-$priv_list['page-package-settings'] = array();
-$priv_list['page-package-settings']['name'] = gettext("WebCfg - Package: Settings page");
-$priv_list['page-package-settings']['descr'] = gettext("Allow access to the 'Package: Settings' page.");
-$priv_list['page-package-settings']['match'] = array();
-$priv_list['page-package-settings']['match'][] = "pkg.php*";
-
 $priv_list['page-interfaces-gre-edit'] = array();
 $priv_list['page-interfaces-gre-edit']['name'] = gettext("WebCfg - Interfaces: GRE: Edit page");
 $priv_list['page-interfaces-gre-edit']['descr'] = gettext("Allow access to the 'Interfaces: GRE: Edit' page.");
 $priv_list['page-interfaces-gre-edit']['match'] = array();
 $priv_list['page-interfaces-gre-edit']['match'][] = "interfaces_gre_edit.php*";
 
-$priv_list['page-interfacess-lagg'] = array();
-$priv_list['page-interfacess-lagg']['name'] = gettext("WebCfg - Interfaces: LAGG: page");
-$priv_list['page-interfacess-lagg']['descr'] = gettext("Edit Interface LAGG");
-$priv_list['page-interfacess-lagg']['match'] = array();
-$priv_list['page-interfacess-lagg']['match'][] = "interfaces_lagg.php*";
-
-$priv_list['page-interfaces-ppps-edit'] = array();
-$priv_list['page-interfaces-ppps-edit']['name'] = gettext("WebCfg - Interfaces: PPP: Edit page");
-$priv_list['page-interfaces-ppps-edit']['descr'] = gettext("Allow access to the 'Interfaces: PPP: Edit' page.");
-$priv_list['page-interfaces-ppps-edit']['match'] = array();
-$priv_list['page-interfaces-ppps-edit']['match'][] = "interfaces_ppps_edit.php*";
-
-$priv_list['page-interfaces-ppps'] = array();
-$priv_list['page-interfaces-ppps']['name'] = gettext("WebCfg - Interfaces: PPP page");
-$priv_list['page-interfaces-ppps']['descr'] = gettext("Allow access to the 'Interfaces: PPP' page.");
-$priv_list['page-interfaces-ppps']['match'] = array();
-$priv_list['page-interfaces-ppps']['match'][] = "interfaces_ppps.php*";
-
 $priv_list['page-interfaces-groups'] = array();
 $priv_list['page-interfaces-groups']['name'] = gettext("WebCfg - Interfaces: Groups page");
 $priv_list['page-interfaces-groups']['descr'] = gettext("Create interface groups");
@@ -463,11 +495,41 @@ $priv_list['page-interfacess-groups']['match'] = array();
 $priv_list['page-interfacess-groups']['match'][] = "interfaces_groups_edit.php*";
 
 $priv_list['page-interfacess-lagg'] = array();
-$priv_list['page-interfacess-lagg']['name'] = gettext("WebCfg - Interfaces: LAGG: Edit page");
-$priv_list['page-interfacess-lagg']['descr'] = gettext("Edit Interface LAGG");
+$priv_list['page-interfacess-lagg']['name'] = "WebCfg - Interfaces: LAGG: page";
+$priv_list['page-interfacess-lagg']['descr'] = "Edit Interface LAGG";
+$priv_list['page-interfacess-lagg']['match'] = array();
+$priv_list['page-interfacess-lagg']['match'][] = "interfaces_lagg.php*";
+
+$priv_list['page-interfacess-lagg'] = array();
+$priv_list['page-interfacess-lagg']['name'] = "WebCfg - Interfaces: LAGG: Edit page";
+$priv_list['page-interfacess-lagg']['descr'] = "Edit Interface LAGG";
 $priv_list['page-interfacess-lagg']['match'] = array();
 $priv_list['page-interfacess-lagg']['match'][] = "interfaces_lagg_edit.php*";
 
+$priv_list['page-interfaces-ppps'] = array();
+$priv_list['page-interfaces-ppps']['name'] = "WebCfg - Interfaces: ppps page";
+$priv_list['page-interfaces-ppps']['descr'] = "Allow access to the 'Interfaces: ppps' page.";
+$priv_list['page-interfaces-ppps']['match'] = array();
+$priv_list['page-interfaces-ppps']['match'][] = "interfaces_ppps.php*";
+
+$priv_list['page-interfaces-ppps-edit'] = array();
+$priv_list['page-interfaces-ppps-edit']['name'] = "WebCfg - Interfaces: PPPs: Edit page";
+$priv_list['page-interfaces-ppps-edit']['descr'] = "Allow access to the 'Interfaces: PPPs: Edit' page.";
+$priv_list['page-interfaces-ppps-edit']['match'] = array();
+$priv_list['page-interfaces-ppps-edit']['match'][] = "interfaces_ppps_edit.php*";
+
+$priv_list['page-interfaces-qinq'] = array();
+$priv_list['page-interfaces-qinq']['name'] = "WebCfg - Interfaces: QinQ page";
+$priv_list['page-interfaces-qinq']['descr'] = "Allow access to the 'Interfaces: QinQ' page.";
+$priv_list['page-interfaces-qinq']['match'] = array();
+$priv_list['page-interfaces-qinq']['match'][] = "interfaces_qinq.php*";
+
+$priv_list['page-interfacess-qinq'] = array();
+$priv_list['page-interfacess-qinq']['name'] = "WebCfg - Interfaces: QinQ: Edit page";
+$priv_list['page-interfacess-qinq']['descr'] = "Edit Interface qinq";
+$priv_list['page-interfacess-qinq']['match'] = array();
+$priv_list['page-interfacess-qinq']['match'][] = "interfaces_qinq_edit.php*";
+
 $priv_list['page-interfaces-vlan'] = array();
 $priv_list['page-interfaces-vlan']['name'] = gettext("WebCfg - Interfaces: VLAN page");
 $priv_list['page-interfaces-vlan']['descr'] = gettext("Allow access to the 'Interfaces: VLAN' page.");
@@ -522,24 +584,6 @@ $priv_list['page-loadbalancer-pool-edit']['descr'] = gettext("Allow access to th
 $priv_list['page-loadbalancer-pool-edit']['match'] = array();
 $priv_list['page-loadbalancer-pool-edit']['match'][] = "load_balancer_pool_edit.php*";
 
-$priv_list['page-system-packagemanager'] = array();
-$priv_list['page-system-packagemanager']['name'] = gettext("WebCfg - System: Package Manager page");
-$priv_list['page-system-packagemanager']['descr'] = gettext("Allow access to the 'System: Package Manager' page.");
-$priv_list['page-system-packagemanager']['match'] = array();
-$priv_list['page-system-packagemanager']['match'][] = "pkg_mgr.php*";
-
-$priv_list['page-services-captiveportal-allowedips'] = array();
-$priv_list['page-services-captiveportal-allowedips']['name'] = gettext("WebCfg - Services: Captive portal: Allowed IPs page");
-$priv_list['page-services-captiveportal-allowedips']['descr'] = gettext("Allow access to the 'Services: Captive portal: Allowed IPs' page.");
-$priv_list['page-services-captiveportal-allowedips']['match'] = array();
-$priv_list['page-services-captiveportal-allowedips']['match'][] = "services_captiveportal_ip.php*";
-
-$priv_list['page-interfacess-qinq'] = array();
-$priv_list['page-interfacess-qinq']['name'] = gettext("WebCfg - Interfaces: QinQ: Edit page");
-$priv_list['page-interfacess-qinq']['descr'] = gettext("Edit Interface qinq");
-$priv_list['page-interfacess-qinq']['match'] = array();
-$priv_list['page-interfacess-qinq']['match'][] = "interfaces_qinq_edit.php*";
-
 $priv_list['page-services-loadbalancer-relay-action'] = array();
 $priv_list['page-services-loadbalancer-relay-action']['name'] = gettext("WebCfg - Services: Load Balancer: Relay Actions page");
 $priv_list['page-services-loadbalancer-relay-action']['descr'] = gettext("Allow access to the 'Services: Load Balancer: Relay Actions' page.");
@@ -558,6 +602,12 @@ $priv_list['page-services-loadbalancer-relay-protocol']['descr'] = gettext("Allo
 $priv_list['page-services-loadbalancer-relay-protocol']['match'] = array();
 $priv_list['page-services-loadbalancer-relay-protocol']['match'][] = "load_balancer_relay_protocol.php*";
 
+$priv_list['page-services-loadbalancer-relay-protocol-edit'] = array();
+$priv_list['page-services-loadbalancer-relay-protocol-edit']['name'] = "WebCfg - Services: Load Balancer: Relay Protocol: Edit page";
+$priv_list['page-services-loadbalancer-relay-protocol-edit']['descr'] = "Allow access to the 'Services: Load Balancer: Relay Protocol: Edit' page.";
+$priv_list['page-services-loadbalancer-relay-protocol-edit']['match'] = array();
+$priv_list['page-services-loadbalancer-relay-protocol-edit']['match'][] = "load_balancer_relay_protocol_edit.php*";
+
 $priv_list['page-services-loadbalancer-virtualservers'] = array();
 $priv_list['page-services-loadbalancer-virtualservers']['name'] = gettext("WebCfg - Services: Load Balancer: Virtual Servers page");
 $priv_list['page-services-loadbalancer-virtualservers']['descr'] = gettext("Allow access to the 'Services: Load Balancer: Virtual Servers' page.");
@@ -570,12 +620,24 @@ $priv_list['page-loadbalancer-virtualserver-edit']['descr'] = gettext("Allow acc
 $priv_list['page-loadbalancer-virtualserver-edit']['match'] = array();
 $priv_list['page-loadbalancer-virtualserver-edit']['match'][] = "load_balancer_virtual_server_edit.php*";
 
+$priv_list['page-package-settings'] = array();
+$priv_list['page-package-settings']['name'] = "WebCfg - Package: Settings page";
+$priv_list['page-package-settings']['descr'] = "Allow access to the 'Package: Settings' page.";
+$priv_list['page-package-settings']['match'] = array();
+$priv_list['page-package-settings']['match'][] = "pkg.php*";
+
 $priv_list['page-package-edit'] = array();
 $priv_list['page-package-edit']['name'] = gettext("WebCfg - Package: Edit page");
 $priv_list['page-package-edit']['descr'] = gettext("Allow access to the 'Package: Edit' page.");
 $priv_list['page-package-edit']['match'] = array();
 $priv_list['page-package-edit']['match'][] = "pkg_edit.php*";
 
+$priv_list['page-system-packagemanager'] = array();
+$priv_list['page-system-packagemanager']['name'] = "WebCfg - System: Package Manager page";
+$priv_list['page-system-packagemanager']['descr'] = "Allow access to the 'System: Package Manager' page.";
+$priv_list['page-system-packagemanager']['match'] = array();
+$priv_list['page-system-packagemanager']['match'][] = "pkg_mgr.php*";
+
 $priv_list['page-system-packagemanager-installpackage'] = array();
 $priv_list['page-system-packagemanager-installpackage']['name'] = gettext("WebCfg - System: Package Manager: Install Package page");
 $priv_list['page-system-packagemanager-installpackage']['descr'] = gettext("Allow access to the 'System: Package Manager: Install Package' page.");
@@ -588,18 +650,18 @@ $priv_list['page-system-packagemanager-installed']['descr'] = gettext("Allow acc
 $priv_list['page-system-packagemanager-installed']['match'] = array();
 $priv_list['page-system-packagemanager-installed']['match'][] = "pkg_mgr_installed.php*";
 
+$priv_list['page-pkg-mgr-settings'] = array();
+$priv_list['page-pkg-mgr-settings']['name'] = "WebCfg - Packages: Settings page";
+$priv_list['page-pkg-mgr-settings']['descr'] = "Allow access to the 'Packages: Settings' page.";
+$priv_list['page-pkg-mgr-settings']['match'] = array();
+$priv_list['page-pkg-mgr-settings']['match'][] = "pkg_mgr_settings.php*";
+
 $priv_list['page-diagnostics-rebootsystem'] = array();
 $priv_list['page-diagnostics-rebootsystem']['name'] = gettext("WebCfg - Diagnostics: Reboot System page");
 $priv_list['page-diagnostics-rebootsystem']['descr'] = gettext("Allow access to the 'Diagnostics: Reboot System' page.");
 $priv_list['page-diagnostics-rebootsystem']['match'] = array();
 $priv_list['page-diagnostics-rebootsystem']['match'][] = "reboot.php*";
 
-$priv_list['page-services-captiveportal-filemanager'] = array();
-$priv_list['page-services-captiveportal-filemanager']['name'] = gettext("WebCfg - Services: Captive portal: File Manager page");
-$priv_list['page-services-captiveportal-filemanager']['descr'] = gettext("Allow access to the 'Services: Captive portal: File Manager' page.");
-$priv_list['page-services-captiveportal-filemanager']['match'] = array();
-$priv_list['page-services-captiveportal-filemanager']['match'][] = "services_captiveportal_filemanager.php*";
-
 $priv_list['page-diagnostics-restart-httpd'] = array();
 $priv_list['page-diagnostics-restart-httpd']['name'] = gettext("WebCfg - Diagnostics: Restart HTTPD : System page");
 $priv_list['page-diagnostics-restart-httpd']['descr'] = gettext("Allow access to the 'Diagnostics: Restart HTTPD: System' page.");
@@ -612,6 +674,36 @@ $priv_list['page-services-captiveportal']['descr'] = gettext("Allow access to th
 $priv_list['page-services-captiveportal']['match'] = array();
 $priv_list['page-services-captiveportal']['match'][] = "services_captiveportal.php*";
 
+$priv_list['page-services-captiveportal-filemanager'] = array();
+$priv_list['page-services-captiveportal-filemanager']['name'] = "WebCfg - Services: Captive portal: File Manager page";
+$priv_list['page-services-captiveportal-filemanager']['descr'] = "Allow access to the 'Services: Captive portal: File Manager' page.";
+$priv_list['page-services-captiveportal-filemanager']['match'] = array();
+$priv_list['page-services-captiveportal-filemanager']['match'][] = "services_captiveportal_filemanager.php*";
+
+$priv_list['page-services-captiveportal-allowedhostnames'] = array();
+$priv_list['page-services-captiveportal-allowedhostnames']['name'] = "WebCfg - Services: Captive portal: Allowed IPs page";
+$priv_list['page-services-captiveportal-allowedhostnames']['descr'] = "Allow access to the 'Services: Captive portal: Allowed IPs' page.";
+$priv_list['page-services-captiveportal-allowedhostnames']['match'] = array();
+$priv_list['page-services-captiveportal-allowedhostnames']['match'][] = "services_captiveportal_ip.php*";
+
+$priv_list['page-services-captiveportal-editallowedhostnames'] = array();
+$priv_list['page-services-captiveportal-editallowedhostnames']['name'] = "WebCfg - Services: Captive portal: Edit Allowed IPs page";
+$priv_list['page-services-captiveportal-editallowedhostnames']['descr'] = "Allow access to the 'Services: Captive portal: Edit Allowed IPs' page.";
+$priv_list['page-services-captiveportal-editallowedhostnames']['match'] = array();
+$priv_list['page-services-captiveportal-editallowedhostnames']['match'][] = "services_captiveportal_hostname_edit.php*";
+
+$priv_list['page-services-captiveportal-allowedips'] = array();
+$priv_list['page-services-captiveportal-allowedips']['name'] = "WebCfg - Services: Captive portal: Allowed IPs page";
+$priv_list['page-services-captiveportal-allowedips']['descr'] = "Allow access to the 'Services: Captive portal: Allowed IPs' page.";
+$priv_list['page-services-captiveportal-allowedips']['match'] = array();
+$priv_list['page-services-captiveportal-allowedips']['match'][] = "services_captiveportal_ip.php*";
+
+$priv_list['page-services-captiveportal-editallowedips'] = array();
+$priv_list['page-services-captiveportal-editallowedips']['name'] = "WebCfg - Services: Captive portal: Edit Allowed IPs page";
+$priv_list['page-services-captiveportal-editallowedips']['descr'] = "Allow access to the 'Services: Captive portal: Edit Allowed IPs' page.";
+$priv_list['page-services-captiveportal-editallowedips']['match'] = array();
+$priv_list['page-services-captiveportal-editallowedips']['match'][] = "services_captiveportal_ip_edit.php*";
+
 $priv_list['page-services-captiveportal-macaddresses'] = array();
 $priv_list['page-services-captiveportal-macaddresses']['name'] = gettext("WebCfg - Services: Captive portal: Mac Addresses page");
 $priv_list['page-services-captiveportal-macaddresses']['descr'] = gettext("Allow access to the 'Services: Captive portal: Mac Addresses' page.");
@@ -624,17 +716,17 @@ $priv_list['page-services-captiveportal-editmacaddresses']['descr'] = gettext("A
 $priv_list['page-services-captiveportal-editmacaddresses']['match'] = array();
 $priv_list['page-services-captiveportal-editmacaddresses']['match'][] = "services_captiveportal_mac_edit.php*";
 
-$priv_list['page-services-dhcpserver-editstaticmapping'] = array();
-$priv_list['page-services-dhcpserver-editstaticmapping']['name'] = gettext("WebCfg - Services: DHCP Server : Edit static mapping page");
-$priv_list['page-services-dhcpserver-editstaticmapping']['descr'] = gettext("Allow access to the 'Services: DHCP Server : Edit static mapping' page.");
-$priv_list['page-services-dhcpserver-editstaticmapping']['match'] = array();
-$priv_list['page-services-dhcpserver-editstaticmapping']['match'][] = "services_dhcp_edit.php*";
+$priv_list['page-services-captiveportal-vouchers'] = array();
+$priv_list['page-services-captiveportal-vouchers']['name'] = "WebCfg - Services: Captive portal Vouchers page";
+$priv_list['page-services-captiveportal-vouchers']['descr'] = "Allow access to the 'Services: Captive portal Vouchers' page.";
+$priv_list['page-services-captiveportal-vouchers']['match'] = array();
+$priv_list['page-services-captiveportal-vouchers']['match'][] = "services_captiveportal_vouchers.php*";
 
-$priv_list['page-services-dhcprelay'] = array();
-$priv_list['page-services-dhcprelay']['name'] = gettext("WebCfg - Services: DHCP Relay page");
-$priv_list['page-services-dhcprelay']['descr'] = gettext("Allow access to the 'Services: DHCP Relay' page.");
-$priv_list['page-services-dhcprelay']['match'] = array();
-$priv_list['page-services-dhcprelay']['match'][] = "services_dhcp_relay.php*";
+$priv_list['page-services-captiveportal-voucher-edit'] = array();
+$priv_list['page-services-captiveportal-voucher-edit']['name'] = "WebCfg - Services: Captive portal Voucher Rolls page";
+$priv_list['page-services-captiveportal-voucher-edit']['descr'] = "Allow access to the 'Services: Captive portal Edit Voucher Rolls' page.";
+$priv_list['page-services-captiveportal-voucher-edit']['match'] = array();
+$priv_list['page-services-captiveportal-voucher-edit']['match'][] = "services_captiveportal_vouchers_edit.php*";
 
 $priv_list['page-services-dhcpserver'] = array();
 $priv_list['page-services-dhcpserver']['name'] = gettext("WebCfg - Services: DHCP server page");
@@ -642,17 +734,29 @@ $priv_list['page-services-dhcpserver']['descr'] = gettext("Allow access to the '
 $priv_list['page-services-dhcpserver']['match'] = array();
 $priv_list['page-services-dhcpserver']['match'][] = "services_dhcp.php*";
 
+$priv_list['page-services-dhcpserver-editstaticmapping'] = array();
+$priv_list['page-services-dhcpserver-editstaticmapping']['name'] = "WebCfg - Services: DHCP Server : Edit static mapping page";
+$priv_list['page-services-dhcpserver-editstaticmapping']['descr'] = "Allow access to the 'Services: DHCP Server : Edit static mapping' page.";
+$priv_list['page-services-dhcpserver-editstaticmapping']['match'] = array();
+$priv_list['page-services-dhcpserver-editstaticmapping']['match'][] = "services_dhcp_edit.php*";
+
+$priv_list['page-services-dhcprelay'] = array();
+$priv_list['page-services-dhcprelay']['name'] = "WebCfg - Services: DHCP Relay page";
+$priv_list['page-services-dhcprelay']['descr'] = "Allow access to the 'Services: DHCP Relay' page.";
+$priv_list['page-services-dhcprelay']['match'] = array();
+$priv_list['page-services-dhcprelay']['match'][] = "services_dhcp_relay.php*";
+
 $priv_list['page-services-dnsforwarder'] = array();
 $priv_list['page-services-dnsforwarder']['name'] = gettext("WebCfg - Services: DNS Forwarder page");
 $priv_list['page-services-dnsforwarder']['descr'] = gettext("Allow access to the 'Services: DNS Forwarder' page.");
 $priv_list['page-services-dnsforwarder']['match'] = array();
 $priv_list['page-services-dnsforwarder']['match'][] = "services_dnsmasq.php*";
 
-$priv_list['page-services-igmpproxy'] = array();
-$priv_list['page-services-igmpproxy']['name'] = gettext("WebCfg - Services: Igmpproxy page");
-$priv_list['page-services-igmpproxy']['descr'] = gettext("Allow access to the 'Services: Igmpproxy' page.");
-$priv_list['page-services-igmpproxy']['match'] = array();
-$priv_list['page-services-igmpproxy']['match'][] = "services_igmpproxy.php*";
+$priv_list['page-services-dnsforwarder-editdomainoverride'] = array();
+$priv_list['page-services-dnsforwarder-editdomainoverride']['name'] = "WebCfg - Services: DNS Forwarder: Edit Domain Override page";
+$priv_list['page-services-dnsforwarder-editdomainoverride']['descr'] = "Allow access to the 'Services: DNS Forwarder: Edit Domain Override' page.";
+$priv_list['page-services-dnsforwarder-editdomainoverride']['match'] = array();
+$priv_list['page-services-dnsforwarder-editdomainoverride']['match'][] = "services_dnsmasq_domainoverride_edit.php*";
 
 $priv_list['page-services-dnsforwarder-edithost'] = array();
 $priv_list['page-services-dnsforwarder-edithost']['name'] = gettext("WebCfg - Services: DNS Forwarder: Edit host page");
@@ -666,12 +770,6 @@ $priv_list['page-services-dynamicdnsclients']['descr'] = gettext("Allow access t
 $priv_list['page-services-dynamicdnsclients']['match'] = array();
 $priv_list['page-services-dynamicdnsclients']['match'][] = "services_dyndns.php*";
 
-$priv_list['page-system-usermanager-settings-testldap'] = array();
-$priv_list['page-system-usermanager-settings-testldap']['name'] = gettext("WebCfg - System: User Manager: Settings: Test LDAP page");
-$priv_list['page-system-usermanager-settings-testldap']['descr'] = gettext("Allow access to the 'System: User Manager: Settings: Test LDAP' page.");
-$priv_list['page-system-usermanager-settings-testldap']['match'] = array();
-$priv_list['page-system-usermanager-settings-testldap']['match'][] = "system_usermanager_settings_test.php*";
-
 $priv_list['page-services-dynamicdnsclient'] = array();
 $priv_list['page-services-dynamicdnsclient']['name'] = gettext("WebCfg - Services: Dynamic DNS client page");
 $priv_list['page-services-dynamicdnsclient']['descr'] = gettext("Allow access to the 'Services: Dynamic DNS client' page.");
@@ -679,22 +777,16 @@ $priv_list['page-services-dynamicdnsclient']['match'] = array();
 $priv_list['page-services-dynamicdnsclient']['match'][] = "services_dyndns_edit.php*";
 
 $priv_list['page-services-igmpproxy'] = array();
-$priv_list['page-services-igmpproxy']['name'] = gettext("WebCfg - Firewall: Igmpproxy: Edit page");
-$priv_list['page-services-igmpproxy']['descr'] = gettext("Allow access to the 'Firewall: Igmpproxy' page.");
+$priv_list['page-services-igmpproxy']['name'] = "WebCfg - Services: Igmpproxy page";
+$priv_list['page-services-igmpproxy']['descr'] = "Allow access to the 'Services: Igmpproxy' page.";
 $priv_list['page-services-igmpproxy']['match'] = array();
-$priv_list['page-services-igmpproxy']['match'][] = "services_igmpproxy_edit.php*";
-
-$priv_list['page-services-proxyarp'] = array();
-$priv_list['page-services-proxyarp']['name'] = gettext("WebCfg - Services: Proxy ARP page");
-$priv_list['page-services-proxyarp']['descr'] = gettext("Allow access to the 'Services: Proxy ARP' page.");
-$priv_list['page-services-proxyarp']['match'] = array();
-$priv_list['page-services-proxyarp']['match'][] = "services_proxyarp.php*";
+$priv_list['page-services-igmpproxy']['match'][] = "services_igmpproxy.php*";
 
-$priv_list['page-services-proxyarp-edit'] = array();
-$priv_list['page-services-proxyarp-edit']['name'] = gettext("WebCfg - Services: Proxy ARP: Edit page");
-$priv_list['page-services-proxyarp-edit']['descr'] = gettext("Allow access to the 'Services: Proxy ARP: Edit' page.");
-$priv_list['page-services-proxyarp-edit']['match'] = array();
-$priv_list['page-services-proxyarp-edit']['match'][] = "services_proxyarp_edit.php*";
+$priv_list['page-services-igmpproxy'] = array();
+$priv_list['page-services-igmpproxy']['name'] = "WebCfg - Firewall: Igmpproxy: Edit page";
+$priv_list['page-services-igmpproxy']['descr'] = "Allow access to the 'Firewall: Igmpproxy' page.";
+$priv_list['page-services-igmpproxy']['match'] = array();
+$priv_list['page-services-igmpproxy']['match'][] = "services_igmpproxy_edit.php*";
 
 $priv_list['page-services-rfc2136clients'] = array();
 $priv_list['page-services-rfc2136clients']['name'] = gettext("WebCfg - Services: RFC 2136 clients page");
@@ -708,12 +800,6 @@ $priv_list['page-services-snmp']['descr'] = gettext("Allow access to the 'Servic
 $priv_list['page-services-snmp']['match'] = array();
 $priv_list['page-services-snmp']['match'][] = "services_snmp.php*";
 
-$priv_list['page-firewall-rules'] = array();
-$priv_list['page-firewall-rules']['name'] = gettext("WebCfg - Firewall: Rules page");
-$priv_list['page-firewall-rules']['descr'] = gettext("Allow access to the 'Firewall: Rules' page.");
-$priv_list['page-firewall-rules']['match'] = array();
-$priv_list['page-firewall-rules']['match'][] = "firewall_rules.php*";
-
 $priv_list['page-services-wakeonlan'] = array();
 $priv_list['page-services-wakeonlan']['name'] = gettext("WebCfg - Services: Wake on LAN page");
 $priv_list['page-services-wakeonlan']['descr'] = gettext("Allow access to the 'Services: Wake on LAN' page.");
@@ -726,6 +812,12 @@ $priv_list['page-services-wakeonlan-edit']['descr'] = gettext("Allow access to t
 $priv_list['page-services-wakeonlan-edit']['match'] = array();
 $priv_list['page-services-wakeonlan-edit']['match'][] = "services_wol_edit.php*";
 
+$priv_list['page-diagnostics-cpuutilization'] = array();
+$priv_list['page-diagnostics-cpuutilization']['name'] = "WebCfg - Diagnostics: CPU Utilization page";
+$priv_list['page-diagnostics-cpuutilization']['descr'] = "Allow access to the 'Diagnostics: CPU Utilization' page.";
+$priv_list['page-diagnostics-cpuutilization']['match'] = array();
+$priv_list['page-diagnostics-cpuutilization']['match'][] = "stats.php*";
+
 $priv_list['page-hidden-detailedstatus'] = array();
 $priv_list['page-hidden-detailedstatus']['name'] = gettext("WebCfg - Hidden: Detailed Status page");
 $priv_list['page-hidden-detailedstatus']['descr'] = gettext("Allow access to the 'Hidden: Detailed Status' page.");
@@ -738,36 +830,78 @@ $priv_list['page-status-captiveportal']['descr'] = gettext("Allow access to the
 $priv_list['page-status-captiveportal']['match'] = array();
 $priv_list['page-status-captiveportal']['match'][] = "status_captiveportal.php*";
 
+$priv_list['page-status-captiveportal-test'] = array();
+$priv_list['page-status-captiveportal-test']['name'] = "WebCfg - Status: Captive portal test Vouchers page";
+$priv_list['page-status-captiveportal-test']['descr'] = "Allow access to the 'Status: Captive portal Test Vouchers' page.";
+$priv_list['page-status-captiveportal-test']['match'] = array();
+$priv_list['page-status-captiveportal-test']['match'][] = "status_captiveportal_test.php*";
+
+$priv_list['page-status-captiveportal-voucher-rolls'] = array();
+$priv_list['page-status-captiveportal-voucher-rolls']['name'] = "WebCfg - Status: Captive portal Voucher Rolls page";
+$priv_list['page-status-captiveportal-voucher-rolls']['descr'] = "Allow access to the 'Status: Captive portal Voucher Rolls' page.";
+$priv_list['page-status-captiveportal-voucher-rolls']['match'] = array();
+$priv_list['page-status-captiveportal-voucher-rolls']['match'][] = "status_captiveportal_voucher_rolls.php*";
+
+$priv_list['page-status-captiveportal-vouchers'] = array();
+$priv_list['page-status-captiveportal-vouchers']['name'] = "WebCfg - Status: Captive portal Vouchers page";
+$priv_list['page-status-captiveportal-vouchers']['descr'] = "Allow access to the 'Status: Captive portal Vouchers' page.";
+$priv_list['page-status-captiveportal-vouchers']['match'] = array();
+$priv_list['page-status-captiveportal-vouchers']['match'][] = "status_captiveportal_vouchers.php*";
+
+$priv_list['page-status-dhcpleases'] = array();
+$priv_list['page-status-dhcpleases']['name'] = "WebCfg - Status: DHCP leases page";
+$priv_list['page-status-dhcpleases']['descr'] = "Allow access to the 'Status: DHCP leases' page.";
+$priv_list['page-status-dhcpleases']['match'] = array();
+$priv_list['page-status-dhcpleases']['match'][] = "status_dhcp_leases.php*";
+
 $priv_list['page-status-filterreloadstatus'] = array();
 $priv_list['page-status-filterreloadstatus']['name'] = gettext("WebCfg - Status: Filter Reload Status page");
 $priv_list['page-status-filterreloadstatus']['descr'] = gettext("Allow access to the 'Status: Filter Reload Status' page.");
 $priv_list['page-status-filterreloadstatus']['match'] = array();
 $priv_list['page-status-filterreloadstatus']['match'][] = "status_filter_reload.php*";
 
+$priv_list['page-status-gatewaygroups'] = array();
+$priv_list['page-status-gatewaygroups']['name'] = "WebCfg - Status: Gateway Groups page";
+$priv_list['page-status-gatewaygroups']['descr'] = "Allow access to the 'Status: Gateway Groups' page.";
+$priv_list['page-status-gatewaygroups']['match'] = array();
+$priv_list['page-status-gatewaygroups']['match'][] = "status_gateway_groups.php*";
+
 $priv_list['page-status-gateways'] = array();
 $priv_list['page-status-gateways']['name'] = gettext("WebCfg - Status: Gateways page");
 $priv_list['page-status-gateways']['descr'] = gettext("Allow access to the 'Status: Gateways' page.");
 $priv_list['page-status-gateways']['match'] = array();
 $priv_list['page-status-gateways']['match'][] = "status_gateways.php*";
 
+$priv_list['page-status-trafficgraph'] = array();
+$priv_list['page-status-trafficgraph']['name'] = "WebCfg - Status: Traffic Graph page";
+$priv_list['page-status-trafficgraph']['descr'] = "Allow access to the 'Status: Traffic Graph' page.";
+$priv_list['page-status-trafficgraph']['match'] = array();
+$priv_list['page-status-trafficgraph']['match'][] = "status_graph.php*";
+
 $priv_list['page-status-cpuload'] = array();
 $priv_list['page-status-cpuload']['name'] = gettext("WebCfg - Status: CPU load page");
 $priv_list['page-status-cpuload']['descr'] = gettext("Allow access to the 'Status: CPU load' page.");
 $priv_list['page-status-cpuload']['match'] = array();
 $priv_list['page-status-cpuload']['match'][] = "status_graph_cpu.php*";
 
-$priv_list['page-status-gatewaygroups'] = array();
-$priv_list['page-status-gatewaygroups']['name'] = gettext("WebCfg - Status: Gateway Groups page");
-$priv_list['page-status-gatewaygroups']['descr'] = gettext("Allow access to the 'Status: Gateway Groups' page.");
-$priv_list['page-status-gatewaygroups']['match'] = array();
-$priv_list['page-status-gatewaygroups']['match'][] = "status_gateway_groups.php*";
-
 $priv_list['page-status-interfaces'] = array();
 $priv_list['page-status-interfaces']['name'] = gettext("WebCfg - Status: Interfaces page");
 $priv_list['page-status-interfaces']['descr'] = gettext("Allow access to the 'Status: Interfaces' page.");
 $priv_list['page-status-interfaces']['match'] = array();
 $priv_list['page-status-interfaces']['match'][] = "status_interfaces.php*";
 
+$priv_list['page-status-loadbalancer-pool'] = array();
+$priv_list['page-status-loadbalancer-pool']['name'] = "WebCfg - Status: Load Balancer: Pool page";
+$priv_list['page-status-loadbalancer-pool']['descr'] = "Allow access to the 'Status: Load Balancer: Pool' page.";
+$priv_list['page-status-loadbalancer-pool']['match'] = array();
+$priv_list['page-status-loadbalancer-pool']['match'][] = "status_lb_pool.php*";
+
+$priv_list['page-status-loadbalancer-virtualserver'] = array();
+$priv_list['page-status-loadbalancer-virtualserver']['name'] = "WebCfg - Status: Load Balancer: Virtual Server page";
+$priv_list['page-status-loadbalancer-virtualserver']['descr'] = "Allow access to the 'Status: Load Balancer: Virtual Server' page.";
+$priv_list['page-status-loadbalancer-virtualserver']['match'] = array();
+$priv_list['page-status-loadbalancer-virtualserver']['match'][] = "status_lb_vs.php*";
+
 $priv_list['page-status-openvpn'] = array();
 $priv_list['page-status-openvpn']['name'] = gettext("WebCfg - Status: OpenVPN page");
 $priv_list['page-status-openvpn']['descr'] = gettext("Allow access to the 'Status: OpenVPN' page.");
@@ -785,7 +919,6 @@ $priv_list['page-status-rrdgraphs']['name'] = gettext("WebCfg - Status: RRD Grap
 $priv_list['page-status-rrdgraphs']['descr'] = gettext("Allow access to the 'Status: RRD Graphs' page.");
 $priv_list['page-status-rrdgraphs']['match'] = array();
 $priv_list['page-status-rrdgraphs']['match'][] = "status_rrd_graph.php*";
-$priv_list['page-status-rrdgraphs']['match'][] = "status_rrd_graph_img.php*";
 
 $priv_list['page-status-rrdgraph-settings'] = array();
 $priv_list['page-status-rrdgraph-settings']['name'] = gettext("WebCfg - Status: RRD Graphs settings page");
@@ -799,18 +932,6 @@ $priv_list['page-status-services']['descr'] = gettext("Allow access to the 'Stat
 $priv_list['page-status-services']['match'] = array();
 $priv_list['page-status-services']['match'][] = "status_services.php*";
 
-$priv_list['page-status-loadbalancer-pool'] = array();
-$priv_list['page-status-loadbalancer-pool']['name'] = gettext("WebCfg - Status: Load Balancer: Pool page");
-$priv_list['page-status-loadbalancer-pool']['descr'] = gettext("Allow access to the 'Status: Load Balancer: Pool' page.");
-$priv_list['page-status-loadbalancer-pool']['match'] = array();
-$priv_list['page-status-loadbalancer-pool']['match'][] = "status_lb_pool.php*";
-
-$priv_list['page-status-loadbalancer-virtualserver'] = array();
-$priv_list['page-status-loadbalancer-virtualserver']['name'] = gettext("WebCfg - Status: Load Balancer: Virtual Server page");
-$priv_list['page-status-loadbalancer-virtualserver']['descr'] = gettext("Allow access to the 'Status: Load Balancer: Virtual Server' page.");
-$priv_list['page-status-loadbalancer-virtualserver']['match'] = array();
-$priv_list['page-status-loadbalancer-virtualserver']['match'][] = "status_lb_vs.php*";
-
 $priv_list['page-status-upnpstatus'] = array();
 $priv_list['page-status-upnpstatus']['name'] = gettext("WebCfg - Status: UPnP Status page");
 $priv_list['page-status-upnpstatus']['descr'] = gettext("Allow access to the 'Status: UPnP Status' page.");
@@ -835,18 +956,6 @@ $priv_list['page-system-advanced-admin']['descr'] = gettext("Allow access to the
 $priv_list['page-system-advanced-admin']['match'] = array();
 $priv_list['page-system-advanced-admin']['match'][] = "system_advanced_admin.php*";
 
-$priv_list['page-system-firmware-manualupdate'] = array();
-$priv_list['page-system-firmware-manualupdate']['name'] = gettext("WebCfg - System: Firmware: Manual Update page");
-$priv_list['page-system-firmware-manualupdate']['descr'] = gettext("Allow access to the 'System: Firmware: Manual Update' page.");
-$priv_list['page-system-firmware-manualupdate']['match'] = array();
-$priv_list['page-system-firmware-manualupdate']['match'][] = "system_firmware.php*";
-
-$priv_list['page-system-firmware-checkforupdate'] = array();
-$priv_list['page-system-firmware-checkforupdate']['name'] = gettext("WebCfg - System: Firmware: Check For Update page");
-$priv_list['page-system-firmware-checkforupdate']['descr'] = gettext("Allow access to the 'System: Firmware: Check For Update' page.");
-$priv_list['page-system-firmware-checkforupdate']['match'] = array();
-$priv_list['page-system-firmware-checkforupdate']['match'][] = "system_firmware_auto.php*";
-
 $priv_list['page-system-advanced-firewall'] = array();
 $priv_list['page-system-advanced-firewall']['name'] = gettext("WebCfg - System: Advanced: Firewall and NAT page");
 $priv_list['page-system-advanced-firewall']['descr'] = gettext("Allow access to the 'System: Advanced: Firewall and NAT' page.");
@@ -865,11 +974,17 @@ $priv_list['page-system-advanced-network']['descr'] = gettext("Allow access to t
 $priv_list['page-system-advanced-network']['match'] = array();
 $priv_list['page-system-advanced-network']['match'][] = "system_advanced-network.php*";
 
+$priv_list['page-system-advanced-notifications'] = array();
+$priv_list['page-system-advanced-notifications']['name'] = "WebCfg - System: Advanced: Tunables page";
+$priv_list['page-system-advanced-notifications']['descr'] = "Allow access to the 'System: Advanced: Tunables' page.";
+$priv_list['page-system-advanced-notifications']['match'] = array();
+$priv_list['page-system-advanced-notifications']['match'][] = "system_advanced-sysctrl.php*";
+
 $priv_list['page-system-advanced-sysctl'] = array();
 $priv_list['page-system-advanced-sysctl']['name'] = gettext("WebCfg - System: Advanced: Tunables page");
 $priv_list['page-system-advanced-sysctl']['descr'] = gettext("Allow access to the 'System: Advanced: Tunables' page.");
 $priv_list['page-system-advanced-sysctl']['match'] = array();
-$priv_list['page-system-advanced-sysctl']['match'][] = "system_advanced-sysctrl.php*";
+$priv_list['page-system-advanced-sysctl']['match'][] = "system_advanced-sysctl.php*";
 
 $priv_list['page-system-authservers'] = array();
 $priv_list['page-system-authservers']['name'] = gettext("WebCfg - System: Authentication Servers");
@@ -889,6 +1004,24 @@ $priv_list['page-system-certmanager']['descr'] = gettext("Allow access to the 'S
 $priv_list['page-system-certmanager']['match'] = array();
 $priv_list['page-system-certmanager']['match'][] = "system_certmanager.php*";
 
+$priv_list['page-system-crlmanager'] = array();
+$priv_list['page-system-crlmanager']['name'] = "WebCfg - System: CRL Manager";
+$priv_list['page-system-crlmanager']['descr'] = "Allow access to the 'System: CRL Manager' page.";
+$priv_list['page-system-crlmanager']['match'] = array();
+$priv_list['page-system-crlmanager']['match'][] = "system_crlmanager.php*";
+
+$priv_list['page-system-firmware-manualupdate'] = array();
+$priv_list['page-system-firmware-manualupdate']['name'] = "WebCfg - System: Firmware: Manual Update page";
+$priv_list['page-system-firmware-manualupdate']['descr'] = "Allow access to the 'System: Firmware: Manual Update' page.";
+$priv_list['page-system-firmware-manualupdate']['match'] = array();
+$priv_list['page-system-firmware-manualupdate']['match'][] = "system_firmware.php*";
+
+$priv_list['page-system-firmware-checkforupdate'] = array();
+$priv_list['page-system-firmware-checkforupdate']['name'] = "WebCfg - System: Firmware: Check For Update page";
+$priv_list['page-system-firmware-checkforupdate']['descr'] = "Allow access to the 'System: Firmware: Check For Update' page.";
+$priv_list['page-system-firmware-checkforupdate']['match'] = array();
+$priv_list['page-system-firmware-checkforupdate']['match'][] = "system_firmware_auto.php*";
+
 $priv_list['page-system-firmware-autoupdate'] = array();
 $priv_list['page-system-firmware-autoupdate']['name'] = gettext("WebCfg - System: Firmware: Auto Update page");
 $priv_list['page-system-firmware-autoupdate']['descr'] = gettext("Allow access to the 'System: Firmware: Auto Update' page.");
@@ -919,30 +1052,30 @@ $priv_list['page-system-gateways']['descr'] = gettext("Allow access to the 'Syst
 $priv_list['page-system-gateways']['match'] = array();
 $priv_list['page-system-gateways']['match'][] = "system_gateways.php*";
 
-$priv_list['page-system-staticroutes'] = array();
-$priv_list['page-system-staticroutes']['name'] = gettext("WebCfg - System: Static Routes page");
-$priv_list['page-system-staticroutes']['descr'] = gettext("Allow access to the 'System: Static Routes' page.");
-$priv_list['page-system-staticroutes']['match'] = array();
-$priv_list['page-system-staticroutes']['match'][] = "system_routes.php*";
-
-$priv_list['page-pfsensewizardsubsystem'] = array();
-$priv_list['page-pfsensewizardsubsystem']['name'] = gettext("WebCfg - pfSense wizard subsystem page");
-$priv_list['page-pfsensewizardsubsystem']['descr'] = gettext("Allow access to the 'pfSense wizard subsystem' page.");
-$priv_list['page-pfsensewizardsubsystem']['match'] = array();
-$priv_list['page-pfsensewizardsubsystem']['match'][] = "wizard.php*";
-
 $priv_list['page-system-gateways-editgateway'] = array();
 $priv_list['page-system-gateways-editgateway']['name'] = gettext("WebCfg - System: Gateways: Edit Gateway page");
 $priv_list['page-system-gateways-editgateway']['descr'] = gettext("Allow access to the 'System: Gateways: Edit Gateway' page.");
 $priv_list['page-system-gateways-editgateway']['match'] = array();
 $priv_list['page-system-gateways-editgateway']['match'][] = "system_gateways_edit.php*";
 
+$priv_list['page-system-groupmanager'] = array();
+$priv_list['page-system-groupmanager']['name'] = "WebCfg - System: Group manager page";
+$priv_list['page-system-groupmanager']['descr'] = "Allow access to the 'System: Group manager' page.";
+$priv_list['page-system-groupmanager']['match'] = array();
+$priv_list['page-system-groupmanager']['match'][] = "system_groupmanager.php*";
+
 $priv_list['page-system-groupmanager-addprivs'] = array();
 $priv_list['page-system-groupmanager-addprivs']['name'] = gettext("WebCfg - System: Group Manager: Add Privileges page");
 $priv_list['page-system-groupmanager-addprivs']['descr'] = gettext("Allow access to the 'System: Group Manager: Add Privileges' page.");
 $priv_list['page-system-groupmanager-addprivs']['match'] = array();
 $priv_list['page-system-groupmanager-addprivs']['match'][] = "system_groupmanager_addprivs.php*";
 
+$priv_list['page-system-staticroutes'] = array();
+$priv_list['page-system-staticroutes']['name'] = "WebCfg - System: Static Routes page";
+$priv_list['page-system-staticroutes']['descr'] = "Allow access to the 'System: Static Routes' page.";
+$priv_list['page-system-staticroutes']['match'] = array();
+$priv_list['page-system-staticroutes']['match'][] = "system_routes.php*";
+
 $priv_list['page-system-staticroutes-editroute'] = array();
 $priv_list['page-system-staticroutes-editroute']['name'] = gettext("WebCfg - System: Static Routes: Edit route page");
 $priv_list['page-system-staticroutes-editroute']['descr'] = gettext("Allow access to the 'System: Static Routes: Edit route' page.");
@@ -955,23 +1088,29 @@ $priv_list['page-system-usermanager']['descr'] = gettext("Allow access to the 'S
 $priv_list['page-system-usermanager']['match'] = array();
 $priv_list['page-system-usermanager']['match'][] = "system_usermanager.php*";
 
+$priv_list['page-system-usermanager-addprivs'] = array();
+$priv_list['page-system-usermanager-addprivs']['name'] = "WebCfg - System: User Manager: Add Privileges page";
+$priv_list['page-system-usermanager-addprivs']['descr'] = "Allow access to the 'System: User Manager: Add Privileges' page.";
+$priv_list['page-system-usermanager-addprivs']['match'] = array();
+$priv_list['page-system-usermanager-addprivs']['match'][] = "system_usermanager_addprivs.php*";
+
 $priv_list['page-system-usermanager-passwordmg'] = array();
 $priv_list['page-system-usermanager-passwordmg']['name'] = "WebCfg - System: User Password Manager page";
 $priv_list['page-system-usermanager-passwordmg']['descr'] = "Allow access to the 'System: User Password Manager' page.";
 $priv_list['page-system-usermanager-passwordmg']['match'] = array();
 $priv_list['page-system-usermanager-passwordmg']['match'][] = "system_usermanager_passwordmg.php*";
 
-$priv_list['page-system-usermanager_addcert'] = array();
-$priv_list['page-system-usermanager_addcert']['name'] = gettext("WebCfg - System: User Manager: Add Certificate");
-$priv_list['page-system-usermanager_addcert']['descr'] = gettext("Allow access to the 'User Manager: Add Certificate' page.");
-$priv_list['page-system-usermanager_addcert']['match'] = array();
-$priv_list['page-system-usermanager_addcert']['match'][] = "system_usermanager_addcert.php*";
+$priv_list['page-system-usermanager-settings'] = array();
+$priv_list['page-system-usermanager-settings']['name'] = "WebCfg - System: User manager: settings page";
+$priv_list['page-system-usermanager-settings']['descr'] = "Allow access to the 'System: User manager: settings' page.";
+$priv_list['page-system-usermanager-settings']['match'] = array();
+$priv_list['page-system-usermanager-settings']['match'][] = "system_usermanager_settings.php*";
 
-$priv_list['page-system-usermanager-addprivs'] = array();
-$priv_list['page-system-usermanager-addprivs']['name'] = gettext("WebCfg - System: User Manager: Add Privileges page");
-$priv_list['page-system-usermanager-addprivs']['descr'] = gettext("Allow access to the 'System: User Manager: Add Privileges' page.");
-$priv_list['page-system-usermanager-addprivs']['match'] = array();
-$priv_list['page-system-usermanager-addprivs']['match'][] = "system_usermanager_addprivs.php*";
+$priv_list['page-system-usermanager-settings-testldap'] = array();
+$priv_list['page-system-usermanager-settings-testldap']['name'] = "WebCfg - System: User Manager: Settings: Test LDAP page";
+$priv_list['page-system-usermanager-settings-testldap']['descr'] = "Allow access to the 'System: User Manager: Settings: Test LDAP' page.";
+$priv_list['page-system-usermanager-settings-testldap']['match'] = array();
+$priv_list['page-system-usermanager-settings-testldap']['match'][] = "system_usermanager_settings_test.php*";
 
 $priv_list['page-upload_progress'] = array();
 $priv_list['page-upload_progress']['name'] = gettext("WebCfg - System: Firmware: Manual Update page (progress bar)");
@@ -979,24 +1118,6 @@ $priv_list['page-upload_progress']['descr'] = gettext("Allow access to the 'Syst
 $priv_list['page-upload_progress']['match'] = array();
 $priv_list['page-upload_progress']['match'][] = "upload_progress*";
 
-$priv_list['page-services-captiveportal-editallowedips'] = array();
-$priv_list['page-services-captiveportal-editallowedips']['name'] = gettext("WebCfg - Services: Captive portal: Edit Allowed IPs page");
-$priv_list['page-services-captiveportal-editallowedips']['descr'] = gettext("Allow access to the 'Services: Captive portal: Edit Allowed IPs' page.");
-$priv_list['page-services-captiveportal-editallowedips']['match'] = array();
-$priv_list['page-services-captiveportal-editallowedips']['match'][] = "services_captiveportal_ip_edit.php*";
-
-$priv_list['page-services-dnsforwarder-editdomainoverride'] = array();
-$priv_list['page-services-dnsforwarder-editdomainoverride']['name'] = gettext("WebCfg - Services: DNS Forwarder: Edit Domain Override page");
-$priv_list['page-services-dnsforwarder-editdomainoverride']['descr'] = gettext("Allow access to the 'Services: DNS Forwarder: Edit Domain Override' page.");
-$priv_list['page-services-dnsforwarder-editdomainoverride']['match'] = array();
-$priv_list['page-services-dnsforwarder-editdomainoverride']['match'][] = "services_dnsmasq_domainoverride_edit.php*";
-
-$priv_list['page-services-pppoeserver-user-edit'] = array();
-$priv_list['page-services-pppoeserver-user-edit']['name'] = gettext("WebCfg - Services: PPPoE Server: User: Edit page");
-$priv_list['page-services-pppoeserver-user-edit']['descr'] = gettext("Allow access to the 'Services: PPPoE Server: User: Edit' page.");
-$priv_list['page-services-pppoeserver-user-edit']['match'] = array();
-$priv_list['page-services-pppoeserver-user-edit']['match'][] = "vpn_pppoe_users_edit.php*";
-
 $priv_list['page-hidden-uploadconfiguration'] = array();
 $priv_list['page-hidden-uploadconfiguration']['name'] = gettext("WebCfg - Hidden: Upload Configuration page");
 $priv_list['page-hidden-uploadconfiguration']['descr'] = gettext("Allow access to the 'Hidden: Upload Configuration' page.");
@@ -1009,6 +1130,18 @@ $priv_list['page-vpn-ipsec']['descr'] = gettext("Allow access to the 'VPN: IPsec
 $priv_list['page-vpn-ipsec']['match'] = array();
 $priv_list['page-vpn-ipsec']['match'][] = "vpn_ipsec.php*";
 
+$priv_list['page-vpn-ipsec-listkeys'] = array();
+$priv_list['page-vpn-ipsec-listkeys']['name'] = "WebCfg - VPN: IPsec: Pre-Shared Keys List";
+$priv_list['page-vpn-ipsec-listkeys']['descr'] = "Allow access to the 'VPN: IPsec: Pre-Shared Keys List' page.";
+$priv_list['page-vpn-ipsec-listkeys']['match'] = array();
+$priv_list['page-vpn-ipsec-listkeys']['match'][] = "vpn_ipsec_keys.php*";
+
+$priv_list['page-vpn-ipsec-editkeys'] = array();
+$priv_list['page-vpn-ipsec-editkeys']['name'] = "WebCfg - VPN: IPsec: Edit Pre-Shared Keys";
+$priv_list['page-vpn-ipsec-editkeys']['descr'] = "Allow access to the 'VPN: IPsec: Edit Pre-Shared Keys' page.";
+$priv_list['page-vpn-ipsec-editkeys']['match'] = array();
+$priv_list['page-vpn-ipsec-editkeys']['match'][] = "vpn_ipsec_keys_edit.php*";
+
 $priv_list['page-vpn-ipsec-mobile'] = array();
 $priv_list['page-vpn-ipsec-mobile']['name'] = gettext("WebCfg - VPN: IPsec: Mobile page");
 $priv_list['page-vpn-ipsec-mobile']['descr'] = gettext("Allow access to the 'VPN: IPsec: Mobile' page.");
@@ -1069,11 +1202,11 @@ $priv_list['page-services-pppoeserver']['descr'] = gettext("Allow access to the
 $priv_list['page-services-pppoeserver']['match'] = array();
 $priv_list['page-services-pppoeserver']['match'][] = "vpn_pppoe.php*";
 
-$priv_list['page-services-pppoeserver-users'] = array();
-$priv_list['page-services-pppoeserver-users']['name'] = gettext("WebCfg - Services: PPPoE Server: Users page");
-$priv_list['page-services-pppoeserver-users']['descr'] = gettext("Allow access to the 'Services: PPPoE Server: Users' page.");
-$priv_list['page-services-pppoeserver-users']['match'] = array();
-$priv_list['page-services-pppoeserver-users']['match'][] = "vpn_pppoe_users.php*";
+$priv_list['page-services-pppoeserver-eidt'] = array();
+$priv_list['page-services-pppoeserver-eidt']['name'] = "WebCfg - Services: PPPoE Server: Edit page";
+$priv_list['page-services-pppoeserver-eidt']['descr'] = "Allow access to the 'Services: PPPoE Server: Edit' page.";
+$priv_list['page-services-pppoeserver-eidt']['match'] = array();
+$priv_list['page-services-pppoeserver-eidt']['match'][] = "vpn_pppoe_edit.php*";
 
 $priv_list['page-vpn-vpnpptp'] = array();
 $priv_list['page-vpn-vpnpptp']['name'] = gettext("WebCfg - VPN: VPN PPTP page");
@@ -1093,11 +1226,11 @@ $priv_list['page-vpn-vpnpptp-user-edit']['descr'] = gettext("Allow access to the
 $priv_list['page-vpn-vpnpptp-user-edit']['match'] = array();
 $priv_list['page-vpn-vpnpptp-user-edit']['match'][] = "vpn_pptp_users_edit.php*";
 
-$priv_list['page-firewall-nat-outbound-edit'] = array();
-$priv_list['page-firewall-nat-outbound-edit']['name'] = gettext("WebCfg - Firewall: NAT: Outbound: Edit page");
-$priv_list['page-firewall-nat-outbound-edit']['descr'] = gettext("Allow access to the 'Firewall: NAT: Outbound: Edit' page.");
-$priv_list['page-firewall-nat-outbound-edit']['match'] = array();
-$priv_list['page-firewall-nat-outbound-edit']['match'][] = "firewall_nat_out_edit.php*";
+$priv_list['page-pfsensewizardsubsystem'] = array();
+$priv_list['page-pfsensewizardsubsystem']['name'] = "WebCfg - pfSense wizard subsystem page";
+$priv_list['page-pfsensewizardsubsystem']['descr'] = "Allow access to the 'pfSense wizard subsystem' page.";
+$priv_list['page-pfsensewizardsubsystem']['match'] = array();
+$priv_list['page-pfsensewizardsubsystem']['match'][] = "wizard.php*";
 
 $priv_list['page-xmlrpclibrary'] = array();
 $priv_list['page-xmlrpclibrary']['name'] = gettext("WebCfg - XMLRPC Library page");
@@ -1105,80 +1238,6 @@ $priv_list['page-xmlrpclibrary']['descr'] = gettext("Allow access to the 'XMLRPC
 $priv_list['page-xmlrpclibrary']['match'] = array();
 $priv_list['page-xmlrpclibrary']['match'][] = "xmlrpc.php*";
 
-$priv_list['page-interfaces-qinq'] = array();
-$priv_list['page-interfaces-qinq']['name'] = gettext("WebCfg - Interfaces: QinQ page");
-$priv_list['page-interfaces-qinq']['descr'] = gettext("Allow access to the 'Interfaces: QinQ' page.");
-$priv_list['page-interfaces-qinq']['match'] = array();
-$priv_list['page-interfaces-qinq']['match'][] = "interfaces_qinq.php*";
-
-$priv_list['page-pkg-mgr-settings'] = array();
-$priv_list['page-pkg-mgr-settings']['name'] = gettext("WebCfg - Packages: Settings page");
-$priv_list['page-pkg-mgr-settings']['descr'] = gettext("Allow access to the 'Packages: Settings' page.");
-$priv_list['page-pkg-mgr-settings']['match'] = array();
-$priv_list['page-pkg-mgr-settings']['match'][] = "pkg_mgr_settings.php*";
-
-$priv_list['page-system-groupmanager'] = array();
-$priv_list['page-system-groupmanager']['name'] = gettext("WebCfg - System: Group manager page");
-$priv_list['page-system-groupmanager']['descr'] = gettext("Allow access to the 'System: Group manager' page.");
-$priv_list['page-system-groupmanager']['match'] = array();
-$priv_list['page-system-groupmanager']['match'][] = "system_groupmanager.php*";
-
-$priv_list['page-status-trafficgraph'] = array();
-$priv_list['page-status-trafficgraph']['name'] = gettext("WebCfg - Status: Traffic Graph page");
-$priv_list['page-status-trafficgraph']['descr'] = gettext("Allow access to the 'Status: Traffic Graph' page.");
-$priv_list['page-status-trafficgraph']['match'] = array();
-$priv_list['page-status-trafficgraph']['match'][] = "status_graph.php*";
-$priv_list['page-status-trafficgraph']['match'][] = "bandwidth_by_ip.php*";
-$priv_list['page-status-trafficgraph']['match'][] = "graph.php*";
-$priv_list['page-status-trafficgraph']['match'][] = "traffic_graphs.widget.php*";
-
-$priv_list['page-services-captiveportal-vouchers'] = array();
-$priv_list['page-services-captiveportal-vouchers']['name'] = gettext("WebCfg - Services: Captive portal Vouchers page");
-$priv_list['page-services-captiveportal-vouchers']['descr'] = gettext("Allow access to the 'Services: Captive portal Vouchers' page.");
-$priv_list['page-services-captiveportal-vouchers']['match'] = array();
-$priv_list['page-services-captiveportal-vouchers']['match'][] = "services_captiveportal_vouchers.php*";
-
-$priv_list['page-services-captiveportal-voucher-edit'] = array();
-$priv_list['page-services-captiveportal-voucher-edit']['name'] = gettext("WebCfg - Services: Captive portal Voucher Rolls page");
-$priv_list['page-services-captiveportal-voucher-edit']['descr'] = gettext("Allow access to the 'Services: Captive portal Edit Voucher Rolls' page.");
-$priv_list['page-services-captiveportal-voucher-edit']['match'] = array();
-$priv_list['page-services-captiveportal-voucher-edit']['match'][] = "services_captiveportal_vouchers_edit.php*";
-
-$priv_list['page-status-captiveportal-test'] = array();
-$priv_list['page-status-captiveportal-test']['name'] = gettext("WebCfg - Status: Captive portal test Vouchers page");
-$priv_list['page-status-captiveportal-test']['descr'] = gettext("Allow access to the 'Status: Captive portal Test Vouchers' page.");
-$priv_list['page-status-captiveportal-test']['match'] = array();
-$priv_list['page-status-captiveportal-test']['match'][] = "status_captiveportal_test.php*";
-
-$priv_list['page-status-captiveportal-voucher-rolls'] = array();
-$priv_list['page-status-captiveportal-voucher-rolls']['name'] = gettext("WebCfg - Status: Captive portal Voucher Rolls page");
-$priv_list['page-status-captiveportal-voucher-rolls']['descr'] = gettext("Allow access to the 'Status: Captive portal Voucher Rolls' page.");
-$priv_list['page-status-captiveportal-voucher-rolls']['match'] = array();
-$priv_list['page-status-captiveportal-voucher-rolls']['match'][] = "status_captiveportal_voucher_rolls.php*";
-
-$priv_list['page-status-captiveportal-vouchers'] = array();
-$priv_list['page-status-captiveportal-vouchers']['name'] = gettext("WebCfg - Status: Captive portal Vouchers page");
-$priv_list['page-status-captiveportal-vouchers']['descr'] = gettext("Allow access to the 'Status: Captive portal Vouchers' page.");
-$priv_list['page-status-captiveportal-vouchers']['match'] = array();
-$priv_list['page-status-captiveportal-vouchers']['match'][] = "status_captiveportal_vouchers.php*";
-
-$priv_list['page-firewall-rules-edit'] = array();
-$priv_list['page-firewall-rules-edit']['name'] = gettext("WebCfg - Firewall: Rules: Edit page");
-$priv_list['page-firewall-rules-edit']['descr'] = gettext("Allow access to the 'Firewall: Rules: Edit' page.");
-$priv_list['page-firewall-rules-edit']['match'] = array();
-$priv_list['page-firewall-rules-edit']['match'][] = "firewall_rules_edit.php*";
-
-$priv_list['page-system-advanced-notifications'] = array();
-$priv_list['page-system-advanced-notifications']['name'] = gettext("WebCfg - System: Advanced: Tunables page");
-$priv_list['page-system-advanced-notifications']['descr'] = gettext("Allow access to the 'System: Advanced: Tunables' page.");
-$priv_list['page-system-advanced-notifications']['match'] = array();
-$priv_list['page-system-advanced-notifications']['match'][] = "system_advanced-sysctrl.php*";
-
-$priv_list['page-firewall-schedules-edit'] = array();
-$priv_list['page-firewall-schedules-edit']['name'] = gettext("WebCfg - Firewall: Schedules: Edit page");
-$priv_list['page-firewall-schedules-edit']['descr'] = gettext("Allow access to the 'Firewall: Schedules: Edit' page.");
-$priv_list['page-firewall-schedules-edit']['match'] = array();
-$priv_list['page-firewall-schedules-edit']['match'][] = "firewall_schedule_edit.php*";
 
 $priv_rmvd = array();