From aa39f2eac2d8ac5f34c7d9c0c95bfecacae4b8b0 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 22 Aug 2023 12:41:30 +0200 Subject: [PATCH 1/3] #11926 Fixed requires --- .../extensions/agents_modules_csv.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pandora_console/extensions/agents_modules_csv.php b/pandora_console/extensions/agents_modules_csv.php index 53225f8e4d..2171a961b1 100644 --- a/pandora_console/extensions/agents_modules_csv.php +++ b/pandora_console/extensions/agents_modules_csv.php @@ -26,20 +26,14 @@ * ============================================================================ */ - -/* - require_once $config['homedir'].'/include/config.php'; - require_once $config['homedir'].'/include/functions_reporting.php'; - require_once $config['homedir'].'/include/functions_modules.php'; -*/ -require_once '../include/config.php'; -require_once '../include/functions_agents.php'; -require_once '../include/functions_reporting.php'; -require_once '../include/functions_modules.php'; -require_once '../include/functions_users.php'; - global $config; +require_once $config['homedir'].'/include/config.php'; +require_once $config['homedir'].'/include/functions_agents.php'; +require_once $config['homedir'].'/include/functions_reporting.php'; +require_once $config['homedir'].'/include/functions_modules.php'; +require_once $config['homedir'].'/include/functions_users.php'; + check_login(); // ACL Check. From 9bb0b30772341cb21538a95475708e83928b7172 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Tue, 22 Aug 2023 14:23:57 +0200 Subject: [PATCH 2/3] #11926 Fix download CSV --- pandora_console/extensions/agents_modules_csv.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pandora_console/extensions/agents_modules_csv.php b/pandora_console/extensions/agents_modules_csv.php index 2171a961b1..8170d568ed 100644 --- a/pandora_console/extensions/agents_modules_csv.php +++ b/pandora_console/extensions/agents_modules_csv.php @@ -28,6 +28,12 @@ global $config; +require_once '../include/config.php'; +require_once '../include/functions_agents.php'; +require_once '../include/functions_reporting.php'; +require_once '../include/functions_modules.php'; +require_once '../include/functions_users.php'; + require_once $config['homedir'].'/include/config.php'; require_once $config['homedir'].'/include/functions_agents.php'; require_once $config['homedir'].'/include/functions_reporting.php'; From fc32fcff87f27a3c055fff33fcbe0356af013eb8 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Tue, 22 Aug 2023 14:35:28 +0200 Subject: [PATCH 3/3] #11926 Fix download CSV --- .../extensions/agents_modules_csv.php | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pandora_console/extensions/agents_modules_csv.php b/pandora_console/extensions/agents_modules_csv.php index 8170d568ed..6ed1061c11 100644 --- a/pandora_console/extensions/agents_modules_csv.php +++ b/pandora_console/extensions/agents_modules_csv.php @@ -27,18 +27,19 @@ */ global $config; +if (true) { + include_once '../include/config.php'; + include_once '../include/functions_agents.php'; + include_once '../include/functions_reporting.php'; + include_once '../include/functions_modules.php'; + include_once '../include/functions_users.php'; + include_once $config['homedir'].'/include/config.php'; + include_once $config['homedir'].'/include/functions_agents.php'; + include_once $config['homedir'].'/include/functions_reporting.php'; + include_once $config['homedir'].'/include/functions_modules.php'; + include_once $config['homedir'].'/include/functions_users.php'; +} -require_once '../include/config.php'; -require_once '../include/functions_agents.php'; -require_once '../include/functions_reporting.php'; -require_once '../include/functions_modules.php'; -require_once '../include/functions_users.php'; - -require_once $config['homedir'].'/include/config.php'; -require_once $config['homedir'].'/include/functions_agents.php'; -require_once $config['homedir'].'/include/functions_reporting.php'; -require_once $config['homedir'].'/include/functions_modules.php'; -require_once $config['homedir'].'/include/functions_users.php'; check_login();