diff --git a/actions.php b/actions.php index b69535026..539ed6967 100755 --- a/actions.php +++ b/actions.php @@ -30,7 +30,7 @@ if (empty($structure) || empty($structure['enabled'])) { die(tr('Accesso negato')); } -$upload_dir = DOCROOT.'/'.Uploads::getDirectory($id_module, $id_plugin); +$upload_dir = base_dir().'/'.Uploads::getDirectory($id_module, $id_plugin); $database->beginTransaction(); @@ -87,7 +87,7 @@ if (filter('op') == 'link_file' || filter('op') == 'unlink_file') { } } - redirect(ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : '')); + redirect(base_link().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : '')); } } @@ -273,13 +273,13 @@ elseif (post('op') == 'send-email') { flash()->error(tr('Errore durante l\'invio email! Verifica i parametri dell\'account SMTP utilizzato.')); } } elseif (filter('op') == 'aggiorna_colonne') { - include_once DOCROOT.'/include/colonne.php'; + include_once base_dir().'/include/colonne.php'; } elseif (filter('op') == 'visualizza_riferimenti') { - include_once DOCROOT.'/include/riferimenti/riferimenti.php'; + include_once base_dir().'/include/riferimenti/riferimenti.php'; } elseif (filter('op') == 'visualizza_righe_riferimenti') { - include_once DOCROOT.'/include/riferimenti/righe_riferimenti.php'; + include_once base_dir().'/include/riferimenti/righe_riferimenti.php'; } elseif (filter('op') == 'visualizza_righe_documento') { - include_once DOCROOT.'/include/riferimenti/righe_documento.php'; + include_once base_dir().'/include/riferimenti/righe_documento.php'; } elseif (filter('op') == 'salva_riferimento_riga') { $database->insert('co_riferimenti_righe', [ 'source_type' => filter('source_type'), @@ -336,7 +336,7 @@ if ($structure->permission == 'rw') { $bulk = empty($bulk) ? [] : $bulk; if (in_array(post('op'), array_keys($bulk))) { - redirect(ROOTDIR.'/controller.php?id_module='.$id_module, 'js'); + redirect(base_link().'/controller.php?id_module='.$id_module, 'js'); } else { // Esecuzione delle operazioni del modulo include $structure->filepath('actions.php'); diff --git a/add.php b/add.php index 7535b9eb6..f634ba663 100755 --- a/add.php +++ b/add.php @@ -20,7 +20,7 @@ include_once __DIR__.'/core.php'; // Inclusione elementi fondamentali del modulo -include $docroot.'/actions.php'; +include base_dir().'/actions.php'; // Controllo dei permessi if (empty($id_plugin)) { diff --git a/ajax.php b/ajax.php index 02aeac754..c1384ccb4 100755 --- a/ajax.php +++ b/ajax.php @@ -72,7 +72,7 @@ switch (filter('op')) { break; case 'checklists': - include DOCROOT.'/plugins/checks.php'; + include base_dir().'/plugins/checks.php'; break; diff --git a/ajax_dataload.php b/ajax_dataload.php index 58e2e0cde..90cc5a835 100755 --- a/ajax_dataload.php +++ b/ajax_dataload.php @@ -168,11 +168,11 @@ if (!empty($query)) { // Link per i moduli if (empty($id_plugin)) { - $column['data-link'] = $rootdir.'/editor.php?id_module='.$id_module.'&id_record='.$id_record.$hash; + $column['data-link'] = base_link().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.$hash; } // Link per i plugin else { - $column['data-link'] = $rootdir.'/add.php?id_module='.$id_module.'&id_record='.$id_record.'&id_plugin='.$id_plugin.'&id_parent='.$id_parent.'&edit=1'.$hash; + $column['data-link'] = base_link().'/add.php?id_module='.$id_module.'&id_record='.$id_record.'&id_plugin='.$id_plugin.'&id_parent='.$id_parent.'&edit=1'.$hash; $column['data-type'] = 'dialog'; } @@ -184,8 +184,8 @@ if (!empty($query)) { $attributes[] = $key.'="'.$val.'"'; } - // Replace rootdir per le query - $value = str_replace('ROOTDIR', ROOTDIR, $value); + // Replace base_link() per le query + $value = str_replace('base_link()', base_link(), $value); $result[] = str_replace('|attr|', implode(' ', $attributes), '
'.$value.'
'); } diff --git a/bug.php b/bug.php index 4001192f8..78b36a820 100755 --- a/bug.php +++ b/bug.php @@ -38,13 +38,13 @@ if (filter('op') == 'send') { $mail->Subject = 'Segnalazione bug OSM '.$version; // Aggiunta dei file di log (facoltativo) - if (!empty(post('log')) && file_exists($docroot.'/logs/error.log')) { - $mail->AddAttachment($docroot.'/logs/error.log'); + if (!empty(post('log')) && file_exists(base_dir().'/logs/error.log')) { + $mail->AddAttachment(base_dir().'/logs/error.log'); } // Aggiunta della copia del database (facoltativo) if (!empty(post('sql'))) { - $backup_file = $docroot.'/Backup OSM '.date('Y-m-d').' '.date('H_i_s').'.sql'; + $backup_file = base_dir().'/Backup OSM '.date('Y-m-d').' '.date('H_i_s').'.sql'; Backup::database($backup_file); $mail->AddAttachment($backup_file); @@ -87,7 +87,7 @@ if (filter('op') == 'send') { delete($backup_file); } - redirect($rootdir.'/bug.php'); + redirect(base_link().'/bug.php'); exit(); } diff --git a/composer.json b/composer.json index ff1cfc7f7..8aab949e8 100755 --- a/composer.json +++ b/composer.json @@ -64,7 +64,46 @@ "autoload": { "psr-4": { "": "src/", - "Update\\": "update/" + "Update\\": "update/", + "Modules\\Aggiornamenti\\": ["modules/aggiornamenti/custom/src/", "modules/aggiornamenti/src/"], + "Modules\\Anagrafiche\\": ["modules/anagrafiche/custom/src/", "modules/anagrafiche/src/"], + "Modules\\Backups\\": ["modules/backups/custom/src/", "modules/backups/src/"], + "Modules\\Emails\\": ["modules/emails/custom/src/", "modules/emails/src/"], + "Modules\\Articoli\\": ["modules/articoli/custom/src/", "modules/articoli/src/"], + "Modules\\Checklists\\": ["modules/checklists/custom/src/", "modules/checklists/src/"], + "Modules\\Ritenute\\": ["modules/ritenute/custom/src/", "modules/ritenute/src/"], + "Modules\\RitenuteContributi\\": ["modules/ritenute_contributi/custom/src/", "modules/ritenute_contributi/src/"], + "Modules\\Rivalse\\": ["modules/rivalse/custom/src/", "modules/rivalse/src/"], + "Modules\\Newsletter\\": ["modules/newsletter/custom/src/", "modules/newsletter/src/"], + "Modules\\Iva\\": ["modules/iva/custom/src/", "modules/iva/src/"], + "Modules\\DDT\\": ["modules/ddt/custom/src/", "modules/ddt/src/"], + "Modules\\Fatture\\": ["modules/fatture/custom/src/", "modules/fatture/src/"], + "Modules\\Ordini\\": ["modules/ordini/custom/src/", "modules/ordini/src/"], + "Modules\\Preventivi\\": ["modules/preventivi/custom/src/", "modules/preventivi/src/"], + "Modules\\Contratti\\": ["modules/contratti/custom/src/", "modules/contratti/src/"], + "Modules\\Interventi\\": ["modules/interventi/custom/src/", "modules/interventi/src/"], + "Modules\\Pagamenti\\": ["modules/pagamenti/custom/src/", "modules/pagamenti/src/"], + "Modules\\Statistiche\\": ["modules/statistiche/custom/src/", "modules/statistiche/src/"], + "Modules\\Scadenzario\\": ["modules/scadenzario/custom/src/", "modules/scadenzario/src/"], + "Modules\\PrimaNota\\": ["modules/primanota/custom/src/", "modules/primanota/src/"], + "Modules\\Utenti\\": ["modules/utenti/custom/src/", "modules/utenti/src/"], + "Modules\\StatoServizi\\": ["modules/stato_servizi/custom/src/", "modules/stato_servizi/src/"], + "Modules\\StatiIntervento\\": ["modules/stati_intervento/custom/src/", "modules/stati_intervento/src/"], + "Modules\\StatiPreventivo\\": ["modules/stati_preventivo/custom/src/", "modules/stati_preventivo/src/"], + "Modules\\StatiContratto\\": ["modules/stati_contratto/custom/src/", "modules/stati_contratto/src/"], + "Modules\\TipiIntervento\\": ["modules/tipi_intervento/custom/src/", "modules/tipi_intervento/src/"], + "Modules\\CategorieDocumentali\\": ["modules/categorie_documenti/custom/src/", "modules/categorie_documenti/src/"], + "Modules\\Listini\\": ["modules/listini/custom/src/", "modules/listini/src/"], + "Modules\\Impianti\\": ["modules/impianti/custom/src/", "modules/impianti/src/"], + "Modules\\Impostazioni\\": ["modules/impostazioni/custom/src/", "modules/impostazioni/src/"], + "Plugins\\ExportFE\\": ["plugins/exportFE/custom/src/", "plugins/exportFE/src/"], + "Plugins\\ImportFE\\": ["plugins/importFE/custom/src/", "plugins/importFE/src/"], + "Plugins\\ReceiptFE\\": ["plugins/receiptFE/custom/src/", "plugins/receiptFE/src/"], + "Plugins\\DichiarazioniIntento\\": ["plugins/dichiarazioni_intento/custom/src/", "plugins/dichiarazioni_intento/src/"], + "Plugins\\PianificazioneInterventi\\": ["plugins/pianificazione_interventi/custom/src/", "plugins/pianificazione_interventi/src/"], + "Plugins\\PianificazioneFatturazione\\": ["plugins/pianificazione_fatturazione/custom/src/", "plugins/pianificazione_fatturazione/src/"], + "Plugins\\StatisticheArticoli\\": ["plugins/statistiche_articoli/custom/src/", "plugins/statistiche_articoli/src/"], + "Plugins\\DettagliArticolo\\": ["plugins/dettagli_articolo/custom/src/", "plugins/dettagli_articolo/src/"] }, "files": [ "lib/functions.php", diff --git a/config/csrf_config.php b/config/csrf_config.php index 06ae5d5f7..5bb7678aa 100755 --- a/config/csrf_config.php +++ b/config/csrf_config.php @@ -21,15 +21,15 @@ * Configuration file for CSRF Protector. */ return [ - 'logDirectory' => DOCROOT.'/logs', + 'logDirectory' => base_dir().'/logs', 'failedAuthAction' => [ 'GET' => 0, 'POST' => 0, ], - 'jsUrl' => ROOTDIR.'/assets/dist/js/csrf/csrfprotector.js', + 'jsUrl' => base_link().'/assets/dist/js/csrf/csrfprotector.js', 'tokenLength' => 10, 'cookieConfig' => [ - 'path' => ROOTDIR, + 'path' => base_link(), 'secure' => isHTTPS(true), ], 'verifyGetFor' => [], diff --git a/config/namespaces.php b/config/namespaces.php index 3b7b3306e..ed9fd2003 100755 --- a/config/namespaces.php +++ b/config/namespaces.php @@ -18,6 +18,7 @@ */ return [ + /* 'modules/aggiornamenti' => 'Modules\Aggiornamenti', 'modules/anagrafiche' => 'Modules\Anagrafiche', 'modules/backups' => 'Modules\Backups', @@ -57,4 +58,5 @@ return [ 'plugins/pianificazione_fatturazione' => 'Plugins\PianificazioneFatturazione', 'plugins/statistiche_articoli' => 'Plugins\StatisticheArticoli', 'plugins/dettagli_articolo' => 'Plugins\DettagliArticolo', + */ ]; diff --git a/controller.php b/controller.php index b01b0f843..bd3278083 100755 --- a/controller.php +++ b/controller.php @@ -20,15 +20,15 @@ include_once __DIR__.'/core.php'; if (!empty($id_record) && !empty($id_module)) { - redirect(ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$id_record); + redirect(base_link().'/editor.php?id_module='.$id_module.'&id_record='.$id_record); } elseif (empty($id_module)) { - redirect(ROOTDIR.'/index.php'); + redirect(base_link().'/index.php'); } include_once App::filepath('include|custom|', 'top.php'); // Inclusione gli elementi fondamentali -include_once $docroot.'/actions.php'; +include_once base_dir().'/actions.php'; // Widget in alto echo '{( "name": "widgets", "id_module": "'.$id_module.'", "position": "top", "place": "controller" )}'; @@ -66,7 +66,7 @@ echo '
'; -include $docroot.'/include/manager.php'; +include base_dir().'/include/manager.php'; echo '
'; @@ -81,7 +81,7 @@ foreach ($plugins as $plugin) { $id_plugin = $plugin['id']; - include $docroot.'/include/manager.php'; + include base_dir().'/include/manager.php'; echo '
'; diff --git a/core.php b/core.php index 3b5eed64e..0e3d308c2 100755 --- a/core.php +++ b/core.php @@ -79,16 +79,16 @@ use Monolog\Handler\StreamHandler; $handlers = []; if (!API\Response::isAPIRequest()) { // File di log di base (logs/error.log, logs/setup.log) - $handlers[] = new StreamHandler($docroot.'/logs/error.log', Monolog\Logger::ERROR); - $handlers[] = new StreamHandler($docroot.'/logs/setup.log', Monolog\Logger::EMERGENCY); + $handlers[] = new StreamHandler(base_dir().'/logs/error.log', Monolog\Logger::ERROR); + $handlers[] = new StreamHandler(base_dir().'/logs/setup.log', Monolog\Logger::EMERGENCY); // Messaggi grafici per l'utente $handlers[] = new Extensions\MessageHandler(Monolog\Logger::ERROR); // File di log ordinati in base alla data if (App::debug()) { - $handlers[] = new RotatingFileHandler($docroot.'/logs/error.log', 0, Monolog\Logger::ERROR); - $handlers[] = new RotatingFileHandler($docroot.'/logs/setup.log', 0, Monolog\Logger::EMERGENCY); + $handlers[] = new RotatingFileHandler(base_dir().'/logs/error.log', 0, Monolog\Logger::ERROR); + $handlers[] = new RotatingFileHandler(base_dir().'/logs/setup.log', 0, Monolog\Logger::EMERGENCY); } // Inizializzazione Whoops @@ -116,7 +116,7 @@ if (!API\Response::isAPIRequest()) { ]); }); } else { - $handlers[] = new StreamHandler($docroot.'/logs/api.log', Monolog\Logger::ERROR); + $handlers[] = new StreamHandler(base_dir().'/logs/api.log', Monolog\Logger::ERROR); } // Sicurezza della sessioni @@ -124,7 +124,7 @@ ini_set('session.cookie_samesite', 'strict'); ini_set('session.use_trans_sid', '0'); ini_set('session.use_only_cookies', '1'); -session_set_cookie_params(0, $rootdir, null, isHTTPS(true)); +session_set_cookie_params(0, base_link(), null, isHTTPS(true)); session_start(); // Disabilita i messaggi nativi di PHP @@ -170,8 +170,8 @@ if (!API\Response::isAPIRequest()) { $lang = !empty($config['lang']) ? $config['lang'] : (isset($_GET['lang']) ? $_GET['lang'] : null); $formatter = !empty($config['formatter']) ? $config['formatter'] : []; $translator = trans(); -$translator->addLocalePath($docroot.'/locale'); -$translator->addLocalePath($docroot.'/modules/*/locale'); +$translator->addLocalePath(base_dir().'/locale'); +$translator->addLocalePath(base_dir().'/modules/*/locale'); $translator->setLocale($lang, $formatter); // Individuazione di versione e revisione del progetto @@ -186,12 +186,12 @@ if (!empty($skip_permissions)) { Permissions::skip(); } -if (!$continue && getURLPath() != slashes(ROOTDIR.'/index.php') && !Permissions::getSkip()) { +if (!$continue && getURLPath() != slashes(base_link().'/index.php') && !Permissions::getSkip()) { if (Auth::check()) { Auth::logout(); } - redirect(ROOTDIR.'/index.php'); + redirect(base_link().'/index.php'); exit(); } diff --git a/cron.php b/cron.php index 89885e693..7c3cae6f0 100644 --- a/cron.php +++ b/cron.php @@ -56,18 +56,18 @@ $pattern = '[%datetime%] %level_name%: %message% %context%'.PHP_EOL; $formatter = new Monolog\Formatter\LineFormatter($pattern); $logger = new Logger('Tasks'); -$handler = new RotatingFileHandler(DOCROOT.'/logs/cron.log', 7); +$handler = new RotatingFileHandler(base_dir().'/logs/cron.log', 7); $handler->setFormatter($formatter); $logger->pushHandler($handler); // Lettura della cache -$ultima_esecuzione = Cache::get('Ultima esecuzione del cron'); +$ultima_esecuzione = Cache::pool('Ultima esecuzione del cron'); $data = $ultima_esecuzione->content; -$in_esecuzione = Cache::get('Cron in esecuzione'); -$cron_id = Cache::get('ID del cron'); +$in_esecuzione = Cache::pool('Cron in esecuzione'); +$cron_id = Cache::pool('ID del cron'); -$disattiva = Cache::get('Disabilita cron'); +$disattiva = Cache::pool('Disabilita cron'); if (!empty($disattiva->content)) { return; } diff --git a/editor.php b/editor.php index 4e5ad9c6e..0d2fb6285 100755 --- a/editor.php +++ b/editor.php @@ -25,9 +25,9 @@ use Carbon\Carbon; $read_only = $structure->permission == 'r'; if (empty($id_record) && !empty($id_module) && empty($id_plugin)) { - redirect(ROOTDIR.'/controller.php?id_module='.$id_module); + redirect(base_link().'/controller.php?id_module='.$id_module); } elseif (empty($id_record) && empty($id_module) && empty($id_plugin)) { - redirect(ROOTDIR.'/index.php'); + redirect(base_link().'/index.php'); } include_once App::filepath('include|custom|', 'top.php'); @@ -45,7 +45,7 @@ $has_access = !empty($query) ? $dbo->fetchNum($query) !== 0 : true; if ($has_access) { // Inclusione gli elementi fondamentali - include_once DOCROOT.'/actions.php'; + include_once base_dir().'/actions.php'; } if (empty($record) || !$has_access) { @@ -58,7 +58,7 @@ if (empty($record) || !$has_access) {
- + '.tr('Indietro').' '; @@ -142,7 +142,7 @@ if (empty($record) || !$has_access) { // Pulsanti di default echo '
- + '.tr("Torna all'elenco").' @@ -266,7 +266,7 @@ if (empty($record) || !$has_access) { echo '
'; - include DOCROOT.'/plugins/notes.php'; + include base_dir().'/plugins/notes.php'; echo '
'; @@ -276,7 +276,7 @@ if (empty($record) || !$has_access) { echo '
'; - include DOCROOT.'/plugins/checks.php'; + include base_dir().'/plugins/checks.php'; echo '
'; @@ -378,7 +378,7 @@ if (empty($record) || !$has_access) { $id_plugin = $plugin['id']; - include DOCROOT.'/include/manager.php'; + include base_dir().'/include/manager.php'; echo '
'; @@ -399,7 +399,7 @@ echo '{( "name": "widgets", "id_module": "'.$id_module.'", "id_record": "'.$id_r if (!empty($record)) { echo '
- + '.tr('Indietro').' '; } @@ -471,7 +471,7 @@ if (!empty($advanced_sessions)) { ?> function getActiveUsers(){ - $.getJSON('/ajax.php?op=active_users', { + $.getJSON('/ajax.php?op=active_users', { id_module: , id_record: }, diff --git a/include/common/articolo.php b/include/common/articolo.php index 6e2c07b79..49227ba34 100755 --- a/include/common/articolo.php +++ b/include/common/articolo.php @@ -78,21 +78,21 @@ if ($module['name'] != 'Contratti' && $module['name'] != 'Preventivi') { echo '
-
-
-
diff --git a/include/common/form.php b/include/common/form.php index bdf5d2a84..9c5c40b73 100755 --- a/include/common/form.php +++ b/include/common/form.php @@ -21,7 +21,7 @@ $result['id'] = isset($result['id']) ? $result['id'] : null; // Form di inserimento riga documento echo ' -
+ diff --git a/include/common/importa.php b/include/common/importa.php index 4b848b476..a4765cb69 100755 --- a/include/common/importa.php +++ b/include/common/importa.php @@ -42,7 +42,7 @@ if (empty($righe)) { return; } -$link = !empty($documento_finale) ? ROOTDIR.'/editor.php?id_module='.$final_module['id'].'&id_record='.$documento_finale->id : ROOTDIR.'/controller.php?id_module='.$final_module['id']; +$link = !empty($documento_finale) ? base_link().'/editor.php?id_module='.$final_module['id'].'&id_record='.$documento_finale->id : base_link().'/controller.php?id_module='.$final_module['id']; echo ' diff --git a/include/init/configuration.php b/include/init/configuration.php index 094384845..1ba6e5c59 100755 --- a/include/init/configuration.php +++ b/include/init/configuration.php @@ -115,7 +115,7 @@ if (post('db_host') !== null) { // Creazione della configurazione if ($dbo->isConnected()) { - $new_config = file_get_contents(DOCROOT.'/config.example.php'); + $new_config = file_get_contents(base_dir().'/config.example.php'); $decimals = post('decimal_separator'); $thousands = post('thousand_separator'); @@ -149,14 +149,14 @@ if (post('db_host') !== null) {

'.tr('Sembra che non ci siano i permessi di scrittura sul file _FILE_', [ '_FILE_' => 'config.inc.php', ]).'

- +
;
- '.tr('Torna indietro').' + '.tr('Torna indietro').'
@@ -184,9 +184,9 @@ if (post('db_host') !== null) { "dir" : "ltr", "lang" : "it-IT", "name" : "OpenSTAManager", - "scope" : "'.ROOTDIR.'", + "scope" : "'.base_link().'", "display" : "fullscreen", - "start_url" : "'.ROOTDIR.'", + "start_url" : "'.base_link().'", "short_name" : "OSM", "theme_color" : "transparent", "description" : "OpenSTAManager", @@ -203,7 +203,7 @@ if (post('db_host') !== null) { }'; file_put_contents('manifest.json', $manifest); - redirect(ROOTDIR.'/index.php'); + redirect(base_link().'/index.php'); exit(); } } @@ -219,7 +219,7 @@ if ((file_exists('config.inc.php') || $valid_config) && !$dbo->isConnected()) {

'.tr("Si è verificato un'errore durante la connessione al database").'.

'.tr('Controllare di aver inserito correttamente i dati di accesso, e che il database atto ad ospitare i dati del gestionale sia esistente').'.

- '.tr('Riprova').' + '.tr('Riprova').'
'; } @@ -240,7 +240,7 @@ if (empty($creation) && (!file_exists('config.inc.php') || !$valid_config)) { '_FILE_' => 'config.inc.php', ]).'.

'.tr("Nel caso il problema persista, rivolgersi all'assistenza ufficiale").'.

- '.tr('Riprova').' + '.tr('Riprova').'
'; } @@ -295,7 +295,7 @@ if (empty($creation) && (!file_exists('config.inc.php') || !$valid_config)) { $("#test").prop("disabled", true); $("#install").prop("disabled", true); $(this).closest("form").ajaxSubmit({ - url: "'.$rootdir.'/index.php", + url: "'.base_link().'/index.php", data: { test: 1, }, diff --git a/include/init/init.php b/include/init/init.php index 27b245a67..cb99470aa 100755 --- a/include/init/init.php +++ b/include/init/init.php @@ -66,7 +66,7 @@ if (post('action') == 'init') { if (!$has_azienda) { Filter::set('post', 'op', 'add'); $id_module = Modules::get('Anagrafiche')['id']; - include DOCROOT.'/modules/anagrafiche/actions.php'; + include base_dir().'/modules/anagrafiche/actions.php'; // Logo stampe if (!empty($_FILES) && !empty($_FILES['blob']['name'])) { @@ -114,7 +114,7 @@ if (post('action') == 'init') { } } - redirect(ROOTDIR, 'js'); + redirect(base_link(), 'js'); exit(); } @@ -172,7 +172,7 @@ if (!$has_azienda) { $readonly_tipo = true; ob_start(); - include DOCROOT.'/modules/anagrafiche/add.php'; + include base_dir().'/modules/anagrafiche/add.php'; $anagrafica = ob_get_clean(); echo str_replace('', '', $anagrafica); @@ -258,7 +258,7 @@ echo ' $("button[type=submit]").not("#config").remove(); }); - + '; include_once App::filepath('include|custom|', 'bottom.php'); diff --git a/include/init/requirements.php b/include/init/requirements.php index 8498da7ec..b1ed7dff2 100755 --- a/include/init/requirements.php +++ b/include/init/requirements.php @@ -145,7 +145,7 @@ $dirs = [ $directories = []; foreach ($dirs as $name => $description) { - $status = is_writable($docroot.DIRECTORY_SEPARATOR.$name); + $status = is_writable(base_dir().DIRECTORY_SEPARATOR.$name); $directories[] = [ 'name' => $name, diff --git a/include/init/update.php b/include/init/update.php index 37e9ebd5e..72ef78c1b 100755 --- a/include/init/update.php +++ b/include/init/update.php @@ -104,7 +104,7 @@ if (filter('action') == 'do_update') { } echo ' - + '.tr('Continua').' '; } @@ -125,7 +125,7 @@ if (filter('action') == 'do_update') {

'.tr("E' attualmente in corso la procedura di aggiornamento del software, e pertanto siete pregati di attendere fino alla sua conclusione").'.

'.tr("Nel caso il problema persista, rivolgersi all'amministratore o all'assistenza ufficiale").'.

- '.tr('Riprova').' + '.tr('Riprova').'
'; @@ -202,7 +202,7 @@ if (filter('action') == 'do_update') { foreach ($updates as $update) { if ($update['sql'] && (!empty($update['done']) || is_null($update['done']))) { - $queries = readSQLFile(DOCROOT.$update['directory'].$update['filename'].'.sql', ';'); + $queries = readSQLFile(base_dir().$update['directory'].$update['filename'].'.sql', ';'); $total += count($queries); if (intval($update['done']) > 1) { diff --git a/include/top.php b/include/top.php index 0af6d18a7..85e8dcf8e 100755 --- a/include/top.php +++ b/include/top.php @@ -38,9 +38,9 @@ echo ' '; -if (file_exists(DOCROOT.'/manifest.json')) { +if (file_exists(base_dir().'/manifest.json')) { echo ' - '; + '; } // CSS @@ -166,7 +166,7 @@ if (Auth::check()) { }, }; globals = { - rootdir: "'.$rootdir.'", + rootdir: "'.base_link().'", js: "'.$paths['js'].'", css: "'.$paths['css'].'", img: "'.$paths['img'].'", @@ -209,7 +209,7 @@ if (Auth::check()) { echo ' - '.tr('Scarica').' + '.tr('Scarica').'
diff --git a/modules/categorie_articoli/add.php b/modules/categorie_articoli/add.php index baa56e1ea..e40bd18bd 100755 --- a/modules/categorie_articoli/add.php +++ b/modules/categorie_articoli/add.php @@ -27,7 +27,7 @@ if (isset($id_record)) { ?>
-
+
@@ -72,7 +72,7 @@ include_once __DIR__.'/../../core.php'; - +
diff --git a/modules/categorie_articoli/row-list.php b/modules/categorie_articoli/row-list.php index 3d67c8ca8..891d621ca 100755 --- a/modules/categorie_articoli/row-list.php +++ b/modules/categorie_articoli/row-list.php @@ -29,7 +29,7 @@ foreach ($subcategorie as $sub) { '.$sub['colore'].' '.$sub['nota'].' - + diff --git a/modules/contratti/edit.php b/modules/contratti/edit.php index ad4af3fdc..fe9fbe56a 100755 --- a/modules/contratti/edit.php +++ b/modules/contratti/edit.php @@ -237,7 +237,7 @@ if (!empty($rs)) { - @@ -289,7 +289,7 @@ if (!empty($rs)) { - diff --git a/modules/dashboard/actions.php b/modules/dashboard/actions.php index 99049b018..5c8bfded0 100755 --- a/modules/dashboard/actions.php +++ b/modules/dashboard/actions.php @@ -74,7 +74,7 @@ switch (filter('op')) { 'title' => 'Int. '.$sessione['codice'].' '.$sessione['cliente'].'
'.tr('Tecnici').': '.$sessione['nome_tecnico'].' '.(($sessione['have_attachments']) ? '' : ''), 'start' => $sessione['orario_inizio'], 'end' => $sessione['orario_fine'], - 'url' => ROOTDIR.'/editor.php?id_module='.$modulo_interventi->id.'&id_record='.$sessione['idintervento'], + 'url' => base_link().'/editor.php?id_module='.$modulo_interventi->id.'&id_record='.$sessione['idintervento'], 'backgroundColor' => $sessione['colore'], 'textColor' => color_inverse($sessione['colore']), 'borderColor' => ($sessione['colore_tecnico'] == '#FFFFFF') ? color_darken($sessione['colore_tecnico'], 100) : $sessione['colore_tecnico'], diff --git a/modules/dashboard/widgets/notifiche.php b/modules/dashboard/widgets/notifiche.php index 0cbb67359..ffb683734 100755 --- a/modules/dashboard/widgets/notifiche.php +++ b/modules/dashboard/widgets/notifiche.php @@ -51,7 +51,7 @@ if (empty($notes)) { $moduli = $notes->groupBy('id_module')->sortBy('notification_date'); foreach ($moduli as $module_id => $note) { - $modulo = Module::get($module_id); + $modulo = Module::pool($module_id); echo '

'.$modulo->title.'

diff --git a/modules/ddt/ajax/search.php b/modules/ddt/ajax/search.php index 5e2c1c645..237d3ae5c 100755 --- a/modules/ddt/ajax/search.php +++ b/modules/ddt/ajax/search.php @@ -51,7 +51,7 @@ foreach ($rs as $r) { $numero = empty($r['numero_esterno']) ? $r['numero'] : $r['numero_esterno']; - $result['link'] = ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$r['id']; + $result['link'] = base_link().'/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']; diff --git a/modules/ddt/edit.php b/modules/ddt/edit.php index 0669fbed9..ea71479c0 100755 --- a/modules/ddt/edit.php +++ b/modules/ddt/edit.php @@ -324,7 +324,7 @@ if (!$block_edit) { $ordini = $dbo->fetchArray($ordini_query)[0]['tot']; echo ' - + '.tr('Ordine').' '; diff --git a/modules/emails/src/Account.php b/modules/emails/src/Account.php index f5378373d..d6e57e914 100755 --- a/modules/emails/src/Account.php +++ b/modules/emails/src/Account.php @@ -24,12 +24,12 @@ use Common\SimpleModelTrait; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Notifications\EmailNotification; -use Traits\StoreTrait; +use Traits\LocalPoolTrait; class Account extends Model { use SimpleModelTrait; - use StoreTrait; + use LocalPoolTrait; use SoftDeletes; protected $table = 'em_accounts'; diff --git a/modules/emails/src/Template.php b/modules/emails/src/Template.php index 058f6aa67..58451cd10 100755 --- a/modules/emails/src/Template.php +++ b/modules/emails/src/Template.php @@ -24,12 +24,12 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Models\Module; use Models\PrintTemplate; -use Traits\StoreTrait; +use Traits\LocalPoolTrait; class Template extends Model { use SimpleModelTrait; - use StoreTrait; + use LocalPoolTrait; use SoftDeletes; protected $table = 'em_templates'; diff --git a/modules/fatture/actions.php b/modules/fatture/actions.php index 941128873..37239e4cd 100755 --- a/modules/fatture/actions.php +++ b/modules/fatture/actions.php @@ -143,7 +143,7 @@ switch (post('op')) { if ($stato_fe && empty($checks)) { try { $fattura_pa = new FatturaElettronica($id_record); - $file = $fattura_pa->save(DOCROOT.'/'.FatturaElettronica::getDirectory()); + $file = $fattura_pa->save(base_dir().'/'.FatturaElettronica::getDirectory()); flash()->info(tr('Fattura elettronica generata correttamente!')); diff --git a/modules/fatture/add_intervento.php b/modules/fatture/add_intervento.php index cc3f9d223..0b1389055 100755 --- a/modules/fatture/add_intervento.php +++ b/modules/fatture/add_intervento.php @@ -44,7 +44,7 @@ echo ' '_NUM_' => $numero, ]).'

- + '; diff --git a/modules/fatture/add_serial.php b/modules/fatture/add_serial.php index 0c67a1438..0468e987e 100755 --- a/modules/fatture/add_serial.php +++ b/modules/fatture/add_serial.php @@ -75,7 +75,7 @@ $rs = $dbo->fetchArray('SELECT mg_articoli.id AS idarticolo, mg_articoli.codice, echo '

'.tr('Articolo').': '.$rs[0]['codice'].' - '.$rs[0]['descrizione'].'

- + diff --git a/modules/fatture/ajax/search.php b/modules/fatture/ajax/search.php index ba1d2cbc2..7e918e176 100755 --- a/modules/fatture/ajax/search.php +++ b/modules/fatture/ajax/search.php @@ -53,7 +53,7 @@ foreach ($rs as $r) { $numero = empty($r['numero_esterno']) ? $r['numero'] : $r['numero_esterno']; - $result['link'] = ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$r['id']; + $result['link'] = base_link().'/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']; diff --git a/modules/fatture/bulk.php b/modules/fatture/bulk.php index a98acc5f2..99ea9a5de 100755 --- a/modules/fatture/bulk.php +++ b/modules/fatture/bulk.php @@ -27,7 +27,7 @@ use Util\Zip; switch (post('op')) { case 'export-bulk': - $dir = DOCROOT.'/files/export_fatture/'; + $dir = base_dir().'/files/export_fatture/'; directory($dir.'tmp/'); $dir = slashes($dir); @@ -113,7 +113,7 @@ switch (post('op')) { break; case 'export-xml-bulk': - $dir = DOCROOT.'/files/export_fatture/'; + $dir = base_dir().'/files/export_fatture/'; directory($dir.'tmp/'); $dir = slashes($dir); @@ -301,7 +301,7 @@ $operations['registrazione-contabile'] = [ 'title' => tr('Registrazione contabile'), 'type' => 'modal', 'origine' => 'fatture', - 'url' => $rootdir.'/add.php?id_module='.Modules::get('Prima nota')['id'], + 'url' => base_link().'/add.php?id_module='.Modules::get('Prima nota')['id'], ], ]; diff --git a/modules/fatture/buttons.php b/modules/fatture/buttons.php index 0b392234e..fa2051fa0 100755 --- a/modules/fatture/buttons.php +++ b/modules/fatture/buttons.php @@ -42,11 +42,11 @@ if ($dir == 'entrata') { @@ -72,7 +72,7 @@ if (!empty($record['is_fiscale'])) { } echo ' - + '.tr('Registra insoluto').' '; @@ -87,7 +87,7 @@ if (!empty($record['is_fiscale'])) { } echo ' - + '.tr('Registra contabile').' '; diff --git a/modules/fatture/edit.php b/modules/fatture/edit.php index 44be79b29..3bf94427d 100755 --- a/modules/fatture/edit.php +++ b/modules/fatture/edit.php @@ -599,7 +599,7 @@ if (!$block_edit) { echo '
- + Attività
'; @@ -609,7 +609,7 @@ if (!$block_edit) { $preventivi = $dbo->fetchArray($prev_query)[0]['tot']; echo '
- + Preventivo
'; @@ -619,7 +619,7 @@ if (!$block_edit) { $contratti = $dbo->fetchArray($contr_query)[0]['tot']; echo '
- + Contratto
'; @@ -637,7 +637,7 @@ if (!$block_edit) { AND dt_ddt.id IN (SELECT idddt FROM dt_righe_ddt WHERE dt_righe_ddt.idddt = dt_ddt.id AND (qta - qta_evasa) > 0)'; $ddt = $dbo->fetchArray($ddt_query)[0]['tot']; echo ' - + Ddt '; @@ -645,7 +645,7 @@ if (!$block_edit) { $ordini_query = 'SELECT COUNT(*) AS tot FROM or_ordini WHERE idanagrafica='.prepare($record['idanagrafica']).' AND idstatoordine IN (SELECT id FROM or_statiordine WHERE descrizione IN(\'Accettato\', \'Evaso\', \'Parzialmente evaso\', \'Parzialmente fatturato\')) AND idtipoordine=(SELECT id FROM or_tipiordine WHERE dir='.prepare($dir).') AND or_ordini.id IN (SELECT idordine FROM or_righe_ordini WHERE or_righe_ordini.idordine = or_ordini.id AND (qta - qta_evasa) > 0)'; $ordini = $dbo->fetchArray($ordini_query)[0]['tot']; echo ' - + Ordine '; } diff --git a/modules/fatture/variables.php b/modules/fatture/variables.php index f074222ba..89c5b1c99 100755 --- a/modules/fatture/variables.php +++ b/modules/fatture/variables.php @@ -31,9 +31,9 @@ FROM co_documenti WHERE co_documenti.id='.prepare($id_record)); if (!empty(setting('Logo stampe'))) { - $logo_azienda = BASEURL.'/'.Models\Upload::where('filename', setting('Logo stampe'))->first()->fileurl; + $logo_azienda = base_url().'/'.Models\Upload::where('filename', setting('Logo stampe'))->first()->fileurl; } else { - $logo_azienda = str_replace(DOCROOT, BASEURL, App::filepath('templates/base|custom|/logo_azienda.jpg')); + $logo_azienda = str_replace(base_dir(), base_url(), App::filepath('templates/base|custom|/logo_azienda.jpg')); $logo_azienda = str_replace('\\', '/', $logo_azienda); } diff --git a/modules/gestione_componenti/actions.php b/modules/gestione_componenti/actions.php index 9f5446db4..516651ba1 100755 --- a/modules/gestione_componenti/actions.php +++ b/modules/gestione_componenti/actions.php @@ -19,7 +19,7 @@ include_once __DIR__.'/../../core.php'; -$path = $docroot.'/files/impianti/'; +$path = base_dir().'/files/impianti/'; switch (post('op')) { case 'update': diff --git a/modules/gestione_componenti/edit.php b/modules/gestione_componenti/edit.php index 066217461..855b2faad 100755 --- a/modules/gestione_componenti/edit.php +++ b/modules/gestione_componenti/edit.php @@ -32,7 +32,7 @@ if (empty($id_record)) { for ($c = 1; $c <= count($cmp); ++$c) { echo ' - + '.$c.' '.$cmp[$c - 1][0].' '; diff --git a/modules/gestione_componenti/init.php b/modules/gestione_componenti/init.php index 1711abcc7..b53dc2ef8 100755 --- a/modules/gestione_componenti/init.php +++ b/modules/gestione_componenti/init.php @@ -19,9 +19,9 @@ include_once __DIR__.'/../../core.php'; -$cmp = \Util\Ini::getList($docroot.'/files/impianti/'); +$cmp = \Util\Ini::getList(base_dir().'/files/impianti/'); if (!empty($id_record) && isset($cmp[$id_record - 1])) { $record['nomefile'] = $cmp[$id_record - 1][0]; - $record['contenuto'] = file_get_contents($docroot.'/files/impianti/'.$record['nomefile']); + $record['contenuto'] = file_get_contents(base_dir().'/files/impianti/'.$record['nomefile']); } diff --git a/modules/giacenze_sedi/init.php b/modules/giacenze_sedi/init.php index 4e6f556ea..e9f32889d 100644 --- a/modules/giacenze_sedi/init.php +++ b/modules/giacenze_sedi/init.php @@ -21,5 +21,5 @@ include_once __DIR__.'/../../core.php'; if (isset($id_record)) { $id_module = Modules::get('Articoli')['id']; - redirect(ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$id_record); + redirect(base_link().'/editor.php?id_module='.$id_module.'&id_record='.$id_record); } diff --git a/modules/impianti/actions.php b/modules/impianti/actions.php index 8af12487c..bf41a243a 100644 --- a/modules/impianti/actions.php +++ b/modules/impianti/actions.php @@ -21,7 +21,7 @@ include_once __DIR__.'/../../core.php'; $op = post('op'); -$upload_dir = $docroot.'/files/'.Modules::get('Impianti')['directory']; +$upload_dir = base_dir().'/files/'.Modules::get('Impianti')['directory']; switch ($op) { // Aggiorno informazioni di base impianto @@ -124,8 +124,8 @@ switch ($op) { } // ...altrimenti carico dal file .ini - elseif (file_exists($docroot.'/files/impianti/'.$filename)) { - $contenuto = file_get_contents($docroot.'/files/impianti/'.$filename); + elseif (file_exists(base_dir().'/files/impianti/'.$filename)) { + $contenuto = file_get_contents(base_dir().'/files/impianti/'.$filename); } crea_form_componente($contenuto); diff --git a/modules/impianti/ajax/search.php b/modules/impianti/ajax/search.php index 9988b77d2..508416d86 100644 --- a/modules/impianti/ajax/search.php +++ b/modules/impianti/ajax/search.php @@ -49,7 +49,7 @@ $rs = $dbo->fetchArray($query); foreach ($rs as $r) { $result = []; - $result['link'] = ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$r['id']; + $result['link'] = base_link().'/editor.php?id_module='.$link_id.'&id_record='.$r['id']; $result['title'] = $r['matricola'].' - '.$r['nome']; $result['category'] = 'Impianti'; diff --git a/modules/impianti/edit.php b/modules/impianti/edit.php index 982bb0030..e774ad1f2 100644 --- a/modules/impianti/edit.php +++ b/modules/impianti/edit.php @@ -25,7 +25,7 @@ if (!empty($record['immagine'])) { $default_img = '/'.Uploads::getDirectory($id_module).'/'.$fileinfo['filename'].'_thumb600.'.$fileinfo['extension']; - $img = file_exists(DOCROOT.$default_img) ? ROOTDIR.$default_img : ROOTDIR.'/'.Uploads::getDirectory($id_module).'/'.$record['immagine']; + $img = file_exists(base_dir().$default_img) ? base_link().$default_img : base_link().'/'.Uploads::getDirectory($id_module).'/'.$record['immagine']; } ?> diff --git a/modules/impianti/plugins/my_impianti.componenti.php b/modules/impianti/plugins/my_impianti.componenti.php index 2ecae780a..026dad961 100755 --- a/modules/impianti/plugins/my_impianti.componenti.php +++ b/modules/impianti/plugins/my_impianti.componenti.php @@ -46,8 +46,8 @@ switch (filter('op')) { $filename = get('filename'); if (!empty($filename)) { - $contenuto = file_get_contents(DOCROOT.'/files/impianti/'.$filename); - $nome = Ini::getValue(Ini::readFile(DOCROOT.'/files/impianti/'.$filename), 'Nome'); + $contenuto = file_get_contents(base_dir().'/files/impianti/'.$filename); + $nome = Ini::getValue(Ini::readFile(base_dir().'/files/impianti/'.$filename), 'Nome'); $query = 'INSERT INTO my_impianto_componenti(filename, idimpianto, contenuto, nome, data) VALUES('.prepare($filename).', '.prepare($id_record).', '.prepare($contenuto).', '.prepare($nome).', NOW())'; $dbo->query($query); @@ -63,8 +63,8 @@ switch (filter('op')) { $filename = get('filename'); $id = get('id'); - $nome = Ini::getValue(Ini::readFile(DOCROOT.'/files/impianti/'.$filename), 'Nome'); - $contenuto = file_get_contents(DOCROOT.'/files/impianti/'.$filename); + $nome = Ini::getValue(Ini::readFile(base_dir().'/files/impianti/'.$filename), 'Nome'); + $contenuto = file_get_contents(base_dir().'/files/impianti/'.$filename); // Verifico che questo componente non sia già stato sostituito $query = 'SELECT * FROM my_impianto_componenti WHERE idsostituto = '.prepare($id); @@ -111,7 +111,7 @@ echo '
'; // Elenca i componenti disponibili -$componenti_disponibili = Ini::getList(DOCROOT.'/files/my_impianti/', $id_list); +$componenti_disponibili = Ini::getList(base_dir().'/files/my_impianti/', $id_list); echo '
@@ -203,7 +203,7 @@ if (!empty($componenti_installati)) { echo '
- + '; // Nome @@ -324,7 +324,7 @@ echo ' + '; +'; $start = $_SESSION['period_start']; $end = $_SESSION['period_end']; diff --git a/modules/stato_email/edit.php b/modules/stato_email/edit.php index 155ba9ea5..91dc431b6 100755 --- a/modules/stato_email/edit.php +++ b/modules/stato_email/edit.php @@ -145,7 +145,7 @@ foreach ($uploads as $upload) { echo ' - '.$upload->name.' + '.$upload->name.' '.$upload->pivot->name.' '; diff --git a/modules/stato_servizi/actions.php b/modules/stato_servizi/actions.php index c3c8c81e0..f261adbcc 100755 --- a/modules/stato_servizi/actions.php +++ b/modules/stato_servizi/actions.php @@ -35,13 +35,13 @@ switch (filter('op')) { // Elimino il modulo dal menu $dbo->query('DELETE FROM zz_modules WHERE id='.prepare($id).' OR parent='.prepare($id)); - $uninstall_script = DOCROOT.'/modules/'.$module_dir.'/update/uninstall.php'; + $uninstall_script = base_dir().'/modules/'.$module_dir.'/update/uninstall.php'; if (file_exists($uninstall_script)) { include_once $uninstall_script; } - delete(DOCROOT.'/modules/'.$module_dir.'/'); + delete(base_dir().'/modules/'.$module_dir.'/'); flash()->info(tr('Modulo "_MODULE_" disinstallato!', [ '_MODULE_' => $modulo, @@ -160,8 +160,8 @@ switch (filter('op')) { $dirs = [ $backup_dir => tr('Backup'), - DOCROOT.'/files' => tr('Allegati'), - DOCROOT.'/logs' => tr('Logs'), + base_dir().'/files' => tr('Allegati'), + base_dir().'/logs' => tr('Logs'), ]; foreach ($dirs as $dir => $description) { diff --git a/modules/stato_servizi/edit.php b/modules/stato_servizi/edit.php index 398a5b3ff..c86e59eb4 100755 --- a/modules/stato_servizi/edit.php +++ b/modules/stato_servizi/edit.php @@ -77,9 +77,9 @@ foreach ($widgets as $widget) { // Possibilità di disabilitare o abilitare i moduli tranne quello degli aggiornamenti if ($widget['enabled']) { - $stato = "".$stato."\n"; + $stato = "".$stato."\n"; } else { - $stato = "".$stato."\n"; + $stato = "".$stato."\n"; } // POSIZIONE @@ -91,10 +91,10 @@ foreach ($widgets as $widget) { if ($widget['location'] == 'controller_right') { $posizione = " "; - $posizione = "".$posizione."\n"; + $posizione = "".$posizione."\n"; } elseif ($widget['location'] == 'controller_top') { $posizione = " '; - $posizione = "".$posizione."\n"; + $posizione = "".$posizione."\n"; } echo ' diff --git a/modules/stato_servizi/modutil.php b/modules/stato_servizi/modutil.php index 0c445ea1d..1693fcc3c 100755 --- a/modules/stato_servizi/modutil.php +++ b/modules/stato_servizi/modutil.php @@ -41,9 +41,9 @@ function submodules($list, $depth = 0) // Possibilità di disabilitare o abilitare i moduli tranne quello degli aggiornamenti if (!$locked) { if ($sub['enabled']) { - $stato = "".$stato."\n"; + $stato = "".$stato."\n"; } else { - $stato = "".$stato."\n"; + $stato = "".$stato."\n"; } } @@ -77,7 +77,7 @@ function submodules($list, $depth = 0) // Possibilità di disinstallare solo se il modulo non è tra quelli predefiniti if (empty($sub['default'])) { $result .= ' - + "; } else { diff --git a/modules/stato_servizi/src/API/v1/FolderSize.php b/modules/stato_servizi/src/API/v1/FolderSize.php index c17e6f57c..423dd2f71 100755 --- a/modules/stato_servizi/src/API/v1/FolderSize.php +++ b/modules/stato_servizi/src/API/v1/FolderSize.php @@ -35,14 +35,14 @@ class FolderSize extends Resource implements RetrieveInterface $dirs = [ $backup_dir => tr('Backup'), - DOCROOT.'/files' => tr('Allegati'), - DOCROOT.'/logs' => tr('Logs'), + base_dir().'/files' => tr('Allegati'), + base_dir().'/logs' => tr('Logs'), ]; } else { $array = explode(',', $dirs); foreach ($array as $key => $value) { $dirs = [ - DOCROOT.'/'.$value => $key, + base_dir().'/'.$value => $key, ]; } } diff --git a/modules/stato_servizi/widgets/spazio_utilizzato.php b/modules/stato_servizi/widgets/spazio_utilizzato.php index 32f7c3972..f6f298a06 100755 --- a/modules/stato_servizi/widgets/spazio_utilizzato.php +++ b/modules/stato_servizi/widgets/spazio_utilizzato.php @@ -22,7 +22,7 @@ include_once __DIR__.'/../../../core.php'; $module = Modules::get('Stato dei servizi'); echo ' -'; +'; // Operazioni JavaScript echo ' diff --git a/modules/utenti/actions.php b/modules/utenti/actions.php index 532f60c02..b7028dc2b 100755 --- a/modules/utenti/actions.php +++ b/modules/utenti/actions.php @@ -116,7 +116,7 @@ switch (filter('op')) { $utente->save(); - redirect(ROOTDIR.'/modules/utenti/info.php'); + redirect(base_link().'/modules/utenti/info.php'); break; diff --git a/modules/utenti/info.php b/modules/utenti/info.php index fa7314817..33fb02c51 100755 --- a/modules/utenti/info.php +++ b/modules/utenti/info.php @@ -37,7 +37,7 @@ if (!empty($rs)) { $anagrafica = $rs[0]; } -$api = BASEURL.'/api/?token='.$token; +$api = base_url().'/api/?token='.$token; $module = Modules::get('Utenti e permessi'); echo ' diff --git a/modules/utenti/user.php b/modules/utenti/user.php index bee45d8e7..b04b2e559 100755 --- a/modules/utenti/user.php +++ b/modules/utenti/user.php @@ -46,7 +46,7 @@ if (!empty($user)) { } echo ' - + diff --git a/modules/utenti/variables.php b/modules/utenti/variables.php index af0550ec7..c4c234d13 100755 --- a/modules/utenti/variables.php +++ b/modules/utenti/variables.php @@ -24,5 +24,5 @@ $reset_token = $record->reset_token; return [ 'username' => $record->username, 'reset_token' => $reset_token, - 'reset_link' => BASEURL.'/reset.php?reset_token='.$reset_token, + 'reset_link' => base_url().'/reset.php?reset_token='.$reset_token, ]; diff --git a/modules/viste/edit.php b/modules/viste/edit.php index 90d4c15bc..32b652d88 100755 --- a/modules/viste/edit.php +++ b/modules/viste/edit.php @@ -132,7 +132,7 @@ function testQuery(){ $("#main_loading").fadeIn(); $.ajax({ - url: "'.ROOTDIR.'/actions.php?id_module=" + globals.id_module + "&id_record=" + globals.id_record + "&op=test", + url: "'.base_link().'/actions.php?id_module=" + globals.id_module + "&id_record=" + globals.id_record + "&op=test", cache: false, type: "post", processData: false, diff --git a/pdfgen.php b/pdfgen.php index 755823113..7221b93ab 100755 --- a/pdfgen.php +++ b/pdfgen.php @@ -43,7 +43,7 @@ if (empty($result)) {
- + '.tr('Indietro').'
'; diff --git a/plugins/exportFE/edit.php b/plugins/exportFE/edit.php index f324874a4..a29fdfdd1 100755 --- a/plugins/exportFE/edit.php +++ b/plugins/exportFE/edit.php @@ -86,7 +86,7 @@ echo ' - + '.tr('Visualizza').' '; @@ -143,7 +143,7 @@ if (!empty($record['codice_stato_fe'])) { if (!empty($ultima_ricevuta)) { echo ' - + '.tr('Visualizza ricevuta').' '; } diff --git a/plugins/exportFE/init.php b/plugins/exportFE/init.php index 26a965d8d..9bb387c53 100755 --- a/plugins/exportFE/init.php +++ b/plugins/exportFE/init.php @@ -26,4 +26,4 @@ try { } catch (UnexpectedValueException $e) { } -$upload_dir = DOCROOT.'/'.FatturaElettronica::getDirectory(); +$upload_dir = base_dir().'/'.FatturaElettronica::getDirectory(); diff --git a/plugins/exportFE/src/FatturaElettronica.php b/plugins/exportFE/src/FatturaElettronica.php index 159895cb7..3e6c81bb3 100755 --- a/plugins/exportFE/src/FatturaElettronica.php +++ b/plugins/exportFE/src/FatturaElettronica.php @@ -85,7 +85,7 @@ class FatturaElettronica { $documento = $this->getDocumento(); - return !empty($documento['progressivo_invio']) && file_exists(DOCROOT.'/'.static::getDirectory().'/'.$this->getFilename()); + return !empty($documento['progressivo_invio']) && file_exists(base_dir().'/'.static::getDirectory().'/'.$this->getFilename()); } /** @@ -1454,7 +1454,7 @@ class FatturaElettronica // Inclusione foreach ($allegati as $allegato) { if ($allegato['category'] == 'Allegati Fattura Elettronica') { - $file = DOCROOT.'/'.$directory.'/'.$allegato['filename']; + $file = base_dir().'/'.$directory.'/'.$allegato['filename']; $attachments[] = [ 'NomeAttachment' => $allegato['name'], @@ -1482,7 +1482,7 @@ class FatturaElettronica $dir = static::getDirectory(); $print = Prints::getModulePredefinedPrint($id_module); - $info = Prints::render($print['id'], $documento['id'], DOCROOT.'/'.$dir); + $info = Prints::render($print['id'], $documento['id'], base_dir().'/'.$dir); $name = 'Stampa allegata'; $is_presente = database()->fetchNum('SELECT id FROM zz_files WHERE id_module = '.prepare($id_module).' AND id_record = '.prepare($documento['id']).' AND name = '.prepare($name)); diff --git a/plugins/exportFE/src/Interaction.php b/plugins/exportFE/src/Interaction.php index 2bc6d9bb3..79d8d0e07 100755 --- a/plugins/exportFE/src/Interaction.php +++ b/plugins/exportFE/src/Interaction.php @@ -33,7 +33,7 @@ class Interaction extends Services { try { $fattura = new FatturaElettronica($id_record); - $file = DOCROOT.'/'.FatturaElettronica::getDirectory().'/'.$fattura->getFilename(); + $file = base_dir().'/'.FatturaElettronica::getDirectory().'/'.$fattura->getFilename(); $response = static::request('POST', 'invio_fattura_xml', [ 'xml' => file_get_contents($file), diff --git a/plugins/importFE/actions.php b/plugins/importFE/actions.php index 88f34b942..53c92ca13 100755 --- a/plugins/importFE/actions.php +++ b/plugins/importFE/actions.php @@ -156,7 +156,7 @@ switch (filter('op')) { $process_result = Interaction::processInvoice($filename); if ($process_result != '') { flash()->error($process_result); - redirect(ROOTDIR.'/controller.php?id_module='.$id_module); + redirect(base_link().'/controller.php?id_module='.$id_module); return; } @@ -166,12 +166,12 @@ switch (filter('op')) { $file = $files[$id_record - 1]; if (get('sequence') == null) { - redirect(ROOTDIR.'/editor.php?id_module='.$id_module.'&id_record='.$id_fattura); + redirect(base_link().'/editor.php?id_module='.$id_module.'&id_record='.$id_fattura); } elseif (!empty($file)) { - redirect(ROOTDIR.'/editor.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&id_record='.$id_record.'&sequence=1'); + redirect(base_link().'/editor.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&id_record='.$id_record.'&sequence=1'); } else { flash()->info(tr('Tutte le fatture salvate sono state importate!')); - redirect(ROOTDIR.'/controller.php?id_module='.$id_module); + redirect(base_link().'/controller.php?id_module='.$id_module); } break; diff --git a/plugins/importFE/generate.php b/plugins/importFE/generate.php index ed73a39e8..3ec14ace2 100755 --- a/plugins/importFE/generate.php +++ b/plugins/importFE/generate.php @@ -28,7 +28,7 @@ $(document).ready(function() { }); '; -$skip_link = $has_next ? ROOTDIR.'/editor.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&id_record='.($id_record + 1).'&sequence='.get('sequence') : ROOTDIR.'/editor.php?id_module='.$id_module; +$skip_link = $has_next ? base_link().'/editor.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&id_record='.($id_record + 1).'&sequence='.get('sequence') : base_link().'/editor.php?id_module='.$id_module; if (empty($fattura_pa)) { if (!empty($error)) { diff --git a/plugins/importFE/init.php b/plugins/importFE/init.php index 27b0abe4b..72429d1c5 100755 --- a/plugins/importFE/init.php +++ b/plugins/importFE/init.php @@ -43,6 +43,6 @@ if (isset($id_record)) { if (empty($record)) { flash()->warning(tr('Nessuna fattura da importare!')); - redirect(ROOTDIR.'/controller.php?id_module='.$id_module); + redirect(base_link().'/controller.php?id_module='.$id_module); } } diff --git a/plugins/importFE/src/FatturaElettronica.php b/plugins/importFE/src/FatturaElettronica.php index 61f150592..8efad4761 100755 --- a/plugins/importFE/src/FatturaElettronica.php +++ b/plugins/importFE/src/FatturaElettronica.php @@ -92,7 +92,7 @@ class FatturaElettronica return $value->name == 'Fatturazione Elettronica'; }); - self::$directory = DOCROOT.'/'.$plugin->upload_directory; + self::$directory = base_dir().'/'.$plugin->upload_directory; } } diff --git a/plugins/importFE/src/Interaction.php b/plugins/importFE/src/Interaction.php index a4ef30a0d..4df35bd4d 100755 --- a/plugins/importFE/src/Interaction.php +++ b/plugins/importFE/src/Interaction.php @@ -37,7 +37,7 @@ class Interaction extends Services $result = self::getFileList($list); // Aggiornamento cache hook - Cache::get('Fatture Elettroniche')->set($result); + Cache::pool('Fatture Elettroniche')->set($result); return $result; } diff --git a/plugins/importFE/src/InvoiceHook.php b/plugins/importFE/src/InvoiceHook.php index 4da147a40..20d09cc7a 100755 --- a/plugins/importFE/src/InvoiceHook.php +++ b/plugins/importFE/src/InvoiceHook.php @@ -51,7 +51,7 @@ class InvoiceHook extends CachedManager return $value->name == 'Fatturazione Elettronica'; }); - $link = ROOTDIR.'/controller.php?id_module='.$module->id.'#tab_'.$plugin->id; + $link = base_link().'/controller.php?id_module='.$module->id.'#tab_'.$plugin->id; } $message = tr('Ci sono _NUM_ fatture passive da importare', [ diff --git a/plugins/importFE/view.php b/plugins/importFE/view.php index ca01b1c8e..902b6bbbe 100755 --- a/plugins/importFE/view.php +++ b/plugins/importFE/view.php @@ -30,7 +30,7 @@ $xml->loadXML($content); // XSL $xsl = new DOMDocument(); -$xsl->load(DOCROOT.'/plugins/xml/asso-invoice.xsl'); +$xsl->load(base_dir().'/plugins/xml/asso-invoice.xsl'); // XSLT $xslt = new XSLTProcessor(); diff --git a/plugins/pianificazione_interventi/edit.php b/plugins/pianificazione_interventi/edit.php index f699d396b..b5c2406b5 100755 --- a/plugins/pianificazione_interventi/edit.php +++ b/plugins/pianificazione_interventi/edit.php @@ -158,7 +158,7 @@ if (!$elenco_promemoria->isEmpty()) { - diff --git a/plugins/pianificazione_interventi/row-list.php b/plugins/pianificazione_interventi/row-list.php index f01536f3a..100ca1e59 100755 --- a/plugins/pianificazione_interventi/row-list.php +++ b/plugins/pianificazione_interventi/row-list.php @@ -137,7 +137,7 @@ if (!$righe->isEmpty()) { if ($r['abilita_serial']) { echo ' - '; } diff --git a/plugins/pianificazione_interventi/widgets/promemoria_da_pianificare.php b/plugins/pianificazione_interventi/widgets/promemoria_da_pianificare.php index 6acfa66f7..60dee75d9 100644 --- a/plugins/pianificazione_interventi/widgets/promemoria_da_pianificare.php +++ b/plugins/pianificazione_interventi/widgets/promemoria_da_pianificare.php @@ -108,7 +108,7 @@ foreach ($raggruppamenti as $mese => $raggruppamento) { // Pulsanti echo ' - diff --git a/plugins/receiptFE/src/Interaction.php b/plugins/receiptFE/src/Interaction.php index 77c258ff3..5cfa51f75 100755 --- a/plugins/receiptFE/src/Interaction.php +++ b/plugins/receiptFE/src/Interaction.php @@ -37,7 +37,7 @@ class Interaction extends Services $result = self::getFileList($list); // Aggiornamento cache hook - Cache::get('Ricevute Elettroniche')->set($result); + Cache::pool('Ricevute Elettroniche')->set($result); return $list; } diff --git a/plugins/receiptFE/src/ReceiptHook.php b/plugins/receiptFE/src/ReceiptHook.php index 47f56f883..1b059624b 100755 --- a/plugins/receiptFE/src/ReceiptHook.php +++ b/plugins/receiptFE/src/ReceiptHook.php @@ -32,7 +32,7 @@ class ReceiptHook extends Manager public function needsExecution() { // Lettura cache - $todo_cache = Cache::get('Ricevute Elettroniche'); + $todo_cache = Cache::pool('Ricevute Elettroniche'); return !$todo_cache->isValid() || !empty($todo_cache->content); } @@ -40,8 +40,8 @@ class ReceiptHook extends Manager public function execute() { // Lettura cache - $todo_cache = Cache::get('Ricevute Elettroniche'); - $completed_cache = Cache::get('Ricevute Elettroniche importate'); + $todo_cache = Cache::pool('Ricevute Elettroniche'); + $completed_cache = Cache::pool('Ricevute Elettroniche importate'); // Refresh cache if (!$todo_cache->isValid()) { @@ -92,8 +92,8 @@ class ReceiptHook extends Manager public function response() { // Lettura cache - $todo_cache = Cache::get('Ricevute Elettroniche'); - $completed_cache = Cache::get('Ricevute Elettroniche importate'); + $todo_cache = Cache::pool('Ricevute Elettroniche'); + $completed_cache = Cache::pool('Ricevute Elettroniche importate'); $completed_number = count($completed_cache->content); $total_number = $completed_number + count($todo_cache->content); diff --git a/plugins/receiptFE/src/Ricevuta.php b/plugins/receiptFE/src/Ricevuta.php index 48638debd..240337e96 100755 --- a/plugins/receiptFE/src/Ricevuta.php +++ b/plugins/receiptFE/src/Ricevuta.php @@ -95,7 +95,7 @@ class Ricevuta if (!isset(self::$directory)) { $plugin = Plugins::get('Ricevute FE'); - self::$directory = DOCROOT.'/'.$plugin->upload_directory; + self::$directory = base_dir().'/'.$plugin->upload_directory; } return self::$directory; diff --git a/plugins/revisioni/edit.php b/plugins/revisioni/edit.php index 4266c46d4..029c2d94b 100755 --- a/plugins/revisioni/edit.php +++ b/plugins/revisioni/edit.php @@ -24,7 +24,7 @@ $revisione_principale = $dbo->fetchOne('SELECT master_revision FROM co_preventiv $revisioni = $dbo->fetchArray('SELECT * FROM co_preventivi WHERE master_revision = '.prepare($revisione_principale['master_revision']).' OR id = '.prepare($revisione_principale['master_revision']).' ORDER BY created_at'); echo " - + @@ -89,7 +89,7 @@ echo " '; echo " -
+ diff --git a/plugins/statistiche_anagrafiche/info.php b/plugins/statistiche_anagrafiche/info.php index 83d4cb211..720bb121e 100755 --- a/plugins/statistiche_anagrafiche/info.php +++ b/plugins/statistiche_anagrafiche/info.php @@ -107,7 +107,7 @@ echo '
'.tr('Preventivi').' - '.($preventivi->count() > 0 ? ''.tr('Visualizza').' ' : '').' + '.($preventivi->count() > 0 ? ''.tr('Visualizza').' ' : '').'
'.$preventivi->count().'
@@ -122,7 +122,7 @@ echo '
'.tr('Contratti').' - '.($contratti->count() > 0 ? ''.tr('Visualizza').' ' : '').' + '.($contratti->count() > 0 ? ''.tr('Visualizza').' ' : '').'
'.$contratti->count().'
@@ -137,7 +137,7 @@ echo '
'.tr('Ordini cliente').' - '.($ordini_cliente->count() > 0 ? ''.tr('Visualizza').' ' : '').' + '.($ordini_cliente->count() > 0 ? ''.tr('Visualizza').' ' : '').'
'.$ordini_cliente->count().'
@@ -154,7 +154,7 @@ echo '
'.tr('Attività').' - '.($interventi->count() > 0 ? ''.tr('Visualizza').' ' : '').' + '.($interventi->count() > 0 ? ''.tr('Visualizza').' ' : '').'
'.$interventi->count().'
@@ -169,7 +169,7 @@ echo '
'.tr('Ddt in uscita').' - '.($ddt_uscita->count() > 0 ? ''.tr('Visualizza').' ' : '').' + '.($ddt_uscita->count() > 0 ? ''.tr('Visualizza').' ' : '').'
'.$ddt_uscita->count().'
@@ -184,7 +184,7 @@ echo '
'.tr('Fatture').' - '.($fatture_vendita->count() > 0 ? ''.tr('Visualizza').' ' : '').' + '.($fatture_vendita->count() > 0 ? ''.tr('Visualizza').' ' : '').'
'.$fatture_vendita->count().'
diff --git a/reset.php b/reset.php index bbcd4089d..08d5a8ea4 100755 --- a/reset.php +++ b/reset.php @@ -44,7 +44,7 @@ switch (post('op')) { $utente->reset_token = secure_random_string(); $utente->save(); - $template = Template::get('Reset password'); + $template = Template::pool('Reset password'); $mail = Mail::build($utente, $template, $utente->id); $mail->addReceiver($utente->email); @@ -59,7 +59,7 @@ switch (post('op')) { flash()->error(tr("Errore durante la gestione della richiesta: si prega di contattare l'amministratore").'.'); } - redirect(ROOTDIR.'/index.php'); + redirect(base_link().'/index.php'); exit(); break; @@ -76,7 +76,7 @@ switch (post('op')) { flash()->info(tr('Password cambiata!')); - redirect(ROOTDIR.'/index.php'); + redirect(base_link().'/index.php'); exit(); break; } @@ -121,7 +121,7 @@ if (Auth::isBrute()) { echo '
- +

'.$pageTitle.'

diff --git a/src/AJAX.php b/src/AJAX.php index 826246150..4c1107bc9 100755 --- a/src/AJAX.php +++ b/src/AJAX.php @@ -58,7 +58,7 @@ class AJAX $files = self::find('ajax/select.php', false); // File di gestione predefinita - array_unshift($files, DOCROOT.'/ajax_select.php'); + array_unshift($files, base_dir().'/ajax_select.php'); foreach ($files as $file) { $results = self::getSelectResults($file, $resource, $elements, [ @@ -142,7 +142,7 @@ class AJAX $files = self::find('ajax/search.php'); // File di gestione predefinita - array_unshift($files, DOCROOT.'/ajax_search.php'); + array_unshift($files, base_dir().'/ajax_search.php'); $results = []; foreach ($files as $file) { @@ -166,7 +166,7 @@ class AJAX $files = self::find('ajax/complete.php'); // File di gestione predefinita - array_unshift($files, DOCROOT.'/ajax_complete.php'); + array_unshift($files, base_dir().'/ajax_complete.php'); foreach ($files as $file) { $result = self::getCompleteResults($file, $resource); @@ -206,10 +206,10 @@ class AJAX $list = []; foreach ($pieces as $piece) { // File nativi - $files = glob(DOCROOT.'/modules/{'.implode(',', $piece).'}/'.$file, GLOB_BRACE); + $files = glob(base_dir().'/modules/{'.implode(',', $piece).'}/'.$file, GLOB_BRACE); // File personalizzati - $custom_files = glob(DOCROOT.'/modules/{'.implode(',', $piece).'}/custom/'.$file, GLOB_BRACE); + $custom_files = glob(base_dir().'/modules/{'.implode(',', $piece).'}/custom/'.$file, GLOB_BRACE); // Pulizia dei file nativi che sono stati personalizzati foreach ($custom_files as $key => $value) { diff --git a/src/API/App/v1/Interventi.php b/src/API/App/v1/Interventi.php index 5089a0372..bb3a29f1b 100644 --- a/src/API/App/v1/Interventi.php +++ b/src/API/App/v1/Interventi.php @@ -233,7 +233,7 @@ class Interventi extends AppResource $constraint->aspectRatio(); }); - $img->save(DOCROOT.'/files/interventi/'.$firma_file); + $img->save(base_dir().'/files/interventi/'.$firma_file); return $firma_file; } diff --git a/src/API/Common/Allegato.php b/src/API/Common/Allegato.php index d76acafb1..725360939 100755 --- a/src/API/Common/Allegato.php +++ b/src/API/Common/Allegato.php @@ -52,7 +52,7 @@ class Allegato extends Resource implements RetrieveInterface, CreateInterface ->where('id_record', $request['id_record']) ->first(); if (!empty($upload)) { - download(DOCROOT.'/'.$upload->filepath, $upload->original_name); + download(base_dir().'/'.$upload->filepath, $upload->original_name); } return [ diff --git a/src/API/Common/Stampa.php b/src/API/Common/Stampa.php index 4801894a4..067a6a359 100755 --- a/src/API/Common/Stampa.php +++ b/src/API/Common/Stampa.php @@ -30,7 +30,7 @@ class Stampa extends Resource implements RetrieveInterface { $print = PrintTemplate::where('name', $request['name'])->first(); if (!empty($print)) { - $directory = DOCROOT.'/files/api'; + $directory = base_dir().'/files/api'; $data = Prints::render($print->id, $request['id_record'], $directory); download($data['path']); diff --git a/src/API/Common/Task.php b/src/API/Common/Task.php index 5548f5bdc..2832e68f8 100644 --- a/src/API/Common/Task.php +++ b/src/API/Common/Task.php @@ -44,22 +44,22 @@ class Task extends Resource implements RetrieveInterface, CreateInterface $database = database(); // Rimozione della registrazione del cron attuale - $ultima_esecuzione = Cache::get('Ultima esecuzione del cron'); + $ultima_esecuzione = Cache::pool('Ultima esecuzione del cron'); $ultima_esecuzione->set(null); // Segnalazione della chiusura al cron attuale - $cron_id = Cache::get('ID del cron'); + $cron_id = Cache::pool('ID del cron'); $cron_id->set(null); // Rimozione dell'eventuale blocco sul cron - $disattiva = Cache::get('Disabilita cron'); + $disattiva = Cache::pool('Disabilita cron'); $disattiva->set(null); // Salvataggio delle modifiche $database->commitTransaction(); // Attesa della conclusione per il cron precedente - $in_esecuzione = Cache::get('Cron in esecuzione'); + $in_esecuzione = Cache::pool('Cron in esecuzione'); while ($in_esecuzione->content) { $timestamp = (new Carbon())->addMinutes(1)->getTimestamp(); time_sleep_until($timestamp); @@ -81,7 +81,7 @@ class Task extends Resource implements RetrieveInterface, CreateInterface */ protected function request() { - $endpoint = BASEURL.'/cron.php'; + $endpoint = base_url().'/cron.php'; $postData = json_encode([]); $endpointParts = parse_url($endpoint); diff --git a/src/API/Manager.php b/src/API/Manager.php index ac10101de..e9111ff04 100755 --- a/src/API/Manager.php +++ b/src/API/Manager.php @@ -36,7 +36,7 @@ class Manager protected $type; /** - * @throws InvalidArgumentException + * @throws \InvalidArgumentException */ public function __construct($resource, $type, $version) { @@ -46,7 +46,7 @@ class Manager ->first(); if (empty($object)) { - throw new ResourceNotFound(); + throw new ResourceNotFound(); } $this->resource = $object; diff --git a/src/API/Response.php b/src/API/Response.php index 8c5d6b3ae..d3e557d42 100755 --- a/src/API/Response.php +++ b/src/API/Response.php @@ -211,7 +211,7 @@ class Response */ public static function isAPIRequest() { - return getURLPath() == slashes(ROOTDIR.'/api/index.php'); + return getURLPath() == slashes(base_link().'/api/index.php'); } /** @@ -221,7 +221,7 @@ class Response * * @return array */ - public function getRequest($raw = false) + public static function getRequest($raw = false) { $request = []; diff --git a/src/App.php b/src/App.php index 50af9661d..4ef8dd28e 100755 --- a/src/App.php +++ b/src/App.php @@ -17,6 +17,8 @@ * along with this program. If not, see . */ +use Util\Messages; + /** * Classe per la gestione delle utenze. * @@ -24,12 +26,16 @@ */ class App { + public static $docroot; + public static $rootdir; + public static $baseurl; + /** @var array Identificativo del modulo corrente */ protected static $current_module; /** @var int Identificativo dell'elemento corrente */ protected static $current_element; - /** @var \Util\Messages Gestione dei messaggi flash */ + /** @var Messages Gestione dei messaggi flash */ protected static $flash = null; /** @var bool Stato di debug */ @@ -71,8 +77,8 @@ class App public static function getConfig() { if (empty(self::$config['db_host'])) { - if (file_exists(DOCROOT.'/config.inc.php')) { - include DOCROOT.'/config.inc.php'; + if (file_exists(base_dir().'/config.inc.php')) { + include base_dir().'/config.inc.php'; $config = get_defined_vars(); } else { @@ -116,13 +122,13 @@ class App /** * Restituisce l'oggetto dedicato alla gestione dei messaggi per l'utente. * - * @return \Util\Messages + * @return Messages */ public static function flash() { if (empty(self::$flash)) { $storage = null; - self::$flash = new \Util\Messages($storage, 'messages'); + self::$flash = new Messages($storage, 'messages'); } return self::$flash; @@ -131,8 +137,6 @@ class App /** * Individua i percorsi di base necessari per il funzionamento del gestionale. * Attenzione: questo metodo deve essere eseguito all'interno di un file nella cartella principale del progetto per permettere il corretto funzionamento degli URL. - * - * @return array */ public static function definePaths($docroot) { @@ -154,6 +158,10 @@ class App define('DOCROOT', $docroot); define('ROOTDIR', $rootdir); define('BASEURL', $baseurl); + + self::$docroot = $docroot; + self::$rootdir = $rootdir; + self::$baseurl = $baseurl; } } @@ -164,7 +172,7 @@ class App */ public static function getPaths() { - $assets = ROOTDIR.'/assets/dist'; + $assets = base_link().'/assets/dist'; return [ 'assets' => $assets, @@ -218,7 +226,7 @@ class App foreach ($lang_replace as $replace) { $name = str_replace('|lang|', $replace, $element); - if (file_exists(DOCROOT.str_replace(ROOTDIR, '', $name))) { + if (file_exists(base_dir().str_replace(base_link(), '', $name))) { $assets_element = $name; break; } @@ -293,7 +301,7 @@ class App */ public static function filepath($path, $file = null) { - $path = str_contains($path, DOCROOT) ? $path : DOCROOT.'/'.ltrim($path, '/'); + $path = str_contains($path, base_dir()) ? $path : base_dir().'/'.ltrim($path, '/'); $path = empty($file) ? $path : rtrim($path, '/').'/'.$file; $original_file = str_replace('|custom|', '', $path); @@ -316,8 +324,8 @@ class App */ protected static function getDefaultConfig() { - if (file_exists(DOCROOT.'/config.example.php')) { - include DOCROOT.'/config.example.php'; + if (file_exists(base_dir().'/config.example.php')) { + include base_dir().'/config.example.php'; } $db_host = ''; diff --git a/src/Backup.php b/src/Backup.php index fbb6599f7..66a946855 100755 --- a/src/Backup.php +++ b/src/Backup.php @@ -169,14 +169,14 @@ class Backup ], ]; - if (starts_with($backup_dir, slashes(DOCROOT))) { + if (starts_with($backup_dir, slashes(base_dir()))) { $ignores['dirs'][] = basename($backup_dir); } // Creazione backup in formato ZIP if (extension_loaded('zip')) { $result = Zip::create([ - DOCROOT, + base_dir(), self::getDatabaseDirectory(), ], $backup_dir.'/'.$backup_name.'.zip', $ignores); } @@ -184,7 +184,7 @@ class Backup // Creazione backup attraverso la copia dei file else { $result = copyr([ - DOCROOT, + base_dir(), self::getDatabaseDirectory(), ], $backup_dir.'/'.$backup_name.'.zip', $ignores); } @@ -244,7 +244,7 @@ class Backup // fino a ripristino ultimato // Rimozione del database - $tables = include DOCROOT.'/update/tables.php'; + $tables = include base_dir().'/update/tables.php'; // Ripristino del database $database_file = $extraction_dir.'/database.sql'; @@ -261,19 +261,19 @@ class Backup } // Salva il file di configurazione - $config = file_get_contents(DOCROOT.'/config.inc.php'); + $config = file_get_contents(base_dir().'/config.inc.php'); // Copia i file dalla cartella temporanea alla root - copyr($extraction_dir, DOCROOT); + copyr($extraction_dir, base_dir()); // Ripristina il file di configurazione dell'installazione - file_put_contents(DOCROOT.'/config.inc.php', $config); + file_put_contents(base_dir().'/config.inc.php', $config); // Pulizia if (!empty($cleanup)) { delete($extraction_dir); } - delete(DOCROOT.'/database.sql'); + delete(base_dir().'/database.sql'); } /** diff --git a/src/Extensions/EloquentCollector.php b/src/Extensions/EloquentCollector.php index 58584b1ea..b83ce08f3 100755 --- a/src/Extensions/EloquentCollector.php +++ b/src/Extensions/EloquentCollector.php @@ -19,6 +19,9 @@ namespace Extensions; +use Illuminate\Database\Capsule\Manager; +use PDO; + class EloquentCollector extends \DebugBar\DataCollector\PDO\PDOCollector { protected $capsule; @@ -54,7 +57,7 @@ class EloquentCollector extends \DebugBar\DataCollector\PDO\PDOCollector } /** - * @return Illuminate\Database\Capsule\Manager; + * @return Manager; */ protected function getEloquentCapsule() { diff --git a/src/HTMLBuilder/HTMLBuilder.php b/src/HTMLBuilder/HTMLBuilder.php index d37fef186..2595532e8 100755 --- a/src/HTMLBuilder/HTMLBuilder.php +++ b/src/HTMLBuilder/HTMLBuilder.php @@ -93,7 +93,7 @@ class HTMLBuilder 'list' => [ 'filelist_and_upload' => Manager\FileManager::class, 'button' => Manager\ButtonManager::class, - 'csrf' => Manager\CSRFManager::class, + //'csrf' => Manager\CSRFManager::class, 'custom_fields' => Manager\FieldManager::class, 'widgets' => Manager\WidgetManager::class, 'log_email' => Manager\EmailManager::class, @@ -195,9 +195,7 @@ class HTMLBuilder } // Ricorsione - if ($depth < self::$max_recursion) { - $result = self::replace($result, $depth + 1); - } + $result = self::replace($result); return !empty($result) ? $result : json_encode($json); } @@ -318,7 +316,7 @@ class HTMLBuilder $class = is_object($class) ? $class : new $class(); - if ($class instanceof Handler\ManagerInterface) { + if ($class instanceof Manager\ManagerInterface) { self::$managers['list'][$input] = $original; self::$managers['instances'][$original] = $class; } @@ -327,8 +325,7 @@ class HTMLBuilder /** * Imposta l'oggetto responsabile per la costruzione del codice HTML per il tag personalizzato. * - * @param string $input - * @param string|mixed $class + * @param array $record */ public static function setRecord($record) { diff --git a/src/HTMLBuilder/Handler/CKEditorHandler.php b/src/HTMLBuilder/Handler/CKEditorHandler.php index 0fd14fdbe..5015828c3 100755 --- a/src/HTMLBuilder/Handler/CKEditorHandler.php +++ b/src/HTMLBuilder/Handler/CKEditorHandler.php @@ -31,7 +31,7 @@ class CKEditorHandler implements HandlerInterface // Generazione del codice HTML return ' - + +