Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion admin/about.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down
2 changes: 1 addition & 1 deletion admin/autodeclaration.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions admin/setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion ajax/dismiss_notice.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions class/actions_autoverifactu.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions core/modules/facture/doc/pdf_Autoverifactu.modules.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';


/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';


/**
Expand Down
20 changes: 11 additions & 9 deletions env.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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__);
6 changes: 3 additions & 3 deletions js/autoverifactu.js.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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'));
Expand Down
Loading