Miglioramento gestione identificatori

actions.php

@@ -2,19 +2,7 @@
 
 include_once __DIR__.'/core.php';
 
-// Lettura parametri iniziali
+if (empty($structure) || empty($structure['enabled'])) {
-if (!empty($id_plugin)) {
-    $element = Plugins::get($id_plugin);
-
-    $directory = '/plugins/'.$element['directory'];
-    $id_module = $element['idmodule_to'];
-} else {
-    $element = Modules::get($id_module);
-
-    $directory = '/modules/'.$element['directory'];
-}
-
-if (empty($element) || empty($element['enabled'])) {
     die(tr('Accesso negato'));
 }
 
@@ -131,8 +119,8 @@ if (filter('op') == 'link_file' || filter('op') == 'unlink_file') {
 }
 
 // Inclusione di eventuale plugin personalizzato
-if (!empty($element['script'])) {
+if (!empty($structure['script'])) {
-    include $element->getEditFile();
+    include $structure->getEditFile();
 
     $database->commitTransaction();
 
@@ -140,13 +128,13 @@ if (!empty($element['script'])) {
 }
 
 // Caricamento funzioni del modulo
-$modutil = App::filepath($directory.'|custom|', 'modutil.php');
+$modutil = $structure->filepath('modutil.php');
 if (!empty($modutil)) {
     include_once $modutil;
 }
 
 // Lettura risultato query del modulo
-$init = App::filepath($directory.'|custom|', 'init.php');
+$init = $structure->filepath('init.php');
 if (!empty($init)) {
     include_once $init;
 }
@@ -164,7 +152,7 @@ if (!isset($record) && isset($records[0])) {
 // Registrazione del record
 HTMLBuilder\HTMLBuilder::setRecord($record);
 
-if ($element->permission == 'rw') {
+if ($structure->permission == 'rw') {
     // Esecuzione delle operazioni di gruppo
     $id_records = post('id_records');
     $id_records = is_array($id_records) ? $id_records : explode(';', $id_records);
@@ -173,7 +161,7 @@ if ($element->permission == 'rw') {
     });
     $id_records = array_unique($id_records);
 
-    $bulk = App::filepath($directory.'|custom|', 'bulk.php');
+    $bulk = $structure->filepath('bulk.php');
     $bulk = empty($bulk) ? [] : include $bulk;
     $bulk = empty($bulk) ? [] : $bulk;
 
@@ -181,7 +169,7 @@ if ($element->permission == 'rw') {
         redirect(ROOTDIR.'/controller.php?id_module='.$id_module, 'js');
     } else {
         // Esecuzione delle operazioni del modulo
-        include App::filepath($directory.'|custom|', 'actions.php');
+        include $structure->filepath('actions.php');
 
         // Operazioni generiche per i campi personalizzati
         if (post('op') != null) {

add.php

@@ -15,7 +15,7 @@ echo '
 <div id="form_'.$id_module.'-'.$id_plugin.'">
 ';
 
-include !empty(get('edit')) ? $element->getEditFile() : $element->getAddFile();
+include !empty(get('edit')) ? $structure->getEditFile() : $structure->getAddFile();
 
 echo '
 </div>';

ajax.php

@@ -48,10 +48,6 @@ switch (get('op')) {
         break;
 
     case 'list_attachments':
-        $id_module = get('id_module');
-        $id_record = get('id_record');
-        $id_plugin = get('id_plugin');
-
         echo '{( "name": "filelist_and_upload", "id_module": "'.$id_module.'", "id_record": "'.$id_record.'", "id_plugin": "'.$id_plugin.'" )}';
 
         break;

ajax_dataload.php

@@ -11,13 +11,7 @@ $order = filter('order')[0];
 $order['column'] = $order['column'] - 1;
 array_shift($columns);
 
-// Lettura parametri iniziali
+$total = App::readQuery($structure);
-if (!empty($id_plugin)) {
-    $element = Plugins::get($id_plugin);
-} else {
-    $element = Modules::get($id_module);
-}
-$total = App::readQuery($element);
 
 // Lettura parametri modulo
 $result_query = $total['query'];

controller.php

@@ -22,10 +22,10 @@ echo '
 			<ul class="nav nav-tabs pull-right" id="tabs" role="tablist">
 				<li class="pull-left active header">
 					<a data-toggle="tab" href="#tab_0">
-                        <i class="'.$element['icon'].'"></i> '.$element['title'];
+                        <i class="'.$structure['icon'].'"></i> '.$structure['title'];
 
 // Pulsante "Aggiungi" solo se il modulo è di tipo "table" e se esiste il template per la popup
-if ($element->hasAddFile() && $element->permission == 'rw') {
+if ($structure->hasAddFile() && $structure->permission == 'rw') {
     echo '
 						<button type="button" class="btn btn-primary" data-toggle="modal" data-title="'.tr('Aggiungi').'..." data-target="#bs-popup" data-href="add.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'"><i class="fa fa-plus"></i></button>';
 }

core.php

@@ -202,14 +202,6 @@ if (!API::isAPIRequest()) {
     $theme = !empty($theme) ? $theme : 'default';
 
     if ($continue) {
-        $id_module = filter('id_module');
-        $id_record = filter('id_record');
-        $id_plugin = filter('id_plugin');
-        $id_parent = filter('id_parent');
-
-        Modules::setCurrent($id_module);
-        Plugins::setCurrent($id_plugin);
-
         // Periodo di visualizzazione dei record
         // Personalizzato
         if (!empty($_GET['period_start'])) {
@@ -222,13 +214,23 @@ if (!API::isAPIRequest()) {
             $_SESSION['period_end'] = date('Y').'-12-31';
         }
 
+        $id_record = filter('id_record');
+        $id_parent = filter('id_parent');
+
+        Modules::setCurrent(filter('id_module'));
+        Plugins::setCurrent(filter('id_plugin'));
+
+        // Variabili fondamentali
+        $module = Modules::getCurrent();
+        $plugin = Plugins::getCurrent();
+        $structure = isset($plugin) ? $plugin : $module;
+
+        $id_module = $module['id'];
+        $id_plugin = $plugin['id'];
+
         $user = Auth::user();
 
         if (!empty($id_module)) {
-            $module = Modules::get($id_module);
-
-            $pageTitle = $module['title'];
-
             // Segmenti
             if (!isset($_SESSION['module_'.$id_module]['id_segment'])) {
                 $segments = Modules::getSegments($id_module);

editor.php

@@ -45,10 +45,10 @@ if (empty($record)) {
 			<ul class="nav nav-tabs pull-right" id="tabs" role="tablist">
 				<li class="pull-left active header">
 					<a data-toggle="tab" href="#tab_0">
-                        <i class="'.$element['icon'].'"></i> '.$element['title'];
+                        <i class="'.$structure['icon'].'"></i> '.$structure['title'];
 
     // Pulsante "Aggiungi" solo se il modulo è di tipo "table" e se esiste il template per la popup
-    if ($element->hasAddFile() && $element->permission == 'rw') {
+    if ($structure->hasAddFile() && $structure->permission == 'rw') {
         echo '
 						<button type="button" class="btn btn-primary" data-toggle="modal" data-title="'.tr('Aggiungi').'..." data-target="#bs-popup" data-href="add.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'"><i class="fa fa-plus"></i></button>';
     }
@@ -140,7 +140,7 @@ if (empty($record)) {
                     <br>';
 
     // Pulsanti personalizzati
-    $buttons = Modules::filepath($id_module, 'buttons.php');
+    $buttons = $structure->filepath('buttons.php');
     if (!empty($buttons)) {
         ob_start();
         include $buttons;
@@ -160,7 +160,7 @@ if (empty($record)) {
 
                     <div id="module-edit">';
 
-    include $element->getEditFile();
+    include $structure->getEditFile();
 
     echo '
                     </div>
@@ -292,7 +292,7 @@ echo '
         <script>';
 
 // Se l'utente ha i permessi in sola lettura per il modulo, converto tutti i campi di testo in span
-$read_only = $element->permission == 'r';
+$read_only = $structure->permission == 'r';
 if ($read_only || !empty($block_edit)) {
     $not = $read_only ? '' : '.not(".unblockable")';
 

include/manager.php

@@ -2,31 +2,27 @@
 
 include_once __DIR__.'/../core.php';
 
-// Lettura parametri iniziali
+// Compatibilità per controller ed editor
 if (!empty($id_plugin)) {
-    $element = Plugins::get($id_plugin);
+    $structure = Plugins::get($id_plugin);
-
-    $directory = '/plugins/'.$element['directory'];
 } else {
-    $element = Modules::get($id_module);
+    $structure = Modules::get($id_module);
-
-    $directory = '/modules/'.$element['directory'];
 }
 
 if (!empty($id_plugin)) {
     // Inclusione di eventuale plugin personalizzato
-    if (!empty($element['script'])) {
+    if (!empty($structure['script'])) {
-        include $element->getEditFile();
+        include $structure->getEditFile();
 
         return;
     }
 
     echo '
         <h4>
-			<span  class="'.(!empty($element['help']) ? ' tip' : '').'"'.(!empty($element['help']) ? ' title="'.prepareToField($element['help']).'" data-position="bottom"' : '').' >
+			<span  class="'.(!empty($structure['help']) ? ' tip' : '').'"'.(!empty($structure['help']) ? ' title="'.prepareToField($structure['help']).'" data-position="bottom"' : '').' >
-            '.$element['title'].(!empty($element['help']) ? ' <i class="fa fa-question-circle-o"></i>' : '').'</span>';
+            '.$structure['title'].(!empty($structure['help']) ? ' <i class="fa fa-question-circle-o"></i>' : '').'</span>';
 
-    if ($element->hasAddFile()) {
+    if ($structure->hasAddFile()) {
         echo '
         <button type="button" class="btn btn-primary" data-toggle="modal" data-title="'.tr('Aggiungi').'..." data-target="#bs-popup" data-href="add.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&id_parent='.$id_record.'"><i class="fa fa-plus"></i></button>';
     }
@@ -35,19 +31,19 @@ if (!empty($id_plugin)) {
     </h4>';
 }
 
-$type = $element['option'];
+$type = $structure['option'];
 
 // Caricamento funzioni del modulo
-$modutil = App::filepath($directory.'|custom|', 'modutil.php');
+$modutil = $structure->filepath('modutil.php');
 if (!empty($modutil)) {
     include_once $modutil;
 }
 
 // Lettura risultato query del modulo
-// include App::filepath($directory.'|custom|', 'init.php');
+// include $structure->filepath('init.php');
 
 // Caricamento file aggiuntivo su elenco record
-$controller_before = App::filepath($directory.'|custom|', 'controller_before.php');
+$controller_before = $structure->filepath('controller_before.php');
 if (!empty($controller_before)) {
     include $controller_before;
 }
@@ -56,7 +52,7 @@ if (!empty($controller_before)) {
  * Datatables con record
  */
 if (!empty($type) && $type != 'menu' && $type != 'custom') {
-    $total = App::readQuery($element);
+    $total = App::readQuery($structure);
 
     if (empty($id_plugin) && count(Modules::getSegments($id_module)) > 1) {
         echo '
@@ -220,11 +216,11 @@ if (!empty($type) && $type != 'menu' && $type != 'custom') {
  * Inclusione modulo personalizzato
  */
 elseif ($type == 'custom') {
-    include $element->getEditFile();
+    include $structure->getEditFile();
 }
 
 // Caricamento file aggiuntivo su elenco record
-$controller_after = App::filepath($directory.'|custom|', 'controller_after.php');
+$controller_after = $structure->filepath('controller_after.php');
 if (!empty($controller_after)) {
     include $controller_after;
 }

include/top.php

@@ -5,6 +5,8 @@ include_once __DIR__.'/../core.php';
 $paths = App::getPaths();
 $user = Auth::user();
 
+$pageTitle = $pageTitle ?: $structure->title;
+
 $messages = flash()->getMessages();
 
 echo '<!DOCTYPE html>

lib/functions.js

@@ -195,7 +195,7 @@ $(document).ready(function () {
         stop: function (event, ui) {
             var order = $(this).sortable('toArray').toString();
 
-            $.post(globals.rootdir + "/modules/aggiornamenti/actions.php?id_module=" + globals.aggiornamenti_id, {
+            $.post(globals.rootdir + "/actions.php?id_module=" + globals.aggiornamenti_id, {
                 op: 'sortmodules',
                 ids: order
             });
@@ -404,7 +404,7 @@ function start_widgets($widgets) {
                 var new_class = "";
 
                 var order = $(this).sortable('toArray').toString();
-                $.post(globals.rootdir + "/modules/aggiornamenti/actions.php?id_module=" + globals.aggiornamenti_id, {
+                $.post(globals.rootdir + "/actions.php?id_module=" + globals.aggiornamenti_id, {
                     op: 'updatewidget',
                     location: dst_list,
                     id_module: globals.id_module,
@@ -413,7 +413,7 @@ function start_widgets($widgets) {
                     id: ui.item.attr('id')
                 });
 
-                $.post(globals.rootdir + "/modules/aggiornamenti/actions.php?id_module=" + globals.aggiornamenti_id, {
+                $.post(globals.rootdir + "/actions.php?id_module=" + globals.aggiornamenti_id, {
                     op: 'sortwidget',
                     location: dst_list,
                     ids: order,

lib/functions.php

@@ -292,12 +292,12 @@ function get_client_ip()
  */
 function translateTemplate()
 {
-    $id_module = filter('id_module');
-    $id_plugin = filter('id_plugin');
     $id_record = filter('id_record');
-
-    $id_email = filter('id_email');
     $id_parent = filter('id_parent');
+    $id_email = filter('id_email');
+
+    $id_module = Modules::getCurrent()['id'];
+    $id_plugin = Plugins::getCurrent()['id'];
 
     $template = ob_get_clean();
 

modules/aggiornamenti/actions.php

@@ -134,8 +134,6 @@ switch (post('op')) {
         break;
 
     case 'sortwidget':
-        $id_module = post('id_module');
-        $id_record = post('id_record');
         $location = post('location');
 
         $location = empty($id_record) ? 'controller_'.$location : 'editor_'.$location;
@@ -155,8 +153,6 @@ switch (post('op')) {
         break;
 
     case 'updatewidget':
-        $id_module = post('id_module');
-        $id_record = post('id_record');
         $location = post('location');
         $class = post('class');
         $id = explode('_', post('id'));

modules/anagrafiche/ajax/search.php

@@ -6,7 +6,7 @@ include_once __DIR__.'/../../../core.php';
     Anagrafiche
 */
 
-$id_module = Modules::get('Anagrafiche')['id'];
+$link_id = Modules::get('Anagrafiche')['id'];
 
 $fields = [
     'Codice' => 'codice',
@@ -50,7 +50,7 @@ $rs = $dbo->fetchArray($query);
 foreach ($rs as $r) {
     $result = [];
 
-    $result['link'] = ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$r['id'];
+    $result['link'] = ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$r['id'];
     $result['title'] = $r['ragione_sociale'];
     $result['title'] .= !empty($r['deleted_at']) ? ' <small class="text-danger"><em>('.tr('Eliminato').')</em></small>' : '';
     $result['category'] = 'Anagrafiche';
@@ -97,7 +97,7 @@ $plugin = $dbo->fetchArray("SELECT id FROM zz_plugins WHERE name='Referenti'");
 foreach ($rs as $r) {
     $result = [];
 
-    $result['link'] = ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$r['id'].'#tab_'.$plugin[0]['id'];
+    $result['link'] = ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$r['id'].'#tab_'.$plugin[0]['id'];
     $result['title'] = $r['nome'];
     $result['category'] = 'Referenti';
 

modules/articoli/ajax/complete.php

@@ -24,8 +24,8 @@ switch ($resource) {
                 for ($i = 0; $i < sizeof($fatture); ++$i) {
                     ($fatture[$i]['n2_fattura'] != '') ? $n_fattura = $fatture[$i]['n2_fattura'] : $n_fattura = $fatture[$i]['n_fattura'];
 
-                    $id_module = Modules::get('Fatture di vendita')['id'];
+                    $link_id = Modules::get('Fatture di vendita')['id'];
-                    echo "<tr><td class='first_cell text-left'><a href='".ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$fatture[$i]['iddocumento']."'  target=\"_blank\" title=\"Apri il documento su una nuova finestra\">Fatt. n. ".$n_fattura."</a></td>\n";
+                    echo "<tr><td class='first_cell text-left'><a href='".ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$fatture[$i]['iddocumento']."'  target=\"_blank\" title=\"Apri il documento su una nuova finestra\">Fatt. n. ".$n_fattura."</a></td>\n";
 
                     echo "<td class='table_cell text-left'>".Translator::dateToLocale($fatture[$i]['data_fattura'])."</td>\n";
                     echo "<td class='table_cell text-right'>".Translator::numberToLocale($fatture[$i]['costo_unitario'])." &euro;</td></tr>\n";
@@ -54,8 +54,8 @@ switch ($resource) {
             for ($i = 0; $i < sizeof($fatture); ++$i) {
                 ($fatture[$i]['n2_fattura'] != '') ? $n_fattura = $fatture[$i]['n2_fattura'] : $n_fattura = $fatture[$i]['n_fattura'];
 
-                $id_module = Modules::get('Fatture di vendita')['id'];
+                $link_id = Modules::get('Fatture di vendita')['id'];
-                echo "<tr><td class='first_cell text-left'><a href='".ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$fatture[$i]['iddocumento']."'  target=\"_blank\" title=\"Apri il documento su una nuova finestra\">Fatt. n. ".$n_fattura."</a></td>\n";
+                echo "<tr><td class='first_cell text-left'><a href='".ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$fatture[$i]['iddocumento']."'  target=\"_blank\" title=\"Apri il documento su una nuova finestra\">Fatt. n. ".$n_fattura."</a></td>\n";
 
                 echo "<td class='table_cell text-left'>".Translator::dateToLocale($fatture[$i]['data_fattura'])."</td>\n";
                 echo "<td class='table_cell text-right'>".Translator::numberToLocale($fatture[$i]['costo_unitario'])." &euro;</td></tr>\n";
@@ -84,8 +84,8 @@ switch ($resource) {
             for ($i = 0; $i < sizeof($fatture); ++$i) {
                 ($fatture[$i]['n2_fattura'] != '') ? $n_fattura = $fatture[$i]['n2_fattura'] : $n_fattura = $fatture[$i]['n_fattura'];
 
-                $id_module = Modules::get('Fatture di acquisto')['id'];
+                $link_id = Modules::get('Fatture di acquisto')['id'];
-                echo "<tr><td class='first_cell text-left'><a href='".ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$fatture[$i]['iddocumento']."'  target=\"_blank\" title=\"Apri il documento su una nuova finestra\">Fatt. n. ".$n_fattura."</a></td>\n";
+                echo "<tr><td class='first_cell text-left'><a href='".ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$fatture[$i]['iddocumento']."'  target=\"_blank\" title=\"Apri il documento su una nuova finestra\">Fatt. n. ".$n_fattura."</a></td>\n";
 
                 echo "<td class='table_cell text-left'>".Translator::dateToLocale($fatture[$i]['data_fattura'])."</td>\n";
                 echo "<td class='table_cell text-right'>".Translator::numberToLocale($fatture[$i]['costo_unitario'])." &euro;</td></tr>\n";

modules/articoli/ajax/search.php

@@ -2,7 +2,7 @@
 
 include_once __DIR__.'/../../../core.php';
 
-$id_module = Modules::get('Articoli')['id'];
+$link_id = Modules::get('Articoli')['id'];
 
 $fields = [
     'Codice' => 'codice',
@@ -31,7 +31,7 @@ $rs = $dbo->fetchArray($query);
 foreach ($rs as $r) {
     $result = [];
 
-    $result['link'] = ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$r['id'];
+    $result['link'] = ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$r['id'];
     $result['title'] = $r['codice'].' - '.$r['descrizione'];
     $result['category'] = 'Articoli';
 

modules/automezzi/ajax/search.php

@@ -2,7 +2,7 @@
 
 include_once __DIR__.'/../../../core.php';
 
-$id_module = Modules::get('Automezzi')['id'];
+$link_id = Modules::get('Automezzi')['id'];
 
 $fields = [
     'Nome' => 'nome',
@@ -29,7 +29,7 @@ $rs = $dbo->fetchArray($query);
 foreach ($rs as $r) {
     $result = [];
 
-    $result['link'] = ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$r['id'];
+    $result['link'] = ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$r['id'];
     $result['title'] = $r['nome'];
     $result['category'] = 'Automezzi';
 

modules/ddt/ajax/search.php

@@ -30,11 +30,11 @@ foreach ($rs as $r) {
     $result = [];
 
     $module = ($r['dir'] == 'uscita') ? 'Ddt di acquisto' : 'Ddt di vendita';
-    $id_module = Modules::get($module)['id'];
+    $link_id = Modules::get($module)['id'];
 
     $numero = empty($r['numero_esterno']) ? $r['numero'] : $r['numero_esterno'];
 
-    $result['link'] = ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$r['id'];
+    $result['link'] = ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$r['id'];
     $result['title'] = $r['tipologia'].' num. '.$numero.' del '.Translator::dateToLocale($r['data']);
     $result['category'] = $r['tipologia'];
 

modules/fatture/ajax/search.php

@@ -32,11 +32,11 @@ foreach ($rs as $r) {
     $result = [];
 
     $module = ($r['dir'] == 'uscita') ? 'Fatture di acquisto' : 'Fatture di vendita';
-    $id_module = Modules::get($module)['id'];
+    $link_id = Modules::get($module)['id'];
 
     $numero = empty($r['numero_esterno']) ? $r['numero'] : $r['numero_esterno'];
 
-    $result['link'] = ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$r['id'];
+    $result['link'] = ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$r['id'];
     $result['title'] = $r['tipologia'].' num. '.$numero.' del '.Translator::dateToLocale($r['data']);
     $result['category'] = $r['tipologia'];
 

modules/fatture/edit.php

@@ -456,7 +456,7 @@ $(".btn-sm[data-toggle=\"tooltip\"]").each(function() {
             form.find("input:disabled, select:disabled").removeAttr("disabled");
 
             $.ajax({
-                url: globals.rootdir + "/modules/fatture/actions.php?id_module=" + globals.id_module ,
+                url: globals.rootdir + "/actions.php?id_module=" + globals.id_module ,
                 cache: false,
                 type: "POST",
                 processData: false,

modules/interventi/ajax/search.php

@@ -2,7 +2,7 @@
 
 include_once __DIR__.'/../../../core.php';
 
-$id_module = Modules::get('Interventi')['id'];
+$link_id = Modules::get('Interventi')['id'];
 
 $fields = [
     'Codice intervento' => 'codice',
@@ -33,7 +33,7 @@ $rs = $dbo->fetchArray($query);
 foreach ($rs as $r) {
     $result = [];
 
-    $result['link'] = ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$r['id'];
+    $result['link'] = ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$r['id'];
     $result['title'] = 'Intervento '.$r['codice'].' del '.Translator::dateToLocale($r['data']);
     $result['category'] = 'Interventi';
 

modules/my_impianti/ajax/search.php

@@ -2,7 +2,7 @@
 
 include_once __DIR__.'/../../../core.php';
 
-$id_module = Modules::get('MyImpianti')['id'];
+$link_id = Modules::get('MyImpianti')['id'];
 
 $fields = [
     'Matricola' => 'matricola',
@@ -32,7 +32,7 @@ $rs = $dbo->fetchArray($query);
 foreach ($rs as $r) {
     $result = [];
 
-    $result['link'] = ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$r['id'];
+    $result['link'] = ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$r['id'];
     $result['title'] = $r['matricola'].' - '.$r['nome'];
     $result['category'] = 'MyImpianti';
 

modules/preventivi/ajax/search.php

@@ -2,7 +2,7 @@
 
 include_once __DIR__.'/../../../core.php';
 
-$id_module = Modules::get('Preventivi')['id'];
+$link_id = Modules::get('Preventivi')['id'];
 
 $fields = [
     'Codice preventivo' => 'numero',
@@ -29,7 +29,7 @@ $rs = $dbo->fetchArray($query);
 foreach ($rs as $r) {
     $result = [];
 
-    $result['link'] = ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$r['id'];
+    $result['link'] = ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$r['id'];
     $result['title'] = 'Preventivo '.$r['numero'];
 
     if ($rs[$r]['data_accettazione'] == '0000-00-00') {

src/API.php

@@ -106,7 +106,7 @@ class API extends \Util\Singleton
         try {
             if (in_array($resource, array_keys($resources))) {
                 // Inclusione funzioni del modulo
-                include_once App::filepath(DOCROOT.'/modules/'.$resources[$resource].'|custom|', 'modutil.php');
+                include_once App::filepath('modules/'.$resources[$resource].'|custom|', 'modutil.php');
 
                 // Esecuzione delle operazioni personalizzate
                 $filename = DOCROOT.'/modules/'.$resources[$resource].'/api/'.$kind.'.php';
@@ -222,7 +222,7 @@ class API extends \Util\Singleton
         }
 
         // Inclusione funzioni del modulo
-        include_once App::filepath(DOCROOT.'/modules/'.$resources[$resource].'|custom|', 'modutil.php');
+        include_once App::filepath('modules/'.$resources[$resource].'|custom|', 'modutil.php');
 
         // Database
         $dbo = $database = Database::getConnection();

src/App.php

@@ -374,8 +374,11 @@ class App
      */
     public static function replacePlaceholder($query)
     {
-        $id_module = filter('id_module');
         $id_parent = filter('id_parent');
+
+        $id_module = Modules::getCurrent()['id'];
+        $id_plugin = Plugins::getCurrent()['id'];
+
         $user = Auth::user();
 
         $segment = !empty($_SESSION['module_'.$id_module]['id_segment']);

src/HTMLBuilder/HTMLBuilder.php

@@ -51,15 +51,15 @@ class HTMLBuilder
     /** @var array Elenco dei gestori dei campi HTML */
     protected static $handlers = [
         'list' => [
-            'default' => 'HTMLBuilder\Handler\DefaultHandler',
+            'default' => Handler\DefaultHandler::class,
-            'image' => 'HTMLBuilder\Handler\MediaHandler',
+            'image' => Handler\MediaHandler::class,
-            'select' => 'HTMLBuilder\Handler\SelectHandler',
+            'select' => Handler\SelectHandler::class,
-            'checkbox' => 'HTMLBuilder\Handler\ChoicesHandler',
+            'checkbox' => Handler\ChoicesHandler::class,
-            'radio' => 'HTMLBuilder\Handler\ChoicesHandler',
+            'radio' => Handler\ChoicesHandler::class,
-            'bootswitch' => 'HTMLBuilder\Handler\ChoicesHandler',
+            'bootswitch' => Handler\ChoicesHandler::class,
-            'timestamp' => 'HTMLBuilder\Handler\DateHandler',
+            'timestamp' => Handler\DateHandler::class,
-            'date' => 'HTMLBuilder\Handler\DateHandler',
+            'date' => Handler\DateHandler::class,
-            'time' => 'HTMLBuilder\Handler\DateHandler',
+            'time' => Handler\DateHandler::class,
             'ckeditor' => Handler\CKEditorHandler::class,
         ],
         'instances' => [],
@@ -67,18 +67,18 @@ class HTMLBuilder
 
     /** @var array Generatore del contenitore per i campi HTML */
     protected static $wrapper = [
-        'class' => 'HTMLBuilder\Wrapper\HTMLWrapper',
+        'class' => Wrapper\HTMLWrapper::class,
         'istance' => null,
     ];
 
     /** @var array Elenco dei gestori delle strutture HTML */
     protected static $managers = [
         'list' => [
-            'filelist_and_upload' => 'HTMLBuilder\Manager\FileManager',
+            'filelist_and_upload' => Manager\FileManager::class,
-            'button' => 'HTMLBuilder\Manager\ButtonManager',
+            'button' => Manager\ButtonManager::class,
-            'csrf' => 'HTMLBuilder\Manager\CSRFManager',
+            'csrf' => Manager\CSRFManager::class,
-            'custom_fields' => 'HTMLBuilder\Manager\FieldManager',
+            'custom_fields' => Manager\FieldManager::class,
-            'widgets' => 'HTMLBuilder\Manager\WidgetManager',
+            'widgets' => Manager\WidgetManager::class,
         ],
         'instances' => [],
     ];

src/HTMLBuilder/Wrapper/HTMLWrapper.php

@@ -2,6 +2,8 @@
 
 namespace HTMLBuilder\Wrapper;
 
+use Modules;
+
 /**
  * @since 2.3
  */
@@ -98,17 +100,16 @@ class HTMLWrapper implements WrapperInterface
 
         $pieces = explode('|', $string);
 
-        $id_module = $pieces[1];
+        $module_id = $pieces[1];
+        $module = Modules::get($module_id);
 
         $get = !empty($pieces[2]) ? '&'.$pieces[2] : null;
         $classes = !empty($pieces[3]) ? ' '.$pieces[3] : null;
         $extras = !empty($pieces[4]) ? ' '.$pieces[4] : null;
 
-        $module = \Modules::get($id_module);
-
         if (in_array($module->permission, ['r', 'rw'])) {
             $result = '
-<button '.$extras.' data-href="'.ROOTDIR.'/add.php?id_module='.$id_module.$get.'&select='.$values['id'].'&ajax=yes" data-target="#bs-popup2" data-toggle="modal" data-title="'.tr('Aggiungi').'" type="button" class="btn'.$classes.'">
+<button '.$extras.' data-href="'.ROOTDIR.'/add.php?id_module='.$module->id.$get.'&select='.$values['id'].'&ajax=yes" data-target="#bs-popup2" data-toggle="modal" data-title="'.tr('Aggiungi').'" type="button" class="btn'.$classes.'">
     <i class="fa fa-plus"></i>
 </button>';
         }

src/Modules.php

@@ -344,16 +344,13 @@ class Modules
     /**
      * Individua il percorso per il file.
      *
-     * @param string|int $module
+     * @param string|int $element
      * @param string     $file
      *
      * @return string|null
      */
-    public static function filepath($module, $file)
+    public static function filepath($element, $file)
     {
-        $module = self::get($module);
+        return self::get($element)->filepath($file);
-        $directory = 'modules/'.$module['directory'].'|custom|';
-
-        return App::filepath($directory, $file);
     }
 }

src/Plugins.php

@@ -78,21 +78,21 @@ class Plugins
 
         // Fix modulo
         $plugin = self::getCurrent();
+        if (isset($plugin)) {
+            Modules::setCurrent($plugin->module()->id);
+        }
     }
 
     /**
      * Individua il percorso per il file.
      *
-     * @param string|int $plugin
+     * @param string|int $element
      * @param string     $file
      *
      * @return string|null
      */
-    public static function filepath($plugin, $file)
+    public static function filepath($element, $file)
     {
-        $plugin = self::get($plugin);
+        return self::get($element)->filepath($file);
-        $directory = 'plugins/'.$plugin['directory'].'|custom|';
-
-        return App::filepath($directory, $file);
     }
 }

src/Prints.php

@@ -278,7 +278,7 @@ class Prints
         $user = Auth::user();
 
         // Impostazioni di default
-        $default = include App::filepath(DOCROOT.'/templates/base|custom|', 'settings.php');
+        $default = include App::filepath('templates/base|custom|', 'settings.php');
 
         // Impostazioni personalizzate della stampa
         $custom = include self::filepath($id_print, 'settings.php');

src/Traits/StoreTrait.php

@@ -73,6 +73,10 @@ trait StoreTrait
      */
     public static function getCurrent()
     {
+        if(!isset(self::$current)){
+            return null;
+        }
+
         return self::get(self::$current);
     }