From c73683f8c8a97a29110fa728516ff58bf4571df0 Mon Sep 17 00:00:00 2001
From: Mat Sugumaran <msugumaran@merethis.com>
Date: Mon, 25 Jun 2007 15:32:42 +0000
Subject: [PATCH] git-svn-id: http://svn.centreon.com/Plugins/Dev@2520
 6bcd3966-0018-0410-8128-fd23d134de7e

---
 centreon-plugins/src/traps/fill_trapDB       | 2 +-
 centreon-plugins/src/traps/genSnmpttConfFile | 9 ++++++---
 centreon-plugins/src/traps/trapHandler       | 8 ++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/centreon-plugins/src/traps/fill_trapDB b/centreon-plugins/src/traps/fill_trapDB
index aa6932212..c61006f95 100644
--- a/centreon-plugins/src/traps/fill_trapDB
+++ b/centreon-plugins/src/traps/fill_trapDB
@@ -29,7 +29,7 @@ use Getopt::Long;
 use DBI;
 
 use vars qw($mysql_database_oreon $mysql_database_ods $mysql_host $mysql_user $mysql_passwd);
-require "@INSTALL_DIR_OREON@/ODS/etc/conf.pm";
+require "@OREON_PATH@/ODS/etc/conf.pm";
 
 #########################################
 ## TEST IF OID ALREADY EXISTS IN DATABASE
diff --git a/centreon-plugins/src/traps/genSnmpttConfFile b/centreon-plugins/src/traps/genSnmpttConfFile
index d1e502586..797ed3f58 100644
--- a/centreon-plugins/src/traps/genSnmpttConfFile
+++ b/centreon-plugins/src/traps/genSnmpttConfFile
@@ -29,7 +29,7 @@ use Getopt::Long;
 use DBI;
 
 use vars qw($mysql_database_oreon $mysql_database_ods $mysql_host $mysql_user $mysql_passwd);
-require "@INSTALL_DIR_OREON@/ODS/etc/conf.pm";
+require "@OREON_PATH@/ODS/etc/conf.pm";
 
 ######################################
 ## Get snmptt configuration files path
@@ -72,9 +72,12 @@ sub main() {
 		$nbMan++ if ($sth2->rows);
 		while (my @values = $sth2->fetchrow_array()) {
 		    $nbTraps++;
+		    my $args = "";
 		    print FILE "EVENT ".$values[0]." ".$values[1]." \"Status Event\" ".$values[2]."\n";
-		    print FILE "FORMAT ".$values[3]."\n" if (defined($values[3]));
-		    print FILE "EXEC ".$NAGIOS_TRAPS."/trapHandler \$aA \$o \"\$*\"\n";
+		    if (defined($values[3])) {
+			print FILE "FORMAT ".$values[3]."\n";
+		    } 
+		    print FILE "EXEC ".$NAGIOS_TRAPS."/trapHandler \$aA \$o \"\$*\|\"\n";
 		    if (defined($values[4])) {
 				print FILE "SDESC\n".$values[4];
 				if ($values[4] =~ /\n$/) {
diff --git a/centreon-plugins/src/traps/trapHandler b/centreon-plugins/src/traps/trapHandler
index 2ad8c1c48..5232906f9 100644
--- a/centreon-plugins/src/traps/trapHandler
+++ b/centreon-plugins/src/traps/trapHandler
@@ -28,7 +28,7 @@ use strict;
 use DBI;
 
 use vars qw($mysql_database_oreon $mysql_database_ods $mysql_host $mysql_user $mysql_passwd);
-require "@INSTALL_DIR_OREON@/ODS/etc/conf.pm";
+require "@OREON_PATH@/ODS/etc/conf.pm";
 
 ###############################
 ## GET HOSTNAME FROM IP ADDRESS
@@ -108,11 +108,11 @@ sub getTrapsInfos($$$){
 		    my @vars = split(/\ /,$arguments_line);
 		    $argument =~ s/\$([0-9]+)/$vars[$1-1]/g;
 		    chomp($datetime);
-		    $sth = $_[0]->prepare("SELECT command_file FROM cfg_nagios WHERE nagios_activate = '1' LIMIT 1");
-    		$sth->execute();
+		    my $sth = $dbh->prepare("SELECT command_file FROM cfg_nagios WHERE nagios_activate = '1' LIMIT 1");
+		    $sth->execute();
 			my @conf = $sth->fetchrow_array();
 		   	$sth->finish();
-		    my $submit = `/usr/bin/printf "[$datetime] PROCESS_SERVICE_CHECK_RESULT;$this_host;$this_service;$status;$argument" >> $conf[0]`;
+		    my $submit = `/bin/echo "[$datetime] PROCESS_SERVICE_CHECK_RESULT;$this_host;$this_service;$status;$arguments_line" >> $conf[0]`;
 		}
     }
     $dbh->disconnect();