From ef168cd96bfe12c613ae0bf2fd8b9813aba570cb Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Mon, 26 Sep 2011 13:33:19 +0000
Subject: [PATCH] fix bugs to url generation (ignore opt)

git-svn-id: http://www.observium.org/svn/observer/trunk@2574 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/functions.inc.php | 2 +-
 html/includes/print-menubar.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index 688c4584c5..29fd63b6e5 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -68,7 +68,7 @@ function generate_url($vars, $new_vars = array())
 
   foreach($vars as $var => $value)
   {
-    if ($value != "")
+    if ($value != "" && strstr($var, "opt") === FALSE)
     {
       $url .= $var ."=".$value."/";
     }
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 472757eefc..2bac3c2df8 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -248,7 +248,7 @@ if ($ports['errored'])
 
 if ($ports['ignored'])
 {
-  echo('<li><a href="ports/ignored=1/"><img src="images/16/chart_curve_link.png" border="0" align="absmiddle" /> Ignored ('.$ports['ignored'].')</a></li>');
+  echo('<li><a href="ports/ignore=1/"><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.png" border="0" align="absmiddle" /> Traffic Bills</a></li>'); $ifbreak = 1; }