From 34f2bb8da11900d66ad74001071b1bf6b59b8de8 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Fri, 30 Sep 2011 13:09:14 +0000
Subject: [PATCH] fix graphtypes

git-svn-id: http://www.observium.org/svn/observer/trunk@2615 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/device/nfsen_common.inc.php |  3 ++-
 html/includes/graphs/generic_multi_line.inc.php  | 16 +++++++---------
 .../generic_multi_simplex_seperated.inc.php      |  3 ++-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/html/includes/graphs/device/nfsen_common.inc.php b/html/includes/graphs/device/nfsen_common.inc.php
index f06e33e400..d172891b2e 100644
--- a/html/includes/graphs/device/nfsen_common.inc.php
+++ b/html/includes/graphs/device/nfsen_common.inc.php
@@ -1,6 +1,7 @@
 <?php
 include("includes/graphs/common.inc.php");
-$device = device_by_id_cache($id);
+
+$simple_rrd = TRUE;
 
 if (!is_array($config['nfsen_rrds'])) { $config['nfsen_rrds'] = array($config['nfsen_rrds']); }
 
diff --git a/html/includes/graphs/generic_multi_line.inc.php b/html/includes/graphs/generic_multi_line.inc.php
index ac73664a17..78adb1dd4f 100644
--- a/html/includes/graphs/generic_multi_line.inc.php
+++ b/html/includes/graphs/generic_multi_line.inc.php
@@ -27,8 +27,11 @@ foreach ($rrd_list as $rrd)
 
   $rrd_options .= " DEF:".$id."=$filename:$ds:AVERAGE";
 
-  if (!$basicrrd)
+  if ($simple_rrd || $basicrrd)
   {
+    $rrd_options .= " CDEF:".$id."min=".$id." ";
+    $rrd_options .= " CDEF:".$id."max=".$id." ";
+  } else {
     $rrd_options .= " DEF:".$id."min=$filename:$ds:MIN";
     $rrd_options .= " DEF:".$id."max=$filename:$ds:MAX";
   }
@@ -45,14 +48,9 @@ foreach ($rrd_list as $rrd)
 
   }
 
-  if (!$basicrrd)
-  {
-    $rrd_optionsb .= " GPRINT:".$id.":LAST:%5.2lf%s GPRINT:".$id."min:MIN:%5.2lf%s";
-    $rrd_optionsb .= " GPRINT:".$id."max:MAX:%5.2lf%s GPRINT:".$id.":AVERAGE:'%5.2lf%s\\n'";
-  } else {
-    $rrd_optionsb .= " GPRINT:".$id.":LAST:%5.2lf%s GPRINT:".$id.":MIN:%5.2lf%s";
-    $rrd_optionsb .= " GPRINT:".$id.":MAX:%5.2lf%s GPRINT:".$id.":AVERAGE:'%5.2lf%s\\n'";
-  }
+  $rrd_optionsb .= " GPRINT:".$id.":LAST:%5.2lf%s GPRINT:".$id."min:MIN:%5.2lf%s";
+  $rrd_optionsb .= " GPRINT:".$id."max:MAX:%5.2lf%s GPRINT:".$id.":AVERAGE:'%5.2lf%s\\n'";
+
   $i++; $iter++;
 
 }
diff --git a/html/includes/graphs/generic_multi_simplex_seperated.inc.php b/html/includes/graphs/generic_multi_simplex_seperated.inc.php
index 0ce6c69101..740715cb33 100644
--- a/html/includes/graphs/generic_multi_simplex_seperated.inc.php
+++ b/html/includes/graphs/generic_multi_simplex_seperated.inc.php
@@ -24,7 +24,8 @@ foreach ($rrd_list as $i => $rrd)
   }
 
   $rrd_options .= " DEF:".$rrd['ds'].$i."=".$rrd['filename'].":".$rrd['ds'].":AVERAGE ";
-  if($simple_rrd) 
+
+  if($simple_rrd || $basicrrd)
   {
     $rrd_options .= " CDEF:".$rrd['ds'].$i."min=".$rrd['ds'].$i." ";
     $rrd_options .= " CDEF:".$rrd['ds'].$i."max=".$rrd['ds'].$i." ";