From a42c178799a1b4f7f05915e221d792fbbe5ba782 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Mon, 26 Sep 2011 14:06:48 +0000
Subject: [PATCH] migrate pseudowires to new format

git-svn-id: http://www.observium.org/svn/observer/trunk@2576 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/functions.inc.php |  4 ++--
 html/pages/pseudowires.inc.php  | 31 ++++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index 29fd63b6e5..ef51fb5e47 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -413,8 +413,8 @@ function generate_port_url($port, $vars=array())
 
 function generate_port_thumbnail($args)
 {
-  if (!$args['bg']) { $args['bg'] = "FFFFF"; }
-  $args['content'] = "<img src='graph.php?type=".$args['graph_type']."&amp;id=".$args['interface_id']."&amp;from=".$args['from']."&amp;to=".$args['to']."&amp;width=".$args['width']."&amp;height=".$args['height']."&amp;legend=no&amp;bg=".$args['bg']."'>";
+  if (!$args['bg']) { $args['bg'] = "FFFFFF"; }
+  $args['content'] = "<img src='graph.php?type=".$args['graph_type']."&amp;id=".$args['interface_id']."&amp;from=".$args['from']."&amp;to=".$args['to']."&amp;width=".$args['width']."&amp;height=".$args['height']."&amp;bg=".$args['bg']."'>";
   echo(generate_port_link($args, $args['content']));
 }
 
diff --git a/html/pages/pseudowires.inc.php b/html/pages/pseudowires.inc.php
index fdee743430..362a0d3759 100644
--- a/html/pages/pseudowires.inc.php
+++ b/html/pages/pseudowires.inc.php
@@ -1,15 +1,25 @@
 <?php
 
+if(!isset($vars['view'])) { $vars['view'] = 'detail'; }
+
+$link_array = array('page' => 'pseudowires');
+
 print_optionbar_start();
 
-echo("<a href='pseudowires/'>Details</a> | Graphs :
-<a href='pseudowires/graphs/mini/'>Mini</a>
-");
+echo('<span style="font-weight: bold;">Pseudowires</span> &#187; ');
+
+if ($vars['view'] == "detail") { echo('<span class="pagemenu-selected">'); }
+echo(generate_link("Details",$link_array,array('view'=> 'detail')));
+if ($vars['view'] == "detail") { echo('</span>'); }
+
+echo(" | ");
+
+if ($vars['view'] == "minigraphs") { echo('<span class="pagemenu-selected">'); }
+echo(generate_link("Mini Graphs",$link_array,array('view' => "minigraphs")));
+if ($vars['view'] == "minigraphs") { echo('</span>'); }
 
 print_optionbar_end();
 
-list($opta, $optb, $optc, $optd, $opte) = explode("/", $_GET['opta']);
-
 echo("<table cellpadding=5 cellspacing=0 class=devicetable width=100%>");
 
 foreach (dbFetchRows("SELECT * FROM pseudowires AS P, ports AS I, devices AS D WHERE P.interface_id = I.interface_id AND I.device_id = D.device_id ORDER BY D.hostname,I.ifDescr") as $pw_a)
@@ -38,10 +48,9 @@ foreach (dbFetchRows("SELECT * FROM pseudowires AS P, ports AS I, devices AS D W
                                                                                           <td>".generate_device_link($pw_b)."</td><td>".generate_port_link($pw_b)."</td></tr>");
     echo("<tr style=\"background-color: #$bg;\"><td colspan=2>".$pw_a['ifAlias']."</td><td colspan=2>".$pw_b['ifAlias']."</td></tr>");
 
-    if ($opta == "graphs")
+    if ($vars['view'] == "minigraphs")
     {
       echo("<tr style=\"background-color: #$bg;\"><td></td><td colspan=2>");
-      if (!$optb) { $optb = "mini"; }
 
       if ($pw_a)
       {
@@ -50,10 +59,10 @@ foreach (dbFetchRows("SELECT * FROM pseudowires AS P, ports AS I, devices AS D W
         $pw_a['from'] = $day;
         $pw_a['to'] = $now;
         $pw_a['bg'] = $bg;
-        $types = array('bits','pkts','errors');
+        $types = array('bits','upkts','errors');
         foreach ($types as $graph_type)
         {
-          $pw_a['graph_type'] = $graph_type;
+          $pw_a['graph_type'] = "port_".$graph_type;
           generate_port_thumbnail($pw_a);
         }
       }
@@ -66,10 +75,10 @@ foreach (dbFetchRows("SELECT * FROM pseudowires AS P, ports AS I, devices AS D W
         $pw_b['from'] = $day;
         $pw_b['to'] = $now;
         $pw_b['bg'] = $bg;
-        $types = array('bits','pkts','errors');
+        $types = array('bits','upkts','errors');
         foreach ($types as $graph_type)
         {
-          $pw_b['graph_type'] = $graph_type;
+          $pw_b['graph_type'] = "port_".$graph_type;
           generate_port_thumbnail($pw_b);
         }
       }