From 3a947d31bdf6e0e4926fbad995f9208950ff441e Mon Sep 17 00:00:00 2001
From: Daniel Barbero Martin <daniel.barbero@artica.es>
Date: Mon, 7 Jun 2021 17:58:36 +0200
Subject: [PATCH] Wip command center, collections merge

---
 pandora_console/include/functions_config.php  |  6 +----
 .../include/functions_filemanager.php         | 27 +++----------------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 3920109890..96fb8f383e 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -3255,11 +3255,7 @@ function config_process_config()
         config_update_value('ehorus_req_timeout', 5);
     }
 
-    if (is_metaconsole()) {
-        if (!isset($config['metaconsole_deploy_collection'])) {
-            config_update_value('metaconsole_deploy_collection', 0);
-        }
-
+    if (is_metaconsole() === true) {
         if (!isset($config['metaconsole_deploy_inventory_plugin'])) {
             config_update_value('metaconsole_deploy_inventory_plugin', 0);
         }
diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php
index 4265566116..bb5fb63e41 100644
--- a/pandora_console/include/functions_filemanager.php
+++ b/pandora_console/include/functions_filemanager.php
@@ -132,14 +132,6 @@ global $config;
 function upload_file($upload_file_or_zip, $default_real_directory)
 {
     global $config;
-
-    $homedir_filemanager = trim($config['homedir']);
-    $sec2 = get_parameter('sec2');
-
-    if ($sec2 === 'enterprise/godmode/agentes/collections' || $sec2 === 'advanced/collections') {
-        $homedir_filemanager .= '/attachment/collection/';
-    }
-
     $config['filemanager'] = [];
     $config['filemanager']['correct_upload_file'] = 0;
     $config['filemanager']['message'] = null;
@@ -183,7 +175,7 @@ function upload_file($upload_file_or_zip, $default_real_directory)
                 if (empty($directory) === true) {
                     $nombre_archivo = $real_directory.'/'.$filename;
                 } else {
-                    $nombre_archivo = $homedir_filemanager.'/'.$directory.'/'.$filename;
+                    $nombre_archivo = $default_real_directory.'/'.$directory.'/'.$filename;
                 }
 
                 if (! @copy($_FILES['file']['tmp_name'], $nombre_archivo)) {
@@ -259,13 +251,6 @@ function create_text_file($default_real_directory)
 {
     global $config;
 
-    $homedir_filemanager = trim($config['homedir']);
-    $sec2 = get_parameter('sec2');
-
-    if ($sec2 == 'enterprise/godmode/agentes/collections' || $sec2 == 'advanced/collections') {
-        $homedir_filemanager .= '/attachment/collection/';
-    }
-
     $config['filemanager'] = [];
     $config['filemanager']['correct_upload_file'] = 0;
     $config['filemanager']['message'] = null;
@@ -292,7 +277,7 @@ function create_text_file($default_real_directory)
             if (empty($directory) === true) {
                 $nombre_archivo = $real_directory.'/'.$filename;
             } else {
-                $nombre_archivo = $homedir_filemanager.'/'.$directory.'/'.$filename;
+                $nombre_archivo = $default_real_directory.'/'.$directory.'/'.$filename;
             }
 
             if (! @touch($nombre_archivo)) {
@@ -313,17 +298,13 @@ function create_text_file($default_real_directory)
 }
 
 
-$homedir_filemanager = trim($config['homedir']);
-$sec2 = get_parameter('sec2');
-if ($sec2 === 'enterprise/godmode/agentes/collections' || $sec2 === 'advanced/collections') {
-    $homedir_filemanager .= '/attachment/collection/';
-}
-
 // CREATE DIR.
 $create_dir = (bool) get_parameter('create_dir');
 if ($create_dir === true) {
     global $config;
 
+    $homedir_filemanager = io_safe_output($config['attachment_store']).'/collection';
+
     $config['filemanager'] = [];
     $config['filemanager']['correct_create_dir'] = 0;
     $config['filemanager']['message'] = null;