From 35c891c0802dd1c5bdfd0f3221e5380ccfacf412 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Fri, 21 Nov 2008 15:06:23 +0000
Subject: [PATCH] fixes

git-svn-id: http://www.observium.org/svn/observer/trunk@314 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/interfaces.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/discovery/interfaces.php b/includes/discovery/interfaces.php
index dfe1e1c1a..20d22043b 100755
--- a/includes/discovery/interfaces.php
+++ b/includes/discovery/interfaces.php
@@ -22,11 +22,11 @@
       $ifDescr = shell_exec($config['snmpget'] . " -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'] . " ifDescr.$ifIndex");
       $ifDescr = str_replace("No Such Object available on this agent at this OID", "", $ifDescr);
       $ifDescr = str_replace("No Such Instance currently exists at this OID", "", $ifDescr);
+      $ifDescr = trim(str_replace("\"", "", $ifDescr));
     } else { $ifDescr = trim(str_replace("\"", "", $ifName)); }
 
     if(!strstr($entry, "irtual")) {
-      $ifName = trim(str_replace("\"", "", $ifName));
-      $if = trim(strtolower($ifName));
+      $if = trim(strtolower($ifDescr));
       $nullintf = 0;
       foreach($config['bad_if'] as $bi) {
       if (strstr($if, $bi)) {
@@ -41,7 +41,7 @@
           # Add Interface
            echo("+");
         } else {
-          mysql_query("UPDATE `interfaces` SET `deleted` = '0', `ifDescr` = '$ifDescr' WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex' AND `deleted` = '1'"); 
+          mysql_query("UPDATE `interfaces` SET `deleted` = '0', `ifDescr` = '$ifDescr' WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex'"); 
           if(mysql_affected_rows()) { 
             echo("*"); 
           } else {