From 82468971714141e56416823cded81fb3f86a389f Mon Sep 17 00:00:00 2001 From: Lucas Garcia Date: Fri, 28 Aug 2026 22:59:58 +0200 Subject: [PATCH] feat: autoverifactu dir constant --- admin/about.php | 4 +++- admin/autodeclaration.php | 2 +- admin/setup.php | 6 +++--- ajax/dismiss_notice.php | 3 ++- class/actions_autoverifactu.class.php | 4 ++-- .../facture/doc/pdf_Autoverifactu.modules.php | 4 ++-- ...overifactu_AutoverifactuTriggers.class.php | 6 +++--- env.php | 20 ++++++++++--------- js/autoverifactu.js.php | 6 +++--- 9 files changed, 30 insertions(+), 25 deletions(-) diff --git a/admin/about.php b/admin/about.php index 0fad12e..3f2ebe6 100755 --- a/admin/about.php +++ b/admin/about.php @@ -27,7 +27,9 @@ // Libraries require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php'; -require_once dirname(__DIR__) . '/lib/autoverifactu.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/autoverifactu.lib.php'; + +global $langs, $user, $db; // Translations $langs->loadLangs(array('errors', 'admin', 'autoverifactu@autoverifactu')); diff --git a/admin/autodeclaration.php b/admin/autodeclaration.php index 24f36f5..4d75293 100644 --- a/admin/autodeclaration.php +++ b/admin/autodeclaration.php @@ -27,7 +27,7 @@ // Libraries require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php'; -require_once dirname(__DIR__) . '/lib/autoverifactu.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/autoverifactu.lib.php'; global $langs, $user, $hookmanager; diff --git a/admin/setup.php b/admin/setup.php index d980db0..bba2335 100755 --- a/admin/setup.php +++ b/admin/setup.php @@ -29,9 +29,9 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/profid.lib.php'; -require_once dirname(__DIR__) . '/lib/autoverifactu.lib.php'; -require_once dirname(__DIR__) . '/lib/setup.lib.php'; -require_once dirname(__DIR__) . '/lib/validation.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/autoverifactu.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/setup.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/validation.lib.php'; /** * Global variables. diff --git a/ajax/dismiss_notice.php b/ajax/dismiss_notice.php index 0f51a16..8dfa927 100644 --- a/ajax/dismiss_notice.php +++ b/ajax/dismiss_notice.php @@ -46,8 +46,9 @@ require_once dirname(__DIR__) . '/env.php'; + require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php'; -require_once dirname(__DIR__) . '/lib/autoverifactu.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/autoverifactu.lib.php'; global $db, $user; diff --git a/class/actions_autoverifactu.class.php b/class/actions_autoverifactu.class.php index b430a90..fec4d13 100644 --- a/class/actions_autoverifactu.class.php +++ b/class/actions_autoverifactu.class.php @@ -28,8 +28,8 @@ require_once DOL_DOCUMENT_ROOT . '/blockedlog/class/blockedlog.class.php'; require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; -require_once dirname(__DIR__) . '/lib/autoverifactu.lib.php'; -require_once dirname(__DIR__) . '/lib/validation.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/autoverifactu.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/validation.lib.php'; /** * Class ActionsAutoverifactu diff --git a/core/modules/facture/doc/pdf_Autoverifactu.modules.php b/core/modules/facture/doc/pdf_Autoverifactu.modules.php index 8e2cde0..2b834c2 100644 --- a/core/modules/facture/doc/pdf_Autoverifactu.modules.php +++ b/core/modules/facture/doc/pdf_Autoverifactu.modules.php @@ -40,8 +40,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php'; -require_once dirname(__DIR__, 4) . '/lib/validation.lib.php'; -require_once dirname(__DIR__, 4) . '/lib/autoverifactu.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/validation.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/autoverifactu.lib.php'; /* diff --git a/core/triggers/interface_10_modAutoverifactu_AutoverifactuTriggers.class.php b/core/triggers/interface_10_modAutoverifactu_AutoverifactuTriggers.class.php index 7013787..546fabc 100644 --- a/core/triggers/interface_10_modAutoverifactu_AutoverifactuTriggers.class.php +++ b/core/triggers/interface_10_modAutoverifactu_AutoverifactuTriggers.class.php @@ -33,9 +33,9 @@ require_once DOL_DOCUMENT_ROOT . '/core/triggers/dolibarrtriggers.class.php'; require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; -require_once dirname(__DIR__, 2) . '/lib/autoverifactu.lib.php'; -require_once dirname(__DIR__, 2) . '/lib/verifactu.lib.php'; -require_once dirname(__DIR__, 2) . '/lib/validation.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/autoverifactu.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/verifactu.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/validation.lib.php'; /** diff --git a/env.php b/env.php index bce9655..0404762 100644 --- a/env.php +++ b/env.php @@ -5,7 +5,7 @@ // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined) if (!$res && !empty($_SERVER['CONTEXT_DOCUMENT_ROOT'])) { - $res = @include $_SERVER['CONTEXT_DOCUMENT_ROOT'] . '/main.inc.php'; + $res = @include $_SERVER['CONTEXT_DOCUMENT_ROOT'] . '/main.inc.php'; } // Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME @@ -14,31 +14,33 @@ $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1; while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { - $i--; - $j--; + $i--; + $j--; } if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1)) . '/main.inc.php')) { - $res = @include substr($tmp, 0, ($i + 1)) . '/main.inc.php'; + $res = @include substr($tmp, 0, ($i + 1)) . '/main.inc.php'; } if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1))) . '/main.inc.php')) { - $res = @include dirname(substr($tmp, 0, ($i + 1))) . '/main.inc.php'; + $res = @include dirname(substr($tmp, 0, ($i + 1))) . '/main.inc.php'; } // Try main.inc.php using relative path if (!$res && file_exists('../main.inc.php')) { - $res = @include '../main.inc.php'; + $res = @include '../main.inc.php'; } if (!$res && file_exists('../../main.inc.php')) { - $res = @include '../../main.inc.php'; + $res = @include '../../main.inc.php'; } if (!$res && file_exists('../../../main.inc.php')) { - $res = @include '../../../main.inc.php'; + $res = @include '../../../main.inc.php'; } if (!$res) { - die('Include of main fails'); + die('Include of main fails'); } + +define('AUTOVERIFACTU_DIR', __DIR__); diff --git a/js/autoverifactu.js.php b/js/autoverifactu.js.php index 105b7aa..69dea82 100644 --- a/js/autoverifactu.js.php +++ b/js/autoverifactu.js.php @@ -57,6 +57,9 @@ require_once dirname(__DIR__) . '/env.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php'; +require_once AUTOVERIFACTU_DIR . '/lib/autoverifactu.lib.php'; + // Define js type header('Content-Type: application/javascript'); // Important: Following code is to cache this file to avoid page request by browser at each Dolibarr page access. @@ -67,9 +70,6 @@ header('Cache-Control: no-cache'); } -require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php'; -require_once dirname(__DIR__) . '/lib/autoverifactu.lib.php'; - global $langs, $user, $mysoc; $langs->loadLangs(array('admin', 'autoverifactu@autoverifactu'));