From 550f834e345d3804e1ed213e6ca34a8183d61337 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Tue, 5 May 2015 15:34:03 +0200
Subject: [PATCH] Oracle related fixes.

---
 pandora_server/lib/PandoraFMS/Core.pm |  4 +++-
 pandora_server/lib/PandoraFMS/DB.pm   | 13 +++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 05379661f5..5a1bd261d1 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -4502,7 +4502,7 @@ sub pandora_module_unknown ($$) {
 			}
 			
 			my $do_event = 0;
-			if ($module->{'disabled_types_event'} eq "") {
+			if (!defined($module->{'disabled_types_event'}) || $module->{'disabled_types_event'} eq "") {
 				$do_event = 1;
 			}
 			else {
@@ -4776,6 +4776,8 @@ sub pandora_get_os ($$) {
 sub load_module_macros ($$) {
 	my ($macros, $macro_hash) = @_;
 	
+	return if (!defined($macros));
+
 	# Decode and parse module macros
 	my $decoded_macros = {};
 	eval {
diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm
index 57bb081880..446c9d271b 100644
--- a/pandora_server/lib/PandoraFMS/DB.pm
+++ b/pandora_server/lib/PandoraFMS/DB.pm
@@ -779,12 +779,11 @@ sub db_process_insert($$$$;@) {
 	}
 	$wildcards = '('.$wildcards.')';
 	
-	my $columns_string = join($RDBMS_QUOTE . ',' . $RDBMS_QUOTE,
-		@columns_array);
+	my $columns_string = join(',', @columns_array);
 	
 	my $res = db_insert ($dbh,
 		$index,
-		"INSERT INTO $table (" . $RDBMS_QUOTE . $columns_string . $RDBMS_QUOTE . ") VALUES " . $wildcards, @values_array);
+		"INSERT INTO $table ($columns_string) VALUES " . $wildcards, @values_array);
 	
 	
 	return $res;
@@ -854,10 +853,8 @@ sub add_address ($$) {
 sub add_new_address_agent ($$$) {
 	my ($dbh, $addr_id, $agent_id) = @_;
 	
-	db_do ($dbh, 'INSERT INTO taddress_agent (' .
-		$RDBMS_QUOTE . 'id_a' . $RDBMS_QUOTE . ', ' .
-		$RDBMS_QUOTE. 'id_agent' . $RDBMS_QUOTE. ')
-		VALUES (?, ?)', $addr_id, $agent_id);
+	db_do ($dbh, 'INSERT INTO taddress_agent (id_a, id_agent)
+	              VALUES (?, ?)', $addr_id, $agent_id);
 }
 
 ########################################################################
@@ -1028,7 +1025,7 @@ sub db_insert_get_values ($) {
 		# Not value for the given column
 		next if (! defined ($value));
 		
-		$columns .= $PandoraFMS::DB::RDBMS_QUOTE . "$key" . $PandoraFMS::DB::RDBMS_QUOTE . ",";
+		$columns .= $key . ",";
 		push (@values, $value);
 	}