From 0d01ebf64fa280707f5df1f180a736b86f290a81 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Fri, 25 Sep 2009 11:35:04 +0000
Subject: [PATCH] updates to mac accounting. moving to array arguments for
 graphing functions

git-svn-id: http://www.observium.org/svn/observer/trunk@474 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/mac_acc_total.inc.php   | 36 +++++++++++---------
 html/pages/device/port/macaccounting.inc.php | 14 ++++----
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/html/includes/graphs/mac_acc_total.inc.php b/html/includes/graphs/mac_acc_total.inc.php
index a4bf50279d..8545bfb784 100644
--- a/html/includes/graphs/mac_acc_total.inc.php
+++ b/html/includes/graphs/mac_acc_total.inc.php
@@ -1,36 +1,34 @@
 <?php
 
-function graph_mac_acc_total ($interface, $stat, $graph, $from, $to, $width, $height, $title, $vertical) {
-  global $config, $installdir;
-  $imgfile = $config['install_dir'] . "/graphs/" . "$graph";
-  $options = "--alt-autoscale-max -E --start $from --end " . ($to - 150) . " --width $width --height $height ";
+function graph_mac_acc_total ($args) {
+  global $config;
+  if($args['height'] < "99") { $options .= " --only-graph "; }
+  if($args['sort'] == "in" || $args['sort'] == "out") { $sort = "bps_" . $args['sort']; } else { $sort = "bps"; }
+  $imgfile = $config['install_dir'] . "/graphs/" . $args['graphfile'];
+  $options .= " --alt-autoscale-max -E --start ".$args['from']." --end " . ($args['to'] - 150) . " --width ".$args['width']." --height ".$args['height']." ";
   $options .= $config['rrdgraph_def_text'];
-  if($height < "99") { $options .= " --only-graph "; }
-  $hostname = gethostbyid($device);
-  $sql = "SELECT *, (bps_in + bps_out) AS bps FROM `mac_accounting` AS M, `interfaces` AS I, `devices` AS D WHERE M.interface_id = '$interface'
-          AND I.interface_id = M.interface_id AND I.device_id = D.device_id ORDER BY bps DESC LIMIT 0,10";
+  $sql = "SELECT *, (bps_in + bps_out) AS bps FROM `mac_accounting` AS M, `interfaces` AS I, `devices` AS D WHERE M.interface_id = '".$args['port']."'
+          AND I.interface_id = M.interface_id AND I.device_id = D.device_id ORDER BY $sort DESC LIMIT 0,10";
   $query = mysql_query($sql);
-  if($width <= "300") { $options .= "--font LEGEND:7:".$config['mono_font']." --font AXIS:6:".$config['mono_font']." --font-render-mode normal "; }
+  if($args['width'] <= "300") { $options .= "--font LEGEND:7:".$config['mono_font']." --font AXIS:6:".$config['mono_font']." --font-render-mode normal "; }
   $pluses = ""; $iter = '0';
   $options .= " COMMENT:'                                     In\: Current     Maximum      Total      Out\: Current     Maximum     Total\\\\n'";
   while($acc = mysql_fetch_array($query)) {
-   if($stat == "pkts") {
+   if($args['stat'] == "pkts") {
      $this_rrd = $config['rrd_dir'] . "/" . $acc['hostname'] . "/mac-accounting/" . $acc['ifIndex'] . "-" . $acc['mac'] . "-pkts.rrd";
      $units='pps'; $unit = 'p'; $multiplier = '1';
      $colours = 'purples';
-   } elseif ($stat == "bits") {
+   } elseif ($args['stat'] == "bits") {
      $this_rrd = $config['rrd_dir'] . "/" . $acc['hostname'] . "/mac-accounting/" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd";
      $units='bps'; $unit='B'; $multiplier='8';
      $colours='greens';
    }
    if(is_file($this_rrd)) {
-
    $name = $acc['mac'];
    $addy = mysql_fetch_array(mysql_query("SELECT * FROM ipv4_mac where mac_address = '".$acc['mac']."'"));
    if($addy) {
      $name = @gethostbyaddr($addy['ipv4_address']);
    } 
-
     $this_id = str_replace(".", "", $acc['mac']);
     if(!$config['graph_colours'][$colours][$iter]) { $iter = 0; }
     $colour=$config['graph_colours'][$colours][$iter];
@@ -63,9 +61,15 @@ function graph_mac_acc_total ($interface, $stat, $graph, $from, $to, $width, $he
   return $imgfile;
 }
 
-$port = $_GET['if'];
-$stat = $_GET['stat'];
+$args['port']      = $_GET['port'];
+$args['stat']      = $_GET['stat'];
+$args['sort']      = $_GET['sort'];
+$args['graphfile'] = $graphfile;
+$args['from']      = $from;
+$args['to']        = $to;
+$args['width']     = $width;
+$args['height']    = $height;
 
-$graph = graph_mac_acc_total ($port, $stat, $graphfile, $from, $to, $width, $height, $title, $vertical);
+$graph = graph_mac_acc_total ($args);
 
 ?>
diff --git a/html/pages/device/port/macaccounting.inc.php b/html/pages/device/port/macaccounting.inc.php
index d6e271624a..ac956ea4a9 100644
--- a/html/pages/device/port/macaccounting.inc.php
+++ b/html/pages/device/port/macaccounting.inc.php
@@ -32,42 +32,42 @@
             <div style='margin: 0px 10px 20px 0px; padding:5px; background: #e5e5e5;'>
             <span class=device-head>Day</span><br />
             <a href='".$config['base_url']."/device/" . $device['device_id'] . "/interface/".$interface['interface_id']."/macaccounting/$stat/top10/1day/'>
-              <img style='border: #5e5e5e 2px;' valign=middle src='".$config['base_url']."/graph.php?if=".$interface['interface_id']."&stat=$stat&type=mac_acc_total&from=-1day&to=now&width=150&height=50' />
+              <img style='border: #5e5e5e 2px;' valign=middle src='".$config['base_url']."/graph.php?port=".$interface['interface_id']."&stat=$stat&type=mac_acc_total&from=-1day&to=now&width=150&height=50' />
             </a> 
             </div>
             <div style='margin: 0px 10px 20px 0px; padding:5px; background: #e5e5e5;'>
             <span class=device-head>Week</span><br />
              <a href='".$config['base_url']."/device/" . $device['device_id'] . "/interface/".$interface['interface_id']."/macaccounting/$stat/top10/1week/'>
-             <img valign=middle src='".$config['base_url']."/graph.php?if=".$interface['interface_id']."&type=mac_acc_total&stat=$stat&from=-1week&to=now&width=150&height=50' /> 
+             <img valign=middle src='".$config['base_url']."/graph.php?port=".$interface['interface_id']."&type=mac_acc_total&stat=$stat&from=-1week&to=now&width=150&height=50' /> 
              </a>
              </div>
              <div style='margin: 0px 10px 20px 0px; padding:5px; background: #e5e5e5;'>
              <span class=device-head>Month</span><br />
              <a href='".$config['base_url']."/device/" . $device['device_id'] . "/interface/".$interface['interface_id']."/macaccounting/$stat/top10/1month/'>
-             <img valign=middle src='".$config['base_url']."/graph.php?if=".$interface['interface_id']."&type=mac_acc_total&stat=$stat&from=-1month&to=now&width=150&height=50' /> 
+             <img valign=middle src='".$config['base_url']."/graph.php?port=".$interface['interface_id']."&type=mac_acc_total&stat=$stat&from=-1month&to=now&width=150&height=50' /> 
              </a>
              </div>
              <div style='margin: 0px 10px 20px 0px; padding:5px; background: #e5e5e5;'>
              <span class=device-head>Year</span><br />
              <a href='".$config['base_url']."/device/" . $device['device_id'] . "/interface/".$interface['interface_id']."/macaccounting/$stat/top10/1year/'>
-             <img valign=middle src='".$config['base_url']."/graph.php?if=".$interface['interface_id']."&type=mac_acc_total&stat=$stat&from=-1year&to=now&width=150&height=50' /> 
+             <img valign=middle src='".$config['base_url']."/graph.php?port=".$interface['interface_id']."&type=mac_acc_total&stat=$stat&from=-1year&to=now&width=150&height=50' /> 
              </a>
              </div>
         </div>
         <div style='float: left;'>
-          <img src='".$config['base_url']."/graph.php?if=".$interface['interface_id']."&type=mac_acc_total&stat=$stat&from=$from&to=now&width=750&height=245' />
+          <img src='".$config['base_url']."/graph.php?port=".$interface['interface_id']."&type=mac_acc_total&stat=$stat&from=$from&to=now&width=750&height=245' />
         </div>
         <div style=' margin:0px; float: left;';>
              <div style='margin: 0px 0px 20px 10px; padding:5px; background: #e5e5e5;'>
             <span class=device-head>Traffic</span><br />
             <a href='".$config['base_url']."/device/" . $device['device_id'] . "/interface/".$interface['interface_id']."/macaccounting/bits/top10/1day/'>
-              <img style='border: #5e5e5e 2px;' valign=middle src='".$config['base_url']."/graph.php?if=".$interface['interface_id']."&stat=bits&type=mac_acc_total&from=$from&to=now&width=150&height=50' />
+              <img style='border: #5e5e5e 2px;' valign=middle src='".$config['base_url']."/graph.php?port=".$interface['interface_id']."&stat=bits&type=mac_acc_total&from=$from&to=now&width=150&height=50' />
             </a>
             </div>
             <div style='margin: 0px 0px 20px 10px; padding:5px; background: #e5e5e5;'>
             <span class=device-head>Packets</span><br />
             <a href='".$config['base_url']."/device/" . $device['device_id'] . "/interface/".$interface['interface_id']."/macaccounting/pkts/top10/1day/'>
-              <img style='border: #5e5e5e 2px;' valign=middle src='".$config['base_url']."/graph.php?if=".$interface['interface_id']."&stat=pkts&type=mac_acc_total&from=$from&to=now&width=150&height=50' />
+              <img style='border: #5e5e5e 2px;' valign=middle src='".$config['base_url']."/graph.php?port=".$interface['interface_id']."&stat=pkts&type=mac_acc_total&from=$from&to=now&width=150&height=50' />
             </a>
             </div>
         </div>