Merge pull request #307 from Evarisk/1.1.0

1.1.0
Evarisk · May 10, 2023 · 45dd077 · 45dd077
2 parents b54896b + 63682b3
commit 45dd077
Show file tree

Hide file tree

Showing 176 changed files with 18,888 additions and 17,452 deletions.
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,74 +1,52 @@
-# DOLIMEET - Suivi des réunions, sessions de formation, audits pour [DOLIBARR ERP CRM](https://www.dolibarr.org)
+# DoliMeet sur [DOLIBARR ERP CRM](https://www.dolibarr.org)
 
-## Description du module
+## Informations
 
-Dolimeet permet de suivre :
-- Réunions et compte rendu
-- Sessions de formation avec attestions de présence et certification de réalisation
-- Audits avec le compte rendu
+- Numéro du module : 436304
+- Dernière mise à jour : 10/05/2023
+- Éditeur : [Evarisk](https://www.evarisk.com)
+- Thème : eldy
+- Licence : GPLv3
+- Disponible sur : Windows - MacOS - Linux
 
-## Traduction / translate
+## Version
 
-Les traductions sont modifiables dans le répertoire langs 
-Translations can be completed manually by editing files into directories *langs*.
+- Version :  1.1.0
+- Compatibilité : Dolibarr 15.0.0 - 16.0.4
+- Saturne framework : 1.0.0
 
-## Installation
-
-### From the ZIP file and GUI interface
+## Liens
 
-- If you get the module in a zip file (like when downloading it from the market place [Dolistore](https://www.dolistore.com)), go into
-menu ```Home - Setup - Modules - Deploy external module``` and upload the zip file.
+- Support & Assistance : [Forum www.dolibarr.fr](https://www.dolibarr.fr) / Par mail à [email protected]
+- Demo : [Demo DoliMeet](https://www.demodoli.digirisk.com) - ID: demo - Password: demo
+- Documentation : [Wiki DoliMeet](https://wiki.dolibarr.org/index.php/Module_DoliMeet)
+- Projet GitHub : [Projet DoliMeet](https://github.com/Evarisk/dolimeet/projects?query=is%3Aopen)
+- D'autres modules développés par Evarisk disponibles sur [DoliStore.com](https://www.dolistore.com)
 
-Note: If this screen tell you there is no custom directory, check your setup is correct:
+## Fonctionnalités
 
-- In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file and check that following lines are not commented:
+- Réunions et compte-rendus
+- Sessions de formation avec attestation de présence et certificat de réalisation
+- Audits et compte-rendus
 
-    ```php
-    //$dolibarr_main_url_root_alt ...
-    //$dolibarr_main_document_root_alt ...
-    ```
+## Traductions
 
-- Uncomment them if necessary (delete the leading ```//```) and assign a sensible value according to your Dolibarr installation
+- Français
+- Anglais
 
-    For example :
-
-    - UNIX:
-        ```php
-        $dolibarr_main_url_root_alt = '/custom';
-        $dolibarr_main_document_root_alt = '/var/www/Dolibarr/htdocs/custom';
-        ```
+## Installation
 
-    - Windows:
-        ```php
-        $dolibarr_main_url_root_alt = '/custom';
-        $dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
-        ```
+### Méthode 1 :
 
-### From a GIT repository
+- Depuis le menu "Déployer/Installer un module externe" de Dolibarr :
+- Glisser l'archive ZIP 'module_dolimeet-X.Y.Z' et cliquer sur "ENVOYER FICHIER"
+- Glisser l'archive ZIP 'module_saturne-X.Y.Z' et cliquer sur "ENVOYER FICHIER"
+- Activer le module dans la liste des Modules/Applications installés
 
-- Clone the repository in ```$dolibarr_main_document_root_alt/dolimeet```
+### Méthode 2 :
 
-```sh
-cd ....../custom
-git clone [email protected]:gitlogin/dolimeet.git dolimeet
+- Dans le dossier "dolibarr/htdocs/custom" copier la ligne suivante :
+``` 
+git clone https://github.com/Evarisk/dolimeet.git
+git clone https://github.com/Evarisk/saturne.git
 ```
-
-### <a name="final_steps"></a>Final steps
-
-From your browser:
-
-  - Log into Dolibarr as a super-administrator
-  - Go to "Setup" -> "Modules"
-  - You should now be able to find and enable the module
-
--->
-
-## Licenses
-
-### Main code
-
-GPLv3 or (at your option) any later version. See file COPYING for more information.
-
-### Documentation
-
-All texts and readmes are licensed under GFDL.
diff --git a/admin/about.php b/admin/about.php
@@ -1,6 +1,5 @@
 <?php
-/* Copyright (C) 2004-2017 Laurent Destailleur  <[email protected]>
- * Copyright (C) 2022 Theo David <[email protected]>
+/* Copyright (C) 2021-2023 EVARISK <[email protected]>
  *
  * 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
@@ -17,87 +16,56 @@
  */
 
 /**
- * \file    dolimeet/admin/about.php
+ * \file    admin/about.php
  * \ingroup dolimeet
  * \brief   About page of module DoliMeet.
  */
 
-// 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 DoliMeet environment
+if (file_exists('../dolimeet.main.inc.php')) {
+	require_once __DIR__ . '/../dolimeet.main.inc.php';
+} else {
+	die('Include of dolimeet 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/dolimeet.lib.php';
+require_once __DIR__ . '/../lib/dolimeet.lib.php';
+require_once __DIR__ . '/../core/modules/modDoliMeet.class.php';
 
-// Translations
-$langs->loadLangs(array("errors", "admin", "dolimeet@dolimeet"));
+// Global variables definitions
+global $db, $langs, $user;
 
-// Access control
-if (!$user->admin) {
-	accessforbidden();
-}
+// Load translation files required by the page
+saturne_load_langs(['admin']);
 
-// Parameters
-$action = GETPOST('action', 'aZ09');
-$backtopage = GETPOST('backtopage', 'alpha');
+// Initialize technical objects
+$modDoliMeet = new modDoliMeet($db);
 
+// Get parameters
+$backtopage = GETPOST('backtopage', 'alpha');
 
-/*
- * Actions
- */
-
-// None
-
+// Security check - Protection if external user
+$permissiontoread = $user->rights->dolimeet->adminpage->read;
+saturne_check_access($permissiontoread);
 
 /*
  * View
  */
 
-$form = new Form($db);
-
-$help_url = '';
-$page_name = "DoliMeetAbout";
+$title    = $langs->trans('ModuleAbout', 'DoliMeet');
+$help_url = 'FR:Module_DoliMeet';
 
-llxHeader('', $langs->trans($page_name), $help_url);
+saturne_header(0,'', $title, $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');
+$linkback = '<a href="' . ($backtopage ?: DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1') . '">' . $langs->trans('BackToModuleList') . '</a>';
+print load_fiche_titre($title, $linkback, 'dolimeet_color@dolimeet');
 
 // Configuration header
-$head = dolimeetAdminPrepareHead();
-print dol_get_fiche_head($head, 'about', $langs->trans($page_name), 0, 'dolimeet@dolimeet');
+$head = dolimeet_admin_prepare_head();
+print dol_get_fiche_head($head, 'about', $title, -1, 'dolimeet_color@dolimeet');
 
-dol_include_once('/dolimeet/core/modules/modDoliMeet.class.php');
-$tmpmodule = new modDoliMeet($db);
-print $tmpmodule->getDescLong();
+print $modDoliMeet->getDescLong();
 
 // Page end
 print dol_get_fiche_end();