Move these permissions to user.priv.inc so they don't get blasted when priv.defs.inc is automatically regenerated.

Conflicts:

	etc/inc/priv.defs.inc

2 files changed, 18 insertions, 18 deletions

diff --git a/etc/inc/priv.defs.inc b/etc/inc/priv.defs.inc
index 8f95611..ed01678 100644
--- a/etc/inc/priv.defs.inc
+++ b/etc/inc/priv.defs.inc
@@ -12,18 +12,6 @@ $priv_list['page-all']['descr'] = gettext("Allow access to all pages");
 $priv_list['page-all']['match'] = array();
 $priv_list['page-all']['match'][] = "*";
 
-$priv_list['page-dashboard-all'] = array();
-$priv_list['page-dashboard-all']['name'] = gettext("WebCfg - Dashboard (all)");
-$priv_list['page-dashboard-all']['descr'] = gettext("Allow access to all pages required for the dashboard.");
-$priv_list['page-dashboard-all']['match'] = array();
-$priv_list['page-dashboard-all']['match'][] = "index.php*";
-$priv_list['page-dashboard-all']['match'][] = "*.widget.php*";
-$priv_list['page-dashboard-all']['match'][] = "graph.php*";
-$priv_list['page-dashboard-all']['match'][] = "graph_cpu.php*";
-$priv_list['page-dashboard-all']['match'][] = "getstats.php*";
-$priv_list['page-dashboard-all']['match'][] = "ifstats.php*";
-$priv_list['page-dashboard-all']['match'][] = "diag_logs_filter_dynamic.php*";
-
 $priv_list['page-status-carp'] = array();
 $priv_list['page-status-carp']['name'] = gettext("WebCfg - Status: CARP page");
 $priv_list['page-status-carp']['descr'] = gettext("Allow access to the 'Status: CARP' page.");
@@ -438,12 +426,6 @@ $priv_list['page-system-login/logout']['descr'] = gettext("Allow access to the '
 $priv_list['page-system-login/logout']['match'] = array();
 $priv_list['page-system-login/logout']['match'][] = "index.php*";
 
-$priv_list['page-system-directwidget'] = array();
-$priv_list['page-system-directwidget']['name'] = "WebCfg - System: Direct access to dashboard widgets.";
-$priv_list['page-system-directwidget']['descr'] = "Allow direct access to the Dashboard widget pages, required for some widgets using AJAX.";
-$priv_list['page-system-directwidget']['match'] = array();
-$priv_list['page-system-directwidget']['match'][] = "*.widget.php*";
-
 $priv_list['page-interfaces'] = array();
 $priv_list['page-interfaces']['name'] = gettext("WebCfg - Interfaces: WAN page");
 $priv_list['page-interfaces']['descr'] = gettext("Allow access to the 'Interfaces' page.");
diff --git a/etc/inc/priv/user.priv.inc b/etc/inc/priv/user.priv.inc
index bfc7f59..8df1c1a 100644
--- a/etc/inc/priv/user.priv.inc
+++ b/etc/inc/priv/user.priv.inc
@@ -2,6 +2,24 @@
 
 global $priv_list;
 
+$priv_list['page-dashboard-all'] = array();
+$priv_list['page-dashboard-all']['name'] = "WebCfg - Dashboard (all)";
+$priv_list['page-dashboard-all']['descr'] = "Allow access to all pages required for the dashboard.";
+$priv_list['page-dashboard-all']['match'] = array();
+$priv_list['page-dashboard-all']['match'][] = "index.php*";
+$priv_list['page-dashboard-all']['match'][] = "*.widget.php*";
+$priv_list['page-dashboard-all']['match'][] = "graph.php*";
+$priv_list['page-dashboard-all']['match'][] = "graph_cpu.php*";
+$priv_list['page-dashboard-all']['match'][] = "getstats.php*";
+$priv_list['page-dashboard-all']['match'][] = "ifstats.php*";
+$priv_list['page-dashboard-all']['match'][] = "diag_logs_filter_dynamic.php*";
+
+$priv_list['page-dashboard-widgets'] = array();
+$priv_list['page-dashboard-widgets']['name'] = "WebCfg - System: Direct access to dashboard widgets.";
+$priv_list['page-dashboard-widgets']['descr'] = "Allow direct access to the Dashboard widget pages, required for some widgets using AJAX.";
+$priv_list['page-dashboard-widgets']['match'] = array();
+$priv_list['page-dashboard-widgets']['match'][] = "*.widget.php*";
+
 $priv_list['user-shell-access'] = array();
 $priv_list['user-shell-access']['name']  = "User - System - Shell account access";
 $priv_list['user-shell-access']['descr'] = "Indicates whether the user is able to login for ".