From f91180fe7c1493c04938e2855c6d9fea6cf57f5c Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Tue, 3 Apr 2007 19:28:18 +0000
Subject: [PATCH] Make $mono_font global in graphing functions.

git-svn-id: http://www.observium.org/svn/observer/trunk@32 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/functions.php         | 24 ++++++++++++------------
 includes/graphing.php          |  2 +-
 includes/procurve-graphing.php |  4 ++--
 includes/snom-graphing.php     |  2 +-
 includes/unix-graphing.php     | 24 ++++++++++++------------
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index cab44eb6c..5785e7047 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -343,7 +343,7 @@ function fixifName ($inf) {
 
 function trafgraph ($rrd, $graph, $from, $to, $width, $height)
 {
-  global $rrdtool; global $installdir;    
+  global $rrdtool, $installdir, $mono_font;    
   $database = "rrd/" . $rrd;
   $imgfile = "graphs/" . "$graph";
   $optsa = array( "--alt-autoscale-max",
@@ -395,7 +395,7 @@ function trafgraph ($rrd, $graph, $from, $to, $width, $height)
 }
 
 function pktsgraph ($rrd, $graph, $from, $to, $width, $height) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $database = "rrd/" . $rrd;
   $imgfile = "graphs/" . "$graph";
   $optsa = array( "--alt-autoscale-max",
@@ -436,7 +436,7 @@ function pktsgraph ($rrd, $graph, $from, $to, $width, $height) {
 
 function errorgraph ($rrd, $graph, $from, $to, $width, $height)
 {
-    global $rrdtool; global $installdir;
+    global $rrdtool, $installdir, $mono_font;
     $database = "rrd/" . $rrd;
     $imgfile = "graphs/" . "$graph";
 
@@ -480,7 +480,7 @@ function errorgraph ($rrd, $graph, $from, $to, $width, $height)
 
 function nucastgraph ($rrd, $graph, $from, $to, $width, $height)
 {
-    global $rrdtool; global $installdir;
+    global $rrdtool, $installdir, $mono_font;
     $database = "rrd/" . $rrd;
     $imgfile = "graphs/" . "$graph";
   $optsa = array( "--start", $from, "--end", $to,
@@ -521,7 +521,7 @@ function nucastgraph ($rrd, $graph, $from, $to, $width, $height)
 
 function cpugraph ($rrd, $graph , $from, $to, $width, $height)
 {
- global $rrdtool; global $installdir;
+ global $rrdtool, $installdir, $mono_font;
     $database = "rrd/" . $rrd;
     $imgfile = "graphs/" . "$graph";
     $optsa = array( "--start", $from, "--width", $width, "--height", $height, "--vertical-label", $vertical, "--alt-autoscale-max",
@@ -560,7 +560,7 @@ function cpugraph ($rrd, $graph , $from, $to, $width, $height)
 
 function tempgraph ($rrd, $graph, $from, $to, $width, $height, $title, $vertical)
 {
- global $rrdtool; global $installdir;
+ global $rrdtool, $installdir, $mono_font;
     $database = "rrd/" . $rrd;
     $imgfile = "graphs/" . "$graph";
 
@@ -598,7 +598,7 @@ function tempgraph ($rrd, $graph, $from, $to, $width, $height, $title, $vertical
 
 function uptimegraph ($rrd, $graph , $from, $to, $width, $height, $title, $vertical)
 {
- global $rrdtool; global $installdir;
+ global $rrdtool, $installdir, $mono_font;
     $rrd = "rrd/" . $rrd;
     $imgfile = "graphs/" . "$graph";
     $optsa = array( "--start", $from, "--width", $width, "--height", $height, "--alt-autoscale-max",
@@ -630,7 +630,7 @@ function uptimegraph ($rrd, $graph , $from, $to, $width, $height, $title, $verti
 
 function memgraph ($rrd, $graph , $from, $to, $width, $height, $title, $vertical)
 {
- global $rrdtool; global $installdir;
+ global $rrdtool, $installdir, $mono_font;
     $database = "rrd/" . $rrd;
     $imgfile = "graphs/" . "$graph";
     $memrrd = $database;
@@ -661,7 +661,7 @@ function memgraph ($rrd, $graph , $from, $to, $width, $height, $title, $vertical
 }
 
 function ip_graph ($rrd, $graph, $from, $to, $width, $height) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $database = "rrd/" . $rrd;
   $imgfile = "graphs/" . "$graph";
   $optsa = array( "--start", $from, "--end", $to, "--width", $width, "--height", $height, "--alt-autoscale-max", "-E", "-l 0",
@@ -713,7 +713,7 @@ function ip_graph ($rrd, $graph, $from, $to, $width, $height) {
 }
 
 function icmp_graph ($rrd, $graph, $from, $to, $width, $height) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $database = "rrd/" . $rrd;
   $imgfile = "graphs/" . "$graph";
   $optsa = array( "--start", $from, "--end", $to, "--width", $width, "--height", $height, "--alt-autoscale-max", "-E", "-l 0",
@@ -770,7 +770,7 @@ function icmp_graph ($rrd, $graph, $from, $to, $width, $height) {
 }
 
 function tcp_graph ($rrd, $graph, $from, $to, $width, $height) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $database = "rrd/" . $rrd;
   $imgfile = "graphs/" . "$graph";
   $optsa = array( "--start", $from, "--end", $to, "--width", $width, "--height", $height, "--alt-autoscale-max", "-E", "-l 0",
@@ -822,7 +822,7 @@ function tcp_graph ($rrd, $graph, $from, $to, $width, $height) {
 }
 
 function udp_graph ($rrd, $graph, $from, $to, $width, $height) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $database = "rrd/" . $rrd;
   $imgfile = "graphs/" . "$graph";
   $optsa = array( "--start", $from, "--end", $to, "--width", $width, "--height", $height, "--alt-autoscale-max", "-E", "-l 0",
diff --git a/includes/graphing.php b/includes/graphing.php
index 9d00fd116..dbf573507 100644
--- a/includes/graphing.php
+++ b/includes/graphing.php
@@ -1,7 +1,7 @@
 <?php
 
 function temp_graph ($device, $graph, $from, $to, $width, $height, $title, $vertical) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $optsa = array( "--start", $from, "--end", $to, "--width", $width, "--height", $height, "--vertical-label", $vertical, "--alt-autoscale-max",
                  "-l 0",
                  "-E",
diff --git a/includes/procurve-graphing.php b/includes/procurve-graphing.php
index 6a983f71e..e034f72aa 100755
--- a/includes/procurve-graphing.php
+++ b/includes/procurve-graphing.php
@@ -2,7 +2,7 @@
 
 function cpugraphHP ($rrd, $graph , $from, $to, $width, $height)
 {
- global $rrdtool; global $installdir;
+ global $rrdtool, $installdir, $mono_font;
     $database = "rrd/" . $rrd;
     $imgfile = "graphs/" . "$graph";
 
@@ -36,7 +36,7 @@ function cpugraphHP ($rrd, $graph , $from, $to, $width, $height)
 
 function memgraphHP ($rrd, $graph , $from, $to, $width, $height, $title, $vertical)
 {
- global $rrdtool; global $installdir;
+ global $rrdtool, $installdir, $mono_font;
     $database = "rrd/" . $rrd;
     $imgfile = "graphs/" . "$graph";
     $memrrd = $database;
diff --git a/includes/snom-graphing.php b/includes/snom-graphing.php
index 06152a2e7..d72804203 100644
--- a/includes/snom-graphing.php
+++ b/includes/snom-graphing.php
@@ -1,7 +1,7 @@
 <?php
 
 function callsgraphSNOM ($rrd, $graph, $from, $to, $width, $height, $title, $vertical) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $database = "rrd/" . $rrd;
   $imgfile = "graphs/" . "$graph";
   $optsa = array( "--start", $from, "--end", $to, "--width", $width, "--height", $height, "--vertical-label", $vertical ,"--alt-autoscale-max",
diff --git a/includes/unix-graphing.php b/includes/unix-graphing.php
index 0a238da58..ccf332c11 100755
--- a/includes/unix-graphing.php
+++ b/includes/unix-graphing.php
@@ -3,7 +3,7 @@
 // Start Graphing Functions
 
 function mailerrorgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $vertical) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $range = $to - $from;
   $points_per_sample = 3;
   $xpoints = '540';
@@ -81,7 +81,7 @@ function mailerrorgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title,
 
 
 function mailsgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $vertical) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $points_per_sample = 3;
   $range = $to - $from;
   $xpoints = '540';
@@ -139,7 +139,7 @@ function mailsgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $ver
 
 function memgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $vertical)
 {
- global $rrdtool; global $installdir;
+ global $rrdtool, $installdir, $mono_font;
     $database = "rrd/" . $rrd;
     $imgfile = "graphs/" . "$graph";
     $optsa = array ( 
@@ -222,7 +222,7 @@ function memgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $verti
 }
 
 function loadgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $vertical) {
-    global $rrdtool; global $installdir;
+    global $rrdtool, $installdir, $mono_font;
     $database = "rrd/" . $rrd;
     $imgfile = "graphs/" . "$graph";
     $optsa = array(
@@ -276,7 +276,7 @@ function loadgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $vert
 
 
 function usersgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $vertical) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $database = "rrd/" . $rrd;
   $imgfile = "graphs/" . "$graph";
   $optsa = array(
@@ -314,7 +314,7 @@ function usersgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $ver
 }
 
 function procsgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $vertical) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $database = "rrd/" . $rrd;
   $imgfile = "graphs/" . "$graph";
   $optsa = array(
@@ -354,7 +354,7 @@ function procsgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $ver
 
 
 function cpugraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $vertical) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $database = "rrd/" . $rrd;
   $imgfile = "graphs/" . "$graph";
   $optsa = array(
@@ -409,7 +409,7 @@ function cpugraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $verti
 }
 
 function couriergraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $vertical) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $points_per_sample = 3;
   $range = $to - $from;
   $rrd = "rrd/" . $rrd;
@@ -477,7 +477,7 @@ function couriergraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $v
 }
 
 function apachehitsgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $vertical) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $database = "rrd/" . $rrd;
   $imgfile = "graphs/" . "$graph";
   $optsa = array( "--start", $from, "--end", $to, "--width", $width, "--height", $height, "--vertical-label", $vertical ,"--alt-autoscale-max",
@@ -509,7 +509,7 @@ function apachehitsgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title,
 }
 
 function unixfsgraph ($device, $graph, $from, $to, $width, $height, $title, $vertical) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $optsa = array( "--start", $from, "--end", $to, "--width", $width, "--height", $height, "--vertical-label", $vertical, "--alt-autoscale-max",
                  "-l 0",
                  "-E", 
@@ -554,7 +554,7 @@ function unixfsgraph ($device, $graph, $from, $to, $width, $height, $title, $ver
 }
 
 function apachebitsgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $vertical) {
-  global $rrdtool; global $installdir;
+  global $rrdtool, $installdir, $mono_font;
   $database = "rrd/" . $rrd;
   $imgfile = "graphs/" . "$graph";
   $optsa = array( "--start", $from, "--end", $to, "--width", $width, "--height", $height, "--vertical-label", $vertical,"--alt-autoscale-max",
@@ -588,7 +588,7 @@ function apachebitsgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title,
 
 function tempgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $vertical)
 {
- global $rrdtool; global $installdir;
+ global $rrdtool, $installdir, $mono_font;
     $database = "rrd/" . $rrd;
     $imgfile = "graphs/" . "$graph";