diff --git a/actions.php b/actions.php index 8d3c2734a..99e4542e7 100755 --- a/actions.php +++ b/actions.php @@ -88,7 +88,7 @@ if (filter('op') == 'aggiungi-allegato' || filter('op') == 'rimuovi-allegato') { } } - redirect_legacy(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : '')); + redirect_legacy(base_url().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : '')); } } @@ -350,7 +350,7 @@ if ($structure->permission == 'rw') { $bulk = empty($bulk) ? [] : $bulk; if (in_array(post('op'), array_keys($bulk))) { - redirect_legacy(base_path().'/controller.php?id_module='.$id_module, 'js'); + redirect_legacy(base_url().'/controller.php?id_module='.$id_module, 'js'); } else { // Esecuzione delle operazioni del modulo ($include_file = $structure->filepath('actions.php')) ? include $include_file : null; diff --git a/ajax_dataload.php b/ajax_dataload.php index 0c7cd67fc..66155ec55 100755 --- a/ajax_dataload.php +++ b/ajax_dataload.php @@ -180,11 +180,11 @@ if (!empty($query)) { // Link per i moduli if (empty($id_plugin)) { - $column['data-link'] = base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.$hash; + $column['data-link'] = base_url().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.$hash; } // Link per i plugin else { - $column['data-link'] = base_path().'/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_url().'/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'; } @@ -197,7 +197,7 @@ if (!empty($query)) { } // Replace base_link() per le query - $value = str_replace('base_link()', base_path(), $value); + $value = str_replace('base_link()', base_url(), $value); $result[] = str_replace('|attr|', implode(' ', $attributes), '
'.$value.'
'); } diff --git a/bug.php b/bug.php index 62753cb98..03c3e9e07 100755 --- a/bug.php +++ b/bug.php @@ -87,7 +87,7 @@ if (filter('op') == 'send') { delete($backup_file); } - redirect_legacy(base_path().'/bug.php'); + redirect_legacy(base_url().'/bug.php'); throw new \LegacyExitException(); } diff --git a/composer.json b/composer.json index 9ea25a88a..1c42ce1c9 100755 --- a/composer.json +++ b/composer.json @@ -14,25 +14,12 @@ "email": "info@openstamanager.com" }], "require": { - "php": ">=7.2", - "ext-curl": "*", - "ext-dom": "*", - "ext-fileinfo": "*", - "ext-intl": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-openssl": "*", - "ext-pdo": "*", - "ext-simplexml": "*", - "ext-xsl": "*", - "ext-zip": "*", "aluguest/ical-easy-reader": "^1.5", "voku/stringy": "~6.0", "davidepastore/codice-fiscale": "^0.6.0", "ezyang/htmlpurifier": "^4.8", "ifsnop/mysqldump-php": "^2.3", - "illuminate/support": "~7|~8", + "illuminate/support": "~9", "intervention/image": "^2.3", "league/oauth2-client": "^2.6", "league/oauth2-google": "^3.0", @@ -50,6 +37,12 @@ "phpunit/phpunit": "~9.0", "orchestra/testbench": "~5|~6" }, + "repositories": [ + { + "url": "https://github.com/wdog/sdd_ita.git", + "type": "git" + } + ], "autoload": { "psr-4": { "": "src/", diff --git a/config/csrf_config.php b/config/csrf_config.php index 61b740868..73ddb6241 100755 --- a/config/csrf_config.php +++ b/config/csrf_config.php @@ -26,10 +26,10 @@ return [ 'GET' => 0, 'POST' => 0, ], - 'jsUrl' => base_path().'/assets/dist/js/csrf/csrfprotector.js', + 'jsUrl' => base_url().'/assets/dist/js/csrf/csrfprotector.js', 'tokenLength' => 10, 'cookieConfig' => [ - 'path' => base_path(), + 'path' => base_url(), 'secure' => isHTTPS(true), ], 'verifyGetFor' => [], diff --git a/controller.php b/controller.php index b45a90177..942b7fb06 100755 --- a/controller.php +++ b/controller.php @@ -20,9 +20,9 @@ include_once __DIR__.'/core.php'; if (!empty($id_record) && !empty($id_module)) { - redirect_legacy(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record); + redirect_legacy(base_url().'/editor.php?id_module='.$id_module.'&id_record='.$id_record); } elseif (empty($id_module)) { - redirect_legacy(base_path().'/'); + redirect_legacy(base_url().'/'); } include_once AppLegacy::filepath('include|custom|', 'top.php'); diff --git a/editor.php b/editor.php index 1998c1893..6d0df7728 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_legacy(base_path().'/controller.php?id_module='.$id_module); + redirect_legacy(base_url().'/controller.php?id_module='.$id_module); } elseif (empty($id_record) && empty($id_module) && empty($id_plugin)) { - redirect_legacy(base_path().'/'); + redirect_legacy(base_url().'/'); } include_once AppLegacy::filepath('include|custom|', 'top.php'); @@ -73,7 +73,7 @@ if (empty($record) || !$has_access) {
- + '.tr('Indietro').' '; @@ -159,7 +159,7 @@ if (empty($record) || !$has_access) { // Pulsanti di default echo '
- + '.tr("Torna all'elenco").' @@ -441,7 +441,7 @@ echo '{( "name": "widgets", "id_module": "'.$id_module.'", "id_record": "'.$id_r if (!empty($record)) { echo '
- + '.tr('Indietro').' '; } @@ -519,7 +519,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 0d30782f3..c1ac5f9c8 100755 --- a/include/common/articolo.php +++ b/include/common/articolo.php @@ -86,7 +86,7 @@ $disabled = empty($result['idarticolo']); echo '
-
@@ -94,14 +94,14 @@ echo '
-
-
diff --git a/include/common/form.php b/include/common/form.php index 116547030..430d0fa09 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 221fd534f..3d12c085c 100755 --- a/include/common/importa.php +++ b/include/common/importa.php @@ -55,7 +55,7 @@ if ($righe->isEmpty()) { return; } -$link = !empty($documento_finale) ? base_path().'/editor.php?id_module='.$final_module['id'].'&id_record='.$documento_finale->id : base_path().'/controller.php?id_module='.$final_module['id']; +$link = !empty($documento_finale) ? base_url().'/editor.php?id_module='.$final_module['id'].'&id_record='.$documento_finale->id : base_url().'/controller.php?id_module='.$final_module['id']; echo ' diff --git a/include/init/configuration.php b/include/init/configuration.php index 3b2f1f43c..6e1af3c89 100755 --- a/include/init/configuration.php +++ b/include/init/configuration.php @@ -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" : "'.base_path().'", + "scope" : "'.base_url().'", "display" : "fullscreen", - "start_url" : "'.base_path().'", + "start_url" : "'.base_url().'", "short_name" : "OSM", "theme_color" : "transparent", "description" : "OpenSTAManager", @@ -203,7 +203,7 @@ if (post('db_host') !== null) { }'; file_put_contents('manifest.json', $manifest); - redirect_legacy(base_path().'/index.php'); + redirect_legacy(base_url().'/index.php'); throw new \LegacyExitException(); } } @@ -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: "'.base_path().'/index.php", + url: "'.base_url().'/index.php", data: { test: 1, }, diff --git a/include/init/init.php b/include/init/init.php index 69d33c025..786fd4544 100755 --- a/include/init/init.php +++ b/include/init/init.php @@ -114,7 +114,7 @@ if (post('action') == 'init') { } } - redirect_legacy(base_path(), 'js'); + redirect_legacy(base_url(), 'js'); throw new \LegacyExitException(); } diff --git a/include/init/update.php b/include/init/update.php index 0ef654a2c..e94036962 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').'
'; diff --git a/include/top.php b/include/top.php index 4b8ff41cb..b6f070afb 100755 --- a/include/top.php +++ b/include/top.php @@ -42,7 +42,7 @@ echo ' if (file_exists(base_dir().'/manifest.json')) { echo ' - '; + '; } // CSS @@ -181,7 +181,7 @@ if (auth()->check()) { globals = { content_was_modified: false, - rootdir: "'.base_path().'", + rootdir: "'.base_url().'", js: "'.$paths['js'].'", css: "'.$paths['css'].'", img: "'.$paths['img'].'", @@ -259,7 +259,7 @@ if (auth()->check()) { diff --git a/modules/articoli/plugins/articoli.movimenti.php b/modules/articoli/plugins/articoli.movimenti.php index c8c32aea4..b18aa441f 100755 --- a/modules/articoli/plugins/articoli.movimenti.php +++ b/modules/articoli/plugins/articoli.movimenti.php @@ -27,20 +27,20 @@ echo '
'; if (empty($_GET['movimentazione_completa'])) { echo ' - + '.tr('Mostra tutti i movimenti').' '; } else { echo ' - + '.tr('Mostra gli ultimi 20 movimenti').' '; } echo ' - + '.tr('Visualizza dettagli').' '; diff --git a/modules/articoli/src/Articolo.php b/modules/articoli/src/Articolo.php index 565f73604..84ceaa876 100755 --- a/modules/articoli/src/Articolo.php +++ b/modules/articoli/src/Articolo.php @@ -176,7 +176,7 @@ class Articolo extends Model $image = $directory.$this->immagine; $image_thumbnail = $directory.$fileinfo['filename'].'_thumb600.'.$fileinfo['extension']; - $url = file_exists(base_dir().$image_thumbnail) ? base_path().$image_thumbnail : base_path().$image; + $url = file_exists(base_dir().$image_thumbnail) ? base_url().$image_thumbnail : base_url().$image; return $url; } diff --git a/modules/articoli/widgets/stampa_inventario.php b/modules/articoli/widgets/stampa_inventario.php index a1040bd80..98fe5bbd9 100755 --- a/modules/articoli/widgets/stampa_inventario.php +++ b/modules/articoli/widgets/stampa_inventario.php @@ -23,7 +23,7 @@ include_once __DIR__.'/../../../core.php'; $id_print = $dbo->fetchOne('SELECT zz_prints.id FROM zz_prints INNER JOIN zz_modules ON zz_prints.id_module=zz_modules.id WHERE zz_modules.name="Articoli" AND zz_prints.name="Inventario magazzino"')['id']; echo ' -
+
diff --git a/modules/backups/edit.php b/modules/backups/edit.php index 8cf378ed1..91e045de0 100755 --- a/modules/backups/edit.php +++ b/modules/backups/edit.php @@ -234,7 +234,7 @@ if (file_exists($backup_dir)) { loadSize("'.$id.'", "c-'.$id.'"); - '.tr('Scarica').' + '.tr('Scarica').'
diff --git a/modules/categorie_articoli/actions.php b/modules/categorie_articoli/actions.php index 8643f77d4..35868ee4b 100755 --- a/modules/categorie_articoli/actions.php +++ b/modules/categorie_articoli/actions.php @@ -42,7 +42,7 @@ switch (filter('op')) { // Redirect alla categoria se si sta modificando una sottocategoria $database->commitTransaction(); - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); + redirect(base_url().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); throw new \LegacyExitException();; break; @@ -85,7 +85,7 @@ switch (filter('op')) { } else { // Redirect alla categoria se si sta aggiungendo una sottocategoria $database->commitTransaction(); - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); + redirect(base_url().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); throw new \LegacyExitException();; } diff --git a/modules/categorie_articoli/add.php b/modules/categorie_articoli/add.php index 9bad36961..ad3c0d841 100755 --- a/modules/categorie_articoli/add.php +++ b/modules/categorie_articoli/add.php @@ -27,7 +27,7 @@ if (isset($id_record)) { ?>
-
+
diff --git a/modules/categorie_articoli/row-list.php b/modules/categorie_articoli/row-list.php index f39439e78..b9edaa16f 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/combinazioni_articoli/edit.php b/modules/combinazioni_articoli/edit.php index 554a352bd..798c7eac7 100644 --- a/modules/combinazioni_articoli/edit.php +++ b/modules/combinazioni_articoli/edit.php @@ -114,7 +114,7 @@ function modificaVariante(id) { function rimuoviVariante(id) { if( confirm(\'Rimuovere la variante dalla combinazione?\') ){ - $.post( \''.base_path().'/modules/combinazioni_articoli/actions.php\', { op: \'remove-variante\', id_articolo: + id }, function(data){ location.href=\''.base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.'\'; } ); + $.post( \''.base_url().'/modules/combinazioni_articoli/actions.php\', { op: \'remove-variante\', id_articolo: + id }, function(data){ location.href=\''.base_url().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.'\'; } ); } } diff --git a/modules/contratti/edit.php b/modules/contratti/edit.php index 2ffbc7cba..5ed625987 100755 --- a/modules/contratti/edit.php +++ b/modules/contratti/edit.php @@ -248,7 +248,7 @@ if (!empty($rs)) { - @@ -300,7 +300,7 @@ if (!empty($rs)) { - diff --git a/modules/dashboard/ajax.php b/modules/dashboard/ajax.php index abcdfeb79..65839b235 100644 --- a/modules/dashboard/ajax.php +++ b/modules/dashboard/ajax.php @@ -109,7 +109,7 @@ switch (filter('op')) { 'title' => '
'.(($sessione['is_completato']) ? '' : '').' '.(($sessione['have_attachments']) ? '' : '').'
'.'Int. '.$sessione['codice'].' '.$sessione['cliente'].'
'.tr('Tecnici').': '.$sessione['nome_tecnico'], 'start' => $sessione['orario_inizio'], 'end' => $sessione['orario_fine'], - 'link' => base_path().'/editor.php?id_module='.$modulo_interventi->id.'&id_record='.$sessione['idintervento'], + 'link' => base_url().'/editor.php?id_module='.$modulo_interventi->id.'&id_record='.$sessione['idintervento'], 'backgroundColor' => $backgroundcolor, 'textColor' => color_inverse($backgroundcolor), 'borderColor' => ($bordercolor == '#FFFFFF') ? color_darken($bordercolor, 100) : $bordercolor, @@ -149,7 +149,7 @@ switch (filter('op')) { 'title' => '
'.(($preventivo['is_completato']) ? '' : '').' '.(($preventivo['have_attachments']) ? '' : '').'
'.'Accettazione prev. '.$preventivo['numero'].' '.$preventivo['nome'].'
'.tr('Cliente').': '.$preventivo['cliente'], 'start' => $preventivo['data_accettazione'], 'end' => $preventivo['data_accettazione'], - 'url' => base_path().'/editor.php?id_module='.$modulo_preventivi->id.'&id_record='.$preventivo['id'], + 'url' => base_url().'/editor.php?id_module='.$modulo_preventivi->id.'&id_record='.$preventivo['id'], 'backgroundColor' => '#ff7f50', 'textColor' => color_inverse('#ff7f50'), 'borderColor' => '#ff7f50', @@ -166,7 +166,7 @@ switch (filter('op')) { 'title' => '
'.(($preventivo['is_completato']) ? '' : '').' '.(($preventivo['have_attachments']) ? '' : '').'
'.'Conclusione prev. '.$preventivo['numero'].' '.$preventivo['nome'].'
'.tr('Cliente').': '.$preventivo['cliente'], 'start' => $preventivo['data_conclusione'], 'end' => $preventivo['data_conclusione'], - 'url' => base_path().'/editor.php?id_module='.$modulo_preventivi->id.'&id_record='.$preventivo['id'], + 'url' => base_url().'/editor.php?id_module='.$modulo_preventivi->id.'&id_record='.$preventivo['id'], 'backgroundColor' => '#ff7f50', 'textColor' => color_inverse('#ff7f50'), 'borderColor' => '#ff7f50', diff --git a/modules/ddt/ajax/search.php b/modules/ddt/ajax/search.php index f983012c8..20adea3a1 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'] = base_path().'/editor.php?id_module='.$link_id.'&id_record='.$r['id']; + $result['link'] = base_url().'/editor.php?id_module='.$link_id.'&id_record='.$r['id']; $result['title'] = $r['tipologia'].' num. '.$numero.' del '.dateFormat($r['data']); $result['category'] = $r['tipologia']; diff --git a/modules/ddt/buttons.php b/modules/ddt/buttons.php index d204dc15a..37d959cdd 100755 --- a/modules/ddt/buttons.php +++ b/modules/ddt/buttons.php @@ -27,7 +27,7 @@ if (!empty($ddt->id_ddt_trasporto_interno)) { echo '
- + '.tr('DDT di completamento trasporto').'
'; diff --git a/modules/ddt/edit.php b/modules/ddt/edit.php index 5a5542943..98269bb10 100755 --- a/modules/ddt/edit.php +++ b/modules/ddt/edit.php @@ -358,12 +358,12 @@ if (!$block_edit) { $ddt_query = 'SELECT COUNT(*) AS tot FROM dt_ddt WHERE idstatoddt IN (SELECT id FROM dt_statiddt WHERE descrizione IN(\'Evaso\', \'Parzialmente evaso\', \'Parzialmente fatturato\')) AND idtipoddt=(SELECT id FROM or_tipiordine WHERE dir="'.($dir == 'entrata' ? 'uscita' : 'entrata').'") 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 ' - + '.tr('Ddt').' '; echo ' - + '.tr('Ordine').' '; diff --git a/modules/fatture/add_intervento.php b/modules/fatture/add_intervento.php index a5cf85fad..b9b0e3e81 100755 --- a/modules/fatture/add_intervento.php +++ b/modules/fatture/add_intervento.php @@ -46,7 +46,7 @@ echo ' '_NUM_' => $numero, ]).'

- + '; diff --git a/modules/fatture/add_serial.php b/modules/fatture/add_serial.php index d51b42b28..e9235c81c 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 6e6268ea9..d7d0a807d 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'] = base_path().'/editor.php?id_module='.$link_id.'&id_record='.$r['id']; + $result['link'] = base_url().'/editor.php?id_module='.$link_id.'&id_record='.$r['id']; $result['title'] = $r['tipologia'].' num. '.$numero.' del '.dateFormat($r['data']); $result['category'] = $r['tipologia']; diff --git a/modules/fatture/bulk.php b/modules/fatture/bulk.php index 85ea77438..21d424b95 100755 --- a/modules/fatture/bulk.php +++ b/modules/fatture/bulk.php @@ -494,7 +494,7 @@ $operations['registrazione-contabile'] = [ 'title' => tr('Registrazione contabile'), 'type' => 'modal', 'origine' => 'fatture', - 'url' => base_path().'/add.php?id_module='.module('Prima nota')['id'], + 'url' => base_url().'/add.php?id_module='.module('Prima nota')['id'], ], ]; diff --git a/modules/fatture/buttons.php b/modules/fatture/buttons.php index 6cfbe2b81..c5680105e 100755 --- a/modules/fatture/buttons.php +++ b/modules/fatture/buttons.php @@ -42,11 +42,11 @@ if ($dir == 'entrata') { @@ -80,7 +80,7 @@ if (!empty($record['is_fiscale'])) { } echo ' - + '.tr('Registra insoluto').' '; @@ -98,7 +98,7 @@ if (!empty($record['is_fiscale'])) { } echo ' - + '.tr('Registra contabile').' '; diff --git a/modules/fatture/variables.php b/modules/fatture/variables.php index 9563731e2..e78280ff5 100755 --- a/modules/fatture/variables.php +++ b/modules/fatture/variables.php @@ -32,9 +32,9 @@ FROM co_documenti WHERE co_documenti.id='.prepare($id_record)); if (!empty(setting('Logo stampe'))) { - $logo_azienda = base_path().'/'.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(base_dir(), base_path(), AppLegacy::filepath('templates/base|custom|/logo_azienda.jpg')); + $logo_azienda = str_replace(base_dir(), base_url(), AppLegacy::filepath('templates/base|custom|/logo_azienda.jpg')); $logo_azienda = str_replace('\\', '/', $logo_azienda); } diff --git a/modules/giacenze_sedi/init.php b/modules/giacenze_sedi/init.php index da34197c2..1de32beab 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 = module('Articoli')['id']; - redirect_legacy(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record); + redirect_legacy(base_url().'/editor.php?id_module='.$id_module.'&id_record='.$id_record); } diff --git a/modules/impianti/ajax/search.php b/modules/impianti/ajax/search.php index 70af21ff5..9d72c3fe0 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'] = base_path().'/editor.php?id_module='.$link_id.'&id_record='.$r['id']; + $result['link'] = base_url().'/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 049b49b9c..9bb84950f 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(base_dir().$default_img) ? base_path().$default_img : base_path().'/'.Uploads::getDirectory($id_module).'/'.$record['immagine']; + $img = file_exists(base_dir().$default_img) ? base_url().$default_img : base_url().'/'.Uploads::getDirectory($id_module).'/'.$record['immagine']; } ?> diff --git a/modules/impianti/plugins/my_impianti.interventi.php b/modules/impianti/plugins/my_impianti.interventi.php index 0dea0ab05..0e7c09ce4 100644 --- a/modules/impianti/plugins/my_impianti.interventi.php +++ b/modules/impianti/plugins/my_impianti.interventi.php @@ -123,7 +123,7 @@ foreach ($impianti_collegati as $impianto) { '.tr("Componenti soggetti all'intervento").' - + '; @@ -159,7 +159,7 @@ $sedi = $dbo->fetchArray('SELECT id, nomesede, citta FROM an_sedi WHERE idanagra echo '

'.tr('Impianti disponibili').'

- +
@@ -169,7 +169,7 @@ echo '

- + '; diff --git a/modules/import/actions.php b/modules/import/actions.php index 7a318e382..1727f1367 100755 --- a/modules/import/actions.php +++ b/modules/import/actions.php @@ -49,7 +49,7 @@ switch (filter('op')) { // Generazione del file $import_manager::createExample($filepath); - echo base_path().'/'.$file; + echo base_url().'/'.$file; } break; diff --git a/modules/interventi/add.php b/modules/interventi/add.php index e2c1698bd..f4c441595 100755 --- a/modules/interventi/add.php +++ b/modules/interventi/add.php @@ -526,7 +526,7 @@ echo ' if (data !== undefined) { // Carico nel panel i dettagli del cliente - $.get("'.base_path().'/ajax_complete.php?module=Interventi&op=dettagli&id_anagrafica=" + value, function(data){ + $.get("'.base_url().'/ajax_complete.php?module=Interventi&op=dettagli&id_anagrafica=" + value, function(data){ $("#dettagli_cliente").html(data); }); } else { diff --git a/modules/interventi/ajax/search.php b/modules/interventi/ajax/search.php index 021539071..9f395bb76 100755 --- a/modules/interventi/ajax/search.php +++ b/modules/interventi/ajax/search.php @@ -53,7 +53,7 @@ $rs = $dbo->fetchArray($query); foreach ($rs as $r) { $result = []; - $result['link'] = base_path().'/editor.php?id_module='.$link_id.'&id_record='.$r['id']; + $result['link'] = base_url().'/editor.php?id_module='.$link_id.'&id_record='.$r['id']; $result['title'] = 'Intervento '.$r['codice'].' del '.dateFormat($r['data']); $result['category'] = 'Interventi'; diff --git a/modules/interventi/ajax_tecnici.php b/modules/interventi/ajax_tecnici.php index c8a9b427f..9ad267e4c 100755 --- a/modules/interventi/ajax_tecnici.php +++ b/modules/interventi/ajax_tecnici.php @@ -245,7 +245,7 @@ if (!$is_completato) { } echo ' - + diff --git a/modules/partitario/add_conto.php b/modules/partitario/add_conto.php index a6499d8dd..32e5852f1 100755 --- a/modules/partitario/add_conto.php +++ b/modules/partitario/add_conto.php @@ -22,7 +22,7 @@ include_once __DIR__.'/../../core.php'; $id_conto = get('id'); $lvl = get('lvl'); -?>
+?> diff --git a/modules/partitario/edit_conto.php b/modules/partitario/edit_conto.php index b5506de4d..0c9584c71 100755 --- a/modules/partitario/edit_conto.php +++ b/modules/partitario/edit_conto.php @@ -31,7 +31,7 @@ if ($lvl == 2) { $info = $dbo->fetchOne($query); -?> +?> diff --git a/modules/preventivi/ajax/search.php b/modules/preventivi/ajax/search.php index 0e248f589..ebfcab5a6 100755 --- a/modules/preventivi/ajax/search.php +++ b/modules/preventivi/ajax/search.php @@ -46,7 +46,7 @@ $rs = $dbo->fetchArray($query); foreach ($rs as $r) { $result = []; - $result['link'] = base_path().'/editor.php?id_module='.$link_id.'&id_record='.$r['id']; + $result['link'] = base_url().'/editor.php?id_module='.$link_id.'&id_record='.$r['id']; $result['title'] = 'Preventivo '.$r['numero']; if ($r['data_accettazione'] == '0000-00-00') { diff --git a/modules/preventivi/widgets/preventivi.dashboard.php b/modules/preventivi/widgets/preventivi.dashboard.php index 8ddc9add9..a3f53a8dd 100755 --- a/modules/preventivi/widgets/preventivi.dashboard.php +++ b/modules/preventivi/widgets/preventivi.dashboard.php @@ -42,7 +42,7 @@ if (!empty($rs)) { $attr = ''; } - echo ''.$preventivo['nome']."
".$preventivo['ragione_sociale'].''; + echo ''.$preventivo['nome']."
".$preventivo['ragione_sociale'].''; echo ''.$data_accettazione.''; echo ''.$data_conclusione.''; } diff --git a/modules/primanota/add.php b/modules/primanota/add.php index 8db816db4..e9665bd0c 100755 --- a/modules/primanota/add.php +++ b/modules/primanota/add.php @@ -260,7 +260,7 @@ if (!empty(get('id_anagrafica'))) { $id_anagrafica = $dbo->fetchOne('SELECT idanagrafica FROM co_documenti WHERE id IN('.(get('id_documenti') ?: '0').')')['idanagrafica']; } echo ' - + diff --git a/modules/primanota/edit.php b/modules/primanota/edit.php index 427a7a8b9..7d361e934 100755 --- a/modules/primanota/edit.php +++ b/modules/primanota/edit.php @@ -37,7 +37,7 @@ include_once __DIR__.'/../../core.php'; $modulo = ($rs[0]['dir'] == 'entrata') ? 'Fatture di vendita' : 'Fatture di acquisto'; ?>

- +
fetchArray('SELECT dir FROM co_tipidocumento INNER JOIN co_documenti ON co_tipidocumento.id=co_documenti.idtipodocumento WHERE co_documenti.id='.prepare($rs_doc[$i]['iddocumento'])); $modulo = ($rs[0]['dir'] == 'entrata') ? 'Fatture di vendita' : 'Fatture di acquisto'; ?> -
    • +
    • diff --git a/modules/scadenzario/bulk.php b/modules/scadenzario/bulk.php index 296cd5582..e8c0f1ef0 100755 --- a/modules/scadenzario/bulk.php +++ b/modules/scadenzario/bulk.php @@ -75,7 +75,7 @@ $operations['registrazione-contabile'] = [ 'title' => tr('Registrazione contabile'), 'type' => 'modal', 'origine' => 'scadenzario', - 'url' => base_path().'/add.php?id_module='.module('Prima nota')['id'], + 'url' => base_url().'/add.php?id_module='.module('Prima nota')['id'], ], ]; diff --git a/modules/scadenzario/edit.php b/modules/scadenzario/edit.php index 19a0eeff4..efb5ca2f5 100755 --- a/modules/scadenzario/edit.php +++ b/modules/scadenzario/edit.php @@ -189,7 +189,7 @@ echo ' if ($totale_da_pagare != 0) { echo '
    - + '.tr('Registra contabile pagamento...').'
    diff --git a/modules/scadenzario/variables.php b/modules/scadenzario/variables.php index 8593df2ea..617296ef3 100755 --- a/modules/scadenzario/variables.php +++ b/modules/scadenzario/variables.php @@ -29,7 +29,7 @@ FROM co_scadenziario INNER JOIN an_anagrafiche ON co_documenti.idanagrafica=an_anagrafiche.idanagrafica WHERE co_scadenziario.pagato != co_scadenziario.da_pagare AND co_scadenziario.iddocumento = (SELECT iddocumento FROM co_scadenziario s WHERE id='.prepare($id_record).')'); -$logo_azienda = str_replace(base_dir(), base_path(), AppLegacy::filepath('templates/base|custom|/logo_azienda.jpg')); +$logo_azienda = str_replace(base_dir(), base_url(), AppLegacy::filepath('templates/base|custom|/logo_azienda.jpg')); // Variabili da sostituire return [ diff --git a/modules/smtp/actions.php b/modules/smtp/actions.php index 8fd8b05f1..1385c4be3 100755 --- a/modules/smtp/actions.php +++ b/modules/smtp/actions.php @@ -86,7 +86,7 @@ switch (filter('op')) { // Link di redirect dopo la configurazione $modulo_account_email = Module::pool('Account email'); - $oauth2->after_configuration = base_path().'/editor.php?id_module='.$modulo_account_email->id.'&id_record='.$id_record; + $oauth2->after_configuration = base_url().'/editor.php?id_module='.$modulo_account_email->id.'&id_record='.$id_record; $oauth2->save(); @@ -139,7 +139,7 @@ switch (filter('op')) { case 'oauth2': $oauth2 = $account->oauth2; - $redirect = base_path().'/oauth2.php?id='.$oauth2->id; + $redirect = base_url().'/oauth2.php?id='.$oauth2->id; redirect($redirect); break; diff --git a/modules/smtp/edit.php b/modules/smtp/edit.php index 4467ec5c0..7a17f7e1f 100755 --- a/modules/smtp/edit.php +++ b/modules/smtp/edit.php @@ -132,7 +132,7 @@ echo '
    - + '.(empty($oauth2->access_token) ? tr('Completa configurazione') : tr('Ripeti configurazione')).'
    diff --git a/modules/stampe_contabili/edit.php b/modules/stampe_contabili/edit.php index 95426ac56..00acef128 100755 --- a/modules/stampe_contabili/edit.php +++ b/modules/stampe_contabili/edit.php @@ -34,11 +34,11 @@ echo '
    - + - + - +
    @@ -84,7 +84,7 @@ echo '
    - + '.Prints::getLink('Mastrino', 1, 'btn-primary col-md-3 col-md-push-1', '
    '.tr('Situazione').'
    '.tr('patrimoniale'), '|default| fa-2x', 'lev=1').' diff --git a/modules/statistiche/edit.php b/modules/statistiche/edit.php index 2ea98ee7b..f9bbca4df 100755 --- a/modules/statistiche/edit.php +++ b/modules/statistiche/edit.php @@ -22,7 +22,7 @@ include_once __DIR__.'/../../core.php'; use Modules\Statistiche\Stats; echo ' -'; +'; $start = session('period_start'); $end = session('period_end'); diff --git a/modules/stato_email/edit.php b/modules/stato_email/edit.php index 29ddea8bd..bb6ac61b4 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/src/ServicesHook.php b/modules/stato_servizi/src/ServicesHook.php index 45144d250..fb17e5b85 100644 --- a/modules/stato_servizi/src/ServicesHook.php +++ b/modules/stato_servizi/src/ServicesHook.php @@ -75,7 +75,7 @@ class ServicesHook extends Manager return [ 'icon' => null, 'message' => $message, - 'link' => base_path().'/controller.php?id_module='.$module->id, + 'link' => base_url().'/controller.php?id_module='.$module->id, 'show' => Services::isEnabled() && !empty($message), ]; } diff --git a/modules/stato_servizi/widgets/spazio_utilizzato.php b/modules/stato_servizi/widgets/spazio_utilizzato.php index 662786607..8db608611 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 = module('Stato dei servizi'); echo ' -'; +'; // Operazioni JavaScript echo ' diff --git a/modules/utenti/actions.php b/modules/utenti/actions.php index c241c8668..ea7859f38 100755 --- a/modules/utenti/actions.php +++ b/modules/utenti/actions.php @@ -116,7 +116,7 @@ switch (filter('op')) { $utente->save(); - redirect_legacy(base_path().'/modules/utenti/info.php'); + redirect_legacy(base_url().'/modules/utenti/info.php'); break; diff --git a/modules/utenti/info.php b/modules/utenti/info.php index bd5eb4f11..d086e8b68 100755 --- a/modules/utenti/info.php +++ b/modules/utenti/info.php @@ -39,7 +39,7 @@ if (!empty($rs)) { $anagrafica = $rs[0]; } -$api = base_path().'/api/?token='.$token; +$api = base_url().'/api/?token='.$token; $module = module('Utenti e permessi'); echo ' diff --git a/modules/utenti/user.php b/modules/utenti/user.php index 0d855c233..badcf8af6 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 ecfc95f1e..208abd249 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' => base_path().'/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 fd5be85fa..25b64bc9e 100755 --- a/modules/viste/edit.php +++ b/modules/viste/edit.php @@ -132,7 +132,7 @@ function testQuery(){ $("#main_loading").fadeIn(); $.ajax({ - url: "'.base_path().'/actions.php?id_module=" + globals.id_module + "&id_record=" + globals.id_record + "&op=test", + url: "'.base_url().'/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 efe378703..254b6cbe4 100755 --- a/pdfgen.php +++ b/pdfgen.php @@ -43,7 +43,7 @@ if (empty($result)) {
    - + '.tr('Indietro').'
    '; diff --git a/plugins/componenti/edit.php b/plugins/componenti/edit.php index 2933355a0..a336b8d32 100644 --- a/plugins/componenti/edit.php +++ b/plugins/componenti/edit.php @@ -138,7 +138,7 @@ foreach ($elenchi as $elenco) {
    - + @@ -251,7 +251,7 @@ echo ' const id_componente = tr.data("id"); if(confirm("'.tr('Vuoi sostituire questo componente?').'")) { - redirect("'.base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.'&op=sostituisci&backto=record-edit&id_plugin='.$id_plugin.'&id_componente=" + id_componente + "&hash=tab_'.$structure->id.'"); + redirect("'.base_url().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.'&op=sostituisci&backto=record-edit&id_plugin='.$id_plugin.'&id_componente=" + id_componente + "&hash=tab_'.$structure->id.'"); } } @@ -260,7 +260,7 @@ echo ' const id_componente = tr.data("id"); if(confirm("'.tr('Vuoi eliminare questo componente?').'")){ - redirect("'.base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.'&op=rimuovi&backto=record-edit&id_plugin='.$id_plugin.'&id_componente=" + id_componente + "&hash=tab_'.$structure->id.'"); + redirect("'.base_url().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.'&op=rimuovi&backto=record-edit&id_plugin='.$id_plugin.'&id_componente=" + id_componente + "&hash=tab_'.$structure->id.'"); } } diff --git a/plugins/exportFE/edit.php b/plugins/exportFE/edit.php index a69d5d108..9dab553f9 100755 --- a/plugins/exportFE/edit.php +++ b/plugins/exportFE/edit.php @@ -88,7 +88,7 @@ if ($fattura !== null) { - + '.tr('Visualizza').' '; diff --git a/plugins/importFE/actions.php b/plugins/importFE/actions.php index 10413e051..48e1bb9c1 100755 --- a/plugins/importFE/actions.php +++ b/plugins/importFE/actions.php @@ -155,7 +155,7 @@ switch (filter('op')) { $process_result = Interaction::processInvoice($filename); if ($process_result != '') { flash()->error($process_result); - redirect_legacy(base_path().'/controller.php?id_module='.$id_module); + redirect_legacy(base_url().'/controller.php?id_module='.$id_module); return; } @@ -165,9 +165,9 @@ switch (filter('op')) { $file = $files[$id_record - 1]; if (get('sequence') == null) { - redirect_legacy(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_fattura); + redirect_legacy(base_url().'/editor.php?id_module='.$id_module.'&id_record='.$id_fattura); } elseif (!empty($file)) { - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&id_record='.$id_record.'&sequence=1'); + redirect(base_url().'/editor.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&id_record='.$id_record.'&sequence=1'); flash()->warning(tr('È stata appena creata la fattura numero _NUM_ del _DATA_ (_ANAGRAFICA_)', [ '_NUM_' => $fattura->numero, '_DATA_' => dateFormat($fattura->data), @@ -175,7 +175,7 @@ switch (filter('op')) { ])); } else { flash()->info(tr('Tutte le fatture salvate sono state importate!')); - redirect_legacy(base_path().'/controller.php?id_module='.$id_module); + redirect_legacy(base_url().'/controller.php?id_module='.$id_module); } break; diff --git a/plugins/importFE/generate.php b/plugins/importFE/generate.php index cfc18d047..941202f24 100755 --- a/plugins/importFE/generate.php +++ b/plugins/importFE/generate.php @@ -29,7 +29,7 @@ $(document).ready(function() { }); '; -$skip_link = $has_next ? base_path().'/editor.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&id_record='.($id_record + 1).'&sequence='.get('sequence') : base_path().'/editor.php?id_module='.$id_module; +$skip_link = $has_next ? base_url().'/editor.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&id_record='.($id_record + 1).'&sequence='.get('sequence') : base_url().'/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 8d1b484f5..8613c5af4 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_legacy(base_path().'/controller.php?id_module='.$id_module); + redirect_legacy(base_url().'/controller.php?id_module='.$id_module); } } diff --git a/plugins/importFE/src/InvoiceHook.php b/plugins/importFE/src/InvoiceHook.php index d35c1407c..b522296af 100755 --- a/plugins/importFE/src/InvoiceHook.php +++ b/plugins/importFE/src/InvoiceHook.php @@ -53,7 +53,7 @@ class InvoiceHook extends CachedManager return $value->name == 'Fatturazione Elettronica'; }); - $link = base_path().'/controller.php?id_module='.$module->id.'#tab_'.$plugin->id; + $link = base_url().'/controller.php?id_module='.$module->id.'#tab_'.$plugin->id; } $message = tr('Ci sono _NUM_ fatture passive da importare', [ diff --git a/plugins/pianificazione_interventi/edit.php b/plugins/pianificazione_interventi/edit.php index 09f22fefa..beedae861 100755 --- a/plugins/pianificazione_interventi/edit.php +++ b/plugins/pianificazione_interventi/edit.php @@ -153,7 +153,7 @@ if (!$elenco_promemoria->isEmpty()) { - diff --git a/plugins/pianificazione_interventi/row-list.php b/plugins/pianificazione_interventi/row-list.php index b0a81692b..f092aa225 100755 --- a/plugins/pianificazione_interventi/row-list.php +++ b/plugins/pianificazione_interventi/row-list.php @@ -133,7 +133,7 @@ if (!$righe->isEmpty()) { if ($riga->abilita_serial) { echo ' - '; } diff --git a/plugins/pianificazione_interventi/widgets/promemoria_da_pianificare.php b/plugins/pianificazione_interventi/widgets/promemoria_da_pianificare.php index fe260e3ff..099ad5e3d 100644 --- a/plugins/pianificazione_interventi/widgets/promemoria_da_pianificare.php +++ b/plugins/pianificazione_interventi/widgets/promemoria_da_pianificare.php @@ -118,7 +118,7 @@ foreach ($raggruppamenti as $mese => $raggruppamento) { // Pulsanti echo ' - diff --git a/plugins/presentazioni_bancarie/edit.php b/plugins/presentazioni_bancarie/edit.php index de22c7b5d..997fb9ad1 100644 --- a/plugins/presentazioni_bancarie/edit.php +++ b/plugins/presentazioni_bancarie/edit.php @@ -73,6 +73,6 @@ function esporta(button) { let pagati = input("pagati").get(); let processati = input("processati").get(); - redirect("'.base_path().'/editor.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&records=" + records + "&pagati=" + pagati + "&processati=" + processati); + redirect("'.base_url().'/editor.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&records=" + records + "&pagati=" + pagati + "&processati=" + processati); } '; diff --git a/plugins/presentazioni_bancarie/src/Gestore.php b/plugins/presentazioni_bancarie/src/Gestore.php index 2a9828029..9c567da43 100644 --- a/plugins/presentazioni_bancarie/src/Gestore.php +++ b/plugins/presentazioni_bancarie/src/Gestore.php @@ -358,7 +358,7 @@ class Gestore // Generazione filename $filename = $this->id_riba.'.txt'; $file = $path.'/'.$filename; - $files[] = base_path().'/'.$file; + $files[] = base_url().'/'.$file; // Salvataggio del file file_put_contents(base_dir().'/'.$file, $content); @@ -372,7 +372,7 @@ class Gestore // Generazione filename $filename = $this->id_credito_diretto.'.xml'; $file = $path.'/'.$filename; - $files[] = base_path().'/'.$file; + $files[] = base_url().'/'.$file; // Salvataggio del file file_put_contents(base_dir().'/'.$file, $xml); @@ -395,7 +395,7 @@ class Gestore // Generazione filename $filename = $this->id_debito_diretto.'.xml'; $file = $path.'/'.$filename; - $files[] = base_path().'/'.$file; + $files[] = base_url().'/'.$file; // Salvataggio del file file_put_contents(base_dir().'/'.$file, $xml); diff --git a/plugins/receiptFE/src/NotificheRicevuteHook.php b/plugins/receiptFE/src/NotificheRicevuteHook.php index 1debc354d..5acda6517 100644 --- a/plugins/receiptFE/src/NotificheRicevuteHook.php +++ b/plugins/receiptFE/src/NotificheRicevuteHook.php @@ -51,6 +51,7 @@ class NotificheRicevuteHook extends Manager ->count(); // Messaggio di importazione + $message = null; if (!empty($in_attesa) && !empty($con_errore)) { $message = tr('Sono presenti _ERR_ fatture elettroniche con ricevute di scarto o errori di trasmissione, _WAIT_ in attesa di ricevuta da più di 7 giorni', [ '_ERR_' => $con_errore, @@ -74,7 +75,7 @@ class NotificheRicevuteHook extends Manager 'icon' => 'fa fa-ticket text-yellow', 'message' => $message, 'show' => $con_errore != 0 || $in_attesa != 0, - 'link' => base_path().'/controller.php?id_module='.$module->id.'#tab_'.$plugin->id, + 'link' => base_url().'/controller.php?id_module='.$module->id.'#tab_'.$plugin->id, ]; } diff --git a/plugins/receiptFE/src/ReceiptHook.php b/plugins/receiptFE/src/ReceiptHook.php index 1fbfdd33e..a81ab5611 100755 --- a/plugins/receiptFE/src/ReceiptHook.php +++ b/plugins/receiptFE/src/ReceiptHook.php @@ -113,7 +113,7 @@ class ReceiptHook extends Manager 'icon' => 'fa fa-ticket text-'.$color, 'message' => $message, 'show' => $notify, - 'link' => base_path().'/controller.php?id_module='.$module->id, + 'link' => base_url().'/controller.php?id_module='.$module->id, ]; } } diff --git a/plugins/revisioni/edit.php b/plugins/revisioni/edit.php index 75341039c..f9ac6e3fb 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 " - + @@ -90,7 +90,7 @@ echo " '; echo " -
    + diff --git a/plugins/statistiche_anagrafiche/info.php b/plugins/statistiche_anagrafiche/info.php index 1d19b7812..0890871b4 100755 --- a/plugins/statistiche_anagrafiche/info.php +++ b/plugins/statistiche_anagrafiche/info.php @@ -115,7 +115,7 @@ echo '
    '.tr('Preventivi').' - '.($preventivi->count() > 0 ? ''.tr('Visualizza').' ' : '').' + '.($preventivi->count() > 0 ? ''.tr('Visualizza').' ' : '').'
    '.$preventivi->count().'
    @@ -130,7 +130,7 @@ echo '
    '.tr('Contratti').' - '.($contratti->count() > 0 ? ''.tr('Visualizza').' ' : '').' + '.($contratti->count() > 0 ? ''.tr('Visualizza').' ' : '').'
    '.$contratti->count().'
    @@ -145,7 +145,7 @@ echo '
    '.tr('Ordini cliente').' - '.($ordini_cliente->count() > 0 ? ''.tr('Visualizza').' ' : '').' + '.($ordini_cliente->count() > 0 ? ''.tr('Visualizza').' ' : '').'
    '.$ordini_cliente->count().'
    @@ -162,7 +162,7 @@ echo '
    '.tr('Attività').' - '.($interventi->count() > 0 ? ''.tr('Visualizza').' ' : '').' + '.($interventi->count() > 0 ? ''.tr('Visualizza').' ' : '').'
    '.$interventi->count().'
    @@ -177,7 +177,7 @@ echo '
    '.tr('Ddt in uscita').' - '.($ddt_uscita->count() > 0 ? ''.tr('Visualizza').' ' : '').' + '.($ddt_uscita->count() > 0 ? ''.tr('Visualizza').' ' : '').'
    '.$ddt_uscita->count().'
    @@ -192,7 +192,7 @@ echo '
    '.tr('Fatture').' - '.($fatture_vendita->count() + $note_credito->count() > 0 ? ''.tr('Visualizza').' ' : '').' + '.($fatture_vendita->count() + $note_credito->count() > 0 ? ''.tr('Visualizza').' ' : '').'
    '.($fatture_vendita->count() + $note_credito->count()).'
    diff --git a/reset.php b/reset.php index 2fe1ec66b..88a0ec642 100755 --- a/reset.php +++ b/reset.php @@ -59,7 +59,7 @@ switch (post('op')) { flash()->error(tr("Errore durante la gestione della richiesta: si prega di contattare l'amministratore").'.'); } - redirect_legacy(base_path().'/index.php'); + redirect_legacy(base_url().'/index.php'); throw new \LegacyExitException(); break; @@ -76,7 +76,7 @@ switch (post('op')) { flash()->info(tr('Password cambiata!')); - redirect_legacy(base_path().'/index.php'); + redirect_legacy(base_url().'/index.php'); throw new \LegacyExitException(); break; } @@ -121,7 +121,7 @@ if (auth()->isBrute()) { echo '
    - +

    '.$pageTitle.'

    diff --git a/routes.php b/routes.php index bc1299292..dac76d8c2 100644 --- a/routes.php +++ b/routes.php @@ -20,5 +20,6 @@ Route::middleware(['web', 'legacy']) // Route di fallback generale Route::any('/legacy/{path}', [LegacyController::class, 'index']) ->name('legacy') - ->where('path', '.*'); + ->where('path', '.*') + ->withoutMiddleware([\App\Http\Middleware\VerifyCsrfToken::class]); }); diff --git a/src/API/Common/Task.php b/src/API/Common/Task.php index fde134da9..ef33474c0 100644 --- a/src/API/Common/Task.php +++ b/src/API/Common/Task.php @@ -81,7 +81,7 @@ class Task extends Resource implements RetrieveInterface, CreateInterface */ protected function request() { - $endpoint = base_path().'/cron.php'; + $endpoint = base_url().'/cron.php'; $postData = json_encode([]); $endpointParts = parse_url($endpoint); diff --git a/src/API/Response.php b/src/API/Response.php index 5480d02f8..654ca9280 100755 --- a/src/API/Response.php +++ b/src/API/Response.php @@ -225,7 +225,7 @@ class Response */ public static function isAPIRequest() { - return getURLPath() == slashes(base_path().'/api/index.php'); + return getURLPath() == slashes(base_url().'/api/index.php'); } /** diff --git a/src/HTMLBuilder/Handler/CKEditorHandler.php b/src/HTMLBuilder/Handler/CKEditorHandler.php index 101b07f40..fd86095bc 100755 --- a/src/HTMLBuilder/Handler/CKEditorHandler.php +++ b/src/HTMLBuilder/Handler/CKEditorHandler.php @@ -34,6 +34,6 @@ class CKEditorHandler implements HandlerInterface // Generazione del codice HTML return ' - '; + '; } } diff --git a/src/HTMLBuilder/Handler/DefaultHandler.php b/src/HTMLBuilder/Handler/DefaultHandler.php index 4151535d4..8cc9345a5 100755 --- a/src/HTMLBuilder/Handler/DefaultHandler.php +++ b/src/HTMLBuilder/Handler/DefaultHandler.php @@ -129,7 +129,7 @@ class DefaultHandler implements HandlerInterface $result .= '
    - +