-
- |
-
-
- |
-
- '>
-
- '>
-
- |
+
+ |
-
-
+ ' . __('Access Granted') . '', $t['id']);
}
}
+
form_checkbox_cell($t['name'], $t['id']);
+
form_end_row();
}
} else {
- print '| ' . __('No Matching Trees Found') . ' | ';
+ print '| ' . __('No Matching Trees Found') . ' | ';
}
html_end_box(false);
@@ -1983,55 +2008,123 @@ function changeRealm() {
}
}
-function user() {
- global $config, $auth_realms, $actions, $item_rows;
+function create_user_filter() {
+ global $item_rows;
+
+ $all = array('-1' => __('All'));
+ $any = array('-1' => __('Any'));
+ $none = array('0' => __('None'));
+
+ $groups = array_rekey(
+ db_fetch_assoc('SELECT id, description
+ FROM user_auth_group
+ ORDER BY description'),
+ 'id', 'description'
+ );
- /* ================= input validation and session storage ================= */
- $filters = array(
+ $groups = $all + $groups;
+
+ $logins = array(
+ '0' => __esc('All'),
+ '1' => __esc('< 1 Week Ago'),
+ '2' => __esc('< 1 Month Ago'),
+ '3' => __esc('> 1 Month Ago'),
+ '4' => __esc('> 2 Months Ago'),
+ '5' => __esc('> 4 Months Ago'),
+ '6' => __esc('Never')
+ );
+
+ $realms = array(
+ '-1' => __('All'),
+ '0' => __('Local'),
+ '2' => __('Basic'),
+ '3' => __('LDAP/AD'),
+ '4' => __('Domain')
+ );
+
+ return array(
'rows' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'pageset' => true,
- 'default' => '-1'
- ),
- 'realm' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'pageset' => true,
- 'default' => '-1'
- ),
- 'page' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'default' => '1'
- ),
- 'login' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'pageset' => true,
- 'default' => '0'
- ),
- 'filter' => array(
- 'filter' => FILTER_DEFAULT,
- 'pageset' => true,
- 'default' => ''
- ),
- 'group' => array(
- 'filter' => FILTER_CALLBACK,
- 'default' => '-1',
- 'pageset' => true,
- 'options' => array('options' => 'sanitize_search_string')
+ array(
+ 'filter' => array(
+ 'method' => 'textbox',
+ 'friendly_name' => __('Search'),
+ 'filter' => FILTER_DEFAULT,
+ 'placeholder' => __('Enter a search term'),
+ 'size' => '30',
+ 'default' => '',
+ 'pageset' => true,
+ 'max_length' => '120',
+ 'value' => ''
+ ),
+ 'group' => array(
+ 'method' => 'drop_array',
+ 'friendly_name' => __('Group'),
+ 'filter' => FILTER_VALIDATE_INT,
+ 'default' => '-1',
+ 'pageset' => true,
+ 'array' => $groups,
+ 'value' => '-1'
+ ),
+ 'login' => array(
+ 'method' => 'drop_array',
+ 'friendly_name' => __('Last Login'),
+ 'filter' => FILTER_VALIDATE_INT,
+ 'default' => '0',
+ 'pageset' => true,
+ 'array' => $logins,
+ 'value' => '0'
+ ),
+ 'realm' => array(
+ 'method' => 'drop_array',
+ 'friendly_name' => __('Realm'),
+ 'filter' => FILTER_VALIDATE_INT,
+ 'default' => '0',
+ 'pageset' => true,
+ 'array' => $realms,
+ 'value' => '0'
+ ),
+ 'rows' => array(
+ 'method' => 'drop_array',
+ 'friendly_name' => __('Users'),
+ 'filter' => FILTER_VALIDATE_INT,
+ 'default' => '-1',
+ 'pageset' => true,
+ 'array' => $item_rows,
+ 'value' => '-1'
+ )
+ )
),
- 'sort_column' => array(
- 'filter' => FILTER_CALLBACK,
- 'default' => 'username',
- 'options' => array('options' => 'sanitize_search_string')
+ 'buttons' => array(
+ 'go' => array(
+ 'method' => 'submit',
+ 'display' => __('Go'),
+ 'title' => __('Apply filter to table'),
+ ),
+ 'clear' => array(
+ 'method' => 'button',
+ 'display' => __('Clear'),
+ 'title' => __('Reset filter to default values'),
+ )
),
- 'sort_direction' => array(
- 'filter' => FILTER_CALLBACK,
- 'default' => 'ASC',
- 'options' => array('options' => 'sanitize_search_string')
+ 'sort' => array(
+ 'sort_column' => 'username',
+ 'sort_direction' => 'ASC'
)
);
+}
- validate_store_request_vars($filters, 'sess_usera');
- /* ================= input validation ================= */
+function user() {
+ global $config, $auth_realms, $actions, $item_rows;
+
+ $filters = create_user_filter();
+
+ /* create the page filter */
+ $pageFilter = new CactiTableFilter(__('User Management'), 'user_admin.php', 'form_user', 'sess_ua', 'user_admin.php?action=edit');
+
+ $pageFilter->rows_label = __('Users');
+
+ $pageFilter->set_filter_array($filters);
+ $pageFilter->render();
if (get_request_var('rows') == '-1') {
$rows = read_config_option('num_rows_table');
@@ -2039,155 +2132,29 @@ function user() {
$rows = get_request_var('rows');
}
- html_filter_start_box(__('User Management'), 'user_admin.php?tab=general&action=user_edit');
-
- ?>
-
- |
-
-
- |
-
- = 0) {
if (get_request_var('realm') < 4) {
- $sql_where .= ($sql_where != '' ? ' AND ':'WHERE ') . ' ua.realm = ' . get_request_var('realm');
+ $sql_where .= ($sql_where != '' ? ' AND ':'WHERE ') . ' ua.realm = ?';
+ $sql_params[] = get_request_var('realm');
} else {
$sql_where .= ($sql_where != '' ? ' AND ':'WHERE ') . ' ua.realm > 3';
}
}
if (get_request_var('group') > 0) {
- $sql_where .= ($sql_where != '' ? ' AND ':'WHERE ') . ' ug.group_id = ' . get_request_var('group');
+ $sql_where .= ($sql_where != '' ? ' AND ':'WHERE ') . ' ug.group_id = ?';
+ $sql_params[] = get_request_var('group');
}
if (get_request_var('login') > 0) {
@@ -2206,7 +2173,7 @@ function clearFilter() {
}
}
- $total_rows = db_fetch_cell("SELECT
+ $total_rows = db_fetch_cell_prepared("SELECT
COUNT(DISTINCT ua.id)
FROM user_auth AS ua
LEFT JOIN (
@@ -2217,12 +2184,13 @@ function clearFilter() {
ON ua.id = ul.user_id
LEFT JOIN user_auth_group_members AS ug
ON ua.id = ug.user_id
- $sql_where");
+ $sql_where",
+ $sql_params);
$sql_order = get_order_string();
$sql_limit = ' LIMIT ' . ($rows * (get_request_var('page') - 1)) . ',' . $rows;
- $user_list = db_fetch_assoc("SELECT ua.id, ua.username, ua.full_name,
+ $user_list = db_fetch_assoc_prepared("SELECT ua.id, ua.username, ua.full_name,
ua.realm, ua.enabled, ua.policy_graphs, ua.policy_hosts, ua.policy_graph_templates,
time, MAX(UNIX_TIMESTAMP(time)) as dtime
FROM user_auth AS ua
@@ -2237,7 +2205,47 @@ function clearFilter() {
$sql_where
GROUP BY ua.id
$sql_order
- $sql_limit");
+ $sql_limit",
+ $sql_params);
+
+ $display_text = array(
+ 'username' => array(
+ 'display' => __('User Name'),
+ 'sort' => 'ASC'
+ ),
+ 'id' => array(
+ 'display' => __('User ID'),
+ 'sort' => 'ASC'
+ ),
+ 'full_name' => array(
+ 'display' => __('Full Name'),
+ 'sort' => 'ASC'
+ ),
+ 'enabled' => array(
+ 'display' => __('Enabled'),
+ 'sort' => 'ASC'
+ ),
+ 'realm' => array(
+ 'display' => __('Realm'),
+ 'sort' => 'ASC'
+ ),
+ 'policy_graphs' => array(
+ 'display' => __('Graph Policy'),
+ 'sort' => 'ASC'
+ ),
+ 'policy_hosts' => array(
+ 'display' => __('Device Policy'),
+ 'sort' => 'ASC'
+ ),
+ 'policy_graph_templates' => array(
+ 'display' => __('Template Policy'),
+ 'sort' => 'ASC'
+ ),
+ 'dtime' => array(
+ 'display' => __('Last Login'),
+ 'sort' => 'DESC'
+ )
+ );
$nav = html_nav_bar('user_admin.php?filter=' . get_request_var('filter'), MAX_DISPLAY_PAGES, get_request_var('page'), $rows, $total_rows, 9, __('Users'), 'page', 'main');
@@ -2247,18 +2255,6 @@ function clearFilter() {
html_start_box('', '100%', '', '3', 'center', '');
- $display_text = array(
- 'username' => array(__('User Name'), 'ASC'),
- 'id' => array(__('User ID'), 'ASC'),
- 'full_name' => array(__('Full Name'), 'ASC'),
- 'enabled' => array(__('Enabled'), 'ASC'),
- 'realm' => array(__('Realm'), 'ASC'),
- 'policy_graphs' => array(__('Graph Policy'), 'ASC'),
- 'policy_hosts' => array(__('Device Policy'), 'ASC'),
- 'policy_graph_templates' => array(__('Template Policy'), 'ASC'),
- 'dtime' => array(__('Last Login'), 'DESC')
- );
-
html_header_sort_checkbox($display_text, get_request_var('sort_column'), get_request_var('sort_direction'), false);
if (cacti_sizeof($user_list)) {
@@ -2318,787 +2314,221 @@ function clearFilter() {
form_end();
}
-function process_graph_request_vars() {
- /* ================= input validation and session storage ================= */
- $filters = array(
- 'rows' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'pageset' => true,
- 'default' => read_config_option('num_rows_table')
- ),
- 'page' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'default' => '1'
- ),
- 'filter' => array(
- 'filter' => FILTER_DEFAULT,
- 'pageset' => true,
- 'default' => ''
- ),
- 'graph_template_id' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'pageset' => true,
- 'default' => '-1',
- ),
- 'associated' => array(
- 'filter' => FILTER_VALIDATE_REGEXP,
- 'options' => array('options' => array('regexp' => '(true|false)')),
- 'pageset' => true,
- 'default' => 'true'
- )
- );
-
- validate_store_request_vars($filters, 'sess_uag');
- /* ================= input validation ================= */
-}
-
-function process_group_request_vars() {
- /* ================= input validation and session storage ================= */
- $filters = array(
- 'rows' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'pageset' => true,
- 'default' => read_config_option('num_rows_table')
- ),
- 'page' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'default' => '1'
- ),
- 'filter' => array(
- 'filter' => FILTER_DEFAULT,
- 'pageset' => true,
- 'default' => ''
- ),
- 'associated' => array(
- 'filter' => FILTER_VALIDATE_REGEXP,
- 'options' => array('options' => array('regexp' => '(true|false)')),
- 'pageset' => true,
- 'default' => 'true'
- )
- );
-
- validate_store_request_vars($filters, 'sess_uagr');
- /* ================= input validation ================= */
-}
-
-function process_device_request_vars() {
- /* ================= input validation and session storage ================= */
- $filters = array(
- 'rows' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'pageset' => true,
- 'default' => read_config_option('num_rows_table')
- ),
- 'page' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'default' => '1'
- ),
- 'filter' => array(
- 'filter' => FILTER_DEFAULT,
- 'pageset' => true,
- 'default' => ''
- ),
- 'host_template_id' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'pageset' => true,
- 'default' => '-1',
- ),
- 'associated' => array(
- 'filter' => FILTER_VALIDATE_REGEXP,
- 'options' => array('options' => array('regexp' => '(true|false)')),
- 'pageset' => true,
- 'default' => 'true'
- )
- );
+function create_graphs_filter() {
+ global $item_rows;
- validate_store_request_vars($filters, 'sess_uad');
- /* ================= input validation ================= */
-}
+ $any = array('-1' => __('Any'));
+ $none = array('0' => __('None'));
-function process_template_request_vars() {
- /* ================= input validation and session storage ================= */
- $filters = array(
- 'rows' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'pageset' => true,
- 'default' => read_config_option('num_rows_table')
- ),
- 'page' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'default' => '1'
- ),
- 'filter' => array(
- 'filter' => FILTER_DEFAULT,
- 'pageset' => true,
- 'default' => ''
- ),
- 'graph_template_id' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'pageset' => true,
- 'default' => '-1',
- ),
- 'associated' => array(
- 'filter' => FILTER_VALIDATE_REGEXP,
- 'options' => array('options' => array('regexp' => '(true|false)')),
- 'pageset' => true,
- 'default' => 'true'
- )
+ $graph_templates = array_rekey(
+ db_fetch_assoc('SELECT DISTINCT gt.id, gt.name
+ FROM graph_templates AS gt
+ INNER JOIN graph_local AS gl
+ ON gl.graph_template_id = gt.id
+ ORDER BY name'),
+ 'id', 'name'
);
- validate_store_request_vars($filters, 'sess_uate');
- /* ================= input validation ================= */
-}
+ $graph_templates = $any + $none + $graph_templates;
-function process_tree_request_vars() {
- /* ================= input validation and session storage ================= */
- $filters = array(
+ return array(
'rows' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'pageset' => true,
- 'default' => read_config_option('num_rows_table')
- ),
- 'page' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'default' => '1'
- ),
- 'filter' => array(
- 'filter' => FILTER_DEFAULT,
- 'pageset' => true,
- 'default' => ''
- ),
- 'graph_template_id' => array(
- 'filter' => FILTER_VALIDATE_INT,
- 'pageset' => true,
- 'default' => '-1',
+ array(
+ 'filter' => array(
+ 'method' => 'textbox',
+ 'friendly_name' => __('Search'),
+ 'filter' => FILTER_DEFAULT,
+ 'placeholder' => __('Enter a search term'),
+ 'size' => '30',
+ 'default' => '',
+ 'pageset' => true,
+ 'max_length' => '120',
+ 'value' => ''
+ ),
+ 'graph_template_id' => array(
+ 'method' => 'drop_array',
+ 'friendly_name' => __('Template'),
+ 'filter' => FILTER_VALIDATE_INT,
+ 'default' => '0',
+ 'pageset' => true,
+ 'array' => $graph_templates,
+ 'value' => '0'
+ ),
+ 'rows' => array(
+ 'method' => 'drop_array',
+ 'friendly_name' => __('Graphs'),
+ 'filter' => FILTER_VALIDATE_INT,
+ 'default' => '-1',
+ 'pageset' => true,
+ 'array' => $item_rows,
+ 'value' => '-1'
+ )
+ )
),
- 'associated' => array(
- 'filter' => FILTER_VALIDATE_REGEXP,
- 'options' => array('options' => array('regexp' => '(true|false)')),
- 'pageset' => true,
- 'default' => 'true'
+ 'buttons' => array(
+ 'go' => array(
+ 'method' => 'submit',
+ 'display' => __('Go'),
+ 'title' => __('Apply filter to table'),
+ ),
+ 'clear' => array(
+ 'method' => 'button',
+ 'display' => __('Clear'),
+ 'title' => __('Reset filter to default values'),
+ )
)
);
-
- validate_store_request_vars($filters, 'sess_uatr');
- /* ================= input validation ================= */
}
function graph_filter($header_label) {
global $config, $item_rows;
- html_filter_start_box(__esc('Graph Permissions %s', $header_label));
+ $filters = create_device_filter();
- ?>
-
- |
-
-
- |
-
-
-
- |
-
-
- |
-
- array(
+ array(
+ 'filter' => array(
+ 'method' => 'textbox',
+ 'friendly_name' => __('Search'),
+ 'filter' => FILTER_DEFAULT,
+ 'placeholder' => __('Enter a search term'),
+ 'size' => '30',
+ 'default' => '',
+ 'pageset' => true,
+ 'max_length' => '120',
+ 'value' => ''
+ ),
+ 'host_template_id' => array(
+ 'method' => 'drop_array',
+ 'friendly_name' => __('Template'),
+ 'filter' => FILTER_VALIDATE_INT,
+ 'default' => '0',
+ 'pageset' => true,
+ 'array' => $host_templates,
+ 'value' => '0'
+ ),
+ 'rows' => array(
+ 'method' => 'drop_array',
+ 'friendly_name' => __('Devices'),
+ 'filter' => FILTER_VALIDATE_INT,
+ 'default' => '-1',
+ 'pageset' => true,
+ 'array' => $item_rows,
+ 'value' => '-1'
+ )
+ )
+ ),
+ 'buttons' => array(
+ 'go' => array(
+ 'method' => 'submit',
+ 'display' => __('Go'),
+ 'title' => __('Apply filter to table'),
+ ),
+ 'clear' => array(
+ 'method' => 'button',
+ 'display' => __('Clear'),
+ 'title' => __('Reset filter to default values'),
+ )
+ )
+ );
}
function device_filter($header_label) {
global $config, $item_rows;
- html_filter_start_box(__esc('Devices Permission %s', $header_label));
-
- ?>
-
- |
-
-
- |
-
- set_filter_array($filters);
+ $pageFilter->render();
- html_end_box();
+ form_hidden_box('action', 'user_edit', '');
+ form_hidden_box('tab', 'permste', '');
+ form_hidden_box('id', get_request_var('id'), '');
}
function template_filter($header_label) {
global $config, $item_rows;
- html_filter_start_box(__esc('Template Permission %s', $header_label));
+ /* create the page filter */
+ $pageFilter = new CactiTableFilter(__('Template Permissions %s', $header_label), 'user_admin.php?action=user_edit&tab=permste&id=' . get_request_var('id'), 'form_template', 'sess_ua_te');
- ?>
-
- |
-
-
- |
-
-
-
- |
-
-
- |
-
-
-
- |
-
-
- |
-
-
|