From afa5ec2d54d7f12baf321d680cd6d9c1d886561c Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Sat, 6 Jun 2015 21:04:23 +1000 Subject: [PATCH] Allow multiple comma-separated discovery modules to be specified --- includes/discovery/functions.inc.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php index adf05964b4..f369fac79b 100644 --- a/includes/discovery/functions.inc.php +++ b/includes/discovery/functions.inc.php @@ -81,12 +81,12 @@ function discover_device($device, $options = NULL) echo("\n"); - // 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")) - { - include("includes/discovery/".$options['m'].".inc.php"); + // If we've specified modules, use them, else walk the modules array + if ($options['m']) { + foreach (explode(',', $options['m']) as $module) { + if (is_file("includes/discovery/$module.inc.php")) { + include("includes/discovery/$module.inc.php"); + } } } else { foreach ($config['discovery_modules'] as $module => $module_status)