From 11f79330e50f448c5593183ef32fc28e3b6ebb05 Mon Sep 17 00:00:00 2001 From: Dasc3er Date: Wed, 23 Sep 2020 17:53:19 +0200 Subject: [PATCH] Introduzione delle funzioni session_get e session_set --- actions.php | 4 +- ajax_dataload.php | 6 +- bug.php | 2 +- config/csrf_config.php | 4 +- controller.php | 4 +- core.php | 6 +- editor.php | 12 ++-- include/common/articolo.php | 6 +- include/common/form.php | 2 +- include/common/importa.php | 2 +- include/init/configuration.php | 16 +++--- include/init/init.php | 4 +- include/init/update.php | 4 +- include/top.php | 20 +++---- index.php | 10 ++-- lib/functions.php | 56 ++++++++++++++++--- modules/aggiornamenti/edit.php | 2 +- modules/aggiornamenti/src/UpdateHook.php | 2 +- modules/aggiornamenti/upload_modules.php | 2 +- modules/anagrafiche/ajax/search.php | 4 +- modules/articoli/ajax/complete.php | 6 +- modules/articoli/ajax/search.php | 2 +- modules/articoli/edit.php | 2 +- .../articoli/plugins/articoli.movimenti.php | 6 +- modules/articoli/src/Articolo.php | 2 +- .../articoli/widgets/stampa_inventario.php | 2 +- modules/backups/edit.php | 2 +- modules/categorie_articoli/add.php | 2 +- modules/categorie_articoli/edit.php | 2 +- modules/categorie_articoli/row-list.php | 2 +- modules/contratti/edit.php | 4 +- modules/dashboard/actions.php | 2 +- modules/dashboard/edit.php | 8 +-- modules/ddt/ajax/search.php | 2 +- modules/ddt/edit.php | 2 +- modules/fatture/add_intervento.php | 2 +- modules/fatture/add_serial.php | 2 +- modules/fatture/ajax/search.php | 2 +- modules/fatture/bulk.php | 2 +- modules/fatture/buttons.php | 8 +-- modules/fatture/edit.php | 10 ++-- modules/gestione_componenti/edit.php | 2 +- modules/giacenze_sedi/init.php | 2 +- modules/impianti/ajax/search.php | 2 +- modules/impianti/edit.php | 2 +- .../plugins/my_impianti.componenti.php | 6 +- .../plugins/my_impianti.interventi.php | 6 +- modules/import/actions.php | 2 +- modules/interventi/ajax/search.php | 2 +- modules/interventi/ajax_tecnici.php | 2 +- modules/interventi/edit.php | 2 +- modules/interventi/modals/anteprima_firma.php | 2 +- modules/interventi/modals/manage_sessione.php | 2 +- modules/pagamenti/actions.php | 4 +- modules/pagamenti/edit.php | 2 +- modules/partitario/add_conto.php | 2 +- modules/partitario/edit_conto.php | 2 +- modules/preventivi/ajax/search.php | 2 +- .../widgets/preventivi.dashboard.php | 2 +- modules/primanota/add.php | 2 +- modules/primanota/edit.php | 4 +- modules/scadenzario/bulk.php | 2 +- modules/scadenzario/edit.php | 2 +- modules/scadenzario/init.php | 2 +- modules/scadenzario/variables.php | 2 +- modules/stampe_contabili/edit.php | 4 +- modules/statistiche/edit.php | 2 +- modules/stato_email/edit.php | 2 +- modules/stato_servizi/edit.php | 8 +-- modules/stato_servizi/modutil.php | 6 +- .../widgets/spazio_utilizzato.php | 2 +- modules/utenti/actions.php | 2 +- modules/utenti/user.php | 2 +- modules/viste/edit.php | 2 +- pdfgen.php | 2 +- plugins/exportFE/edit.php | 4 +- plugins/importFE/actions.php | 8 +-- plugins/importFE/generate.php | 2 +- plugins/importFE/init.php | 2 +- plugins/importFE/src/InvoiceHook.php | 2 +- plugins/pianificazione_interventi/edit.php | 2 +- .../pianificazione_interventi/row-list.php | 2 +- .../widgets/promemoria_da_pianificare.php | 2 +- plugins/revisioni/edit.php | 4 +- plugins/statistiche_anagrafiche/info.php | 12 ++-- reset.php | 6 +- src/API/Response.php | 2 +- src/App.php | 4 +- src/HTMLBuilder/Handler/CKEditorHandler.php | 2 +- src/HTMLBuilder/Handler/DefaultHandler.php | 2 +- src/HTMLBuilder/Manager/ButtonManager.php | 2 +- src/HTMLBuilder/Manager/FileManager.php | 8 +-- src/HTMLBuilder/Manager/WidgetManager.php | 2 +- src/HTMLBuilder/Wrapper/HTMLWrapper.php | 2 +- src/Models/User.php | 2 +- src/Modules.php | 4 +- src/Permissions.php | 4 +- src/Prints.php | 4 +- src/Traits/PathTrait.php | 2 +- templates/info.php | 2 +- view.php | 2 +- 101 files changed, 231 insertions(+), 191 deletions(-) diff --git a/actions.php b/actions.php index 539ed6967..97534a6e2 100755 --- a/actions.php +++ b/actions.php @@ -87,7 +87,7 @@ if (filter('op') == 'link_file' || filter('op') == 'unlink_file') { } } - redirect(base_link().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : '')); + redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : '')); } } @@ -336,7 +336,7 @@ if ($structure->permission == 'rw') { $bulk = empty($bulk) ? [] : $bulk; if (in_array(post('op'), array_keys($bulk))) { - redirect(base_link().'/controller.php?id_module='.$id_module, 'js'); + redirect(base_path().'/controller.php?id_module='.$id_module, 'js'); } else { // Esecuzione delle operazioni del modulo include $structure->filepath('actions.php'); diff --git a/ajax_dataload.php b/ajax_dataload.php index 90cc5a835..704c3b0cf 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'] = base_link().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.$hash; + $column['data-link'] = base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.$hash; } // Link per i plugin else { - $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-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-type'] = 'dialog'; } @@ -185,7 +185,7 @@ if (!empty($query)) { } // Replace base_link() per le query - $value = str_replace('base_link()', base_link(), $value); + $value = str_replace('base_link()', base_path(), $value); $result[] = str_replace('|attr|', implode(' ', $attributes), '
'.$value.'
'); } diff --git a/bug.php b/bug.php index 78b36a820..b6636eb42 100755 --- a/bug.php +++ b/bug.php @@ -87,7 +87,7 @@ if (filter('op') == 'send') { delete($backup_file); } - redirect(base_link().'/bug.php'); + redirect(base_path().'/bug.php'); exit(); } diff --git a/config/csrf_config.php b/config/csrf_config.php index 5bb7678aa..24ba86f57 100755 --- a/config/csrf_config.php +++ b/config/csrf_config.php @@ -26,10 +26,10 @@ return [ 'GET' => 0, 'POST' => 0, ], - 'jsUrl' => base_link().'/assets/dist/js/csrf/csrfprotector.js', + 'jsUrl' => base_path().'/assets/dist/js/csrf/csrfprotector.js', 'tokenLength' => 10, 'cookieConfig' => [ - 'path' => base_link(), + 'path' => base_path(), 'secure' => isHTTPS(true), ], 'verifyGetFor' => [], diff --git a/controller.php b/controller.php index bd3278083..821068453 100755 --- a/controller.php +++ b/controller.php @@ -20,9 +20,9 @@ include_once __DIR__.'/core.php'; if (!empty($id_record) && !empty($id_module)) { - redirect(base_link().'/editor.php?id_module='.$id_module.'&id_record='.$id_record); + redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record); } elseif (empty($id_module)) { - redirect(base_link().'/index.php'); + redirect(base_path().'/index.php'); } include_once App::filepath('include|custom|', 'top.php'); diff --git a/core.php b/core.php index 0e3d308c2..030fe12a8 100755 --- a/core.php +++ b/core.php @@ -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, base_link(), null, isHTTPS(true)); +session_set_cookie_params(0, base_path(), null, isHTTPS(true)); session_start(); // Disabilita i messaggi nativi di PHP @@ -186,12 +186,12 @@ if (!empty($skip_permissions)) { Permissions::skip(); } -if (!$continue && getURLPath() != slashes(base_link().'/index.php') && !Permissions::getSkip()) { +if (!$continue && getURLPath() != slashes(base_path().'/index.php') && !Permissions::getSkip()) { if (Auth::check()) { Auth::logout(); } - redirect(base_link().'/index.php'); + redirect(base_path().'/index.php'); exit(); } diff --git a/editor.php b/editor.php index 0d2fb6285..5bb43441b 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(base_link().'/controller.php?id_module='.$id_module); + redirect(base_path().'/controller.php?id_module='.$id_module); } elseif (empty($id_record) && empty($id_module) && empty($id_plugin)) { - redirect(base_link().'/index.php'); + redirect(base_path().'/index.php'); } include_once App::filepath('include|custom|', 'top.php'); @@ -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").' @@ -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 49227ba34..ae641803a 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 9c5c40b73..1afb20a1d 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 a4765cb69..13d47c0a4 100755 --- a/include/common/importa.php +++ b/include/common/importa.php @@ -42,7 +42,7 @@ if (empty($righe)) { return; } -$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']; +$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']; echo ' diff --git a/include/init/configuration.php b/include/init/configuration.php index 1ba6e5c59..2abbd4d6c 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_link().'", + "scope" : "'.base_path().'", "display" : "fullscreen", - "start_url" : "'.base_link().'", + "start_url" : "'.base_path().'", "short_name" : "OSM", "theme_color" : "transparent", "description" : "OpenSTAManager", @@ -203,7 +203,7 @@ if (post('db_host') !== null) { }'; file_put_contents('manifest.json', $manifest); - redirect(base_link().'/index.php'); + redirect(base_path().'/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: "'.base_link().'/index.php", + url: "'.base_path().'/index.php", data: { test: 1, }, diff --git a/include/init/init.php b/include/init/init.php index cb99470aa..e1226ca73 100755 --- a/include/init/init.php +++ b/include/init/init.php @@ -114,7 +114,7 @@ if (post('action') == 'init') { } } - redirect(base_link(), 'js'); + redirect(base_path(), 'js'); exit(); } @@ -258,7 +258,7 @@ echo ' $("button[type=submit]").not("#config").remove(); }); - + '; include_once App::filepath('include|custom|', 'bottom.php'); diff --git a/include/init/update.php b/include/init/update.php index 72ef78c1b..8462feda0 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 85e8dcf8e..9b8b80421 100755 --- a/include/top.php +++ b/include/top.php @@ -40,7 +40,7 @@ echo ' if (file_exists(base_dir().'/manifest.json')) { echo ' - '; + '; } // CSS @@ -166,7 +166,7 @@ if (Auth::check()) { }, }; globals = { - rootdir: "'.base_link().'", + rootdir: "'.base_path().'", 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 e40bd18bd..621ce50e7 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 891d621ca..473c79e20 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 fe9fbe56a..b54e61c18 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 5c8bfded0..abbf88edb 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' => base_link().'/editor.php?id_module='.$modulo_interventi->id.'&id_record='.$sessione['idintervento'], + 'url' => base_path().'/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/edit.php b/modules/dashboard/edit.php index 2fca88336..5b8f8a547 100755 --- a/modules/dashboard/edit.php +++ b/modules/dashboard/edit.php @@ -31,7 +31,7 @@ echo '