From d89b0632d82961efe4adf880d040db3ac29157a1 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 23 Mar 2011 10:25:42 +0000
Subject: [PATCH] improve billing graphs a little

git-svn-id: http://www.observium.org/svn/observer/trunk@1961 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/bill/auth.inc.php          | 17 ++++++++++++++++-
 html/includes/graphs/bill/bits.inc.php          | 15 ++++++++++++++-
 .../graphs/generic_multi_bits_separated.inc.php |  4 +++-
 html/pages/bill.inc.php                         |  4 ++--
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/html/includes/graphs/bill/auth.inc.php b/html/includes/graphs/bill/auth.inc.php
index 948594745f..5710b48cb4 100644
--- a/html/includes/graphs/bill/auth.inc.php
+++ b/html/includes/graphs/bill/auth.inc.php
@@ -2,14 +2,29 @@
 
 ### Authorises bill viewing and sets $ports as reference to mysql query containing ports for this bill
 
+include("../includes/billing.php");
+include("../includes/functions.php"); ## FIXME zeropad()
+
 if (is_numeric($_GET['id']) && ($config['allow_unauth_graphs'] || bill_permitted($_GET['id'])))
 {
 
+  $bill_query   = mysql_query("SELECT * FROM `bills` WHERE bill_id = '".mres($_GET['id'])."'");  
+  $bill         = mysql_fetch_assoc($bill_query);
+
+  $day_data     = getDates($bill['bill_day']);
+  $datefrom     = $day_data['0'];
+  $dateto       = $day_data['1'];
+
+  $rates = getRates($_GET['id'], $datefrom,  $dateto);
+
   $ports = mysql_query("SELECT * FROM `bill_ports` AS B, `ports` AS P, `devices` AS D
                         WHERE B.bill_id = '".mres($_GET['id'])."' AND P.interface_id = B.port_id
                         AND D.device_id = P.device_id");
 
   $auth = TRUE;
+
+
+
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/html/includes/graphs/bill/bits.inc.php b/html/includes/graphs/bill/bits.inc.php
index add5a4313c..e75f55ad1e 100644
--- a/html/includes/graphs/bill/bits.inc.php
+++ b/html/includes/graphs/bill/bits.inc.php
@@ -24,6 +24,19 @@ $nototal = 1;
 $rra_in  = "INOCTETS";
 $rra_out = "OUTOCTETS";
 
+#print_r($rates);
+
+if($bill['bill_type'] == "cdr") {
+   $custom_graph = " COMMENT:'\\r' ";
+   $custom_graph .= " HRULE:" . $rates['rate_average'] * 1000 . "#cc0000:'95th %ile \: ".formatRates($rates['rate_95th']*1000)." (".$rates['dir_95th'].") (CDR\: ".formatRates($rates['bill_cdr']*1000).")'";
+   $custom_graph .= " HRULE:" . $rates['rate_average'] * 1000 * -1 . "#cc0000";
+} elseif($bill['bill_type'] == "quota") {
+   $custom_graph = " COMMENT:'\\r' ";
+   $custom_graph .= " HRULE:" . $rates['rate_average'] * 1000 . "#cc0000:'Usage \: ".formatStorage($rates['total_data']*1024*1024)." (".formatRates($rates['rate_average']*1000).")'";
+   $custom_graph .= " HRULE:" . $rates['rate_average'] * 1000 * -1 . "#cc0000";
+}
+
+
 include("includes/graphs/generic_multi_bits_separated.inc.php");
 
-?>
\ No newline at end of file
+?>
diff --git a/html/includes/graphs/generic_multi_bits_separated.inc.php b/html/includes/graphs/generic_multi_bits_separated.inc.php
index 74145d862c..44bb04128d 100644
--- a/html/includes/graphs/generic_multi_bits_separated.inc.php
+++ b/html/includes/graphs/generic_multi_bits_separated.inc.php
@@ -54,7 +54,9 @@ foreach ($rrd_list as $rrd)
   $i++; $iter++;
 }
 
+if ($custom_graph) { $rrd_options .= $custom_graph; }
+
 $rrd_options .= $rrd_optionsb;
 $rrd_options .= " HRULE:0#999999";
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/bill.inc.php b/html/pages/bill.inc.php
index ab085f3608..c820d01db5 100644
--- a/html/pages/bill.inc.php
+++ b/html/pages/bill.inc.php
@@ -35,7 +35,7 @@ if (bill_permitted($bill_id))
   $dateto       = $day_data['1'];
   $rate_data    = getRates($bill_id,$datefrom,$dateto);
   $rate_95th    = $rate_data['rate_95th'];
-  $dir_95th     =	$rate_data['dir_95th'];
+  $dir_95th     = $rate_data['dir_95th'];
   $total_data   = $rate_data['total_data'];
   $rate_average = $rate_data['rate_average'];
 
@@ -258,4 +258,4 @@ else
   include("includes/error-no-perm.inc.php");
 }
 
-?>
\ No newline at end of file
+?>