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

@@ -130,7 +130,7 @@ if ($get_module_detail) {
 	$formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(" . $module_id .", ".  $agentId.", \"" . $server_name . "\", 0, -1)'>". html_print_image ("images/refresh.png", true, array ("style" => 'vertical-align: middle;', "border" => "0" )) . "</a>";
 	$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");
@@ -149,7 +149,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(
@@ -165,12 +165,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(
@@ -275,7 +271,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);
 	}
 	
@@ -365,4 +361,4 @@ if ($get_id_tag) {
 	echo $tag_id;
 	return;
 }
-?>
+?>

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] .= '<br />';
 $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);

pandora_console/operation/agentes/status_monitor.php

@@ -1187,12 +1187,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] = '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) .  '</a>';
-		if (defined('METACONSOLE'))
-			//$data[7] .= "&nbsp;<a href='" . $row['server_url'] . "index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$row["id_agent"]."&amp;tab=data_view&period=86400&loginhash=auto&loginhash_data=" . $row["hashdata"] . "&loginhash_user=" . $row["user"] . "&amp;id=".$row["id_agente_modulo"]."'>" . html_print_image('images/binary.png', true, array("style" => '0', "alt" => '')) . "</a>";
-			$data[7] .= "<a href='javascript: show_module_detail_dialog(" . $row["id_agente_modulo"] . ", ". $row['id_agent'].", \"" . $row['server_name'] . "\", 0, 86400)'>". html_print_image ("images/binary.png", true, array ("border" => "0", "alt" => "")) . "</a>";
-		else
-			$data[7] .= "&nbsp;<a href='index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=".$row["id_agent"]."&amp;tab=data_view&period=86400&amp;id=".$row["id_agente_modulo"]."'>" . html_print_image('images/binary.png', true, array("style" => '0', "alt" => '')) . "</a>";
 		
+		$data[7] .= "<a href='javascript: show_module_detail_dialog(" . $row["id_agente_modulo"] . ", ". $row['id_agent'].", \"" . $row['server_name'] . "\", 0, 86400)'>". html_print_image ("images/binary.png", true, array ("border" => "0", "alt" => "")) . "</a>";
+			
 	}
 	
 	$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']);