diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-03-25 08:59:29 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-03-25 08:59:29 -0300 |
| commit | 152ab4d0c036889d5d983cef0f612c2dcf211e7b (patch) | |
| tree | 2120aa2834d2b0218a8bede4629aaac4acfbd5ec /etc/inc/priv.defs.inc | |
| parent | 54bdff758f68e2e1b1ebd42b8b0b629b68ed1a3d (diff) | |
| parent | d93ee937f2305f06148d972be92224a2a52ba9e5 (diff) | |
| download | pfsense-152ab4d0c036889d5d983cef0f612c2dcf211e7b.zip pfsense-152ab4d0c036889d5d983cef0f612c2dcf211e7b.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/interfaces.inc
etc/inc/priv.defs.inc
etc/inc/shaper.inc
etc/inc/system.inc
Diffstat (limited to 'etc/inc/priv.defs.inc')
| -rw-r--r-- | etc/inc/priv.defs.inc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/etc/inc/priv.defs.inc b/etc/inc/priv.defs.inc index 81eda0d..335c681 100644 --- a/etc/inc/priv.defs.inc +++ b/etc/inc/priv.defs.inc @@ -186,11 +186,11 @@ $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-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*"; +$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-diagnostics-traceroute'] = array(); $priv_list['page-diagnostics-traceroute']['name'] = gettext("WebCfg - Diagnostics: Traceroute page"); @@ -198,6 +198,12 @@ $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-command'] = array(); $priv_list['page-diagnostics-command']['name'] = gettext("WebCfg - Diagnostics: Command page"); $priv_list['page-diagnostics-command']['descr'] = gettext("Allow access to the 'Diagnostics: Command' page."); @@ -1111,12 +1117,6 @@ $priv_list['page-system-groupmanager']['descr'] = gettext("Allow access to the ' $priv_list['page-system-groupmanager']['match'] = array(); $priv_list['page-system-groupmanager']['match'][] = "system_groupmanager.php*"; -$priv_list['page-diag-showbogons'] = array(); -$priv_list['page-diag-showbogons']['name'] = gettext("WebCfg - Diagnostics: System Activity"); -$priv_list['page-diag-showbogons']['descr'] = gettext("Allows access to the 'Diagnostics: Show Bogons' page"); -$priv_list['page-diag-showbogons']['match'] = array(); -$priv_list['page-diag-showbogons']['match'][] = "diag_showbogons.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."); |
