From 3b2446d3cbad3032beda80354cf4ab408de39ce5 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 8 Sep 2011 04:54:34 +0000
Subject: [PATCH] fixes to realtime graph

git-svn-id: http://www.observium.org/svn/observer/trunk@2428 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/pages/device/port/realtime.inc.php | 48 +++++++++++++------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/html/pages/device/port/realtime.inc.php b/html/pages/device/port/realtime.inc.php
index 0784ceef1c..1e8109203e 100644
--- a/html/pages/device/port/realtime.inc.php
+++ b/html/pages/device/port/realtime.inc.php
@@ -1,57 +1,59 @@
 <?php
 
+### FIXME - do this in a function and/or do it in graph-realtime.php
+
+
+if($_GET['optc']) {
+  $interval = $_GET['optc'];
+} else {
+  if($device['os'] == "linux") {
+    $interval = "15";
+  } else {
+    $interval = "2";
+  }
+}
+
 print_optionbar_start();
 
 echo("Polling Interval: ");
 
-if ($_GET['optc'] == "0.25" || !$_GET['optc']) { echo("<span class='pagemenu-selected'>"); }
+if ($interval == "0.25" || !$interval) { echo("<span class='pagemenu-selected'>"); }
 echo("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/port/".$interface['interface_id']."/realtime/0.25/'>0.25s</a>");
-if ($_GET['optc'] == "0.25" || !$_GET['optc']) { echo("</span>"); }
+if ($interval == "0.25" || !$interval) { echo("</span>"); }
 
 echo(" | ");
 
-if ($_GET['optc'] == "1" || !$_GET['optc']) { echo("<span class='pagemenu-selected'>"); }
+if ($interval == "1" || !$interval) { echo("<span class='pagemenu-selected'>"); }
 echo("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/port/".$interface['interface_id']."/realtime/1/'>1s</a>");
-if ($_GET['optc'] == "1" || !$_GET['optc']) { echo("</span>"); }
+if ($interval == "1" || !$interval) { echo("</span>"); }
 
 
 echo(" | ");
 
-if ($_GET['optc'] == "2" || !$_GET['optc']) { echo("<span class='pagemenu-selected'>"); }
+if ($interval == "2" || !$interval) { echo("<span class='pagemenu-selected'>"); }
 echo("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/port/".$interface['interface_id']."/realtime/2/'>2s</a>");
-if ($_GET['optc'] == "2" || !$_GET['optc']) { echo("</span>"); }
+if ($interval == "2" || !$interval) { echo("</span>"); }
 
 echo(" | ");
 
-if ($_GET['optc'] == "5" || !$_GET['optc']) { echo("<span class='pagemenu-selected'>"); }
+if ($interval == "5" || !$interval) { echo("<span class='pagemenu-selected'>"); }
 echo("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/port/".$interface['interface_id']."/realtime/5/'>5s</a>");
-if ($_GET['optc'] == "5" || !$_GET['optc']) { echo("</span>"); }
+if ($interval == "5" || !$interval) { echo("</span>"); }
 
 echo(" | ");
 
-if ($_GET['optc'] == "15" || !$_GET['optc']) { echo("<span class='pagemenu-selected'>"); }
+if ($interval == "15" || !$interval) { echo("<span class='pagemenu-selected'>"); }
 echo("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/port/".$interface['interface_id']."/realtime/15/'>15s</a>");
-if ($_GET['optc'] == "15" || !$_GET['optc']) { echo("</span>"); }
+if ($interval == "15" || !$interval) { echo("</span>"); }
 
 echo(" | ");
 
-if ($_GET['optc'] == "60" || !$_GET['optc']) { echo("<span class='pagemenu-selected'>"); }
+if ($interval == "60" || !$interval) { echo("<span class='pagemenu-selected'>"); }
 echo("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/port/".$interface['interface_id']."/realtime/60/'>60s</a>");
-if ($_GET['optc'] == "60" || !$_GET['optc']) { echo("</span>"); }
+if ($interval == "60" || !$interval) { echo("</span>"); }
 
 print_optionbar_end();
 
-
-### FIXME - do this in a function and/or do it in graph-realtime.php
-
-if($device['os'] == "linux") { 
-  $interval = "15"; 
-} else {
-  $interval = "2";
-}
-
-if($_GET['optc']) { $interval = $_GET['optc']; }
-
 ?>
 
 <div align="center" style="margin: 30px;">