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

Merge branch '2606-Gestión-de-colecciones-desde-metaconsola-return-2-dev' into 'develop' 

2606 gestión de colecciones desde metaconsola return 2 dev

See merge request artica/pandorafms!1989
This commit is contained in:
vgilc 2018-11-19 12:24:22 +01:00
parent 96a36615cc 24fe48d5c5
commit 89868cd3c5
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_config.php
View File

@ -2023,6 +2023,12 @@ 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);
}
}
/* Finally, check if any value was overwritten in a form */
config_update_config();
}

2
pandora_console/include/functions_filemanager.php
View File

@ -742,7 +742,7 @@ function filemanager_file_explorer($real_directory, $relative_directory,
$data[4] .= '<span style="display: flex">';
$typefile = array_pop(explode(".",$fileinfo['name']));
if (is_writable ($fileinfo['realpath']) &&
(! is_dir ($fileinfo['realpath']) || count (scandir ($fileinfo['realpath'])) < 3)) {
(! is_dir ($fileinfo['realpath']) || count (scandir ($fileinfo['realpath'])) < 3) && (!$readOnly)) {
$data[4] .= '<form method="post" action="' . $url . '" style="">';
$data[4] .= '<input type="image" src="images/cross.png" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
$data[4] .= html_print_input_hidden ('filename', $fileinfo['realpath'], true);