From 176dd1b453e9ded9a68f845d17fe18377f50ce2f Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Thu, 27 Mar 2008 11:03:16 +0000 Subject: [PATCH] fixes git-svn-id: http://www.observium.org/svn/observer/trunk@208 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/discovery/interfaces.php | 5 ++--- includes/polling/bgpPeer.inc.php | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/includes/discovery/interfaces.php b/includes/discovery/interfaces.php index 1860b1c8c..d8c776752 100755 --- a/includes/discovery/interfaces.php +++ b/includes/discovery/interfaces.php @@ -30,10 +30,9 @@ if (preg_match('/ng[0-9]+$/', $if)) { $nullintf = '1'; } if ($nullintf == 0) { if(mysql_result(mysql_query("SELECT COUNT(*) FROM `interfaces` WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex'"), 0) == '0') { - mysql_query("INSERT INTO `interfaces` (`device_id`,`ifIndex`,`ifDescr`) VALUES ('$id','$ifIndex','$ifName')"); - echo("\n INSERT INTO `interfaces` (`device_id`,`ifIndex`,`ifDescr`) VALUES ('".$device['device_id']."','$ifIndex','$ifName') \n "); + mysql_query("INSERT INTO `interfaces` (`device_id`,`ifIndex`,`ifDescr`) VALUES ('".$device['device_id']."','$ifIndex','$ifName')"); # Add Interface - echo("+" . mysql_error() . mysql_affected_rows()); + echo("+"); } else { # Interface Already Exists echo("."); diff --git a/includes/polling/bgpPeer.inc.php b/includes/polling/bgpPeer.inc.php index ca8124ea9..00f93f788 100755 --- a/includes/polling/bgpPeer.inc.php +++ b/includes/polling/bgpPeer.inc.php @@ -36,8 +36,6 @@ while($peer = mysql_fetch_array($peers)) { rrdtool_update($peerrrd, "N:$bgpPeerOutUpdates:$bgpPeerInUpdates:$bgpPeerOutTotalMessages:$bgpPeerInTotalMesages:$bgpPeerFsmEstablishedTime"); - echo("$peerrrd N:$bgpPeerOutUpdates:$bgpPeerInUpdates:$bgpPeerOutTotalMessages:$bgpPeerInTotalMesages:$bgpPeerFsmEstablishedTime"); - $update = "UPDATE bgpPeers SET bgpPeerState = '$bgpPeerState', bgpPeerAdminStatus = '$bgpPeerAdminStatus', "; $update .= "bgpPeerFsmEstablishedTime = '$bgpPeerFsmEstablishedTime', bgpPeerInUpdates = '$bgpPeerInUpdates' , bgpPeerOutUpdates = '$bgpPeerOutUpdates'"; $update .= " WHERE `device_id` = '".$device['device_id']."' AND bgpPeerIdentifier = '" . $peer['bgpPeerIdentifier'] . "'";