tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2 

Former-commit-id: 157ed627078c5e6cfedd6ed9d509a339cdb01632
This commit is contained in:
fbsanchez 2019-03-01 11:09:11 +01:00
parent d547024274 b4170ca285
commit adb25e91f8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -340,7 +340,7 @@ class DiscoveryTaskList extends Wizard
$recon_tasks = db_get_all_rows_sql('SELECT * FROM trecon_task');
$user_groups = implode(',', array_keys(users_get_groups()));
// Show network tasks for Recon Server.
// Show network tasks for Recon Server.
if ($recon_tasks === false) {
$recon_tasks = [];
}
@ -399,7 +399,9 @@ class DiscoveryTaskList extends Wizard
$ipam = false;
if ($task['id_recon_script'] != null) {
$recon_script_name = db_get_value('name', 'trecon_script', 'id_recon_script', $task['id_recon_script']);
if (io_safe_output($recon_script_name) == 'IPAM Recon') {
if (io_safe_output($recon_script_name) == 'IPAM Recon'
&& enterprise_installed()
) {
$subnet_obj = json_decode($task['macros'], true);
$subnet = $subnet_obj['1']['value'];
$tipam_task_id = db_get_value('id', 'tipam_network', 'id_recon_task', $task['id_rt']);