From 6ae1ab381b029f8db671c78623e2723841c051bd Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Fri, 13 Aug 2010 14:22:05 +0000
Subject: [PATCH] fix some things :>

git-svn-id: http://www.observium.org/svn/observer/trunk@1679 61d68cd4-352d-0410-923a-c4978735b2b8
---
 .../graphs/multiport/bits_duo.inc.php         | 22 +++++++++----------
 .../graphs/multiport/bits_trio.inc.php        | 12 +++++-----
 html/pages/front/jt.php                       | 12 +++++-----
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/html/includes/graphs/multiport/bits_duo.inc.php b/html/includes/graphs/multiport/bits_duo.inc.php
index 63e17e88a3..5325f20aa6 100644
--- a/html/includes/graphs/multiport/bits_duo.inc.php
+++ b/html/includes/graphs/multiport/bits_duo.inc.php
@@ -1,20 +1,18 @@
 <?php
 
-$ports_a = $_GET['ports'];
-$ports_b = $_GET['ports_b'];
-
 if($_GET['legend']) { $legend = $_GET['legend']; }
 
-  $rrd_options = "--alt-autoscale-max -E --start $from --end " . ($to - 150) . " --width $width --height $height";
+  $rrd_options = "--alt-autoscale-max -E --start $from --end " . ($to - 150) . " --width $width --height $height ";
   $rrd_options .= $config['rrdgraph_def_text'];
   if($height < "99") { $rrd_options .= " --only-graph"; }
   $i = 1;
-  foreach(explode(",", $ports_a) as $ifid) {
+
+  foreach(explode(",", $_GET['id']) as $ifid) {
     $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");
     $int = mysql_fetch_row($query);
-    if(is_file($config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd")) {
-      $rrd_options .= " DEF:inoctets" . $i . "=" . $config['rrd_dir'] . "/port-" . $int[1] . "/" . $int[0] . ".rrd:INOCTETS:AVERAGE";
-      $rrd_options .= " DEF:outoctets" . $i . "=" . $config['rrd_dir'] . "/port-" . $int[1] . "/" . $int[0] . ".rrd:OUTOCTETS:AVERAGE";
+    if(is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd")) {
+      $rrd_options .= " DEF:inoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:INOCTETS:AVERAGE";
+      $rrd_options .= " DEF:outoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:OUTOCTETS:AVERAGE";
       $in_thing .= $seperator . "inoctets" . $i . ",UN,0," . "inoctets" . $i . ",IF";
       $out_thing .= $seperator . "outoctets" . $i . ",UN,0," . "outoctets" . $i . ",IF";
       $pluses .= $plus;
@@ -24,12 +22,12 @@ if($_GET['legend']) { $legend = $_GET['legend']; }
     }
   }
   unset($seperator); unset($plus);
-  foreach(explode(",", $ports_b) as $ifid) {
+  foreach(explode(",", $_GET['idb']) as $ifid) {
     $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");
     $int = mysql_fetch_row($query);
-    if(is_file($config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd")) {
-      $rrd_options .= " DEF:inoctetsb" . $i . "=" . $config['rrd_dir'] . "/port-" . $int[1] . "/" . $int[0] . ".rrd:INOCTETS:AVERAGE";
-      $rrd_options .= " DEF:outoctetsb" . $i . "=" . $config['rrd_dir'] . "/port-" . $int[1] . "/" . $int[0] . ".rrd:OUTOCTETS:AVERAGE";
+    if(is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd")) {
+      $rrd_options .= " DEF:inoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:INOCTETS:AVERAGE";
+      $rrd_options .= " DEF:outoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:OUTOCTETS:AVERAGE";
       $in_thingb .= $seperator . "inoctetsb" . $i . ",UN,0," . "inoctetsb" . $i . ",IF";
       $out_thingb .= $seperator . "outoctetsb" . $i . ",UN,0," . "outoctetsb" . $i . ",IF";
       $plusesb .= $plus;
diff --git a/html/includes/graphs/multiport/bits_trio.inc.php b/html/includes/graphs/multiport/bits_trio.inc.php
index cf364c5d9b..428c6f7d72 100644
--- a/html/includes/graphs/multiport/bits_trio.inc.php
+++ b/html/includes/graphs/multiport/bits_trio.inc.php
@@ -6,8 +6,8 @@ if($_GET['legend']) { $legend = $_GET['legend']; }
   $rrd_options .= $config['rrdgraph_def_text'];
   if($height < "99") { $rrd_options .= " --only-graph"; }
   $i = 1;
-  foreach(explode(",", $_GET['ports']) as $ifid) {
-    $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");
+  foreach(explode(",", $_GET['id']) as $ifid) {
+    $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `id` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");
     $int = mysql_fetch_row($query);
     if(is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd")) {
       if(strstr($inverse, "a")) { $in = "OUT"; $out = "IN"; } else { $in = "IN"; $out = "OUT"; }
@@ -22,8 +22,8 @@ if($_GET['legend']) { $legend = $_GET['legend']; }
     }
   }
   unset($seperator); unset($plus);
-  foreach(explode(",", $_GET['ports_b']) as $ifid) {
-    $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");
+  foreach(explode(",", $_GET['idb']) as $ifid) {
+    $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `id` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");
     $int = mysql_fetch_row($query);
     if(is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd")) {
       if(strstr($inverse, "b")) { $in = "OUT"; $out = "IN"; } else { $in = "IN"; $out = "OUT"; }
@@ -38,8 +38,8 @@ if($_GET['legend']) { $legend = $_GET['legend']; }
     }
   }
   unset($seperator); unset($plus);
-  foreach(explode(",", $_GET['ports_c']) as $ifid) {
-    $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");
+  foreach(explode(",", $_GET['idc']) as $ifid) {
+    $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `id` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");
     $int = mysql_fetch_row($query);
     if(is_file($config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd")) {
       if(strstr($inverse, "c")) { $in = "OUT"; $out = "IN"; } else { $in = "IN"; $out = "OUT"; }
diff --git a/html/pages/front/jt.php b/html/pages/front/jt.php
index 297d9420e7..01999622a5 100644
--- a/html/pages/front/jt.php
+++ b/html/pages/front/jt.php
@@ -139,11 +139,11 @@ if($_SESSION['userlevel'] >= '5')
   if($ports['peering'] && $ports['transit']) {
     echo("<div style='width: 235px; '>
     <a href='internet/' onmouseover=\"return overlib('\
-    <img src=\'graph.php?type=multiport_bits_duo&id=".$ports['peering']."&ports_b=".$ports['transit']."&from=".$day."&to=".$now."&width=400&height=150\'>\
-    <img src=\'graph.php?type=multiport_bits_duo&id=".$ports['peering']."&ports_b=".$ports['transit']."&from=".$week."&to=".$now."&width=400&height=150\'>\
+    <img src=\'graph.php?type=multiport_bits_duo&id=".$ports['peering']."&idb=".$ports['transit']."&from=".$day."&to=".$now."&width=400&height=150\'>\
+    <img src=\'graph.php?type=multiport_bits_duo&id=".$ports['peering']."&idb=".$ports['transit']."&from=".$week."&to=".$now."&width=400&height=150\'>\
     ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\"  >".
     "<div style='font-size: 16px; font-weight: bold; color: #555555;'>Aggregate Internet Traffic</div>".
-    "<img src='graph.php?type=multiport_bits_duo&id=".$ports['peering']."&ports_b=".$ports['transit'].
+    "<img src='graph.php?type=multiport_bits_duo&id=".$ports['peering']."&idb=".$ports['transit'].
     "&from=".$day."&to=".$now."&width=385&height=100&legend=no'></a></div>");
   }
 
@@ -180,11 +180,11 @@ if($_SESSION['userlevel'] >= '5')
   if($ports['broadband'] && $ports['wave_broadband'] && $ports['new_broadband']) {
     echo("<div style='width: 466px; '>
     <a href='broadband/' onmouseover=\"return overlib('\
-    <img src=\'graph.php?type=multiport_bits_trio&id=".$ports['broadband']."&ports_b=".$ports['new_broadband']."&ports_c=".$ports['wave_broadband']."&from=".$day."&to=".$now."&width=400&height=150&inverse=c\'>\
-    <img src=\'graph.php?type=multiport_bits_trio&id=".$ports['broadband']."&ports_b=".$ports['new_broadband']."&ports_c=".$ports['wave_broadband']."&from=".$week."&to=".$now."&width=400&height=150&inverse=c\'>\
+    <img src=\'graph.php?type=multiport_bits_trio&id=".$ports['broadband']."&idb=".$ports['new_broadband']."&idc=".$ports['wave_broadband']."&from=".$day."&to=".$now."&width=400&height=150&inverse=c\'>\
+    <img src=\'graph.php?type=multiport_bits_trio&id=".$ports['broadband']."&idb=".$ports['new_broadband']."&idc=".$ports['wave_broadband']."&from=".$week."&to=".$now."&width=400&height=150&inverse=c\'>\
     ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\"  >".
     "<div style='font-size: 16px; font-weight: bold; color: #555555;'>Aggregate Broadband Traffic</div>".
-    "<img src='graph.php?type=multiport_bits_trio&id=".$ports['broadband']."&ports_b=".$ports['new_broadband']."&ports_c=".$ports['wave_broadband'].
+    "<img src='graph.php?type=multiport_bits_trio&id=".$ports['broadband']."&idb=".$ports['new_broadband']."&idc=".$ports['wave_broadband'].
     "&from=".$day."&to=".$now."&width=385&height=100&legend=no&inverse=c'></a></div>");
   }