From d067cd5812e8cf6338880ec8d78e615d449a0d0e Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@localhost>
Date: Thu, 25 Feb 2010 22:23:48 +0000
Subject: [PATCH] - BUGFIX: Renamed "Interfaces" to "Ports" in the top
 navigation menu. - FEATURE: In the menubar for "Ports" added support for
 ignored interfaces. - BUGFIX: Fixed the
 /ports/(down|admindown|errors|ignored)/ links.

git-svn-id: http://www.observium.org/svn/observer/trunk@955 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/print-menubar.php |  4 ++++
 html/includes/topnav.inc        |  2 +-
 html/pages/ports.php            | 11 +++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index ad9bca95b..c858c8a90 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -118,6 +118,10 @@ if ($ports['errored']) {
   echo('<li><a href="ports/errors/"><img src="images/16/chart_curve_error.png" border="0" align="absmiddle" /> Errored ('.$ports['errored'].')</a></li>');
 }
 
+if ($ports['ignored']) {
+  echo('<li><a href="ports/ignored/"><img src="images/16/chart_curve_link.png" border="0" align="absmiddle" /> Ignored ('.$ports['ignored'].')</a></li>');
+}
+
 if ($config['enable_billing']) { echo('<li><a href="bills/"><img src="images/16/money_pound.png" border="0" align="absmiddle" /> Traffic Bills</a></li>'); $ifbreak = 1;}
 
 if ($config['enable_pseudowires']) { echo('<li><a href="pseudowires/"><img src="images/16/arrow_switch.png" border="0" align="absmiddle" /> Pseudowires</a></li>'); $ifbreak = 1;}
diff --git a/html/includes/topnav.inc b/html/includes/topnav.inc
index 8d382867b..1748f4fef 100644
--- a/html/includes/topnav.inc
+++ b/html/includes/topnav.inc
@@ -63,7 +63,7 @@ if($services['down']) { $services['bgcolour'] = "#ffcccc"; } else { $services['b
     <td width=5></td>
   </tr>
   <tr style="background-color: <?php echo $ports['bgcolour'] ?>">
-      <td width="5"></td><td>Interfaces : </td>
+      <td width="5"></td><td>Ports : </td>
     <td><?php echo $ports['count'] ?></td>
     <td> ( </td>
     <td style='text-align: right'><span class=green> <?php echo $ports['up'] ?> up </span></td>
diff --git a/html/pages/ports.php b/html/pages/ports.php
index db26ae10e..aefb0c403 100644
--- a/html/pages/ports.php
+++ b/html/pages/ports.php
@@ -22,6 +22,7 @@
         <option value='down'<?php if($_POST['state'] == "down") { echo("selected"); } ?>>Down</option>
         <option value='admindown' <?php if($_POST['state'] == "admindown") { echo("selected"); } ?>>Shutdown</option>
         <option value='errors' <?php if($_POST['state'] == "errors") { echo("selected"); } ?>>Errors</option>
+        <option value='ignored' <?php if($_POST['state'] == "ignored") { echo("selected"); } ?>>Ignored</option>
         <option value='ethernet' <?php if($_POST['state'] == "ethernet") { echo("selected"); } ?>>Ethernet</option>
         <option value='l2vlan' <?php if($_POST['state'] == "l2vlan") { echo("selected"); } ?>>L2 VLAN</option>
         <option value='sonet' <?php if($_POST['state'] == "sonet") { echo("selected"); } ?>>SONET</option>
@@ -86,14 +87,16 @@
 #}
 
 
-if($_GET['type'] == "down" || $_POST['state'] == "down") {
-  $where .= "AND I.ifAdminStatus = 'up' AND I.ifOperStatus = 'down'";  
-} elseif ($_GET['type'] == "admindown" || $_POST['state'] == "admindown") {
+if($_GET['opta'] == "down" || $_GET['type'] == "down" || $_POST['state'] == "down") {
+  $where .= "AND I.ifAdminStatus = 'up' AND I.ifOperStatus = 'down' AND I.ignore = '0'";  
+} elseif ($_GET['opta'] == "admindown" || $_GET['type'] == "admindown" || $_POST['state'] == "admindown") {
   $where .= "AND I.ifAdminStatus = 'down'";
-} elseif ($_GET['type'] == "errors" || $_POST['state'] == "errors") {
+} elseif ($_GET['opta'] == "errors" || $_GET['type'] == "errors" || $_POST['state'] == "errors") {
   $where .= "AND ( I.`ifInErrors_delta` > '0' OR I.`ifOutErrors_delta` > '0' )";
 } elseif ($_GET['type'] == "up" || $_POST['state'] == "up") {
   $where .= "AND I.ifOperStatus = 'up'";
+} elseif ($_GET['opta'] == "ignored" || $_GET['type'] == "ignored" || $_POST['state'] == "ignored") {
+  $where .= "AND I.ignore = '1'";
 } elseif ($_GET['type'] == "l2vlan" || $_POST['state'] == "l2vlan") {
   $where .= " AND I.ifType = 'l2vlan'";
 } elseif ($_GET['type'] == "ethernet" || $_POST['state'] == "ethernet") {