From e9e09e9c7ad6b9c41538336e6e872f2a0f2b510c Mon Sep 17 00:00:00 2001 From: Thomas Zilio Date: Wed, 26 Nov 2025 18:51:57 +0100 Subject: [PATCH 01/12] Rename redirect to redirect_url for Laravel compatibility --- actions.php | 6 +-- assets/src/js/functions/functions.js | 4 +- controller.php | 4 +- core.php | 2 +- editor.php | 4 +- include/init/configuration.php | 4 +- include/init/init.php | 2 +- index.php | 14 +++--- lib/functions.php | 6 +-- modules/aggiornamenti/upload_modules.php | 2 +- modules/articoli/bulk.php | 4 +- modules/attributi_combinazioni/edit.php | 2 +- modules/categorie/actions.php | 4 +- modules/categorie_contratti/actions.php | 4 +- modules/combinazioni_articoli/edit.php | 2 +- modules/fatture/edit.php | 2 +- modules/giacenze_sedi/init.php | 2 +- modules/interventi/bulk.php | 2 +- modules/marche/actions.php | 8 ++-- modules/pagamenti/actions.php | 4 +- modules/smtp/actions.php | 2 +- modules/utenti/actions.php | 2 +- modules/utenti/init.php | 2 +- oauth2.php | 2 +- oauth2_login.php | 4 +- plugins/barcode_articoli/edit.php | 2 +- plugins/componenti/edit.php | 4 +- plugins/importFE/actions.php | 8 ++-- plugins/importFE/edit.php | 6 +-- plugins/importFE/generate.php | 2 +- plugins/importFE/init.php | 6 +-- plugins/importFE/list.php | 4 +- plugins/importFE_ZIP/actions.php | 8 ++-- plugins/importFE_ZIP/edit.php | 6 +-- plugins/importFE_ZIP/generate.php | 2 +- plugins/importFE_ZIP/init.php | 2 +- plugins/importFE_ZIP/list.php | 4 +- plugins/pagamenti_anagrafiche/edit.php | 2 +- .../pianificazione_fatturazione/actions.php | 4 +- plugins/presentazioni_bancarie/edit.php | 2 +- plugins/sedi/edit.php | 2 +- plugins/varianti_articolo/edit.php | 2 +- reset.php | 4 +- shared_editor.php | 24 +++++----- src/Permissions.php | 2 +- token_login.php | 48 +++++++++---------- 46 files changed, 119 insertions(+), 119 deletions(-) diff --git a/actions.php b/actions.php index 9e93bc1009..87151436fb 100755 --- a/actions.php +++ b/actions.php @@ -150,10 +150,10 @@ // Determina il redirect appropriato in base al tipo di accesso if (Permissions::isTokenAccess() && !empty($_SESSION['token_access']['id_module_target']) && !empty($_SESSION['token_access']['id_record_target'])) { // Per accesso tramite token, redirect a shared_editor.php - redirect(base_path().'/shared_editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : '')); + redirect_url(base_path().'/shared_editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : '')); } else { // Per accesso normale, redirect a editor.php - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : '')); + redirect_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : '')); } } @@ -494,7 +494,7 @@ $bulk = empty($bulk) ? [] : $bulk; if (in_array(post('op'), array_keys($bulk))) { - redirect(base_path().'/controller.php?id_module='.$id_module, 'js'); + redirect_url(base_path().'/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/assets/src/js/functions/functions.js b/assets/src/js/functions/functions.js index 0341898e9d..9a1b6de342 100755 --- a/assets/src/js/functions/functions.js +++ b/assets/src/js/functions/functions.js @@ -300,7 +300,7 @@ function message(element) { }, }); } else { - redirect(href, data, method, blank); + redirect_url(href, data, method, blank); } }, function (dismiss) { @@ -308,7 +308,7 @@ function message(element) { ); } -function redirect(href, data, method, blank) { +function redirect_url(href, data, method, blank) { method = method ? method : "get"; blank = blank ? blank : false; diff --git a/controller.php b/controller.php index 8e0c32f35c..e46a0ba8db 100755 --- a/controller.php +++ b/controller.php @@ -23,9 +23,9 @@ include_once __DIR__.'/core.php'; if (!empty($id_record) && !empty($id_module)) { - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record); + redirect_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record); } elseif (empty($id_module)) { - redirect(base_path().'/index.php'); + redirect_url(base_path().'/index.php'); } include_once App::filepath('include|custom|', 'top.php'); diff --git a/core.php b/core.php index 9bd51aede1..b83aa08f3f 100755 --- a/core.php +++ b/core.php @@ -192,7 +192,7 @@ } } - redirect(base_path().'/index.php'); + redirect_url(base_path().'/index.php'); exit; } diff --git a/editor.php b/editor.php index 23fcdf938e..41b9cb21f6 100755 --- a/editor.php +++ b/editor.php @@ -27,9 +27,9 @@ $module_header_html = ''; if (empty($id_record) && !empty($id_module) && empty($id_plugin)) { - redirect(base_path().'/controller.php?id_module='.$id_module); + redirect_url(base_path().'/controller.php?id_module='.$id_module); } elseif (empty($id_record) && empty($id_module) && empty($id_plugin)) { - redirect(base_path().'/index.php'); + redirect_url(base_path().'/index.php'); } include_once App::filepath('include|custom|', 'top.php'); diff --git a/include/init/configuration.php b/include/init/configuration.php index 1391505f5d..c3fe910e93 100755 --- a/include/init/configuration.php +++ b/include/init/configuration.php @@ -183,7 +183,7 @@ else { // Creazione manifest.json include_once App::filepath('include/init', 'manifest.php'); - redirect(base_path().'/index.php'); + redirect_url(base_path().'/index.php'); exit; } } @@ -425,7 +425,7 @@ class: "img-flag", var parameters = getUrlVars(); parameters.lang = $(this).val(); - redirect(url, parameters); + redirect_url(url, parameters); } }); } diff --git a/include/init/init.php b/include/init/init.php index 308c694b2c..0f9aca0f70 100755 --- a/include/init/init.php +++ b/include/init/init.php @@ -122,7 +122,7 @@ } } - redirect(base_path(), 'js'); + redirect_url(base_path(), 'js'); exit; } diff --git a/index.php b/index.php index f3cfd7b86d..4a00c9db27 100755 --- a/index.php +++ b/index.php @@ -64,7 +64,7 @@ flash()->error(Auth::getStatus()[$status]['message']); - redirect(base_path().'/index.php'); + redirect_url(base_path().'/index.php'); exit; } @@ -75,7 +75,7 @@ // Pulisce anche l'intended URL al logout Auth::clearIntended(); - redirect(base_path().'/index.php'); + redirect_url(base_path().'/index.php'); exit; } @@ -83,7 +83,7 @@ // Priorità 1: Token access (sistema esistente) if (Permissions::isTokenAccess()) { if (!empty($_SESSION['token_access']['id_module_target']) && !empty($_SESSION['token_access']['id_record_target'])) { - redirect(base_path().'/shared_editor.php?id_module='.$_SESSION['token_access']['id_module_target'].'&id_record='.$_SESSION['token_access']['id_record_target']); + redirect_url(base_path().'/shared_editor.php?id_module='.$_SESSION['token_access']['id_module_target'].'&id_record='.$_SESSION['token_access']['id_record_target']); exit; } } @@ -95,7 +95,7 @@ // Verifica i permessi per l'URL intended if (Auth::canAccessIntended()) { Auth::clearIntended(); - redirect($intended_url); + redirect_url($intended_url); exit; } else { // L'utente non ha i permessi per accedere alla pagina richiesta @@ -108,16 +108,16 @@ $module = Auth::firstModule(); if (!empty($module)) { - redirect(base_path().'/controller.php?id_module='.$module); + redirect_url(base_path().'/controller.php?id_module='.$module); } else { - redirect(base_path().'/index.php?op=logout'); + redirect_url(base_path().'/index.php?op=logout'); } exit; } // Gestione accesso tramite token OTP if (!empty($token) && $dbo->isConnected() && $dbo->isInstalled()) { - redirect(base_path().'/token_login.php?token='.urlencode($token)); + redirect_url(base_path().'/token_login.php?token='.urlencode($token)); exit; } diff --git a/lib/functions.php b/lib/functions.php index b1f2d70305..d6c6da6627 100755 --- a/lib/functions.php +++ b/lib/functions.php @@ -39,7 +39,7 @@ * * @return bool */ -function redirect($url, $type = 'php') +function redirect_url($url, $type = 'php') { switch ($type) { case 'php': @@ -325,9 +325,9 @@ function redirectOperation($id_module, $id_record) $hash = $hash == '#tab_0' ? '' : $hash; if ($backto == 'record-edit') { - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.$hash); + redirect_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.$hash); } elseif ($backto == 'record-list') { - redirect(base_path().'/controller.php?id_module='.$id_module.$hash); + redirect_url(base_path().'/controller.php?id_module='.$id_module.$hash); } exit; diff --git a/modules/aggiornamenti/upload_modules.php b/modules/aggiornamenti/upload_modules.php index 8656d2aae3..e48ea0a59e 100755 --- a/modules/aggiornamenti/upload_modules.php +++ b/modules/aggiornamenti/upload_modules.php @@ -218,4 +218,4 @@ delete($extraction_dir); // Redirect -redirect(base_path().'/editor.php?id_module='.$id_module); +redirect_url(base_path().'/editor.php?id_module='.$id_module); diff --git a/modules/articoli/bulk.php b/modules/articoli/bulk.php index 102fbf0fef..c6660580f3 100755 --- a/modules/articoli/bulk.php +++ b/modules/articoli/bulk.php @@ -180,7 +180,7 @@ $id_print = Prints::getPrints()['Barcode bulk']; } - redirect(base_path().'/pdfgen.php?id_print='.$id_print.'&id_record='.Articolo::where('codice', '!=', '')->first()->id.'&qta='.$qta); + redirect_url(base_path().'/pdfgen.php?id_print='.$id_print.'&id_record='.Articolo::where('codice', '!=', '')->first()->id.'&qta='.$qta); exit; case 'change_quantity': @@ -243,7 +243,7 @@ } $database->commitTransaction(); - redirect(base_path().'/editor.php?id_module='.$id_preventivi.'&id_record='.$id_preventivo); + redirect_url(base_path().'/editor.php?id_module='.$id_preventivi.'&id_record='.$id_preventivo); exit; case 'export_csv': diff --git a/modules/attributi_combinazioni/edit.php b/modules/attributi_combinazioni/edit.php index 299acdb22f..4c91da451d 100644 --- a/modules/attributi_combinazioni/edit.php +++ b/modules/attributi_combinazioni/edit.php @@ -108,7 +108,7 @@ function rimuoviValore(button) { let id = riga.data("id"); // Redirect - redirect(globals.rootdir + "/editor.php", { + redirect_url(globals.rootdir + "/editor.php", { id_module: globals.id_module, id_record: globals.id_record, id_valore: id, diff --git a/modules/categorie/actions.php b/modules/categorie/actions.php index 1902dfeba8..82df0e0630 100644 --- a/modules/categorie/actions.php +++ b/modules/categorie/actions.php @@ -81,7 +81,7 @@ // Redirect alla categoria se si sta modificando una sottocategoria if (!empty($id_original)) { $database->commitTransaction(); - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); + redirect_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); exit; } @@ -131,7 +131,7 @@ } 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_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); exit; } diff --git a/modules/categorie_contratti/actions.php b/modules/categorie_contratti/actions.php index 156e63def1..a04fc62a1b 100644 --- a/modules/categorie_contratti/actions.php +++ b/modules/categorie_contratti/actions.php @@ -46,7 +46,7 @@ // Redirect alla categoria se si sta modificando una sottocategoria if (!empty($id_original)) { $database->commitTransaction(); - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); + redirect_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); exit; } @@ -86,7 +86,7 @@ } 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_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); exit; } diff --git a/modules/combinazioni_articoli/edit.php b/modules/combinazioni_articoli/edit.php index a7c0f65e74..74817f9489 100644 --- a/modules/combinazioni_articoli/edit.php +++ b/modules/combinazioni_articoli/edit.php @@ -125,7 +125,7 @@ function rimuoviVariante(id) { function generaVarianti(button) { // Redirect - redirect(globals.rootdir + "/editor.php", { + redirect_url(globals.rootdir + "/editor.php", { id_module: globals.id_module, id_record: globals.id_record, op: "genera-varianti", diff --git a/modules/fatture/edit.php b/modules/fatture/edit.php index 30354ce4f2..5f5de3c16a 100755 --- a/modules/fatture/edit.php +++ b/modules/fatture/edit.php @@ -1050,7 +1050,7 @@ showCancelButton: true, confirmButtonText: "'.tr('Sì').'" }).then(function (result) { - redirect(globals.rootdir + "/editor.php", { + redirect_url(globals.rootdir + "/editor.php", { id_module: globals.id_module, id_record: globals.id_record, op: "ricalcola_scadenze", diff --git a/modules/giacenze_sedi/init.php b/modules/giacenze_sedi/init.php index 1cf05826bd..041a393e77 100644 --- a/modules/giacenze_sedi/init.php +++ b/modules/giacenze_sedi/init.php @@ -24,5 +24,5 @@ if (!empty($id_record)) { $id_module = Module::where('name', 'Articoli')->first()->id; - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record); + redirect_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record); } diff --git a/modules/interventi/bulk.php b/modules/interventi/bulk.php index 699f64004c..257e52a591 100755 --- a/modules/interventi/bulk.php +++ b/modules/interventi/bulk.php @@ -392,7 +392,7 @@ $_SESSION['superselect']['interventi'] = $id_records; $id_print = Prints::getPrints()['Riepilogo interventi']; - redirect(base_path().'/pdfgen.php?id_print='.$id_print.'&tipo='.post('tipo')); + redirect_url(base_path().'/pdfgen.php?id_print='.$id_print.'&tipo='.post('tipo')); exit; case 'send_mail': diff --git a/modules/marche/actions.php b/modules/marche/actions.php index bf0238d0cc..2621d8f501 100644 --- a/modules/marche/actions.php +++ b/modules/marche/actions.php @@ -114,7 +114,7 @@ if (!empty($id_original)) { $database->commitTransaction(); - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); + redirect_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); exit; } @@ -150,11 +150,11 @@ flash()->error($message.': '.$link); if (empty($id_original)) { - redirect(base_path().'/controller.php?id_module='.$id_module); + redirect_url(base_path().'/controller.php?id_module='.$id_module); exit; } - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); + redirect_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); exit; } else { $marca = Marca::build($nome); @@ -175,7 +175,7 @@ } else { // Redirect alla marca se si sta aggiungendo una modello $database->commitTransaction(); - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); + redirect_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.($id_original ?: $id_record)); exit; } diff --git a/modules/pagamenti/actions.php b/modules/pagamenti/actions.php index 68ad7f3f4a..a7c9562176 100755 --- a/modules/pagamenti/actions.php +++ b/modules/pagamenti/actions.php @@ -121,10 +121,10 @@ if ($id_record == $id) { $res = $dbo->fetchArray('SELECT * FROM `co_pagamenti` LEFT JOIN `co_pagamenti_lang` WHERE `co_pagamenti`.`id`!='.prepare($id).' AND `title`='.prepare($record['descrizione'])); if (count($res) != 0) { - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$res[0]['id']); + redirect_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$res[0]['id']); } else { // $_POST['backto'] = 'record-list'; - redirect(base_path().'/controller.php?id_module='.$id_module); + redirect_url(base_path().'/controller.php?id_module='.$id_module); } } } diff --git a/modules/smtp/actions.php b/modules/smtp/actions.php index 8162cce52d..a274506821 100755 --- a/modules/smtp/actions.php +++ b/modules/smtp/actions.php @@ -139,7 +139,7 @@ case 'oauth2': $oauth2 = $account->oauth2; - redirect(base_path().'/oauth2.php?id='.$oauth2->id); + redirect_url(base_path().'/oauth2.php?id='.$oauth2->id); break; } diff --git a/modules/utenti/actions.php b/modules/utenti/actions.php index 57e373841f..aba049dd1a 100755 --- a/modules/utenti/actions.php +++ b/modules/utenti/actions.php @@ -145,7 +145,7 @@ $utente->save(); - redirect(base_path().'/modules/utenti/info.php'); + redirect_url(base_path().'/modules/utenti/info.php'); break; diff --git a/modules/utenti/init.php b/modules/utenti/init.php index 0a2cde4a62..d2bef9842e 100755 --- a/modules/utenti/init.php +++ b/modules/utenti/init.php @@ -32,7 +32,7 @@ if (!$record) { // Se il record non esiste, reindirizza alla lista flash()->error(tr('Gruppo non trovato')); - redirect(base_path().'/controller.php?id_module='.$id_module); + redirect_url(base_path().'/controller.php?id_module='.$id_module); } } } diff --git a/oauth2.php b/oauth2.php index 1b34238143..210c946926 100644 --- a/oauth2.php +++ b/oauth2.php @@ -58,7 +58,7 @@ } if (empty($_GET['error'])) { - redirect($redirect); + redirect_url($redirect); exit; } else { echo strip_tags($_GET['error']).'
'.strip_tags($_GET['error_description']).' diff --git a/oauth2_login.php b/oauth2_login.php index b02f8c31d1..30f888bb8c 100644 --- a/oauth2_login.php +++ b/oauth2_login.php @@ -64,9 +64,9 @@ if (!auth()->attempt($username, null, true)) { flash()->error(tr('Autenticazione fallita!')); } - redirect(base_path().'/'); + redirect_url(base_path().'/'); } else { - redirect($redirect); + redirect_url($redirect); } exit; diff --git a/plugins/barcode_articoli/edit.php b/plugins/barcode_articoli/edit.php index de3adc442f..ce1267354a 100755 --- a/plugins/barcode_articoli/edit.php +++ b/plugins/barcode_articoli/edit.php @@ -61,7 +61,7 @@ function rimuoviBarcode(button) { let hash = window.location.href.split("#")[1]; confirmDelete(button).then(function () { - redirect(globals.rootdir + "/editor.php", { + redirect_url(globals.rootdir + "/editor.php", { backto: "record-edit", hash: hash, op: "deletebarcode", diff --git a/plugins/componenti/edit.php b/plugins/componenti/edit.php index e59cd6c6b8..b799ee2795 100644 --- a/plugins/componenti/edit.php +++ b/plugins/componenti/edit.php @@ -265,7 +265,7 @@ function sostituisciComponente(trigger) { showCancelButton: true, confirmButtonText: "'.tr('Sì').'" }).then(function () { - 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_url("'.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.'"); }).catch(swal.noop); } @@ -280,7 +280,7 @@ function rimuoviComponente(trigger) { showCancelButton: true, confirmButtonText: "'.tr('Sì').'" }).then(function () { - 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_url("'.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.'"); }).catch(swal.noop); } diff --git a/plugins/importFE/actions.php b/plugins/importFE/actions.php index c9f7347bd3..915c7b1b90 100755 --- a/plugins/importFE/actions.php +++ b/plugins/importFE/actions.php @@ -190,7 +190,7 @@ $process_result = Interaction::processInvoice($filename); if ($process_result != '') { flash()->error($process_result); - redirect(base_path().'/controller.php?id_module='.$id_module); + redirect_url(base_path().'/controller.php?id_module='.$id_module); return; } @@ -200,9 +200,9 @@ $file = $files[$id_record - 1]; if (get('sequence') == null) { - redirect(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_fattura); + redirect_url(base_path().'/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_url(base_path().'/editor.php?id_module='.$id_module.'&id_plugin='.$id_plugin.'&id_record='.$id_record.'&sequence=1'); flash()->info(tr('La fattura numero _NUM_ del _DATA_ (_ANAGRAFICA_) è stata importata correttamente', [ '_NUM_' => $fattura->numero, '_DATA_' => dateFormat($fattura->data), @@ -210,7 +210,7 @@ ])); } else { flash()->info(tr('Tutte le fatture salvate sono state importate!')); - redirect(base_path().'/controller.php?id_module='.$id_module); + redirect_url(base_path().'/controller.php?id_module='.$id_module); } break; diff --git a/plugins/importFE/edit.php b/plugins/importFE/edit.php index 7ddb3a2773..67112362a0 100755 --- a/plugins/importFE/edit.php +++ b/plugins/importFE/edit.php @@ -52,7 +52,7 @@ function upload(btn) { data = JSON.parse(data); if (!data.already) { - redirect(globals.rootdir + "/editor.php?id_module=" + globals.id_module + "&id_plugin=" + '.$id_plugin.' + "&id_record=" + data.id); + redirect_url(globals.rootdir + "/editor.php?id_module=" + globals.id_module + "&id_plugin=" + '.$id_plugin.' + "&id_record=" + data.id); } else { swal({ title: "'.tr('Fattura già importata').'.", @@ -241,13 +241,13 @@ function importComplete(count, counter, btn, restore) { $("#main_loading").fadeOut(); buttonRestore(btn, restore); - redirect(globals.rootdir + "/editor.php?id_module=" + globals.id_module + "&id_plugin=" + '.$id_plugin.' + "&id_record=1&sequence=1"); + redirect_url(globals.rootdir + "/editor.php?id_module=" + globals.id_module + "&id_plugin=" + '.$id_plugin.' + "&id_record=1&sequence=1"); } }'; } else { echo ' function importAll(btn) { - redirect(globals.rootdir + "/editor.php?id_module=" + globals.id_module + "&id_plugin=" + '.$id_plugin.' + "&id_record=1&sequence=1"); + redirect_url(globals.rootdir + "/editor.php?id_module=" + globals.id_module + "&id_plugin=" + '.$id_plugin.' + "&id_record=1&sequence=1"); }'; } echo ' diff --git a/plugins/importFE/generate.php b/plugins/importFE/generate.php index 861ecc9d10..a21401e93e 100755 --- a/plugins/importFE/generate.php +++ b/plugins/importFE/generate.php @@ -80,7 +80,7 @@ '; diff --git a/plugins/sedi/edit.php b/plugins/sedi/edit.php index b1ca870141..59d48ffdd6 100755 --- a/plugins/sedi/edit.php +++ b/plugins/sedi/edit.php @@ -364,7 +364,7 @@ function rimuoviSede(button) { let hash = window.location.href.split("#")[1]; confirmDelete(button).then(function () { - redirect(globals.rootdir + "/editor.php", { + redirect_url(globals.rootdir + "/editor.php", { backto: "record-edit", hash: hash, op: "deletesede", diff --git a/plugins/varianti_articolo/edit.php b/plugins/varianti_articolo/edit.php index 132d7931c1..0c9856c000 100644 --- a/plugins/varianti_articolo/edit.php +++ b/plugins/varianti_articolo/edit.php @@ -65,7 +65,7 @@ '; // Instructions for the first installation @@ -205,7 +205,7 @@

'.tr('Questo processo potrebbe richiedere fino a 10 minuti. Ti preghiamo di attendere il completamento').'.

'.tr("Se il problema persiste, contatta l'amministratore di sistema").'.

- '.tr('Aggiorna pagina').' + '.tr('Aggiorna pagina').' '; @@ -452,7 +452,7 @@ function addVersion(version){ if (Update::isUpdateCompleted()) { echo '
- + '.tr('Configura il gestionale').'
'; diff --git a/include/top.php b/include/top.php index 213fb1736d..4096ea8acc 100755 --- a/include/top.php +++ b/include/top.php @@ -61,7 +61,7 @@ if (file_exists(base_dir().'/manifest.json')) { echo ' - '; + '; } // CSS @@ -219,7 +219,7 @@ }, }; globals = { - rootdir: "'.base_path().'", + rootdir: "'.base_path_osm().'", js: "'.$paths['js'].'", css: "'.$paths['css'].'", img: "'.$paths['img'].'", @@ -294,7 +294,7 @@ echo ' +