Evarisk · nicolas-eoxia · Oct 31, 2024
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,19 @@
+# EditorConfig is awesome: https://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.php]
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -0,0 +1,17 @@
+name: 'Generate Auto Changelog'
+on:
+    push:
+        branches:
+            - main
+jobs:
+    master:
+        name: 'build'
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@master
+              with:
+                  fetch-depth: 0
+            - name: Generate Auto Changelog
+              uses: Evarisk/action-auto-changelog@master
+              with:
+                  github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
@@ -1,23 +1,29 @@
-# DoliSecu sur [DOLIBARR ERP CRM](https://www.dolibarr.org)
+# DoliSecu sur [DOLIBARR ERP CRM](https://dolibarr.org)
 
 ## Informations
 
 - Numéro du module : 436311
 - Version :  1.0.0
 - Dernière mise à jour : 21/11/2022
-- Éditeur : [Evarisk](https://www.evarisk.com)
+- Éditeur : [Evarisk](https://evarisk.com)
 - Compatibilité : Dolibarr 14.0.0 - 16.0.2
 - Thème : Eldy Menu
 - Licence : GPLv3
 - Disponible sur : Windows - MacOS - Linux
 
+### Version
+
+- Version : 1.0.0
+- PHP : 7.4.33
+- Compatibilité : Dolibarr 17.0. - 20.0.1
+
 ## Liens
 
-- Support & Assistance : [Forum www.dolibarr.fr](https://www.dolibarr.fr) / Par mail à contact@evarisk.com
-- Demo : [Demo DoliSecu](https://www.demodoli.digirisk.com) - ID: demo - Password: demo
+- Support & Assistance : [Forum dolibarr.fr](https://dolibarr.fr) / Par mail à technique@evarisk.com
+- Demo : [Demo DoliSecu](https://demodoli.digirisk.com) - ID: demo - Password: demo
 - Documentation : [Wiki DoliSecu](https://wiki.dolibarr.org/index.php/Module_DoliSecu)
-- Projet Github : [Projet DoliSecu](https://github.com/orgs/Evarisk/projects/16)
-- D'autres modules développés par Evarisk disponible sur [Dolistore.com](https://www.dolistore.com)
+- Projet Github : [Projet DoliSecu](https://github.com/Evarisk/DoliSecu/projects?query=is%3Aopen)
+- D'autres modules développés par Evarisk disponible sur [Dolistore.com](https://dolistore.com)
 
 ## Fonctionnalités
 
@@ -42,4 +48,3 @@ Corrigez vos problèmes de sécurité facilement et rapidement
 ``` 
 git clone https://github.com/Evarisk/dolisecu.git
 ```
-
diff --git a/admin/about.php b/admin/about.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2022 EVARISK <dev@evarisk.com>
+/* Copyright (C) 2022-2024 EVARISK <technique@evarisk.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,71 +18,49 @@
 /**
  * \file    dolisecu/admin/about.php
  * \ingroup dolisecu
- * \brief   About page of module DoliSecu.
+ * \brief   About page of module DoliSecu
  */
 
-// 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';
+// Load DoliSecu environment
+if (file_exists('../dolisecu.main.inc.php')) {
+    require_once __DIR__ . '/../dolisecu.main.inc.php';
+} elseif (file_exists('../../dolisecu.main.inc.php')) {
+    require_once __DIR__ . '/../../dolisecu.main.inc.php';
+} else {
+    die('Include of dolisecu main fails');
 }
-// 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');
-}
-
-// Libraries
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
+// Load DoliSecu libraries
 require_once __DIR__ . '/../lib/dolisecu.lib.php';
 require_once __DIR__ . '/../core/modules/modDoliSecu.class.php';
 
 // Global variables definitions
 global $db, $langs, $user;
 
-// Translations
-$langs->loadLangs(['errors', 'admin', 'dolisecu@dolisecu']);
+// Load translation files required by the page
+$langs->loadLangs(['dolisecu@dolisecu']);
 
 // Initialize technical objects
 $modDoliSecu = new modDoliSecu($db);
 
-// Access control
-$permissiontoread = $user->rights->dolisecu->adminpage->read;
-if (empty($conf->dolisecu->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+// Security check - Protection if external user
+$permissionToRead = $user->hasRight('dolisecu', 'adminpage', 'read');
+if (isModEnabled('dolisecu') < 1 || !$permissionToRead) {
+    accessforbidden();
+}
 
 /*
  * View
  */
 
-$help_url = 'FR:Module_DoliSecu';
-$title    = $langs->trans('DoliSecuAbout');
+$title   = $langs->trans('DoliSecuSetup');
+$helpUrl = 'FR:Module_DoliSecu';
 
 llxHeader('', $title, $help_url);
 
 // Subheader
-$linkback = '<a href="' . DOL_URL_ROOT.'/admin/modules.php' . '">'.$langs->trans('BackToModuleList') . '</a>';
-
-print load_fiche_titre($title, $linkback, 'dolisecu_color@dolisecu');
+$linkBack = '<a href="' . DOL_URL_ROOT .'/admin/modules.php' . '">' . $langs->trans('BackToModuleList') . '</a>';
+print load_fiche_titre($title, $linkBack, 'title_setup');
 
 // Configuration header
 $head = dolisecuAdminPrepareHead();
@@ -93,4 +71,4 @@
 // Page end
 print dol_get_fiche_end();
 llxFooter();
-$db->close();
+$db->close();
diff --git a/admin/index.php b/admin/index.php
@@ -0,0 +1,2 @@
+<?php
+//Silence is golden
diff --git a/admin/setup.php b/admin/setup.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2022 EVARISK <dev@evarisk.com>
+/* Copyright (C) 2022-2024 EVARISK <technique@evarisk.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,80 +16,55 @@
  */
 
 /**
- * \file    dolisecu/admin/setup.php
+ * \file    admin/setup.php
  * \ingroup dolisecu
- * \brief   DoliSecu setup page.
+ * \brief   DoliSecu setup page
  */
 
-// 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';
+// Load DoliSecu environment
+if (file_exists('../dolisecu.main.inc.php')) {
+    require_once __DIR__ . '/../dolisecu.main.inc.php';
+} elseif (file_exists('../../dolisecu.main.inc.php')) {
+    require_once __DIR__ . '/../../dolisecu.main.inc.php';
+} else {
+    die('Include of dolisecu main fails');
 }
-// 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');
-}
-
-// Libraries
-require_once DOL_DOCUMENT_ROOT. '/core/lib/admin.lib.php';
 
+// Load DoliSecu libraries
 require_once __DIR__ . '/../lib/dolisecu.lib.php';
 
 // Global variables definitions
-global $db, $langs, $hookmanager, $user;
+global $conf, $db, $langs, $user;
 
-// Translations
+// Load translation files required by the page
 $langs->loadLangs(['admin', 'dolisecu@dolisecu']);
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(['dolisecusetup', 'globalsetup']);
-
-// Access control
-$permissiontoread = $user->rights->dolisecu->adminpage->read;
-if (empty($conf->dolisecu->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+// Security check - Protection if external user
+$permissionToRead = $user->hasRight('dolisecu', 'adminpage', 'read');
+if (isModEnabled('dolisecu') < 1 || !$permissionToRead) {
+    accessforbidden();
+}
 
 /*
  * View
  */
 
-$help_url = 'FR:Module_DoliSecu';
-$title    = $langs->trans('DoliSecuSetup');
+$title   = $langs->trans('DoliSecuSetup');
+$helpUrl = 'FR:Module_DoliSecu';
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $helpUrl);
 
 // Subheader
-$linkback = '<a href="' . DOL_URL_ROOT.'/admin/modules.php' . '">'.$langs->trans('BackToModuleList') . '</a>';
-
-print load_fiche_titre($title, $linkback, 'dolisecu_color@dolisecu');
+$linkBack = '<a href="' . DOL_URL_ROOT . '/admin/modules.php' . '">' . $langs->trans('BackToModuleList') . '</a>';
+print load_fiche_titre($title, $linkBack, 'title_setup');
 
 // Configuration header
 $head = dolisecuAdminPrepareHead();
 print dol_get_fiche_head($head, 'settings', $title, 0, 'dolisecu_color@dolisecu');
 
-// Setup page goes here
 print '<span class="opacitymedium">' . $langs->trans('DoliSecuSetupPage') . '</span>';
 
 // Page end
 print dol_get_fiche_end();
 llxFooter();
-$db->close();
+$db->close();
diff --git a/ChangeLog.md → changelog.md b/ChangeLog.md → changelog.md
diff --git a/core/index.php b/core/index.php
@@ -0,0 +1,2 @@
+<?php
+//Silence is golden
diff --git a/core/modules/index.php b/core/modules/index.php
@@ -0,0 +1,2 @@
+<?php
+//Silence is golden