#102 [Core] fix: includes of module files

Evarisk · Jan 17, 2023 · b43573a · b43573a
1 parent 28d332a
commit b43573a
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 21 deletions.
diff --git a/admin/about.php b/admin/about.php
@@ -96,7 +96,7 @@
 $head = dolicarAdminPrepareHead();
 print dol_get_fiche_head($head, 'about', $langs->trans($page_name), 0, 'dolicar@dolicar');
 
-dol_include_once('/dolicar/core/modules/modDoliCar.class.php');
+require_once __DIR__ . '/../core/modules/modDoliCar.class.php';
 $tmpmodule = new modDoliCar($db);
 print $tmpmodule->getDescLong();
 

diff --git a/core/modules/dolicar/doc/doc_generic_registrationcertificatefr_odt.modules.php b/core/modules/dolicar/doc/doc_generic_registrationcertificatefr_odt.modules.php
@@ -27,13 +27,13 @@
  *	\brief      File of class to build ODT documents for registrationcertificatefrs
  */
 
-dol_include_once('/dolicar/core/modules/dolicar/modules_registrationcertificatefr.php');
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
 
+require_once __DIR__ . '/../../../core/modules/dolicar/modules_registrationcertificatefr.php');
 
 /**
  *	Class to build documents using ODF templates generator

diff --git a/core/modules/dolicar/doc/pdf_standard_registrationcertificatefr.modules.php b/core/modules/dolicar/doc/pdf_standard_registrationcertificatefr.modules.php
@@ -31,12 +31,12 @@
  *  \brief      File of class to generate document from standard template
  */
 
-dol_include_once('/dolicar/core/modules/dolicar/modules_registrationcertificatefr.php');
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
+require_once __DIR__ . '/../../../core/modules/dolicar/modules_registrationcertificatefr.php');
 
 /**
  *	Class to manage PDF template standard_registrationcertificatefr

diff --git a/core/modules/dolicar/mod_registrationcertificatefr_advanced.php b/core/modules/dolicar/mod_registrationcertificatefr_advanced.php
@@ -26,8 +26,7 @@
  * \brief      File containing class for advanced numbering model of RegistrationCertificateFr
  */
 
-dol_include_once('/dolicar/core/modules/dolicar/modules_registrationcertificatefr.php');
-
+require_once __DIR__ . '/../../../core/modules/dolicar/modules_registrationcertificatefr.php');
 
 /**
  *	Class to manage customer Bom numbering rules advanced

diff --git a/core/modules/dolicar/mod_registrationcertificatefr_standard.php b/core/modules/dolicar/mod_registrationcertificatefr_standard.php
@@ -22,7 +22,7 @@
  *  \ingroup    dolicar
  *  \brief      File of class to manage RegistrationCertificateFr numbering rules standard
  */
-dol_include_once('/dolicar/core/modules/dolicar/modules_registrationcertificatefr.php');
+require_once __DIR__ . '/../../../core/modules/dolicar/modules_registrationcertificatefr.php');
 
 
 /**

diff --git a/view/registrationcertificatefr/registrationcertificatefr_agenda.php b/view/registrationcertificatefr/registrationcertificatefr_agenda.php
@@ -79,8 +79,9 @@
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-dol_include_once('/dolicar/class/registrationcertificatefr.class.php');
-dol_include_once('/dolicar/lib/dolicar_registrationcertificatefr.lib.php');
+
+require_once __DIR__ . '/../../class/registrationcertificatefr.class.php';
+require_once __DIR__ . '/../../lib/dolicar_registrationcertificatefr.lib.php';
 
 
 // Load translation files required by the page

diff --git a/view/registrationcertificatefr/registrationcertificatefr_card.php b/view/registrationcertificatefr/registrationcertificatefr_card.php
@@ -56,13 +56,13 @@
 	die("Include of main fails");
 }
 
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 
-dol_include_once('/dolicar/class/registrationcertificatefr.class.php');
-dol_include_once('/dolicar/lib/dolicar_registrationcertificatefr.lib.php');
+require_once __DIR__ . '/../../class/registrationcertificatefr.class.php';
+require_once __DIR__ . '/../../lib/dolicar_registrationcertificatefr.lib.php';
 
 global $conf, $langs, $user, $db, $hookmanager;
 

diff --git a/view/registrationcertificatefr/registrationcertificatefr_contact.php b/view/registrationcertificatefr/registrationcertificatefr_contact.php
@@ -55,8 +55,9 @@
 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-dol_include_once('/dolicar/class/registrationcertificatefr.class.php');
-dol_include_once('/dolicar/lib/dolicar_registrationcertificatefr.lib.php');
+
+require_once __DIR__ . '/../../class/registrationcertificatefr.class.php';
+require_once __DIR__ . '/../../lib/dolicar_registrationcertificatefr.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("dolicar@dolicar", "companies", "other", "mails"));

diff --git a/view/registrationcertificatefr/registrationcertificatefr_document.php b/view/registrationcertificatefr/registrationcertificatefr_document.php
@@ -81,8 +81,9 @@
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-dol_include_once('/dolicar/class/registrationcertificatefr.class.php');
-dol_include_once('/dolicar/lib/dolicar_registrationcertificatefr.lib.php');
+
+require_once __DIR__ . '/../../class/registrationcertificatefr.class.php';
+require_once __DIR__ . '/../../lib/dolicar_registrationcertificatefr.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("dolicar@dolicar", "companies", "other", "mails"));

diff --git a/view/registrationcertificatefr/registrationcertificatefr_list.php b/view/registrationcertificatefr/registrationcertificatefr_list.php
@@ -93,9 +93,8 @@
 
 // load dolicar libraries
 require_once __DIR__ . '/../../class/registrationcertificatefr.class.php';
-
+require_once __DIR__ . '/../../lib/dolicar_registrationcertificatefr.lib.php';
 // for other modules
-//dol_include_once('/othermodule/class/otherobject.class.php');
 
 // Load translation files required by the page
 $langs->loadLangs(array("dolicar@dolicar", "other"));

diff --git a/view/registrationcertificatefr/registrationcertificatefr_note.php b/view/registrationcertificatefr/registrationcertificatefr_note.php
@@ -74,8 +74,8 @@
 	die("Include of main fails");
 }
 
-dol_include_once('/dolicar/class/registrationcertificatefr.class.php');
-dol_include_once('/dolicar/lib/dolicar_registrationcertificatefr.lib.php');
+require_once __DIR__ . '/../../class/registrationcertificatefr.class.php';
+require_once __DIR__ . '/../../lib/dolicar_registrationcertificatefr.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("dolicar@dolicar", "companies"));