From a0d752b11865b389b246b2a145d3a4469b54ee2d Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sun, 18 Jul 2010 12:03:26 +0000
Subject: [PATCH] reverse polarity!

git-svn-id: http://www.observium.org/svn/observer/trunk@1413 61d68cd4-352d-0410-923a-c4978735b2b8
---
 .../graphs/port_adsl_attainable.inc.php       |  4 +--
 html/includes/graphs/port_adsl_power.inc.php  |  4 +--
 html/includes/graphs/port_adsl_snr.inc.php    |  4 +--
 html/includes/graphs/port_adsl_speed.inc.php  |  5 ++-
 html/includes/print-interface-adsl.inc.php    | 31 ++++++++++++-------
 html/pages/device/ports.inc.php               |  2 +-
 6 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/html/includes/graphs/port_adsl_attainable.inc.php b/html/includes/graphs/port_adsl_attainable.inc.php
index ec8a4a708c..204590e956 100644
--- a/html/includes/graphs/port_adsl_attainable.inc.php
+++ b/html/includes/graphs/port_adsl_attainable.inc.php
@@ -15,11 +15,11 @@ $port = mysql_fetch_array($query);
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = "Downstream";
-$rrd_list[0]['rra'] = "AtucCurrAttainableR";
+$rrd_list[0]['rra'] = "AturCurrAttainableR";
 
 $rrd_list[1]['filename'] = $rrd_filename;
 $rrd_list[1]['descr'] = "Upstream";
-$rrd_list[1]['rra'] = "AturCurrAttainableR";
+$rrd_list[1]['rra'] = "AtucCurrAttainableR";
 
 
 $unit_text = "Bits/sec";
diff --git a/html/includes/graphs/port_adsl_power.inc.php b/html/includes/graphs/port_adsl_power.inc.php
index 9833c6abc5..a81bc22859 100644
--- a/html/includes/graphs/port_adsl_power.inc.php
+++ b/html/includes/graphs/port_adsl_power.inc.php
@@ -15,11 +15,11 @@ $port = mysql_fetch_array($query);
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = "Downstream";
-$rrd_list[0]['rra'] = "AtucCurrOutputPwr";
+$rrd_list[0]['rra'] = "AturCurrOutputPwr";
 
 $rrd_list[1]['filename'] = $rrd_filename;
 $rrd_list[1]['descr'] = "Upstream";
-$rrd_list[1]['rra'] = "AturCurrOutputPwr";
+$rrd_list[1]['rra'] = "AtucCurrOutputPwr";
 
 $unit_text = "dBm";
 
diff --git a/html/includes/graphs/port_adsl_snr.inc.php b/html/includes/graphs/port_adsl_snr.inc.php
index afe1518236..6d7d0bb418 100644
--- a/html/includes/graphs/port_adsl_snr.inc.php
+++ b/html/includes/graphs/port_adsl_snr.inc.php
@@ -15,11 +15,11 @@ $port = mysql_fetch_array($query);
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = "Downstream";
-$rrd_list[0]['rra'] = "AtucCurrSnrMgn";
+$rrd_list[0]['rra'] = "AturCurrSnrMgn";
 
 $rrd_list[1]['filename'] = $rrd_filename;
 $rrd_list[1]['descr'] = "Upstream";
-$rrd_list[1]['rra'] = "AturCurrSnrMgn";
+$rrd_list[1]['rra'] = "AtucCurrSnrMgn";
 
 $unit_text = "dB";
 
diff --git a/html/includes/graphs/port_adsl_speed.inc.php b/html/includes/graphs/port_adsl_speed.inc.php
index b4d6232f08..2b18fa3d59 100644
--- a/html/includes/graphs/port_adsl_speed.inc.php
+++ b/html/includes/graphs/port_adsl_speed.inc.php
@@ -13,14 +13,13 @@ $port = mysql_fetch_array($query);
   $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
 #}
 
-
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = "Downstream";
-$rrd_list[0]['rra'] = "AtucChanCurrTxRate";
+$rrd_list[0]['rra'] = "AturChanCurrTxRate";
 
 $rrd_list[1]['filename'] = $rrd_filename;
 $rrd_list[1]['descr'] = "Upstream";
-$rrd_list[1]['rra'] = "AturChanCurrTxRate";
+$rrd_list[1]['rra'] = "AtucChanCurrTxRate";
 
 
 $unit_text = "Bits/sec";
diff --git a/html/includes/print-interface-adsl.inc.php b/html/includes/print-interface-adsl.inc.php
index 1c80a9ddee..2bcc0537ef 100644
--- a/html/includes/print-interface-adsl.inc.php
+++ b/html/includes/print-interface-adsl.inc.php
@@ -22,8 +22,7 @@
 
   echo("<tr style=\"background-color: $row_colour; padding: 5px;\" valign=top onmouseover=\"this.style.backgroundColor='$list_highlight';\" onmouseout=\"this.style.backgroundColor='$row_colour';\"
   onclick=\"location.href='/device/".$device['device_id']."/interface/".$interface['interface_id']."/'\" style='cursor: hand;'>
-           <td valign=top width=350>");
-
+   <td valign=top width=350>");
   echo("        <span class=list-large>
                 " . generateiflink($interface, $interface['ifIndex'] . ". ".$interface['label']) . "
 
@@ -50,36 +49,44 @@
 
   $width="120"; $height="40"; $from = $day;
 
-  echo("</td><td width=150>");
-  echo("".formatRates($interface['adslAtucChanCurrTxRate']) . "/". formatRates($interface['adslAturChanCurrTxRate']));
+  echo("</td><td width=125>");
+  echo(formatRates($interface['ifInOctets_rate'] * 8)."/".formatRates($interface['ifOutOctets_rate'] * 8));
+  echo("<br />");
+  $interface['graph_type'] = "port_bits";
+  echo(generateiflink($interface, "<img src='graph.php?type=".$interface['graph_type']."&port=".$interface['interface_id']."&from=".$from."&to=".$now."&width=".$width."&height=".$height."&legend=no&bg=".
+  str_replace("#","", $row_colour)."'>", $interface['graph_type']));
+
+
+  echo("</td><td width=125>");
+  echo("".formatRates($interface['adslAturChanCurrTxRate']) . "/". formatRates($interface['adslAtucChanCurrTxRate']));
   echo("<br />");
   $interface['graph_type'] = "port_adsl_speed";
   echo(generateiflink($interface, "<img src='graph.php?type=".$interface['graph_type']."&port=".$interface['interface_id']."&from=".$from."&to=".$now."&width=".$width."&height=".$height."&legend=no&bg=".
   str_replace("#","", $row_colour)."'>", $interface['graph_type']));
 
-  echo("</td><td width=150>");
-  echo("".formatRates($interface['adslAtucCurrAttainableRate']) . "/". formatRates($interface['adslAturCurrAttainableRate']));
+  echo("</td><td width=125>");
+  echo("".formatRates($interface['adslAturCurrAttainableRate']) . "/". formatRates($interface['adslAtucCurrAttainableRate']));
   echo("<br />");
   $interface['graph_type'] = "port_adsl_attainable";
   echo(generateiflink($interface, "<img src='graph.php?type=".$interface['graph_type']."&port=".$interface['interface_id']."&from=".$from."&to=".$now."&width=".$width."&height=".$height."&legend=no&bg=".
   str_replace("#","", $row_colour)."'>", $interface['graph_type']));
   
-  echo("</td><td width=150>");
-  echo("".$interface['adslAtucCurrAtn'] . "dB/". $interface['adslAturCurrAtn'] . "dB");
+  echo("</td><td width=125>");
+  echo("".$interface['adslAturCurrAtn'] . "dB/". $interface['adslAtucCurrAtn'] . "dB");
   echo("<br />");
   $interface['graph_type'] = "port_adsl_attenuation";
   echo(generateiflink($interface, "<img src='graph.php?type=".$interface['graph_type']."&port=".$interface['interface_id']."&from=".$from."&to=".$now."&width=".$width."&height=".$height."&legend=no&bg=".
   str_replace("#","", $row_colour)."'>", $interface['graph_type']));
 
-  echo("</td><td width=150>");
-  echo("".$interface['adslAtucCurrSnrMgn'] . "dB/". $interface['adslAturCurrSnrMgn'] . "dB");
+  echo("</td><td width=125>");
+  echo("".$interface['adslAturCurrSnrMgn'] . "dB/". $interface['adslAtucCurrSnrMgn'] . "dB");
   echo("<br />");
   $interface['graph_type'] = "port_adsl_snr";
   echo(generateiflink($interface, "<img src='graph.php?type=".$interface['graph_type']."&port=".$interface['interface_id']."&from=".$from."&to=".$now."&width=".$width."&height=".$height."&legend=no&bg=".
   str_replace("#","", $row_colour)."'>", $interface['graph_type']));
 
-  echo("</td><td width=150>");
-  echo("".$interface['adslAtucCurrOutputPwr'] . "dBm/". $interface['adslAturCurrOutputPwr'] . "dBm");
+  echo("</td><td width=125>");
+  echo("".$interface['adslAturCurrOutputPwr'] . "dBm/". $interface['adslAtucCurrOutputPwr'] . "dBm");
   echo("<br />");
   $interface['graph_type'] = "port_adsl_power";
   echo(generateiflink($interface, "<img src='graph.php?type=".$interface['graph_type']."&port=".$interface['interface_id']."&from=".$from."&to=".$now."&width=".$width."&height=".$height."&legend=no&bg=".
diff --git a/html/pages/device/ports.inc.php b/html/pages/device/ports.inc.php
index 59fd9c46d8..ae0644aba0 100644
--- a/html/pages/device/ports.inc.php
+++ b/html/pages/device/ports.inc.php
@@ -56,7 +56,7 @@ if($_GET['optc'] == thumbs) {
   } elseif($_GET['opta'] == "adsl") {
     echo("<div style='margin: 5px;'><table border=0 cellspacing=0 cellpadding=5 width=100%>");
 
-    echo("<tr><th>Port</th><th>Sync Speed</th><th>Attainable Speed</th><th>Attenuation</th><th>SNR Margin</th><th>Output Powers</th></tr>");
+    echo("<tr><th>Port</th><th>Traffic</th><th>Sync Speed</th><th>Attainable Speed</th><th>Attenuation</th><th>SNR Margin</th><th>Output Powers</th></tr>");
     $i = "0";
     $interface_query = mysql_query("select * from `ports` AS P, `ports_adsl` AS A WHERE P.device_id = '".$device['device_id']."' AND A.interface_id = P.interface_id AND P.deleted = '0' ORDER BY `ifIndex` ASC");
     while($interface = mysql_fetch_array($interface_query)) {