diff --git a/controller.php b/controller.php index a21e50765..90bcffb45 100644 --- a/controller.php +++ b/controller.php @@ -80,7 +80,7 @@ echo ' '; -redirectOperation($id_module, $id_record); +redirectOperation($id_module, isset($id_parent) ? $id_parent : $id_record); // Widget in basso echo '{( "name": "widgets", "id_module": "'.$id_module.'", "position": "right", "place": "controller" )}'; diff --git a/editor.php b/editor.php index 0f37ed7fa..3bcd8a0d8 100755 --- a/editor.php +++ b/editor.php @@ -224,7 +224,7 @@ if (empty($records)) { '; } -redirectOperation($id_module, $id_record); +redirectOperation($id_module, isset($id_parent) ? $id_parent : $id_record); // Widget in basso echo '{( "name": "widgets", "id_module": "'.$id_module.'", "id_record": "'.$id_record.'", "position": "right", "place": "editor" )}'; diff --git a/include/manager.php b/include/manager.php index 9aa747b73..c96b09fe2 100644 --- a/include/manager.php +++ b/include/manager.php @@ -36,6 +36,12 @@ $total = App::readQuery($element); $module_options = (!empty($element['options2'])) ? $element['options2'] : $element['options']; +// Caricamento helper modulo (verifico se ci sono helper personalizzati) +include_once App::filepath($directory.'|custom|', 'modutil.php'); + +// Lettura risultato query del modulo +include App::filepath($directory.'|custom|', 'init.php'); + // Caricamento file aggiuntivo su elenco record include App::filepath($directory.'|custom|', 'controller_before.php'); diff --git a/lib/util.php b/lib/util.php index 59373016c..86e802190 100644 --- a/lib/util.php +++ b/lib/util.php @@ -192,6 +192,8 @@ if (!function_exists('download')) { */ function download($file, $filename = null) { + ob_end_clean(); + if (!headers_sent()) { $filename = !empty($filename) ? $filename : basename($file); diff --git a/modules/articoli/edit.php b/modules/articoli/edit.php index 6073da451..975eaa971 100644 --- a/modules/articoli/edit.php +++ b/modules/articoli/edit.php @@ -11,9 +11,9 @@ $img = null; if (!empty($records[0]['immagine01'])) { $fileinfo = Uploads::fileInfo($records[0]['immagine01']); - $default_img = '/'.Uploads::getUploadDirectory($id_module).'/'.$fileinfo['filename'].'_thumb600.'.$fileinfo['extension']; + $default_img = '/'.Uploads::getDirectory($id_module).'/'.$fileinfo['filename'].'_thumb600.'.$fileinfo['extension']; - $img = file_exists(DOCROOT.$default_img) ? ROOTDIR.$default_img : ROOTDIR.'/'.Uploads::getUploadDirectory($id_module).'/'.$records[0]['immagine01']; + $img = file_exists(DOCROOT.$default_img) ? ROOTDIR.$default_img : ROOTDIR.'/'.Uploads::getDirectory($id_module).'/'.$records[0]['immagine01']; } ?>