diff options
author | jim-p <jimp@pfsense.org> | 2015-11-25 12:14:01 -0500 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2015-11-25 12:14:01 -0500 |
commit | 9599211d3d2720e1871b5193ab37eb1c7962cd6d (patch) | |
tree | 7e27fff15d5614abb830956744265cab133e0566 /src/usr/local | |
parent | e16c1ecf36ddf02ea9a147dd1c07da6a3bc832ec (diff) | |
download | pfsense-9599211d3d2720e1871b5193ab37eb1c7962cd6d.zip pfsense-9599211d3d2720e1871b5193ab37eb1c7962cd6d.tar.gz |
Fix more privilege text/name/page inconsistencies
Diffstat (limited to 'src/usr/local')
26 files changed, 43 insertions, 49 deletions
diff --git a/src/usr/local/www/diag_dump_states_sources.php b/src/usr/local/www/diag_dump_states_sources.php index 7a578d1..2e11a85 100644 --- a/src/usr/local/www/diag_dump_states_sources.php +++ b/src/usr/local/www/diag_dump_states_sources.php @@ -60,10 +60,10 @@ */ ##|+PRIV -##|*IDENT=page-diagnostics-showstates -##|*NAME=Diagnostics: Show States -##|*DESCR=Allow access to the 'Diagnostics: Show States' page. -##|*MATCH=diag_dump_states.php* +##|*IDENT=page-diagnostics-sourcetracking +##|*NAME=Diagnostics: Show Source Tracking +##|*DESCR=Allow access to the 'Diagnostics: Show Source Tracking' page. +##|*MATCH=diag_dump_states_sources.php* ##|-PRIV require_once("guiconfig.inc"); diff --git a/src/usr/local/www/diag_logs_filter.php b/src/usr/local/www/diag_logs_filter.php index bae0c8b..6e7387c 100644 --- a/src/usr/local/www/diag_logs_filter.php +++ b/src/usr/local/www/diag_logs_filter.php @@ -63,8 +63,8 @@ ##|+PRIV ##|*IDENT=page-diagnostics-logs-firewall -##|*NAME=Diagnostics: Logs: Firewall -##|*DESCR=Allow access to the 'Diagnostics: Logs: Firewall' page. +##|*NAME=Status: Logs: Firewall +##|*DESCR=Allow access to the 'Status: Logs: Firewall' page. ##|*MATCH=diag_logs_filter.php* ##|-PRIV diff --git a/src/usr/local/www/diag_logs_settings.php b/src/usr/local/www/diag_logs_settings.php index b7729d1..e8d8731 100644 --- a/src/usr/local/www/diag_logs_settings.php +++ b/src/usr/local/www/diag_logs_settings.php @@ -62,8 +62,8 @@ ##|+PRIV ##|*IDENT=page-diagnostics-logs-settings -##|*NAME=Diagnostics: Logs: Settings -##|*DESCR=Allow access to the 'Diagnostics: Logs: Settings' page. +##|*NAME=Status: Logs: Settings +##|*DESCR=Allow access to the 'Status: Logs: Settings' page. ##|*MATCH=diag_logs_settings.php* ##|-PRIV diff --git a/src/usr/local/www/diag_logs_vpn.php b/src/usr/local/www/diag_logs_vpn.php index ff76793..d14a8a5 100755 --- a/src/usr/local/www/diag_logs_vpn.php +++ b/src/usr/local/www/diag_logs_vpn.php @@ -64,8 +64,8 @@ ##|+PRIV ##|*IDENT=page-diagnostics-logs-pptpvpn -##|*NAME=Diagnostics: Logs: VPN -##|*DESCR=Allow access to the 'Diagnostics: Logs: VPN' page. +##|*NAME=Status: Logs: VPN +##|*DESCR=Allow access to the 'Status: Logs: VPN' page. ##|*MATCH=diag_logs_vpn.php* ##|-PRIV diff --git a/src/usr/local/www/diag_resetstate.php b/src/usr/local/www/diag_resetstate.php index 6e8f341..494e842 100644 --- a/src/usr/local/www/diag_resetstate.php +++ b/src/usr/local/www/diag_resetstate.php @@ -62,8 +62,8 @@ ##|+PRIV ##|*IDENT=page-diagnostics-resetstate -##|*NAME=Diagnostics: Reset state -##|*DESCR=Allow access to the 'Diagnostics: Reset state' page. +##|*NAME=Diagnostics: Reset states +##|*DESCR=Allow access to the 'Diagnostics: Reset states' page. ##|*MATCH=diag_resetstate.php* ##|-PRIV diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php index 8c8ae36..845d7a7 100644 --- a/src/usr/local/www/diag_tables.php +++ b/src/usr/local/www/diag_tables.php @@ -60,7 +60,7 @@ ##|+PRIV ##|*IDENT=page-diagnostics-tables -##|*NAME=Diagnostics: PF Table IP addresses +##|*NAME=Diagnostics: pf Table IP addresses ##|*DESCR=Allow access to the 'Diagnostics: Tables' page. ##|*MATCH=diag_tables.php* ##|-PRIV diff --git a/src/usr/local/www/edit.php b/src/usr/local/www/edit.php index 9bcf7a5..055020e 100644 --- a/src/usr/local/www/edit.php +++ b/src/usr/local/www/edit.php @@ -58,7 +58,7 @@ ##|+PRIV ##|*IDENT=page-diagnostics-edit -##|*NAME=Diagnostics: Edit FIle +##|*NAME=Diagnostics: Edit File ##|*DESCR=Allow access to the 'Diagnostics: Edit File' page. ##|*MATCH=edit.php* ##|*MATCH=browser.php* diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php index 159962a..1fabdea 100644 --- a/src/usr/local/www/firewall_nat_npt.php +++ b/src/usr/local/www/firewall_nat_npt.php @@ -62,8 +62,8 @@ ##|+PRIV ##|*IDENT=page-firewall-nat-npt -##|*NAME=Firewall: NAT: NPT -##|*DESCR=Allow access to the 'Firewall: NAT: NPT' page. +##|*NAME=Firewall: NAT: NPt +##|*DESCR=Allow access to the 'Firewall: NAT: NPt' page. ##|*MATCH=firewall_nat_npt.php* ##|-PRIV diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 157fb44..b81a602 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -1351,7 +1351,7 @@ $section->addInput(new Form_Checkbox( $pconfig['log'] ))->setHelp('Hint: the firewall has limited local log space. Don\'t turn on logging '. 'for everything. If you want to do a lot of logging, consider using a remote '. - 'syslog server (see the <a href="diag_logs_settings.php">Diagnostics: System logs: '. + 'syslog server (see the <a href="diag_logs_settings.php">Status: System logs: '. 'Settings</a> page).'); $section->addInput(new Form_Input( diff --git a/src/usr/local/www/graph_cpu.php b/src/usr/local/www/graph_cpu.php index 484b536..74bf639 100644 --- a/src/usr/local/www/graph_cpu.php +++ b/src/usr/local/www/graph_cpu.php @@ -66,6 +66,7 @@ ##|*NAME=Diagnostics: CPU Utilization ##|*DESCR=Allow access to the 'Diagnostics: CPU Utilization' page. ##|*MATCH=graph_cpu.php* +##|*MATCH=stats.php* ##|-PRIV require_once("guiconfig.inc"); diff --git a/src/usr/local/www/interfaces_ppps.php b/src/usr/local/www/interfaces_ppps.php index 87bb0b9..076ecf7 100644 --- a/src/usr/local/www/interfaces_ppps.php +++ b/src/usr/local/www/interfaces_ppps.php @@ -62,8 +62,8 @@ ##|+PRIV ##|*IDENT=page-interfaces-ppps -##|*NAME=Interfaces: ppps -##|*DESCR=Allow access to the 'Interfaces: ppps' page. +##|*NAME=Interfaces: PPPs +##|*DESCR=Allow access to the 'Interfaces: PPPs' page. ##|*MATCH=interfaces_ppps.php* ##|-PRIV diff --git a/src/usr/local/www/interfaces_wireless_edit.php b/src/usr/local/www/interfaces_wireless_edit.php index 8cddf9b..4dd7930 100644 --- a/src/usr/local/www/interfaces_wireless_edit.php +++ b/src/usr/local/www/interfaces_wireless_edit.php @@ -59,8 +59,8 @@ ##|+PRIV ##|*IDENT=page-interfaces-wireless-edit -##|*NAME=Interfaces: Wireless edit -##|*DESCR=Allow access to the 'Interfaces: Wireless : Edit' page. +##|*NAME=Interfaces: Wireless: Edit +##|*DESCR=Allow access to the 'Interfaces: Wireless: Edit' page. ##|*MATCH=interfaces_wireless_edit.php* ##|-PRIV diff --git a/src/usr/local/www/load_balancer_setting.php b/src/usr/local/www/load_balancer_setting.php index 492aece..13dacb5 100644 --- a/src/usr/local/www/load_balancer_setting.php +++ b/src/usr/local/www/load_balancer_setting.php @@ -60,7 +60,7 @@ ##|+PRIV ##|*IDENT=page-services-loadbalancer-setting -##|*NAME=Services: Load Balancer: setting +##|*NAME=Services: Load Balancer: Settings ##|*DESCR=Allow access to the 'Settings: Load Balancer: Settings' page. ##|*MATCH=load_balancer_setting.php* ##|-PRIV diff --git a/src/usr/local/www/restart_httpd.php b/src/usr/local/www/restart_httpd.php index 02d3bd2..bcbb7be 100644 --- a/src/usr/local/www/restart_httpd.php +++ b/src/usr/local/www/restart_httpd.php @@ -60,8 +60,8 @@ ##|+PRIV ##|*IDENT=page-diagnostics-restart-httpd -##|*NAME=Diagnostics: Restart HTTPD : System -##|*DESCR=Allow access to the 'Diagnostics: Restart HTTPD: System' page. +##|*NAME=Diagnostics: Restart Web Server Daemon +##|*DESCR=Allow access to the 'Diagnostics: Restart Web Server Daemon' page. ##|*MATCH=restart_httpd.php* ##|-PRIV diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php index 239eee3..465b9f0 100644 --- a/src/usr/local/www/services_dhcp.php +++ b/src/usr/local/www/services_dhcp.php @@ -62,8 +62,8 @@ ##|+PRIV ##|*IDENT=page-services-dhcpserver -##|*NAME=Services: DHCP server -##|*DESCR=Allow access to the 'Services: DHCP server' page. +##|*NAME=Services: DHCP Server +##|*DESCR=Allow access to the 'Services: DHCP Server' page. ##|*MATCH=services_dhcp.php* ##|-PRIV diff --git a/src/usr/local/www/services_dhcp_edit.php b/src/usr/local/www/services_dhcp_edit.php index 1040b60..76a6cca 100644 --- a/src/usr/local/www/services_dhcp_edit.php +++ b/src/usr/local/www/services_dhcp_edit.php @@ -62,8 +62,8 @@ ##|+PRIV ##|*IDENT=page-services-dhcpserver-editstaticmapping -##|*NAME=Services: DHCP Server : Edit static mapping -##|*DESCR=Allow access to the 'Services: DHCP Server : Edit static mapping' page. +##|*NAME=Services: DHCP Server: Edit static mapping +##|*DESCR=Allow access to the 'Services: DHCP Server: Edit static mapping' page. ##|*MATCH=services_dhcp_edit.php* ##|-PRIV diff --git a/src/usr/local/www/services_dhcpv6_edit.php b/src/usr/local/www/services_dhcpv6_edit.php index 295f91d..910479f 100644 --- a/src/usr/local/www/services_dhcpv6_edit.php +++ b/src/usr/local/www/services_dhcpv6_edit.php @@ -63,7 +63,7 @@ ##|+PRIV ##|*IDENT=page-services-dhcpserverv6-editstaticmapping -##|*NAME=Services: DHCPv6 Server : Edit static mapping +##|*NAME=Services: DHCPv6 Server: Edit static mapping ##|*DESCR=Allow access to the 'Services: DHCPv6 Server : Edit static mapping' page. ##|*MATCH=services_dhcpv6_edit.php* ##|-PRIV diff --git a/src/usr/local/www/services_ntpd_gps.php b/src/usr/local/www/services_ntpd_gps.php index 8a5e548..ef4946b 100644 --- a/src/usr/local/www/services_ntpd_gps.php +++ b/src/usr/local/www/services_ntpd_gps.php @@ -60,7 +60,7 @@ ##|+PRIV ##|*IDENT=page-services-ntpd-gps ##|*NAME=Services: NTP Serial GPS -##|*DESCR=Allow access to the 'Services: NTP Serial GPS' page.. +##|*DESCR=Allow access to the 'Services: NTP Serial GPS' page. ##|*MATCH=services_ntpd_gps.php* ##|-PRIV diff --git a/src/usr/local/www/services_ntpd_pps.php b/src/usr/local/www/services_ntpd_pps.php index 5c15d0a..1f836cf 100644 --- a/src/usr/local/www/services_ntpd_pps.php +++ b/src/usr/local/www/services_ntpd_pps.php @@ -60,7 +60,7 @@ ##|+PRIV ##|*IDENT=page-services-ntpd-pps ##|*NAME=Services: NTP PPS -##|*DESCR=Allow access to the 'Services: NTP PPS' page.. +##|*DESCR=Allow access to the 'Services: NTP PPS' page. ##|*MATCH=services_ntpd_pps.php* ##|-PRIV diff --git a/src/usr/local/www/stats.php b/src/usr/local/www/stats.php index b898f36..41dc6e4 100644 --- a/src/usr/local/www/stats.php +++ b/src/usr/local/www/stats.php @@ -53,13 +53,6 @@ * */ -##|+PRIV -##|*IDENT=page-diagnostics-cpuutilization -##|*NAME=Diagnostics: CPU Utilization -##|*DESCR=Allow access to the 'Diagnostics: CPU Utilization' page. -##|*MATCH=stats.php* -##|-PRIV - require_once("guiconfig.inc"); require_once("includes/functions.inc.php"); diff --git a/src/usr/local/www/status_rrd_graph_settings.php b/src/usr/local/www/status_rrd_graph_settings.php index 9e4d616..6eaf9dc 100644 --- a/src/usr/local/www/status_rrd_graph_settings.php +++ b/src/usr/local/www/status_rrd_graph_settings.php @@ -60,8 +60,8 @@ ##|+PRIV ##|*IDENT=page-status-rrdgraph-settings -##|*NAME=Status: RRD Graphs settings -##|*DESCR=Allow access to the 'Status: RRD Graphs: settings' page. +##|*NAME=Status: RRD Graphs: Settings +##|*DESCR=Allow access to the 'Status: RRD Graphs: Settings' page. ##|*MATCH=status_rrd_graph_settings.php* ##|-PRIV diff --git a/src/usr/local/www/system_usermanager_settings.php b/src/usr/local/www/system_usermanager_settings.php index 29dc338..4133edb 100644 --- a/src/usr/local/www/system_usermanager_settings.php +++ b/src/usr/local/www/system_usermanager_settings.php @@ -59,8 +59,8 @@ ##|+PRIV ##|*IDENT=page-system-usermanager-settings -##|*NAME=System: User Manager: settings -##|*DESCR=Allow access to the 'System: User Manager: settings' page. +##|*NAME=System: User Manager: Settings +##|*DESCR=Allow access to the 'System: User Manager: Settings' page. ##|*MATCH=system_usermanager_settings.php* ##|-PRIV diff --git a/src/usr/local/www/system_usermanager_settings_ldapacpicker.php b/src/usr/local/www/system_usermanager_settings_ldapacpicker.php index 2a300da..415c2a7 100644 --- a/src/usr/local/www/system_usermanager_settings_ldapacpicker.php +++ b/src/usr/local/www/system_usermanager_settings_ldapacpicker.php @@ -60,7 +60,7 @@ ##|*IDENT=page-system-usermanager-settings-ldappicker ##|*NAME=System: User Manager: Settings: LDAP Picker ##|*DESCR=Allow access to the 'System: User Manager: Settings: LDAP Picker' page. -##|*MATCH=system_usermanager_settings_ldappicker.php* +##|*MATCH=system_usermanager_settings_ldapacpicker.php* ##|-PRIV require("guiconfig.inc"); diff --git a/src/usr/local/www/vpn_l2tp.php b/src/usr/local/www/vpn_l2tp.php index 2a07210..bd61f1e 100644 --- a/src/usr/local/www/vpn_l2tp.php +++ b/src/usr/local/www/vpn_l2tp.php @@ -55,8 +55,8 @@ ##|+PRIV ##|*IDENT=page-vpn-vpnl2tp -##|*NAME=VPN: VPN L2TP -##|*DESCR=Allow access to the 'VPN: VPN L2TP' page. +##|*NAME=VPN: L2TP +##|*DESCR=Allow access to the 'VPN: L2TP' page. ##|*MATCH=vpn_l2tp.php* ##|-PRIV diff --git a/src/usr/local/www/vpn_l2tp_users.php b/src/usr/local/www/vpn_l2tp_users.php index 5775e25..7e714c1 100644 --- a/src/usr/local/www/vpn_l2tp_users.php +++ b/src/usr/local/www/vpn_l2tp_users.php @@ -55,8 +55,8 @@ ##|+PRIV ##|*IDENT=page-vpn-vpnl2tp-users -##|*NAME=VPN: VPN L2TP : Users -##|*DESCR=Allow access to the 'VPN: VPN L2TP : Users' page. +##|*NAME=VPN: L2TP: Users +##|*DESCR=Allow access to the 'VPN: L2TP: Users' page. ##|*MATCH=vpn_l2tp_users.php* ##|-PRIV diff --git a/src/usr/local/www/vpn_l2tp_users_edit.php b/src/usr/local/www/vpn_l2tp_users_edit.php index a35badd..6d6e360 100644 --- a/src/usr/local/www/vpn_l2tp_users_edit.php +++ b/src/usr/local/www/vpn_l2tp_users_edit.php @@ -55,8 +55,8 @@ ##|+PRIV ##|*IDENT=page-vpn-vpnl2tp-users-edit -##|*NAME=VPN: VPN L2TP : Users : Edit -##|*DESCR=Allow access to the 'VPN: VPN L2TP : Users : Edit' page. +##|*NAME=VPN: L2TP: Users: Edit +##|*DESCR=Allow access to the 'VPN: L2TP: Users: Edit' page. ##|*MATCH=vpn_l2tp_users_edit.php* ##|-PRIV |