From 57e292907abbc38afb60c1ae980acb9f37c3f86a Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 4 May 2011 09:13:32 +0000
Subject: [PATCH] fix globals in discovery modules

git-svn-id: http://www.observium.org/svn/observer/trunk@2234 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/discovery-protocols.inc.php | 2 ++
 includes/discovery/frequencies.inc.php         | 3 ++-
 includes/discovery/ipv6-addresses.inc.php      | 4 +++-
 includes/discovery/mempools.inc.php            | 4 +++-
 includes/discovery/power.inc.php               | 3 ++-
 includes/discovery/processors.inc.php          | 4 +++-
 includes/discovery/sensors.inc.php             | 2 ++
 includes/discovery/storage.inc.php             | 2 ++
 8 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/includes/discovery/discovery-protocols.inc.php b/includes/discovery/discovery-protocols.inc.php
index de5803fad..b0e0a9106 100755
--- a/includes/discovery/discovery-protocols.inc.php
+++ b/includes/discovery/discovery-protocols.inc.php
@@ -2,6 +2,8 @@
 
 echo("Discovery protocols:");
 
+global $link_exists;
+
 $community = $device['community'];
 
 if ($device['os'] == "ironware")
diff --git a/includes/discovery/frequencies.inc.php b/includes/discovery/frequencies.inc.php
index fd409d625..6bd02231f 100644
--- a/includes/discovery/frequencies.inc.php
+++ b/includes/discovery/frequencies.inc.php
@@ -1,4 +1,5 @@
 <?php
+
 echo("Frequencies: ");
 
 include_dir("includes/discovery/frequencies");
@@ -9,4 +10,4 @@ check_valid_sensors($device, 'frequency', $valid_sensor);
 
 echo("\n");
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/ipv6-addresses.inc.php b/includes/discovery/ipv6-addresses.inc.php
index 11343f469..dbe254c3e 100644
--- a/includes/discovery/ipv6-addresses.inc.php
+++ b/includes/discovery/ipv6-addresses.inc.php
@@ -2,6 +2,8 @@
 
 echo("IPv6 Addresses : ");
 
+global $valid_v6;
+
 $oids = snmp_walk($device, "ipAddressIfIndex.ipv6", "-Ln -Osq", "IP-MIB");
 $oids = str_replace("ipAddressIfIndex.ipv6.", "", $oids);
 $oids = str_replace("\"", "", $oids);
@@ -81,4 +83,4 @@ unset($valid_v6);
 
 echo("\n");
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/mempools.inc.php b/includes/discovery/mempools.inc.php
index d15a9ea7a..cfaa8843b 100755
--- a/includes/discovery/mempools.inc.php
+++ b/includes/discovery/mempools.inc.php
@@ -2,6 +2,8 @@
 
 echo("Memory : ");
 
+global $valid_mempool; ## FIXME PLEASE!
+
 include_dir("includes/discovery/mempools");
 
 ### Remove memory pools which weren't redetected here
@@ -29,4 +31,4 @@ while ($test_mempool = mysql_fetch_assoc($query))
 unset($valid_mempool);
 echo("\n");
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/power.inc.php b/includes/discovery/power.inc.php
index 0f282d063..31c968292 100644
--- a/includes/discovery/power.inc.php
+++ b/includes/discovery/power.inc.php
@@ -1,4 +1,5 @@
 <?php
+
 echo("Power: ");
 
 include_dir("includes/discovery/power");
@@ -9,4 +10,4 @@ check_valid_sensors($device, 'power', $valid_sensor);
 
 echo("\n");
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/processors.inc.php b/includes/discovery/processors.inc.php
index 53d9f1fa0..06c35944e 100755
--- a/includes/discovery/processors.inc.php
+++ b/includes/discovery/processors.inc.php
@@ -2,6 +2,8 @@
 
 echo("Processors : ");
 
+global $valid_processor;
+
 include_dir("includes/discovery/processors");
 
 ## Last-resort discovery here
@@ -31,4 +33,4 @@ while ($test_processor = mysql_fetch_assoc($query))
 unset($valid_processor);
 echo("\n");
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/sensors.inc.php b/includes/discovery/sensors.inc.php
index 576ce2534..f8f056ded 100644
--- a/includes/discovery/sensors.inc.php
+++ b/includes/discovery/sensors.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+global $valid_sensor;
+
 $valid_sensor = array();
 
 echo("Sensors: ");
diff --git a/includes/discovery/storage.inc.php b/includes/discovery/storage.inc.php
index 340505c27..c3cdd2a24 100755
--- a/includes/discovery/storage.inc.php
+++ b/includes/discovery/storage.inc.php
@@ -2,6 +2,8 @@
 
 echo("Storage : ");
 
+global $valid_storage;
+
 include_dir("includes/discovery/storage");