From 7997ed4440ce34234f20b3525ee7641d164914c7 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Fri, 15 Nov 2013 19:21:18 -0200 Subject: Many fixes on privileges, ticket #3216: - Rename some privileges: page-diag-system-activity => page-diagnostics-system-activity page-interfacess-groups => page-interfaces-groups page-interfacess-lagg => page-interfaces-lagg page-interfacess-qinq => page-interfaces-qinq - Write an upgrade function to replace above privileges by the new name - 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 edit pages (interfaces_groups, interfaces_lagg, interfaces_qinq and services-igmpproxy) - Fix ID for acptiveportal allowedhostnames and editallowedhostnames - Fix some wrong matches --- usr/local/www/diag_limiter_info.php | 8 ++++---- usr/local/www/diag_pf_info.php | 10 +++++----- usr/local/www/diag_system_activity.php | 4 ++-- usr/local/www/diag_system_pftop.php | 8 ++++---- usr/local/www/interfaces_groups_edit.php | 4 ++-- usr/local/www/interfaces_lagg.php | 4 ++-- usr/local/www/interfaces_lagg_edit.php | 4 ++-- usr/local/www/interfaces_qinq_edit.php | 4 ++-- usr/local/www/services_captiveportal_hostname.php | 6 +++--- usr/local/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 +- 16 files changed, 37 insertions(+), 37 deletions(-) (limited to 'usr/local/www') 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..6d62569 100644 --- a/usr/local/www/diag_system_activity.php +++ b/usr/local/www/diag_system_activity.php @@ -33,10 +33,10 @@ */ ##|+PRIV -##|*IDENT=page-diag-system-activity +##|*IDENT=page-diagnostics-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..09053c7 100755 --- a/usr/local/www/interfaces_groups_edit.php +++ b/usr/local/www/interfaces_groups_edit.php @@ -31,9 +31,9 @@ */ ##|+PRIV -##|*IDENT=page-interfacess-groups +##|*IDENT=page-interfaces-groups-edit ##|*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..91515fe 100644 --- a/usr/local/www/interfaces_lagg.php +++ b/usr/local/www/interfaces_lagg.php @@ -33,9 +33,9 @@ */ ##|+PRIV -##|*IDENT=page-interfacess-lagg +##|*IDENT=page-interfaces-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 a2ad5c7..a830172 100644 --- a/usr/local/www/interfaces_lagg_edit.php +++ b/usr/local/www/interfaces_lagg_edit.php @@ -32,9 +32,9 @@ */ ##|+PRIV -##|*IDENT=page-interfacess-lagg +##|*IDENT=page-interfaces-lagg-edit ##|*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..242b26d 100755 --- a/usr/local/www/interfaces_qinq_edit.php +++ b/usr/local/www/interfaces_qinq_edit.php @@ -30,9 +30,9 @@ */ ##|+PRIV -##|*IDENT=page-interfacess-qinq +##|*IDENT=page-interfaces-qinq-edit ##|*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 de6e9b2..d23f0e8 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 dc7eee7..b42aa78 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 dc143ce..a1be55c 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