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-5667-collections-symlinks-doesnt-work' into 'develop' 

Fixed collections symlinks

See merge request artica/pandorafms!3224
This commit is contained in:
Alejandro Fraguas 2020-06-11 12:38:02 +02:00
parent dab1a8b5cb 7a35e8550c
commit 5ac43db03c
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pandora_console/include/functions_filemanager.php
View File

@ -369,11 +369,21 @@ if ($delete_file) {
$config['filemanager']['message'] = ui_print_success_message(__('Deleted'), '', true); $config['filemanager']['message'] = ui_print_success_message(__('Deleted'), '', true);
if (is_dir($filename)) { if (is_dir($filename)) {
rmdir($filename); if (rmdir($filename)) {
$config['filemanager']['delete'] = 1; $config['filemanager']['delete'] = 1;
} else {
$config['filemanager']['delete'] = 0;
}
} else { } else {
unlink($filename); if (unlink($filename)) {
$config['filemanager']['delete'] = 1; $config['filemanager']['delete'] = 1;
} else {
$config['filemanager']['delete'] = 0;
}
}
if ($config['filemanager']['delete'] == 0) {
$config['filemanager']['message'] = ui_print_error_message(__('Deleted'), '', true);
} }
} }
} }
@ -743,7 +753,7 @@ function filemanager_file_explorer(
if (($editor) && (!$readOnly)) { if (($editor) && (!$readOnly)) {
if (($typefile != 'bin') && ($typefile != 'pdf') && ($typefile != 'png') && ($typefile != 'jpg') if (($typefile != 'bin') && ($typefile != 'pdf') && ($typefile != 'png') && ($typefile != 'jpg')
&& ($typefile != 'iso') && ($typefile != 'docx') && ($typefile != 'doc') && ($typefile != 'iso') && ($typefile != 'docx') && ($typefile != 'doc') && ($fileinfo['mime'] != MIME_DIR)
) { ) {
$hash = md5($fileinfo['realpath'].$config['dbpass']); $hash = md5($fileinfo['realpath'].$config['dbpass']);
$data[4] .= "<a style='vertical-align: top;' href='$url&edit_file=1&hash=".$hash.'&location_file='.$fileinfo['realpath']."' style='float: left;'>".html_print_image('images/edit.png', true, ['style' => 'margin-top: 2px;', 'title' => __('Edit file')]).'</a>'; $data[4] .= "<a style='vertical-align: top;' href='$url&edit_file=1&hash=".$hash.'&location_file='.$fileinfo['realpath']."' style='float: left;'>".html_print_image('images/edit.png', true, ['style' => 'margin-top: 2px;', 'title' => __('Edit file')]).'</a>';