diff --git a/aggregate_templates.php b/aggregate_templates.php index 372c5f178..3ad83bc8b 100644 --- a/aggregate_templates.php +++ b/aggregate_templates.php @@ -642,7 +642,7 @@ function aggregate_template() { } form_alternate_row('line' . $template['id'], true, $disabled); - form_selectable_cell("" . ((get_request_var_request('filter') != '') ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($template['name'])) : htmlspecialchars($template['name'])) . '', $template['id']); + form_selectable_cell("" . ((get_request_var_request('filter') != '') ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($template['name'])) : htmlspecialchars($template['name'])) . '', $template['id']); form_selectable_cell($disabled ? 'No':'Yes', $template['id'], '', 'text-align:right'); form_selectable_cell(number_format($template['graphs']), $template['id'], '', 'text-align:right;'); form_selectable_cell(((get_request_var_request('filter') != '') ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($template['graph_template_name'])) : htmlspecialchars($template['graph_template_name'])), $template['id']); diff --git a/automation_graph_rules.php b/automation_graph_rules.php index f8145fddd..126308757 100644 --- a/automation_graph_rules.php +++ b/automation_graph_rules.php @@ -846,8 +846,8 @@ function automation_graph_rules() { $i = 0; if (sizeof($automation_graph_rules_list) > 0) { foreach ($automation_graph_rules_list as $automation_graph_rules) { - $snmp_query_name = ((empty($automation_graph_rules['snmp_query_name'])) ? 'None' : $automation_graph_rules['snmp_query_name']); - $graph_type_name = ((empty($automation_graph_rules['graph_type_name'])) ? 'None' : $automation_graph_rules['graph_type_name']); + $snmp_query_name = ((empty($automation_graph_rules['snmp_query_name'])) ? 'None' : htmlspecialchars($automation_graph_rules['snmp_query_name'])); + $graph_type_name = ((empty($automation_graph_rules['graph_type_name'])) ? 'None' : htmlspecialchars($automation_graph_rules['graph_type_name'])); form_alternate_row_color($colors['alternate'], $colors['light'], $i, 'line' . $automation_graph_rules['id']); $i++; diff --git a/automation_tree_rules.php b/automation_tree_rules.php index 4ba3b43bc..734b3e98a 100644 --- a/automation_tree_rules.php +++ b/automation_tree_rules.php @@ -868,7 +868,7 @@ function automation_tree_rules() { $tree_host_grouping_type = ((empty($host_group_types{$automation_tree_rule['host_grouping_type']})) ? '' : $host_group_types{$automation_tree_rule['host_grouping_type']}); form_alternate_row('line' . $automation_tree_rule['id'], true); - form_selectable_cell("" . (get_request_var_request('filter') != '' ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", $automation_tree_rule['name']) : $automation_tree_rule['name']) . '', $automation_tree_rule['id']); + form_selectable_cell("" . (get_request_var_request('filter') != '' ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($automation_tree_rule['name'])) : htmlspecialchars($automation_tree_rule['name'])) . '', $automation_tree_rule['id']); form_selectable_cell($automation_tree_rule['id'], $automation_tree_rule['id'], '', 'text-align:right'); form_selectable_cell($automation_tree_rule['tree_name'], $automation_tree_rule['id']); form_selectable_cell($subtree_name, $automation_tree_rule['id']); diff --git a/data_queries.php b/data_queries.php index 3c97404d6..f2fea2ad8 100644 --- a/data_queries.php +++ b/data_queries.php @@ -950,7 +950,7 @@ function data_query() { form_selectable_cell($disabled ? 'No':'Yes', $snmp_query['id'], '', 'text-align:right'); form_selectable_cell(number_format($snmp_query['graphs']), $snmp_query['id'], '', 'text-align:right'); form_selectable_cell(number_format($snmp_query['templates']), $snmp_query['id'], '', 'text-align:right'); - form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", $snmp_query['data_input_method']) : $snmp_query['data_input_method']), $snmp_query['id']); + form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", htmlspecialchars($snmp_query['data_input_method'])) : htmlspecialchars($snmp_query['data_input_method'])), $snmp_query['id']); form_selectable_cell($snmp_query['id'], $snmp_query['id'], '', 'text-align:right;'); form_checkbox_cell($snmp_query['name'], $snmp_query['id'], $disabled); form_end_row(); diff --git a/data_sources.php b/data_sources.php index 1f513dcfa..bcb4a095b 100644 --- a/data_sources.php +++ b/data_sources.php @@ -1370,7 +1370,7 @@ function ds() { $poller_interval = ((isset($poller_intervals[$data_source['local_data_id']])) ? $poller_intervals[$data_source['local_data_id']] : 0); form_alternate_row('line' . $data_source['local_data_id'], true); - form_selectable_cell("" . ((get_request_var_request('filter') != '') ? preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", title_trim(htmlspecialchars($data_source['name_cache']), read_config_option('max_title_length'))) : title_trim(htmlspecialchars($data_source['name_cache']), read_config_option('max_title_length'))) . '', $data_source['local_data_id']); + form_selectable_cell("" . ((get_request_var_request('filter') != '') ? preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", title_trim(htmlspecialchars($data_source['name_cache']), read_config_option('max_title_length'))) : title_trim(htmlspecialchars($data_source['name_cache']), read_config_option('max_title_length'))) . '', $data_source['local_data_id']); form_selectable_cell($data_source['local_data_id'], $data_source['local_data_id'], '', 'text-align:right'); form_selectable_cell($data_input_name, $data_source['local_data_id']); form_selectable_cell(get_poller_interval($poller_interval), $data_source['local_data_id']); diff --git a/graphs.php b/graphs.php index 9c591c86f..dba2386ea 100644 --- a/graphs.php +++ b/graphs.php @@ -1724,7 +1724,7 @@ function graph() { /* we're escaping strings here, so no need to escape them on form_selectable_cell */ $template_name = ((empty($graph['name'])) ? 'None' : htmlspecialchars($graph['name'])); form_alternate_row('line' . $graph['local_graph_id'], true); - form_selectable_cell("" . ((get_request_var_request('filter') != '') ? preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", title_trim(htmlspecialchars($graph['title_cache']), read_config_option('max_title_length'))) : title_trim(htmlspecialchars($graph['title_cache']), read_config_option('max_title_length'))) . '', $graph['local_graph_id']); + form_selectable_cell("" . ((get_request_var_request('filter') != '') ? preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", title_trim(htmlspecialchars($graph['title_cache']), read_config_option('max_title_length'))) : title_trim(htmlspecialchars($graph['title_cache']), read_config_option('max_title_length'))) . '', $graph['local_graph_id']); form_selectable_cell($graph['local_graph_id'], $graph['local_graph_id'], '', 'text-align:right'); form_selectable_cell(((get_request_var_request('filter') != '') ? preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", $template_name) : $template_name), $graph['local_graph_id']); form_selectable_cell($graph['height'] . 'x' . $graph['width'], $graph['local_graph_id']); diff --git a/lib/api_automation.php b/lib/api_automation.php index 5b591e57f..672fc1830 100644 --- a/lib/api_automation.php +++ b/lib/api_automation.php @@ -266,10 +266,10 @@ function display_matching_hosts($rule, $rule_type, $url) { foreach ($hosts as $host) { form_alternate_row('line' . $host['host_id'], true); form_selectable_cell("" . - (strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", $host['description']) : $host['description']) . '', $host['host_id']); - form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", $host['hostname']) : $host['hostname']), $host['host_id']); + (strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($host['description'])) : htmlspecialchars($host['description'])) . '', $host['host_id']); + form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($host['hostname'])) : htmlspecialchars($host['hostname'])), $host['host_id']); form_selectable_cell(get_colored_device_status(($host['disabled'] == 'on' ? true : false), $host['status']), $host['host_id']); - form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", $host['host_template_name']) : $host['host_template_name']), $host['host_id']); + form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($host['host_template_name'])) : htmlspecialchars($host['host_template_name'])), $host['host_id']); form_selectable_cell(round(($host['host_id']), 2), $host['host_id']); form_selectable_cell((isset($host_graphs[$host['host_id']]) ? $host_graphs[$host['host_id']] : 0), $host['host_id']); form_selectable_cell((isset($host_data_sources[$host['host_id']]) ? $host_data_sources[$host['host_id']] : 0), $host['host_id']); @@ -527,16 +527,16 @@ function display_matching_graphs($rule, $rule_type, $url) { if (sizeof($graph_list)) { foreach ($graph_list as $graph) { - $template_name = ((empty($graph['name'])) ? 'None' : $graph['name']); + $template_name = ((empty($graph['name'])) ? 'None' : htmlspecialchars($graph['name'])); form_alternate_row_color('line' . $graph['local_graph_id'], true); form_selectable_cell("" . - (strlen(get_request_var_request('filter')) ? reg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", $graph['description']) : $graph['description']) . '', $graph['host_id']); - form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", $graph['hostname']) : $graph['hostname']), $graph['host_id']); - form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", $graph['host_template_name']) : $graph['host_template_name']), $graph['host_id']); + (strlen(get_request_var_request('filter')) ? reg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($graph['description'])) : htmlspecialchars($graph['description'])) . '', $graph['host_id']); + form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($graph['hostname'])) : htmlspecialchars($graph['hostname'])), $graph['host_id']); + form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($graph['host_template_name'])) : htmlspecialchars($graph['host_template_name'])), $graph['host_id']); form_selectable_cell(get_colored_device_status(($graph['disabled'] == 'on' ? true : false), $graph['status']), $graph['host_id']); - form_selectable_cell("" . ((get_request_var_request('filter') != '') ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", title_trim($graph['title_cache'], read_config_option('max_title_graph'))) : title_trim($graph['title_cache'], read_config_option('max_title_graph'))) . '', $graph['local_graph_id']); + form_selectable_cell("" . ((get_request_var_request('filter') != '') ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", title_trim(htmlspecialchars($graph['title_cache']), read_config_option('max_title_graph'))) : title_trim(htmlspecialchars($graph['title_cache']), read_config_option('max_title_graph'))) . '', $graph['local_graph_id']); form_selectable_cell($graph['local_graph_id'], $graph['local_graph_id']); form_selectable_cell(((get_request_var_request('filter') != '') ? preg_replace('(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", $template_name) : $template_name) . '', $graph['local_graph_id']); form_end_row(); @@ -1017,9 +1017,9 @@ function display_matching_trees ($rule_id, $rule_type, $item, $url) { form_alternate_row('line' . $template['host_id'], true); form_selectable_cell("" . - (strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", $template['description']) : $template['description']) . '', $template['host_id']); - form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", $template['hostname']) : $template['hostname']), $template['host_id']); - form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", $template['host_template_name']) : $template['host_template_name']), $template['host_id']); + (strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($template['description'])) : htmlspecialchars($template['description'])) . '', $template['host_id']); + form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($template['hostname'])) : htmlspecialchars($template['hostname'])), $template['host_id']); + form_selectable_cell((strlen(get_request_var_request('filter')) ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($template['host_template_name'])) : htmlspecialchars($template['host_template_name'])), $template['host_id']); form_selectable_cell(get_colored_device_status(($template['disabled'] == 'on' ? true : false), $template['status']), $template['host_id']); form_selectable_cell($template['source'], $template['host_id']); form_selectable_cell($repl, $template['host_id']); diff --git a/lib/html_reports.php b/lib/html_reports.php index 09762b0d0..c26f5b13e 100644 --- a/lib/html_reports.php +++ b/lib/html_reports.php @@ -1497,7 +1497,7 @@ function reports() { foreach ($reports_list as $report) { form_alternate_row('line' . $report['id'], true); - form_selectable_cell("" . ((get_request_var_request('filter') != '') ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", $report['name']) : $report['name']) . '', $report['id']); + form_selectable_cell("" . (get_request_var_request('filter') != '' ? preg_replace('/(' . preg_quote(get_request_var_request('filter')) . ')/i', "\\1", htmlspecialchars($report['name'])) : htmlspecialchars($report['name'])) . '', $report['id']); if (is_reports_admin()) form_selectable_cell($report['full_name'], $report['id']); $interval = 'Every ' . $report['count'] . ' ' . $reports_interval[$report['intrvl']]; diff --git a/managers.php b/managers.php index 183a7c13e..75ecb6b2f 100644 --- a/managers.php +++ b/managers.php @@ -250,8 +250,8 @@ function manager(){ $i = 0; if (sizeof($managers) > 0) { foreach ($managers as $item) { - $description = (strlen(get_request_var_request('filter')) ? (preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", $item['description'])) : $item['description']); - $hostname = (strlen(get_request_var_request('filter')) ? (preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", $item['hostname'])): $item['hostname']); + $description = (strlen(get_request_var_request('filter')) ? (preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", htmlspecialchars($item['description']))) : htmlspecialchars($item['description'])); + $hostname = (strlen(get_request_var_request('filter')) ? (preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", htmlspecialchars($item['hostname']))): htmlspecialchars($item['hostname'])); form_alternate_row('line' . $item['id'], false); form_selectable_cell( '' . $description . '', $item['id']); form_selectable_cell( $item['id'], $item['id']); @@ -589,9 +589,9 @@ function manager_notifications($id){ if (sizeof($snmp_cache) > 0) { foreach ($snmp_cache as $item) { $row_id = $item['mib'] . '__' . $item['name']; - $oid = (strlen(get_request_var_request('filter')) ? (preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", $item['oid'])) : $item['oid']); - $name = (strlen(get_request_var_request('filter')) ? (preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", $item['name'])): $item['name']); - $mib = (strlen(get_request_var_request('filter')) ? (preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", $item['mib'])): $item['mib']); + $oid = (strlen(get_request_var_request('filter')) ? (preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", htmlspecialchars($item['oid']))) : htmlspecialchars($item['oid'])); + $name = (strlen(get_request_var_request('filter')) ? (preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", htmlspecialchars($item['name']))): htmlspecialchars($item['name'])); + $mib = (strlen(get_request_var_request('filter')) ? (preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", htmlspecialchars($item['mib']))): htmlspecialchars($item['mib'])); form_alternate_row('line' . $row_id, false); if($item['description']) { @@ -771,7 +771,7 @@ function manager_logs($id) { if (sizeof($logs)) { foreach ($logs as $item) { - $varbinds = (strlen(get_request_var_request('filter')) ? (preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", $item['varbinds'])): $item['varbinds']); + $varbinds = (strlen(get_request_var_request('filter')) ? (preg_replace('/(' . preg_quote(get_request_var_request('filter'), '/') . ')/i', "\\1", htmlspecialchars($item['varbinds']))): htmlspecialchars($item['varbinds'])); form_alternate_row('line' . $item['id'], true); print "