Skip to content

Commit ed53255

Browse files
committed
fix: upload allegati in ckeditor per moduli senza permessi
1 parent a8cbb63 commit ed53255

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

actions.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
exit(tr('Accesso negato'));
3535
}
3636

37-
$upload_dir = base_dir().'/'.Uploads::getDirectory($id_module, $id_plugin);
38-
3937
$database->beginTransaction();
4038

4139
// Upload allegati e rimozione
@@ -56,10 +54,13 @@
5654
$file_extension = pathinfo($_FILES['upload']['name'], PATHINFO_EXTENSION);
5755

5856
if (in_array(strtolower($file_extension), $allowed_extension) && $_FILES['upload']['size'] < $max_size) {
57+
$id_module_upload = $id_module ?: Modules::getAvailableModules()->first()->id;
58+
$upload_dir = base_path_osm().'/'.Uploads::getDirectory($id_module_upload, $id_plugin);
5959
$upload = Uploads::upload($_FILES['upload'], [
6060
'name' => filter('nome_allegato'),
6161
'id_category' => filter('id_category') ?: null,
62-
'id_module' => Module::where('name', 'Gestione documentale')->first()->id,
62+
'id_module' => $id_module_upload,
63+
'id_plugin' => $id_plugin,
6364
'id_record' => $id_record,
6465
]);
6566

@@ -78,9 +79,9 @@
7879
$upload = Upload::find($id_allegato);
7980

8081
$response = [
81-
'fileName' => base_path_osm().'/files/gestione_documentale/'.basename($upload->filename),
82+
'fileName' => $upload_dir.'/'.basename($upload->filename),
8283
'uploaded' => 1,
83-
'url' => base_path_osm().'/files/gestione_documentale/'.$upload->filename,
84+
'url' => $upload_dir.'/'.$upload->filename,
8485
];
8586

8687
// Upload da form
@@ -89,7 +90,7 @@
8990
<script type="text/javascript">
9091
$(document).ready(function() {
9192
window.parent.toastr.success("'.tr('Caricamento riuscito').'");
92-
window.parent.CKEDITOR.tools.callFunction('.$funcNum.', "'.$baseurl.'/files/gestione_documentale/'.$upload->filename.'");
93+
window.parent.CKEDITOR.tools.callFunction('.$funcNum.', "'.$upload_dir.'/'.$upload->filename.'");
9394
});
9495
</script>';
9596
}
@@ -161,7 +162,6 @@
161162
if (filter('op') == 'download-allegato') {
162163
$rs = $dbo->fetchArray('SELECT * FROM zz_files WHERE id_module='.prepare($id_module).' AND id='.prepare(filter('id')).' AND filename='.prepare(filter('filename')));
163164

164-
// download($upload_dir.'/'.$rs[0]['filename'], $rs[0]['original']);
165165
$file = Upload::find($rs[0]['id']);
166166

167167
if (!empty($file)) {

0 commit comments

Comments
 (0)