diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-02-03 11:01:47 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-02-03 11:02:15 -0500 |
commit | 5d916fc76a1ffcd4d7b446ff063ecfd25f5dfad5 (patch) | |
tree | cfe761ee273bbff21741825ba06d9f53e4600633 /src/etc | |
parent | f519f112e034b35a3288be215110d93fa84e77f4 (diff) | |
download | pfsense-5d916fc76a1ffcd4d7b446ff063ecfd25f5dfad5.zip pfsense-5d916fc76a1ffcd4d7b446ff063ecfd25f5dfad5.tar.gz |
Improvements to the priviledge filter functionality
Diffstat (limited to 'src/etc')
-rw-r--r-- | src/etc/inc/priv.defs.inc | 20 | ||||
-rw-r--r-- | src/etc/inc/priv.inc | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/etc/inc/priv.defs.inc b/src/etc/inc/priv.defs.inc index 06d0418..21bf0f4 100644 --- a/src/etc/inc/priv.defs.inc +++ b/src/etc/inc/priv.defs.inc @@ -43,11 +43,11 @@ $priv_list['page-diagnostics-authentication']['descr'] = gettext("Allow access t $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"); -$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*"; +$priv_list['page-diagnostics-backup-restore'] = array(); +$priv_list['page-diagnostics-backup-restore']['name'] = gettext("WebCfg - Diagnostics: Backup/restore"); +$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*"; $priv_list['page-diagnostics-configurationhistory'] = array(); $priv_list['page-diagnostics-configurationhistory']['name'] = gettext("WebCfg - Diagnostics: Configuration History"); @@ -430,11 +430,11 @@ $priv_list['page-xmlrpcinterfacestats']['descr'] = gettext("Allow access to the $priv_list['page-xmlrpcinterfacestats']['match'] = array(); $priv_list['page-xmlrpcinterfacestats']['match'][] = "ifstats.php*"; -$priv_list['page-system-login/logout'] = array(); -$priv_list['page-system-login/logout']['name'] = gettext("WebCfg - System: Login / Logout / Dashboard"); -$priv_list['page-system-login/logout']['descr'] = gettext("Allow access to the 'System: Login / Logout' page and Dashboard."); -$priv_list['page-system-login/logout']['match'] = array(); -$priv_list['page-system-login/logout']['match'][] = "index.php*"; +$priv_list['page-system-login-logout'] = array(); +$priv_list['page-system-login-logout']['name'] = gettext("WebCfg - System: Login / Logout / Dashboard"); +$priv_list['page-system-login-logout']['descr'] = gettext("Allow access to the 'System: Login / Logout' page and Dashboard."); +$priv_list['page-system-login-logout']['match'] = array(); +$priv_list['page-system-login-logout']['match'][] = "index.php*"; $priv_list['page-interfaces'] = array(); $priv_list['page-interfaces']['name'] = gettext("WebCfg - Interfaces: WAN"); diff --git a/src/etc/inc/priv.inc b/src/etc/inc/priv.inc index b834daa..6315f72 100644 --- a/src/etc/inc/priv.inc +++ b/src/etc/inc/priv.inc @@ -338,7 +338,7 @@ function getAllowedPages($username, &$attributes = array()) { function sort_user_privs($privs) { // Privileges to place first, to redirect properly. - $priority_privs = array("page-dashboard-all", "page-system-login/logout"); + $priority_privs = array("page-dashboard-all", "page-system-login-logout"); $fprivs = array_intersect($privs, $priority_privs); $sprivs = array_diff($privs, $priority_privs); |