From f4e1cee998546aa9a322fadb10cf02c4d9297c3a Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Tue, 27 Jan 2015 15:14:53 +0100 Subject: [PATCH] Fixed problems with view of data when click in binary image in tree view, monitor detail and list of monitors --- pandora_console/include/ajax/module.php | 14 ++++++-------- pandora_console/operation/agentes/datos_agente.php | 10 ++++------ .../operation/agentes/status_monitor.php | 6 ++---- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index 5dca8c9095..985ba2f7d2 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -121,7 +121,7 @@ if ($get_module_detail) { $formtable->data[0][3] = "". html_print_image ("images/refresh.png", true, array ("style" => 'vertical-align: middle;', "border" => "0" )) . ""; $formtable->rowspan[0][3] = 2; $formtable->cellstyle[0][3] = 'vertical-align: middle;'; - + /* $formtable->data[1][0] = html_print_radio_button_extended( "selection_mode", 'range','', $selection_mode, false, '', 'style="margin-right: 15px;"', true) . __("Specify time range"); @@ -140,7 +140,7 @@ if ($get_module_detail) { '', 10, 10, true); $formtable->data[1][2] .= html_print_input_text('time_to', $time_to, '', 9, 7, true); - + */ html_print_table($formtable); $moduletype_name = modules_get_moduletype_name( @@ -156,12 +156,8 @@ if ($get_module_detail) { $columns = array( - "Timestamp" => array( - "utimestamp", - "modules_format_timestamp", - "align" => "left"), "Data" => array( - "datos", + "data", "modules_format_data", "align" => "left"), "Time" => array( @@ -266,7 +262,7 @@ if ($get_module_detail) { ui_print_error_message(__('No available data to show')); } else { - ui_pagination ($count, false, $offset, 0, false, 'offset', true, 'binary_dialog'); + ui_pagination (count($count), false, $offset, 0, false, 'offset', true, 'binary_dialog'); html_print_table($table); } @@ -356,6 +352,7 @@ if ($get_id_tag) { echo $tag_id; return; } +<<<<<<< HEAD if ($list_modules) { include_once($config['homedir'] . "/include/functions_modules.php"); @@ -1058,4 +1055,5 @@ if ($list_modules) { } + ?> diff --git a/pandora_console/operation/agentes/datos_agente.php b/pandora_console/operation/agentes/datos_agente.php index 49ab0585a5..543db4299b 100755 --- a/pandora_console/operation/agentes/datos_agente.php +++ b/pandora_console/operation/agentes/datos_agente.php @@ -95,7 +95,6 @@ if ($moduletype_name == "log4x") { } $columns = array( - "Timestamp" => array("utimestamp", "modules_format_timestamp", "align" => "center" ), "Sev" => array("severity", "modules_format_data", "align" => "center", "width" => "70px"), "Message"=> array("message", "modules_format_verbatim", "align" => "left", "width" => "45%"), "StackTrace" => array("stacktrace", "modules_format_verbatim", "align" => "left", "width" => "50%") @@ -111,8 +110,8 @@ else if (preg_match ("/string/", $moduletype_name)) { } $columns = array( - "Timestamp" => array("utimestamp", "modules_format_timestamp", "align" => "left"), - "Data" => array("datos", "modules_format_data", "align" => "left") + "Data" => array("datos", "modules_format_data", "align" => "left"), + "Time" => array("utimestamp", "modules_format_time", "align" => "center"), ); } else { @@ -124,7 +123,6 @@ else { } $columns = array( - "Timestamp" => array("utimestamp", "modules_format_timestamp", "align" => "left"), "Data" => array("datos", "modules_format_data", "align" => "left"), "Time" => array("utimestamp", "modules_format_time", "align" => "center") ); @@ -186,7 +184,7 @@ $formtable->size[2] = '30%'; $formtable->data[0][0] = html_print_radio_button_extended ("selection_mode", 'fromnow', '', $selection_mode, false, '', 'style="margin-right: 15px;"', true) . __("Choose a time from now"); $formtable->data[0][1] = html_print_extended_select_for_time ('period', $period, '', '', '0', 10, true); - +/* $formtable->data[1][0] = html_print_radio_button_extended ("selection_mode", 'range','', $selection_mode, false, '', 'style="margin-right: 15px;"', true) . __("Specify time range"); $formtable->data[1][1] = __('Timestamp from:'); @@ -199,7 +197,7 @@ $formtable->data[1][1] .= __('Timestamp to:'); $formtable->data[1][2] .= '
'; $formtable->data[1][2] .= html_print_input_text ('date_to', $date_to, '', 10, 10, true); $formtable->data[1][2] .= html_print_input_text ('time_to', $time_to, '', 9, 7, true); - +*/ if (preg_match ("/string/", $moduletype_name) || $moduletype_name == "log4x") { $formtable->data[2][0] = __('Free text for search'); $formtable->data[2][1] = html_print_input_text ("freestring", $freestring, '', 20,30, true); diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index c22a12ecb4..94bda42221 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -1153,11 +1153,9 @@ foreach ($result as $row) { $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$row["id_agente_modulo"]."&label=".rawurlencode(urlencode(base64_encode($row["module_name"])))."&refresh=600','day_".$win_handle."')"; $data[7] = '' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . ''; - if (defined('METACONSOLE')) - $data[7] .= "". html_print_image ("images/binary.png", true, array ("border" => "0", "alt" => "")) . ""; - else - $data[7] .= " " . html_print_image('images/binary.png', true, array("style" => '0', "alt" => '')) . ""; + $data[7] .= "". html_print_image ("images/binary.png", true, array ("border" => "0", "alt" => "")) . ""; + } $data[8] = ui_print_module_warn_value($row['max_warning'], $row['min_warning'], $row['str_warning'], $row['max_critical'], $row['min_critical'], $row['str_critical']);