diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 95f8dc5812..8b1ea71400 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2012-09-04 Juan Manuel Ramon + + * include/functions_graph.php + include/graphs/fgraph.php: Fixed minor bugs. + + * operation/agentes/stat_win.php: Url built with ui_get_full_url + function. + + godmode/reporting/reporting_builder.list_items.php + godmode/reporting/reporting_builder.php: Fixed bug in list element + view due to bad js action of the form. + 2012-09-04 Miguel de Dios * godmode/reporting/graph_builder.php, diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php index a54795bc64..e68351d209 100644 --- a/pandora_console/godmode/reporting/reporting_builder.list_items.php +++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php @@ -342,8 +342,8 @@ html_print_table($table); ui_pagination ($countItems, 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report=' . $idReport . $urlFilter); echo "
"; - echo "
"; + method='post' onSubmit='return added_ids_deleted_items_to_hidden_input();'>"; + echo "
"; html_print_input_hidden('ids_items_to_delete', ''); html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"'); echo "
"; @@ -453,6 +453,8 @@ function message_check_delete_items() { } function added_ids_deleted_items_to_hidden_input() { + message_check_delete_items(); + var ids = ''; var first = true; diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 99ef4e6f67..b54b3ff850 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -476,6 +476,7 @@ switch ($action) { $description = get_parameter('description'); $type_access_selected = get_parameter('type_access', 'group_view'); $id_group_edit_param = (int)get_parameter('id_group_edit', 0); + $report_id_user = get_parameter('report_id_user'); switch ($type_access_selected) { case 'group_view': diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index ae339e0cd1..022b8b5522 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -244,6 +244,7 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events, $flash_chart = $config['flash_charts']; // Get event data (contains alert data too) + $events = array(); if ($show_events == 1 || $show_alerts == 1) { $events = db_get_all_rows_filter ('tevento', array ('id_agentmodule' => $agent_module_id, @@ -328,6 +329,7 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events, } // Get baseline data + $baseline_data = array(); if ($baseline) { $baseline_data = array (); if ($baseline == 1) { diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php index 002b276cf7..16317b2b19 100755 --- a/pandora_console/include/graphs/fgraph.php +++ b/pandora_console/include/graphs/fgraph.php @@ -191,7 +191,7 @@ function slicesbar_graph($chart_data, $period, $width, $height, $colors, $font, function vbar_graph($flash_chart, $chart_data, $width, $height, $color = array(), $legend = array(), $xaxisname = "", $yaxisname = "", $homedir="", $water_mark = '', $font = '', $font_size = '', $force_steps = true, $ttl = 1, $reduce_data_columns = false, - $adapt_key) { + $adapt_key = '') { setup_watermark($water_mark, $water_mark_file, $water_mark_url); @@ -245,7 +245,7 @@ function area_graph($flash_chart, $chart_data, $width, $height, $color, $legend, } if (empty($chart_data)) { - return ''; + return html_print_image($no_data_image, true, array("border" => '0')); } if($flash_chart) { @@ -277,7 +277,7 @@ function stacked_area_graph($flash_chart, $chart_data, $width, $height, $color, setup_watermark($water_mark, $water_mark_file, $water_mark_url); if (empty($chart_data)) { - return ''; + return html_print_image($no_data_image, true, array("border" => '0')); } if($flash_chart) { @@ -312,7 +312,7 @@ function stacked_line_graph($flash_chart, $chart_data, $width, $height, $color, setup_watermark($water_mark, $water_mark_file, $water_mark_url); if (empty($chart_data)) { - return ''; + return html_print_image($no_data_image, true, array("border" => '0')); } if($flash_chart) { @@ -347,7 +347,7 @@ function line_graph($flash_chart, $chart_data, $width, $height, $color, $legend, setup_watermark($water_mark, $water_mark_file, $water_mark_url); if (empty($chart_data)) { - return ''; + return html_print_image($no_data_image, true, array("border" => '0')); } if($flash_chart) { @@ -374,7 +374,7 @@ function line_graph($flash_chart, $chart_data, $width, $height, $color, $legend, function kiviat_graph($graph_type, $flash_chart, $chart_data, $width, $height, $no_data_image, $ttl = 1, $homedir="") { if (empty($chart_data)) { - return ''; + return html_print_image($no_data_image, true, array("border" => '0')); } $graph = array(); diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 1daf940674..9ea3fc9ee8 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -226,11 +226,7 @@ $label = base64_decode(get_parameter('label', '')); else $date = $utime; - $urlImage = 'http://'; - if ($config['https']) { - $urlImage = 'https://'; - } - $urlImage .= $_SERVER['SERVER_NAME'] . $config['homeurl'] . '/'; + $urlImage = ui_get_full_url(false); // log4x doesnt support flash yet //