#175 [Core] fix: doubled require main

Evarisk · Apr 6, 2023 · 3269eed · 3269eed
1 parent 3ce108d
commit 3269eed
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 146 deletions.
diff --git a/admin/about.php b/admin/about.php
@@ -25,6 +25,8 @@
 // Load DoliCar environment
 if (file_exists('../dolicar.main.inc.php')) {
 	require_once __DIR__ . '/../dolicar.main.inc.php';
+} elseif (file_exists('../../dolicar.main.inc.php')) {
+	require_once __DIR__ . '/../../dolicar.main.inc.php';
 } else {
 	die('Include of dolicar main fails');
 }

diff --git a/admin/registrationcertificate.php b/admin/registrationcertificate.php
@@ -25,6 +25,8 @@
 // Load DoliCar environment
 if (file_exists('../dolicar.main.inc.php')) {
 	require_once __DIR__ . '/../dolicar.main.inc.php';
+} elseif (file_exists('../../dolicar.main.inc.php')) {
+	require_once __DIR__ . '/../../dolicar.main.inc.php';
 } else {
 	die('Include of dolicar main fails');
 }

diff --git a/admin/registrationcertificatefr_extrafields.php b/admin/registrationcertificatefr_extrafields.php
diff --git a/admin/setup.php b/admin/setup.php
@@ -25,6 +25,8 @@
 // Load DoliCar environment
 if (file_exists('../dolicar.main.inc.php')) {
 	require_once __DIR__ . '/../dolicar.main.inc.php';
+} elseif (file_exists('../../dolicar.main.inc.php')) {
+	require_once __DIR__ . '/../../dolicar.main.inc.php';
 } else {
 	die('Include of dolicar main fails');
 }

diff --git a/view/registrationcertificatefr/quickcreation.php b/view/registrationcertificatefr/quickcreation.php
@@ -22,7 +22,9 @@
  */
 
 // Load EasyCRM environment
-if (file_exists('../../dolicar.main.inc.php')) {
+if (file_exists('../dolicar.main.inc.php')) {
+	require_once __DIR__ . '/../dolicar.main.inc.php';
+} elseif (file_exists('../../dolicar.main.inc.php')) {
 	require_once __DIR__ . '/../../dolicar.main.inc.php';
 } else {
 	die('Include of dolicar main fails');

diff --git a/view/registrationcertificatefr/registrationcertificatefr_card.php b/view/registrationcertificatefr/registrationcertificatefr_card.php
@@ -23,7 +23,9 @@
  */
 
 // Load DoliCar environment
-if (file_exists('../../dolicar.main.inc.php')) {
+if (file_exists('../dolicar.main.inc.php')) {
+	require_once __DIR__ . '/../dolicar.main.inc.php';
+} elseif (file_exists('../../dolicar.main.inc.php')) {
 	require_once __DIR__ . '/../../dolicar.main.inc.php';
 } else {
 	die('Include of dolicar main fails');

diff --git a/view/registrationcertificatefr/registrationcertificatefr_list.php b/view/registrationcertificatefr/registrationcertificatefr_list.php
@@ -23,7 +23,9 @@
  */
 
 // Load DoliCar environment
-if (file_exists('../../dolicar.main.inc.php')) {
+if (file_exists('../dolicar.main.inc.php')) {
+	require_once __DIR__ . '/../dolicar.main.inc.php';
+} elseif (file_exists('../../dolicar.main.inc.php')) {
 	require_once __DIR__ . '/../../dolicar.main.inc.php';
 } else {
 	die('Include of dolicar main fails');