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-dev' into 'develop' 

collection management from metaconsole

See merge request artica/pandorafms!1962
This commit is contained in:
vgilc 2018-11-13 09:28:29 +01:00
parent 72691ffe8d 2a0d2e6c46
commit 062f413bfe
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/include/functions_filemanager.php
View File

@ -495,16 +495,12 @@ function filemanager_file_explorer($real_directory, $relative_directory,
if ($homedir_filemanager === false) { if ($homedir_filemanager === false) {
$homedir_filemanager = $config['homedir']; $homedir_filemanager = $config['homedir'];
}
unset($config['homedir_filemanager']); unset($config['homedir_filemanager']);
config_update_value('homedir_filemanager', config_update_value(
$homedir_filemanager); 'homedir_filemanager',
} $homedir_filemanager
else { );
$config['homedir_filemanager'] = $homedir_filemanager;
}
$hack_metaconsole = ''; $hack_metaconsole = '';
if (defined('METACONSOLE')) if (defined('METACONSOLE'))
@ -743,11 +739,11 @@ function filemanager_file_explorer($real_directory, $relative_directory,
//Actions buttons //Actions buttons
//Delete button //Delete button
$data[4] = ''; $data[4] = '';
$data[4] .= '<span style="">'; $data[4] .= '<span style="display: flex">';
$typefile = array_pop(explode(".",$fileinfo['name'])); $typefile = array_pop(explode(".",$fileinfo['name']));
if (is_writable ($fileinfo['realpath']) && if (is_writable ($fileinfo['realpath']) &&
(! is_dir ($fileinfo['realpath']) || count (scandir ($fileinfo['realpath'])) < 3)) { (! is_dir ($fileinfo['realpath']) || count (scandir ($fileinfo['realpath'])) < 3)) {
$data[4] .= '<form method="post" action="' . $url . '" style="display: inline;">'; $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] .= '<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); $data[4] .= html_print_input_hidden ('filename', $fileinfo['realpath'], true);
$data[4] .= html_print_input_hidden('hash', md5($fileinfo['realpath'] . $config['dbpass']), true); $data[4] .= html_print_input_hidden('hash', md5($fileinfo['realpath'] . $config['dbpass']), true);