From 3f429642fc7943f14bed911b7c66e6439b9144ef Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Mon, 20 Jun 2011 16:18:18 +0000 Subject: [PATCH] 2011-06-20 Sergio Martin * lib/PandoraFMS/DB.pm: Added quotes to process database functions to avoid errors when the tables will have key words names * lib/PandoraFMS/Core.pm: Fixed a bug change the position of two conditions to avoid a notice git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4471 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 9 +++++++++ pandora_server/lib/PandoraFMS/Core.pm | 2 +- pandora_server/lib/PandoraFMS/DB.pm | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 30fa8fdc0e..927323e828 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,12 @@ +2011-06-20 Sergio Martin + + * lib/PandoraFMS/DB.pm: Added quotes to process + database functions to avoid errors when the tables + will have key words names + + * lib/PandoraFMS/Core.pm: Fixed a bug change the position + of two conditions to avoid a notice + 2011-06-16 Ramon Novoa * lib/PandoraFMS/Core.pm: Fixed a typo. diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index dd2175a948..a4325bdd32 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -1297,7 +1297,7 @@ sub pandora_delete_module ($$;$) { my $agent_name = get_agent_name($dbh, $agent_id); my $module_name = get_module_name($dbh, $module_id); - if ((-e $conf->{incomingdir}.'/conf/'.md5($agent_name).'.conf') && (defined($conf))) { + if ((defined($conf)) && (-e $conf->{incomingdir}.'/conf/'.md5($agent_name).'.conf')) { enterprise_hook('pandora_delete_module_from_conf', [$conf,$agent_name,$module_name]); } } diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm index feef76983f..e13edb5d92 100644 --- a/pandora_server/lib/PandoraFMS/DB.pm +++ b/pandora_server/lib/PandoraFMS/DB.pm @@ -473,9 +473,9 @@ sub db_process_insert($$$$;@) { } $wildcards = '('.$wildcards.')'; - my $columns_string = join(',',@columns_array); + my $columns_string = join('`,`',@columns_array); - my $res = db_insert ($dbh, $index, "INSERT INTO $table (".$columns_string.") VALUES ".$wildcards, @values_array); + my $res = db_insert ($dbh, $index, "INSERT INTO $table (`".$columns_string."`) VALUES ".$wildcards, @values_array); return $res; } @@ -502,7 +502,7 @@ sub db_process_update($$$$$;@) { if($i > 0 && $i <= $#values_array) { $fields = $fields.','; } - $fields = $fields." $columns_array[$i] = ?"; + $fields = $fields." `$columns_array[$i]` = ?"; } push(@values_array, $where_value);