From cc5be54b7156cf3621f070a350dd6c23ff422a0e Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Tue, 16 Feb 2010 01:23:05 +0000
Subject: [PATCH] fixed bug with not unsetting deleted status for ports

git-svn-id: http://www.observium.org/svn/observer/trunk@870 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/pages/device/ports.inc.php   | 2 +-
 includes/discovery/interfaces.php | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/html/pages/device/ports.inc.php b/html/pages/device/ports.inc.php
index 7adf5b404f..77ad6a8565 100644
--- a/html/pages/device/ports.inc.php
+++ b/html/pages/device/ports.inc.php
@@ -55,7 +55,7 @@ if($_GET['optc'] == thumbs) {
     if($_GET['opta'] == "details" ) { $port_details = 1; }
     echo("<div style='margin: 5px;'><table border=0 cellspacing=0 cellpadding=5 width=100%>");
     $i = "1";
-    $interface_query = mysql_query("select * from interfaces WHERE device_id = '$_GET[id]' AND deleted = '0' ORDER BY `ifIndex` ASC");
+    $interface_query = mysql_query("select * from interfaces WHERE device_id = '".$device['device_id']."' AND deleted = '0' ORDER BY `ifIndex` ASC");
     while($interface = mysql_fetch_array($interface_query)) {
       include("includes/print-interface.inc.php");
       $i++; 
diff --git a/includes/discovery/interfaces.php b/includes/discovery/interfaces.php
index 7e7cdcf14d..b7e84ad9f1 100755
--- a/includes/discovery/interfaces.php
+++ b/includes/discovery/interfaces.php
@@ -35,12 +35,8 @@
           # Add Interface
            echo("+");
         } else {
-          if(isset($interface['deleted']) && $interface['deleted']) {
             mysql_query("UPDATE `interfaces` SET `deleted` = '0' WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex'"); 
-            echo("*"); 
-          } else {
             echo(".");
-          }
         }
         $int_exists[] = "$ifIndex";
       } else {