mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix global $device

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2260 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-05 20:37:54 +00:00
parent 78dc7147a6
commit 43e316e7f6
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
discovery.php
View File

@@ -160,6 +160,7 @@ function discover_device($device, $options)
{ {
global $config; global $config;
global $device;
global $valid; $valid = array(); ## Reset $valid array global $valid; $valid = array(); ## Reset $valid array
$attribs = get_dev_attribs($device['device_id']); $attribs = get_dev_attribs($device['device_id']);
@@ -181,10 +182,7 @@ function discover_device($device, $options)
echo("\n"); echo("\n");
#include("includes/discovery/os.inc.php");
### If we've specified a module, use that, else walk the modules array ### If we've specified a module, use that, else walk the modules array
if ($options['m']) if ($options['m'])
{ {
if (is_file("includes/discovery/".$options['m'].".inc.php")) if (is_file("includes/discovery/".$options['m'].".inc.php"))

1
poller.php
View File

@@ -107,6 +107,7 @@ while ($device = mysql_fetch_assoc($device_query))
function poll_device($device, $options) { function poll_device($device, $options) {
global $config; global $config;
global $device;
$attribs = get_dev_attribs($device['device_id']); $attribs = get_dev_attribs($device['device_id']);