From 6b1f9a9941ce677427a8b53a700b773529477349 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Fri, 15 Nov 2013 19:30:31 -0200 Subject: Many fixes on privileges, ticket #3216: - Remove unused privilege page-diagnostics-logs-wireless - Remove duplicated privileges - Fix limiter-info, pf-info and system-pftop that were using wrong name - Add privs for services-igmpproxy-edit - Fix ID for acptiveportal allowedhostnames and editallowedhostnames - Fix some wrong matches --- etc/inc/priv.defs.inc | 112 +++++++++------------ usr/local/www/diag_limiter_info.php | 8 +- usr/local/www/diag_pf_info.php | 10 +- usr/local/www/diag_system_activity.php | 2 +- usr/local/www/diag_system_pftop.php | 8 +- usr/local/www/interfaces_groups_edit.php | 2 +- usr/local/www/interfaces_lagg.php | 2 +- usr/local/www/interfaces_lagg_edit.php | 2 +- usr/local/www/interfaces_qinq_edit.php | 2 +- usr/local/www/services_captiveportal_hostname.php | 6 +- .../www/services_captiveportal_hostname_edit.php | 4 +- usr/local/www/services_igmpproxy_edit.php | 4 +- usr/local/www/system_advanced_firewall.php | 2 +- usr/local/www/system_advanced_misc.php | 2 +- usr/local/www/system_advanced_network.php | 2 +- usr/local/www/system_advanced_notifications.php | 6 +- usr/local/www/system_advanced_sysctl.php | 2 +- 17 files changed, 79 insertions(+), 97 deletions(-) diff --git a/etc/inc/priv.defs.inc b/etc/inc/priv.defs.inc index 5a65f30..e06c678 100644 --- a/etc/inc/priv.defs.inc +++ b/etc/inc/priv.defs.inc @@ -114,12 +114,6 @@ $priv_list['page-ipsecxml']['descr'] = gettext("Allow access to the 'Diag IPsec $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'] = gettext("WebCfg - Diagnostics: System Activity"); -$priv_list['page-diag-system-activity']['descr'] = gettext("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."); @@ -156,12 +150,6 @@ $priv_list['page-diagnostics-logs-resolver']['descr'] = gettext("Allow access to $priv_list['page-diagnostics-logs-resolver']['match'] = array(); $priv_list['page-diagnostics-logs-resolver']['match'][] = "diag_logs_resolver.php*"; -$priv_list['page-diagnostics-logs-wireless'] = array(); -$priv_list['page-diagnostics-logs-wireless']['name'] = gettext("WebCfg - Diagnostics: Logs: Wireless page"); -$priv_list['page-diagnostics-logs-wireless']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: System: Wireless' page."); -$priv_list['page-diagnostics-logs-wireless']['match'] = array(); -$priv_list['page-diagnostics-logs-wireless']['match'][] = "diag_logs_wireless.php*"; - $priv_list['page-hidden-nolongerincluded'] = array(); $priv_list['page-hidden-nolongerincluded']['name'] = gettext("WebCfg - Hidden: No longer included page"); $priv_list['page-hidden-nolongerincluded']['descr'] = gettext("Allow access to the 'Hidden: No longer included' page."); @@ -240,11 +228,29 @@ $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-diagnostics-limiter-info'] = array(); +$priv_list['page-diagnostics-limiter-info']['name'] = gettext("Diagnostics: Limiter Info"); +$priv_list['page-diagnostics-limiter-info']['descr'] = gettext("Allows access to the 'Diagnostics: Limiter Info' page"); +$priv_list['page-diagnostics-limiter-info']['match'] = array(); +$priv_list['page-diagnostics-limiter-info']['match'][] = "diag_limiter_info.php*"; + +$priv_list['page-diagnostics-pf-info'] = array(); +$priv_list['page-diagnostics-pf-info']['name'] = gettext("Diagnostics: pfInfo"); +$priv_list['page-diagnostics-pf-info']['descr'] = gettext("Allows access to the 'Diagnostics: pfInfo' page"); +$priv_list['page-diagnostics-pf-info']['match'] = array(); +$priv_list['page-diagnostics-pf-info']['match'][] = "diag_pf_info.php*"; + $priv_list['page-diag-system-activity'] = array(); $priv_list['page-diag-system-activity']['name'] = gettext("WebCfg - Diagnostics: System Activity"); $priv_list['page-diag-system-activity']['descr'] = gettext("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-diag-system-activity']['match'][] = "diag_system_activity.php*"; + +$priv_list['page-diagnostics-system-pftop'] = array(); +$priv_list['page-diagnostics-system-pftop']['name'] = gettext("Diagnostics: pfTop"); +$priv_list['page-diagnostics-system-pftop']['descr'] = gettext("Allows access to the 'Diagnostics: pfTop' page"); +$priv_list['page-diagnostics-system-pftop']['match'] = array(); +$priv_list['page-diagnostics-system-pftop']['match'][] = "diag_system_pftop.php*"; $priv_list['page-diagnostics-ping'] = array(); $priv_list['page-diagnostics-ping']['name'] = gettext("WebCfg - Diagnostics: Ping page"); @@ -276,18 +282,6 @@ $priv_list['page-diagnostics-statessummary']['descr'] = gettext("Allow access to $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"); -$priv_list['page-diag-system-activity']['descr'] = gettext("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-diag-system-activity'] = array(); -$priv_list['page-diag-system-activity']['name'] = gettext("WebCfg - Diagnostics: System Activity"); -$priv_list['page-diag-system-activity']['descr'] = gettext("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.php*"; - $priv_list['page-diagnostics-tables'] = array(); $priv_list['page-diagnostics-tables']['name'] = gettext("WebCfg - Diagnostics: PF Table IP addresses"); $priv_list['page-diagnostics-tables']['descr'] = gettext("Allow access to the 'Diagnostics: Tables' page."); @@ -549,8 +543,8 @@ $priv_list['page-interfaces-groups']['match'] = array(); $priv_list['page-interfaces-groups']['match'][] = "interfaces_groups.php*"; $priv_list['page-interfacess-groups'] = array(); -$priv_list['page-interfacess-groups']['name'] = gettext("WebCfg - Interfaces: Groups: Edit page"); -$priv_list['page-interfacess-groups']['descr'] = gettext("Edit Interface groups"); +$priv_list['page-interfacess-groups']['name'] = gettext("Interfaces: Groups: Edit page"); +$priv_list['page-interfacess-groups']['descr'] = gettext("Allow access to the 'Interfaces: Groups: Edit' page."); $priv_list['page-interfacess-groups']['match'] = array(); $priv_list['page-interfacess-groups']['match'][] = "interfaces_groups_edit.php*"; @@ -561,8 +555,8 @@ $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'] = gettext("WebCfg - Interfaces: LAGG: Edit page"); -$priv_list['page-interfacess-lagg']['descr'] = gettext("Edit Interface LAGG"); +$priv_list['page-interfacess-lagg']['name'] = gettext("Interfaces: LAGG: Edit page"); +$priv_list['page-interfacess-lagg']['descr'] = gettext("Allow access to the 'Interfaces: LAGG: Edit' page."); $priv_list['page-interfacess-lagg']['match'] = array(); $priv_list['page-interfacess-lagg']['match'][] = "interfaces_lagg_edit.php*"; @@ -585,8 +579,8 @@ $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'] = gettext("WebCfg - Interfaces: QinQ: Edit page"); -$priv_list['page-interfacess-qinq']['descr'] = gettext("Edit Interface qinq"); +$priv_list['page-interfacess-qinq']['name'] = gettext("Interfaces: QinQ: Edit page"); +$priv_list['page-interfacess-qinq']['descr'] = gettext("Allow access to 'Interfaces: QinQ: Edit' page"); $priv_list['page-interfacess-qinq']['match'] = array(); $priv_list['page-interfacess-qinq']['match'][] = "interfaces_qinq_edit.php*"; @@ -752,18 +746,6 @@ $priv_list['page-services-captiveportal-filemanager']['descr'] = gettext("Allow $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'] = gettext("WebCfg - Services: Captive portal: Allowed IPs page"); -$priv_list['page-services-captiveportal-allowedhostnames']['descr'] = gettext("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'] = gettext("WebCfg - Services: Captive portal: Edit Allowed IPs page"); -$priv_list['page-services-captiveportal-editallowedhostnames']['descr'] = gettext("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_ip_edit.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."); @@ -788,17 +770,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-captiveportal-macaddresses'] = array(); -$priv_list['page-services-captiveportal-macaddresses']['name'] = gettext("WebCfg - Services: Captive portal: Allowed Hostnames page"); -$priv_list['page-services-captiveportal-macaddresses']['descr'] = gettext("Allow access to the 'Services: Captive portal: Allowed Hostnames' page."); -$priv_list['page-services-captiveportal-macaddresses']['match'] = array(); -$priv_list['page-services-captiveportal-macaddresses']['match'][] = "services_captiveportal_hostname.php*"; +$priv_list['page-services-captiveportal-allowedhostnames'] = array(); +$priv_list['page-services-captiveportal-allowedhostnames']['name'] = gettext("WebCfg - Services: Captive portal: Allowed Hostnames page"); +$priv_list['page-services-captiveportal-allowedhostnames']['descr'] = gettext("Allow access to the 'Services: Captive portal: Allowed Hostnames' page."); +$priv_list['page-services-captiveportal-allowedhostnames']['match'] = array(); +$priv_list['page-services-captiveportal-allowedhostnames']['match'][] = "services_captiveportal_hostname.php*"; -$priv_list['page-services-captiveportal-editmacaddresses'] = array(); -$priv_list['page-services-captiveportal-editmacaddresses']['name'] = gettext("WebCfg - Services: Captive portal: Edit Allowed Hostnames page"); -$priv_list['page-services-captiveportal-editmacaddresses']['descr'] = gettext("Allow access to the 'Services: Captive portal: Allowed Hostnames' page."); -$priv_list['page-services-captiveportal-editmacaddresses']['match'] = array(); -$priv_list['page-services-captiveportal-editmacaddresses']['match'][] = "services_captiveportal_hostname_edit.php*"; +$priv_list['page-services-captiveportal-editallowedhostnames'] = array(); +$priv_list['page-services-captiveportal-editallowedhostnames']['name'] = gettext("WebCfg - Services: Captive portal: Edit Allowed Hostnames page"); +$priv_list['page-services-captiveportal-editallowedhostnames']['descr'] = gettext("Allow access to the 'Services: Captive portal: Allowed Hostnames' 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-editzones'] = array(); $priv_list['page-services-captiveportal-editzones']['name'] = gettext("Webcfg - Services: Captive portal: Edit Zones page"); @@ -896,11 +878,11 @@ $priv_list['page-services-igmpproxy']['descr'] = gettext("Allow access to the 'S $priv_list['page-services-igmpproxy']['match'] = array(); $priv_list['page-services-igmpproxy']['match'][] = "services_igmpproxy.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']['match'] = array(); -$priv_list['page-services-igmpproxy']['match'][] = "services_igmpproxy_edit.php*"; +$priv_list['page-services-igmpproxy-edit'] = array(); +$priv_list['page-services-igmpproxy-edit']['name'] = gettext("Firewall: Igmpproxy: Edit page"); +$priv_list['page-services-igmpproxy-edit']['descr'] = gettext("Allow access to the 'Services: Igmpproxy: Edit' page."); +$priv_list['page-services-igmpproxy-edit']['match'] = array(); +$priv_list['page-services-igmpproxy-edit']['match'][] = "services_igmpproxy_edit.php*"; $priv_list['page-services-rfc2136clients'] = array(); $priv_list['page-services-rfc2136clients']['name'] = gettext("WebCfg - Services: RFC 2136 clients page"); @@ -1094,31 +1076,31 @@ $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."); $priv_list['page-system-advanced-firewall']['match'] = array(); -$priv_list['page-system-advanced-firewall']['match'][] = "system_advanced.php*"; +$priv_list['page-system-advanced-firewall']['match'][] = "system_advanced_firewall.php*"; $priv_list['page-system-advanced-misc'] = array(); $priv_list['page-system-advanced-misc']['name'] = gettext("WebCfg - System: Advanced: Miscellaneous page"); $priv_list['page-system-advanced-misc']['descr'] = gettext("Allow access to the 'System: Advanced: Miscellaneous' page."); $priv_list['page-system-advanced-misc']['match'] = array(); -$priv_list['page-system-advanced-misc']['match'][] = "system_advanced.php*"; +$priv_list['page-system-advanced-misc']['match'][] = "system_advanced_misc.php*"; $priv_list['page-system-advanced-network'] = array(); $priv_list['page-system-advanced-network']['name'] = gettext("WebCfg - System: Advanced: Network page"); $priv_list['page-system-advanced-network']['descr'] = gettext("Allow access to the 'System: Advanced: Networking' page."); $priv_list['page-system-advanced-network']['match'] = array(); -$priv_list['page-system-advanced-network']['match'][] = "system_advanced-network.php*"; +$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'] = 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']['name'] = gettext("WebCfg - System: Advanced: Notifications page"); +$priv_list['page-system-advanced-notifications']['descr'] = gettext("Allow access to the 'System: Advanced: Notifications' 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-notifications']['match'][] = "system_advanced_notifications.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-sysctl.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"); diff --git a/usr/local/www/diag_limiter_info.php b/usr/local/www/diag_limiter_info.php index 3d8c338..25d066c 100644 --- a/usr/local/www/diag_limiter_info.php +++ b/usr/local/www/diag_limiter_info.php @@ -33,10 +33,10 @@ */ ##|+PRIV -##|*IDENT=page-diag-system-activity -##|*NAME=Diagnostics: System Activity -##|*DESCR=Allows access to the 'Diagnostics: System Activity' page -##|*MATCH=diag_system_activity* +##|*IDENT=page-diagnostics-limiter-info +##|*NAME=Diagnostics: Limiter Info +##|*DESCR=Allows access to the 'Diagnostics: Limiter Info' page +##|*MATCH=diag_limiter_info.php* ##|-PRIV require("guiconfig.inc"); diff --git a/usr/local/www/diag_pf_info.php b/usr/local/www/diag_pf_info.php index e7b0e35..71430df 100644 --- a/usr/local/www/diag_pf_info.php +++ b/usr/local/www/diag_pf_info.php @@ -33,10 +33,10 @@ */ ##|+PRIV -##|*IDENT=page-diag-system-activity -##|*NAME=Diagnostics: System Activity -##|*DESCR=Allows access to the 'Diagnostics: System Activity' page -##|*MATCH=diag_system_activity* +##|*IDENT=page-diagnostics-pf-info +##|*NAME=Diagnostics: pfInfo +##|*DESCR=Allows access to the 'Diagnostics: pfInfo' page +##|*MATCH=diag_pf_info.php* ##|-PRIV require("guiconfig.inc"); @@ -114,4 +114,4 @@ jQuery(document).ready(function() {setTimeout('getpfinfo()', 5000);}); - \ No newline at end of file + diff --git a/usr/local/www/diag_system_activity.php b/usr/local/www/diag_system_activity.php index 05118cf..b3f9634 100644 --- a/usr/local/www/diag_system_activity.php +++ b/usr/local/www/diag_system_activity.php @@ -36,7 +36,7 @@ ##|*IDENT=page-diag-system-activity ##|*NAME=Diagnostics: System Activity ##|*DESCR=Allows access to the 'Diagnostics: System Activity' page -##|*MATCH=diag_system_activity* +##|*MATCH=diag_system_activity.php* ##|-PRIV require("guiconfig.inc"); diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php index 87dbc65..97c1b7a 100644 --- a/usr/local/www/diag_system_pftop.php +++ b/usr/local/www/diag_system_pftop.php @@ -32,9 +32,9 @@ */ ##|+PRIV -##|*IDENT=page-diag-system-activity -##|*NAME=Diagnostics: System Activity -##|*DESCR=Allows access to the 'Diagnostics: System Activity' page +##|*IDENT=page-diagnostics-system-pftop +##|*NAME=Diagnostics: pfTop +##|*DESCR=Allows access to the 'Diagnostics: pfTop' page ##|*MATCH=diag_system_pftop.php* ##|-PRIV @@ -213,4 +213,4 @@ jQuery("#viewtype").change(function() { }); - \ No newline at end of file + diff --git a/usr/local/www/interfaces_groups_edit.php b/usr/local/www/interfaces_groups_edit.php index 1356760..6551323 100755 --- a/usr/local/www/interfaces_groups_edit.php +++ b/usr/local/www/interfaces_groups_edit.php @@ -33,7 +33,7 @@ ##|+PRIV ##|*IDENT=page-interfacess-groups ##|*NAME=Interfaces: Groups: Edit page -##|*DESCR=Edit Interface groups +##|*DESCR=Allow access to the 'Interfaces: Groups: Edit' page. ##|*MATCH=interfaces_groups_edit.php* ##|-PRIV diff --git a/usr/local/www/interfaces_lagg.php b/usr/local/www/interfaces_lagg.php index 4e58254..fcba0ae 100644 --- a/usr/local/www/interfaces_lagg.php +++ b/usr/local/www/interfaces_lagg.php @@ -35,7 +35,7 @@ ##|+PRIV ##|*IDENT=page-interfacess-lagg ##|*NAME=Interfaces: LAGG: page -##|*DESCR=Edit Interface LAGG +##|*DESCR=Allow access to the 'Interfaces: LAGG' page. ##|*MATCH=interfaces_lagg.php* ##|-PRIV diff --git a/usr/local/www/interfaces_lagg_edit.php b/usr/local/www/interfaces_lagg_edit.php index 1a1d468..26595f9 100644 --- a/usr/local/www/interfaces_lagg_edit.php +++ b/usr/local/www/interfaces_lagg_edit.php @@ -34,7 +34,7 @@ ##|+PRIV ##|*IDENT=page-interfacess-lagg ##|*NAME=Interfaces: LAGG: Edit page -##|*DESCR=Edit Interface LAGG +##|*DESCR=Allow access to the 'Interfaces: LAGG: Edit' page. ##|*MATCH=interfaces_lagg_edit.php* ##|-PRIV diff --git a/usr/local/www/interfaces_qinq_edit.php b/usr/local/www/interfaces_qinq_edit.php index beff4b1..adb584a 100755 --- a/usr/local/www/interfaces_qinq_edit.php +++ b/usr/local/www/interfaces_qinq_edit.php @@ -32,7 +32,7 @@ ##|+PRIV ##|*IDENT=page-interfacess-qinq ##|*NAME=Interfaces: QinQ: Edit page -##|*DESCR=Edit Interface qinq +##|*DESCR=Allow access to 'Interfaces: QinQ: Edit' page ##|*MATCH=interfaces_qinq_edit.php* ##|-PRIV diff --git a/usr/local/www/services_captiveportal_hostname.php b/usr/local/www/services_captiveportal_hostname.php index a177656..f9b2a8a 100755 --- a/usr/local/www/services_captiveportal_hostname.php +++ b/usr/local/www/services_captiveportal_hostname.php @@ -36,9 +36,9 @@ ##|+PRIV ##|*IDENT=page-services-captiveportal-allowedhostnames -##|*NAME=Services: Captive portal: Allowed IPs page -##|*DESCR=Allow access to the 'Services: Captive portal: Allowed IPs' page. -##|*MATCH=services_captiveportal_ip.php* +##|*NAME=Services: Captive portal: Allowed Hostnames page +##|*DESCR=Allow access to the 'Services: Captive portal: Allowed Hostnames' page. +##|*MATCH=services_captiveportal_hostname.php* ##|-PRIV require("guiconfig.inc"); diff --git a/usr/local/www/services_captiveportal_hostname_edit.php b/usr/local/www/services_captiveportal_hostname_edit.php index c1b6c25..f7f3308 100755 --- a/usr/local/www/services_captiveportal_hostname_edit.php +++ b/usr/local/www/services_captiveportal_hostname_edit.php @@ -36,8 +36,8 @@ ##|+PRIV ##|*IDENT=page-services-captiveportal-editallowedhostnames -##|*NAME=Services: Captive portal: Edit Allowed IPs page -##|*DESCR=Allow access to the 'Services: Captive portal: Edit Allowed IPs' page. +##|*NAME=Services: Captive portal: Edit Allowed Hostnames page +##|*DESCR=Allow access to the 'Services: Captive portal: Edit Allowed Hostnames' page. ##|*MATCH=services_captiveportal_hostname_edit.php* ##|-PRIV diff --git a/usr/local/www/services_igmpproxy_edit.php b/usr/local/www/services_igmpproxy_edit.php index 78ef6ab..92fb71b 100755 --- a/usr/local/www/services_igmpproxy_edit.php +++ b/usr/local/www/services_igmpproxy_edit.php @@ -37,9 +37,9 @@ */ ##|+PRIV -##|*IDENT=page-services-igmpproxy +##|*IDENT=page-services-igmpproxy-edit ##|*NAME=Firewall: Igmpproxy: Edit page -##|*DESCR=Allow access to the 'Firewall: Igmpproxy' page. +##|*DESCR=Allow access to the 'Services: Igmpproxy: Edit' page. ##|*MATCH=services_igmpproxy_edit.php* ##|-PRIV diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php index 7d184e6..aef44c5 100644 --- a/usr/local/www/system_advanced_firewall.php +++ b/usr/local/www/system_advanced_firewall.php @@ -40,7 +40,7 @@ ##|*IDENT=page-system-advanced-firewall ##|*NAME=System: Advanced: Firewall and NAT page ##|*DESCR=Allow access to the 'System: Advanced: Firewall and NAT' page. -##|*MATCH=system_advanced.php* +##|*MATCH=system_advanced_firewall.php* ##|-PRIV require("guiconfig.inc"); diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php index a69d35b..114f029 100644 --- a/usr/local/www/system_advanced_misc.php +++ b/usr/local/www/system_advanced_misc.php @@ -40,7 +40,7 @@ ##|*IDENT=page-system-advanced-misc ##|*NAME=System: Advanced: Miscellaneous page ##|*DESCR=Allow access to the 'System: Advanced: Miscellaneous' page. -##|*MATCH=system_advanced.php* +##|*MATCH=system_advanced_misc.php* ##|-PRIV require("guiconfig.inc"); diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php index 2b6f476..82b5661 100644 --- a/usr/local/www/system_advanced_network.php +++ b/usr/local/www/system_advanced_network.php @@ -39,7 +39,7 @@ ##|*IDENT=page-system-advanced-network ##|*NAME=System: Advanced: Network page ##|*DESCR=Allow access to the 'System: Advanced: Networking' page. -##|*MATCH=system_advanced-network.php* +##|*MATCH=system_advanced_network.php* ##|-PRIV require("guiconfig.inc"); diff --git a/usr/local/www/system_advanced_notifications.php b/usr/local/www/system_advanced_notifications.php index 3b6d311..fe2eb71 100644 --- a/usr/local/www/system_advanced_notifications.php +++ b/usr/local/www/system_advanced_notifications.php @@ -32,9 +32,9 @@ ##|+PRIV ##|*IDENT=page-system-advanced-notifications -##|*NAME=System: Advanced: Tunables page -##|*DESCR=Allow access to the 'System: Advanced: Tunables' page. -##|*MATCH=system_advanced-sysctrl.php* +##|*NAME=System: Advanced: Notifications page +##|*DESCR=Allow access to the 'System: Advanced: Notifications' page. +##|*MATCH=system_advanced_notifications.php* ##|-PRIV require("guiconfig.inc"); diff --git a/usr/local/www/system_advanced_sysctl.php b/usr/local/www/system_advanced_sysctl.php index 83c129a..da1aef3 100644 --- a/usr/local/www/system_advanced_sysctl.php +++ b/usr/local/www/system_advanced_sysctl.php @@ -40,7 +40,7 @@ ##|*IDENT=page-system-advanced-sysctl ##|*NAME=System: Advanced: Tunables page ##|*DESCR=Allow access to the 'System: Advanced: Tunables' page. -##|*MATCH=system_advanced-sysctl.php* +##|*MATCH=system_advanced_sysctl.php* ##|-PRIV require("guiconfig.inc"); -- cgit v1.1