From 3ca9a23d0ada50cc6dd44f01170c7db6d00ae947 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Wed, 3 Jun 2015 15:53:52 +0200
Subject: [PATCH] =?UTF-8?q?Fixes=20for=20the=20Oracl=E2=82=AC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../godmode/agentes/agent_manager.php         | 13 +++++++++---
 .../godmode/agentes/configurar_agente.php     |  2 +-
 .../include/functions_reporting.php           | 12 +++++++++++
 .../include/functions_reporting_html.php      | 20 +++++++++++++++----
 4 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 6be6c13c0f..d5cb49641a 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -115,8 +115,10 @@ if ($new_agent) {
 		$nombre_agente = $direccion_agente;
 	
 	$servers = servers_get_names();
-	if (!empty($servers))
-		$server_name = reset(array_keys($servers));
+	if (!empty($servers)) {
+		$array_keys_servers = array_keys($servers);
+		$server_name = reset($array_keys_servers);
+	}
 }
 
 if (!$new_agent) {
@@ -138,6 +140,7 @@ if ($disk_conf_delete) {
 
 echo '<form name="conf_agent" method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente">';
 
+$table = new stdClass();
 $table->width = '100%';
 $table->class = "databox filters";
 
@@ -261,7 +264,9 @@ if (!array_key_exists($server_name, $servers)) {
 $table->data[6][0] = __('Server');
 if ($new_agent) {
 	//Set first server by default.
-	$server_name = reset(array_keys(servers_get_names()));
+	$servers_get_names = servers_get_names();
+	$array_keys_servers_get_names = array_keys($servers_get_names);
+	$server_name = reset($array_keys_servers_get_names);
 }
 $table->data[6][1] = html_print_select (servers_get_names (),
 	'server_name', $server_name, '', __('None'), 0, true). ' ' . ui_print_help_icon ('agent_server', true);
@@ -274,6 +279,7 @@ $table->data[7][1] = html_print_input_text ('comentarios', $comentarios,
 html_print_table ($table);
 unset($table);
 
+$table = new stdClass();
 $table->width = '100%';
 $table->class = "databox filters";
 
@@ -388,6 +394,7 @@ $table->data[7][1] = html_print_checkbox('quiet', 1, $quiet, true);
 ui_toggle(html_print_table ($table, true), __('Advanced options'));
 unset($table);
 
+$table = new stdClass();
 $table->width = '100%';
 $table->class = "databox filters";
 
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 64dbaecd89..5ff79f232a 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -356,7 +356,7 @@ if ($id_agente) {
 		. '</a>';
 	
 	// Hidden subtab layer
-	$agent_wizard['sub_menu'] .=  '<ul class="mn subsubmenu" style="display:none; float:none;">';
+	$agent_wizard['sub_menu'] =  '<ul class="mn subsubmenu" style="display:none; float:none;">';
 	$agent_wizard['sub_menu'] .=  '<li class="nomn tab_godmode" style="text-align: center;">';
 	$agent_wizard['sub_menu'] .=  '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&wizard_section=snmp_explorer&id_agente='.$id_agente.'">'
 			. html_print_image ("images/wand_snmp.png", true, array ( "title" => __('SNMP Wizard')))
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 5207ba9ef8..14237dea7e 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -4118,6 +4118,18 @@ function reporting_general($report, $content) {
 					$data['value'] = null;
 				}
 				else {
+					
+					switch ($config["dbtype"]) {
+						case "mysql":
+						case "postgresql":
+							break;
+						case "oracle":
+							if (preg_match("/[0-9]+,[0-9]E+[+-][0-9]+/", $d)) {
+								$d = oracle_format_float_to_php($d);
+							}
+							break;
+					}
+					
 					if (!is_numeric($d)) {
 						$data['value'] = $d;
 					}
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 1574435763..c3440bfbf2 100755
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -1408,6 +1408,7 @@ function reporting_html_monitor_report($table, $item, $mini) {
 	$table->colspan['module']['cell'] = 3;
 	$table->cellstyle['module']['cell'] = 'text-align: center;';
 	
+	$table1 = new stdClass();
 	$table1->width = '99%';
 	$table1->head = array ();
 	$table1->data = array ();
@@ -1700,6 +1701,7 @@ function reporting_html_general(&$table, $item) {
 	if (!empty($item["data"])) {
 		switch ($item['subtype']) {
 			case REPORT_GENERAL_NOT_GROUP_BY_AGENT:
+				$table1 = new stdClass();
 				$table1->width = '99%';
 				$table1->data = array ();
 				$table1->head = array ();
@@ -1715,10 +1717,19 @@ function reporting_html_general(&$table, $item) {
 				$table1->style[3] = 'text-align: left';
 				
 				foreach ($item['data'] as $row) {
-					$table1->data[] = array(
-						$row['agent'],
-						$row['module'],
-						$row['value']);
+					if ($item['date']['period'] != 0) {
+						$table1->data[] = array(
+							$row['agent'],
+							$row['module'],
+							$row['operator'],
+							$row['value']);
+					}
+					else {
+						$table1->data[] = array(
+							$row['agent'],
+							$row['module'],
+							$row['value']);
+					}
 				}
 				break;
 			case REPORT_GENERAL_GROUP_BY_AGENT:
@@ -1763,6 +1774,7 @@ function reporting_html_general(&$table, $item) {
 	}
 	
 	if ($item['resume'] && !empty($item["data"])) {
+		$table_summary = new stdClass();
 		$table_summary->width = '99%';
 		
 		$table_summary->data = array ();