|
34 | 34 | exit(tr('Accesso negato')); |
35 | 35 | } |
36 | 36 |
|
37 | | -$upload_dir = base_dir().'/'.Uploads::getDirectory($id_module, $id_plugin); |
38 | | - |
39 | 37 | $database->beginTransaction(); |
40 | 38 |
|
41 | 39 | // Upload allegati e rimozione |
|
56 | 54 | $file_extension = pathinfo($_FILES['upload']['name'], PATHINFO_EXTENSION); |
57 | 55 |
|
58 | 56 | 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); |
59 | 59 | $upload = Uploads::upload($_FILES['upload'], [ |
60 | 60 | 'name' => filter('nome_allegato'), |
61 | 61 | '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, |
63 | 64 | 'id_record' => $id_record, |
64 | 65 | ]); |
65 | 66 |
|
|
78 | 79 | $upload = Upload::find($id_allegato); |
79 | 80 |
|
80 | 81 | $response = [ |
81 | | - 'fileName' => base_path_osm().'/files/gestione_documentale/'.basename($upload->filename), |
| 82 | + 'fileName' => $upload_dir.'/'.basename($upload->filename), |
82 | 83 | 'uploaded' => 1, |
83 | | - 'url' => base_path_osm().'/files/gestione_documentale/'.$upload->filename, |
| 84 | + 'url' => $upload_dir.'/'.$upload->filename, |
84 | 85 | ]; |
85 | 86 |
|
86 | 87 | // Upload da form |
|
89 | 90 | <script type="text/javascript"> |
90 | 91 | $(document).ready(function() { |
91 | 92 | 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.'"); |
93 | 94 | }); |
94 | 95 | </script>'; |
95 | 96 | } |
|
161 | 162 | if (filter('op') == 'download-allegato') { |
162 | 163 | $rs = $dbo->fetchArray('SELECT * FROM zz_files WHERE id_module='.prepare($id_module).' AND id='.prepare(filter('id')).' AND filename='.prepare(filter('filename'))); |
163 | 164 |
|
164 | | - // download($upload_dir.'/'.$rs[0]['filename'], $rs[0]['original']); |
165 | 165 | $file = Upload::find($rs[0]['id']); |
166 | 166 |
|
167 | 167 | if (!empty($file)) { |
|
0 commit comments