mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
fix global $device
git-svn-id: http://www.observium.org/svn/observer/trunk@2260 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
@@ -160,6 +160,7 @@ function discover_device($device, $options)
|
||||
{
|
||||
|
||||
global $config;
|
||||
global $device;
|
||||
global $valid; $valid = array(); ## Reset $valid array
|
||||
|
||||
$attribs = get_dev_attribs($device['device_id']);
|
||||
@@ -181,10 +182,7 @@ function discover_device($device, $options)
|
||||
|
||||
echo("\n");
|
||||
|
||||
#include("includes/discovery/os.inc.php");
|
||||
|
||||
### If we've specified a module, use that, else walk the modules array
|
||||
|
||||
if ($options['m'])
|
||||
{
|
||||
if (is_file("includes/discovery/".$options['m'].".inc.php"))
|
||||
|
@@ -107,6 +107,7 @@ while ($device = mysql_fetch_assoc($device_query))
|
||||
function poll_device($device, $options) {
|
||||
|
||||
global $config;
|
||||
global $device;
|
||||
|
||||
$attribs = get_dev_attribs($device['device_id']);
|
||||
|
||||
|
Reference in New Issue
Block a user