From 2a11da5582c1c46e305d9bd33df602b235f18b2d Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Tue, 9 Jun 2015 23:21:15 +0100
Subject: [PATCH] No longer show disabled ports

---
 html/pages/device/ports.inc.php | 2 +-
 html/pages/ports.inc.php        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/pages/device/ports.inc.php b/html/pages/device/ports.inc.php
index df7c691d6..a3d2ee0a0 100644
--- a/html/pages/device/ports.inc.php
+++ b/html/pages/device/ports.inc.php
@@ -95,7 +95,7 @@ if ($vars['view'] == 'minigraphs')
 
   global $port_cache, $port_index_cache;
 
-  $ports = dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ? AND `deleted` = '0' ORDER BY `ifIndex` ASC", array($device['device_id']));
+  $ports = dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ? AND `deleted` = '0' AND `disabled` = 0 ORDER BY `ifIndex` ASC", array($device['device_id']));
   // As we've dragged the whole database, lets pre-populate our caches :)
   // FIXME - we should probably split the fetching of link/stack/etc into functions and cache them here too to cut down on single row queries.
   foreach ($ports as $port)
diff --git a/html/pages/ports.inc.php b/html/pages/ports.inc.php
index 2000ffdab..adfb3a0c5 100644
--- a/html/pages/ports.inc.php
+++ b/html/pages/ports.inc.php
@@ -226,8 +226,8 @@ foreach ($ports as $data)
       <div class="form-group">
         <label for="ignore">Ignored</label>
         <input type=checkbox id="ignore" name="ignore" value="1" class="" <?php if ($vars['ignore']) { echo("checked"); } ?> ></input>
-        <label for="disable">Disabled</label>
-        <input type=checkbox id="disable" name="disable" value=1 class="" <?php if ($vars['disable']) { echo("checked"); } ?> ></input>
+        <label for="disabled">Disabled</label>
+        <input type=checkbox id="disabled" name="disabled" value=1 class="" <?php if ($vars['disabled']) { echo("checked"); } ?> ></input>
         </label>
         <label for="deleted">Deleted</label>
         <input type=checkbox id="deleted" name="deleted" value=1 class="" <?php if ($vars['deleted']) { echo("checked"); } ?> ></input>
@@ -303,7 +303,7 @@ foreach ($vars as $var => $value)
           $where .= " AND (I.ignore = 1 OR D.ignore = 1) AND I.deleted = 0";
         }
         break;
-      case 'disable':
+      case 'disabled':
       case 'ifSpeed':
         if (is_numeric($value))
         {