From 7a872ac8397bec087c69137ac106770f85b9bdd4 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Thu, 18 Jun 2015 23:16:53 +0100
Subject: [PATCH] Ignored and disabled ports will not be showing in the main
 port list until selected

---
 html/pages/ports.inc.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/html/pages/ports.inc.php b/html/pages/ports.inc.php
index adfb3a0c5..8ff1f7d34 100644
--- a/html/pages/ports.inc.php
+++ b/html/pages/ports.inc.php
@@ -277,6 +277,8 @@ if(!isset($vars['disabled'])) { $vars['disabled'] = "0"; }
 if(!isset($vars['deleted']))  { $vars['deleted'] = "0"; }
 
 $where = '';
+$ignore_filter = 0;
+$disabled_filter = 0;
 
 foreach ($vars as $var => $value)
 {
@@ -297,13 +299,23 @@ foreach ($vars as $var => $value)
         $param[] = $value;
         break;
       case 'deleted':
+        if ($value == 1) {
+          $where .= " AND `I`.`deleted` = 1";
+          $ignore_filter = 1;
+        }
+        break;
       case 'ignore':
-        if ($value == 1)
-        {
+        if ($value == 1) {
           $where .= " AND (I.ignore = 1 OR D.ignore = 1) AND I.deleted = 0";
+          $ignore_filter = 1;
         }
         break;
       case 'disabled':
+        if ($value == 1) {
+            $where .= " AND `I`.`disabled` = 1 AND `I`.`deleted` = 0";
+            $disabled_filter = 1;
+        }
+        break;
       case 'ifSpeed':
         if (is_numeric($value))
         {
@@ -345,6 +357,10 @@ foreach ($vars as $var => $value)
   }
 }
 
+if ($ignore_filter == 0 && $disabled_filter == 0) {
+    $where .= " AND `I`.`ignore` = 0 AND `I`.`disabled` = 0 AND `I`.`deleted` = 0";
+}
+
 $query = "SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id ".$where." ".$query_sort;
 
 $row = 1;