From 9888002704774f6cb14979da8a1456e8e663fcbc Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 9 May 2012 11:05:28 +0000
Subject: [PATCH] fix netstat graphs (remove invalid double including of
 common.inc.php)

git-svn-id: http://www.observium.org/svn/observer/trunk@3151 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/common.inc.php                   | 2 +-
 html/includes/graphs/device/netstat_icmp.inc.php      | 2 --
 html/includes/graphs/device/netstat_icmp_info.inc.php | 2 --
 html/includes/graphs/device/netstat_ip.inc.php        | 2 --
 html/includes/graphs/device/netstat_snmp.inc.php      | 2 --
 html/includes/graphs/device/netstat_snmp_pkt.inc.php  | 2 --
 html/includes/graphs/device/netstat_tcp.inc.php       | 2 --
 html/includes/graphs/device/netstat_udp.inc.php       | 2 --
 8 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/html/includes/graphs/common.inc.php b/html/includes/graphs/common.inc.php
index b99545b4c..9211db91f 100644
--- a/html/includes/graphs/common.inc.php
+++ b/html/includes/graphs/common.inc.php
@@ -6,7 +6,7 @@ if ($_GET['width'])   { $width  = mres($_GET['width']);  }
 if($config['trim_tobias']) { $width+=12; }
 if ($_GET['height'])  { $height = mres($_GET['height']); }
 if ($_GET['inverse']) { $in = 'out'; $out = 'in'; } else { $in = 'in'; $out = 'out'; }
-if ($_GET['legend'] == "no")  { $rrd_options = " -g"; }
+if ($_GET['legend'] == "no")  { $rrd_options .= " -g"; }
 
 if ($_GET['title'] == "yes")  { $rrd_options .= " --title='".$graph_title."' "; }
 if (isset($_GET['graph_title']))  { $rrd_options .= " --title='".$_GET['graph_title']."' "; }
diff --git a/html/includes/graphs/device/netstat_icmp.inc.php b/html/includes/graphs/device/netstat_icmp.inc.php
index 283ef7016..e9c292aa8 100644
--- a/html/includes/graphs/device/netstat_icmp.inc.php
+++ b/html/includes/graphs/device/netstat_icmp.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-include("includes/graphs/common.inc.php");
-
 $device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-icmp.rrd";
diff --git a/html/includes/graphs/device/netstat_icmp_info.inc.php b/html/includes/graphs/device/netstat_icmp_info.inc.php
index 51b5b54f5..2c4c7ef3c 100644
--- a/html/includes/graphs/device/netstat_icmp_info.inc.php
+++ b/html/includes/graphs/device/netstat_icmp_info.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-include('includes/graphs/common.inc.php');
-
 $device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-icmp.rrd";
diff --git a/html/includes/graphs/device/netstat_ip.inc.php b/html/includes/graphs/device/netstat_ip.inc.php
index c6a174155..7d84636b0 100644
--- a/html/includes/graphs/device/netstat_ip.inc.php
+++ b/html/includes/graphs/device/netstat_ip.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-include("includes/graphs/common.inc.php");
-
 $device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-ip.rrd";
diff --git a/html/includes/graphs/device/netstat_snmp.inc.php b/html/includes/graphs/device/netstat_snmp.inc.php
index a82ce0007..2cda3e328 100644
--- a/html/includes/graphs/device/netstat_snmp.inc.php
+++ b/html/includes/graphs/device/netstat_snmp.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-include("includes/graphs/common.inc.php");
-
 $device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-snmp.rrd";
diff --git a/html/includes/graphs/device/netstat_snmp_pkt.inc.php b/html/includes/graphs/device/netstat_snmp_pkt.inc.php
index 399419469..d48e29423 100644
--- a/html/includes/graphs/device/netstat_snmp_pkt.inc.php
+++ b/html/includes/graphs/device/netstat_snmp_pkt.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-include("includes/graphs/common.inc.php");
-
 $device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-snmp.rrd";
diff --git a/html/includes/graphs/device/netstat_tcp.inc.php b/html/includes/graphs/device/netstat_tcp.inc.php
index b4b3455cf..e218ed5c1 100644
--- a/html/includes/graphs/device/netstat_tcp.inc.php
+++ b/html/includes/graphs/device/netstat_tcp.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-include("includes/graphs/common.inc.php");
-
 $device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-tcp.rrd";
diff --git a/html/includes/graphs/device/netstat_udp.inc.php b/html/includes/graphs/device/netstat_udp.inc.php
index 34d0529d4..88b59f989 100644
--- a/html/includes/graphs/device/netstat_udp.inc.php
+++ b/html/includes/graphs/device/netstat_udp.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-include("includes/graphs/common.inc.php");
-
 $device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-udp.rrd";