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

Merge branch 'ent-3345-Error_al_subir_imagenes_en_el_file_manager' into 'develop' 

fixed error filemanager

See merge request artica/pandorafms!2186

Former-commit-id: d7cbd95f2b8cf86a7cdcbc85e100dc282a94d483
This commit is contained in:
Alejandro Fraguas 2019-02-20 11:42:29 +01:00
parent 1c7c0ebe8f df88582982
commit c527378183
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/include/functions_filemanager.php
View File

@ -126,6 +126,12 @@ if (isset($config['homedir_filemanager'])) {
$homedir_filemanager = $config['homedir']; $homedir_filemanager = $config['homedir'];
} }
$sec2 = get_parameter('sec2');
if ($sec2 == 'enterprise/godmode/agentes/collections') {
$homedir_filemanager .= '/attachment/collection/';
}
$upload_file_or_zip = (bool) get_parameter('upload_file_or_zip'); $upload_file_or_zip = (bool) get_parameter('upload_file_or_zip');
if ($upload_file_or_zip) { if ($upload_file_or_zip) {
@ -499,12 +505,6 @@ function filemanager_file_explorer(
$homedir_filemanager = $config['homedir']; $homedir_filemanager = $config['homedir'];
} }
unset($config['homedir_filemanager']);
config_update_value(
'homedir_filemanager',
$homedir_filemanager
);
$hack_metaconsole = ''; $hack_metaconsole = '';
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
$hack_metaconsole = '../../'; $hack_metaconsole = '../../';
@ -938,4 +938,3 @@ function filemanager_list_dir($dirpath)
return array_merge($dirs, $files); return array_merge($dirs, $files);
} }