tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Wip command center, collections merge

Browse Source
This commit is contained in:
Daniel Barbero Martin 2021-06-07 17:58:36 +02:00
parent c0103367fd
commit 3a947d31bd
2 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_config.php
View File

@ -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);
}

27
pandora_console/include/functions_filemanager.php
View File

@ -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;