From 51ff0df11ba6475078a8fc7fab7cb25cd3fa814a Mon Sep 17 00:00:00 2001
From: Paul Gear <github@libertysys.com.au>
Date: Sat, 11 Jul 2015 14:09:12 +1000
Subject: [PATCH] Really allow dividing as well as multiplying

---
 html/includes/graphs/generic_simplex.inc.php     | 4 ++--
 html/includes/graphs/old_generic_simplex.inc.php | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/html/includes/graphs/generic_simplex.inc.php b/html/includes/graphs/generic_simplex.inc.php
index c004975702..ddc45ba2af 100644
--- a/html/includes/graphs/generic_simplex.inc.php
+++ b/html/includes/graphs/generic_simplex.inc.php
@@ -19,7 +19,7 @@ if ($multiplier)
   $rrd_options .= " DEF:".$ds."_max_o=".$rrd_filename.":".$ds.":MAX";
   $rrd_options .= " DEF:".$ds."_min_o=".$rrd_filename.":".$ds.":MIN";
 
-  if (!isset($multiplier_action)) {
+  if (empty($multiplier_action)) {
       $multiplier_action = "*";
   }
   $rrd_options .= " CDEF:".$ds."=".$ds."_o,$multiplier,$multiplier_action";
@@ -48,7 +48,7 @@ if($_GET['previous'] == "yes")
     $rrd_options .= " DEF:".$ds."_max_oX=".$rrd_filename.":".$ds.":MAX:start=".$prev_from.":end=".$from;
     $rrd_options .= " SHIFT:".$ds."_oX:$period";
     $rrd_options .= " SHIFT:".$ds."_max_oX:$period";
-    if (!isset($multiplier_action)) {
+    if (empty($multiplier_action)) {
         $multiplier_action = "*";
     }
     $rrd_options .= " CDEF:".$ds."X=".$ds."_oX,$multiplier,$multiplier_action";
diff --git a/html/includes/graphs/old_generic_simplex.inc.php b/html/includes/graphs/old_generic_simplex.inc.php
index be70e9a873..bbf6f9e021 100644
--- a/html/includes/graphs/old_generic_simplex.inc.php
+++ b/html/includes/graphs/old_generic_simplex.inc.php
@@ -10,8 +10,11 @@ $line_text = str_pad(truncate($line_text,12,''),12);
 
 if ($multiplier)
 {
+  if (empty($multiplier_action)) {
+      $multiplier_action = "*";
+  }
   $rrd_options .= " DEF:".$ds."_o=".$rrd_filename.":".$ds.":AVERAGE";
-  $rrd_options .= " CDEF:".$ds."=".$ds."_o,$multiplier,*";
+  $rrd_options .= " CDEF:".$ds."=".$ds."_o,$multiplier,$multiplier_action";
 } else {
   $rrd_options .= " DEF:".$ds."=".$rrd_filename.":".$ds.":AVERAGE";
 }
@@ -29,6 +32,9 @@ if($_GET['previous'] == "yes")
 {
   if ($multiplier)
   {
+    if (empty($multiplier_action)) {
+        $multiplier_action = "*";
+    }
     $rrd_options .= " DEF:".$ds."_oX=".$rrd_filename.":".$ds.":AVERAGE:start=".$prev_from.":end=".$from;
     $rrd_options .= " SHIFT:".$ds."_oX:$period";
     $rrd_options .= " CDEF:".$ds."X=".$ds."_oX,$multiplier,*";