#143 [Config] fix: rework with framework

Evarisk · Mar 30, 2023 · 5a44b50 · 5a44b50
1 parent d6e42f6
commit 5a44b50
Show file tree

Hide file tree

Showing 4 changed files with 541 additions and 207 deletions.
diff --git a/admin/about.php b/admin/about.php
@@ -22,46 +22,27 @@
  * \brief   About page of module DoliCar.
  */
 
-// Load Dolibarr environment
-$res = 0;
-// 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";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $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--;
-}
-if (!$res && $i > 0 && file_exists(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";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
+// Load DoliCar environment
+if (file_exists('../dolicar.main.inc.php')) {
+	require_once __DIR__ . '/../dolicar.main.inc.php';
+} else {
+	die('Include of dolicar main fails');
 }
 
 // Libraries
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once '../lib/dolicar.lib.php';
 
+// Global variables definitions
+global $conf, $db, $langs, $user;
+
 // Translations
-$langs->loadLangs(array("errors", "admin", "dolicar@dolicar"));
+saturne_load_langs(['admin', 'categories']);
 
 // Access control
-if (!$user->admin) {
-	accessforbidden();
-}
+$permissiontoread = $user->rights->dolicar->adminpage->read;
+saturne_check_access($permissiontoread);
 
 // Parameters
 $action = GETPOST('action', 'aZ09');
@@ -84,16 +65,15 @@
 $help_url = '';
 $page_name = $langs->transnoentities('DolicarSetup');
 
-
-llxHeader('', $langs->trans($page_name), $help_url);
+saturne_header(0, '', $langs->trans($page_name), $help_url);
 
 // Subheader
 $linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
 print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
 // Configuration header
-$head = dolicarAdminPrepareHead();
+$head = dolicar_admin_prepare_head();
 print dol_get_fiche_head($head, 'about', $langs->trans($page_name), 0, 'dolicar@dolicar');
 
 require_once __DIR__ . '/../core/modules/modDoliCar.class.php';