From b4170ca28594e222a04e5ecf5146ad671203d0d1 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 1 Mar 2019 11:08:49 +0100 Subject: [PATCH] minor fixes, removed tuser_task_scheduled from tasklist, also cde over ipam references Former-commit-id: 46be3614b9aeb9837748149a805427d68a07f566 --- .../wizards/DiscoveryTaskList.class.php | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php index 07788b062e..9796646fce 100644 --- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php +++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php @@ -337,27 +337,10 @@ class DiscoveryTaskList extends Wizard } } - $recon_tasks = db_get_all_rows_sql('SELECT * FROM trecon_task'); - $user_groups = implode(',', array_keys(users_get_groups())); - $defined_tasks = db_get_all_rows_filter( - 'tuser_task_scheduled', - 'id_grupo IN ('.$user_groups.')' - ); + $recon_tasks = db_get_all_rows_sql('SELECT * FROM trecon_task'); + $user_groups = implode(',', array_keys(users_get_groups())); - if (isset($tasks_console) === true - && is_array($tasks_console) === true - ) { - foreach ($tasks_console as $key => $value) { - $value['parameters'] = unserialize( - $value['parameters'] - ); - - $value['type'] = 'Cron'; - array_push($recon_tasks, $value); - } - } - - // Show network tasks for Recon Server. + // Show network tasks for Recon Server. if ($recon_tasks === false) { $recon_tasks = []; } @@ -416,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']);