From 95e1f738fb023c83eceda983b838756c0c8b4e3f Mon Sep 17 00:00:00 2001
From: F TEMPEZ <frederic.tempez@outlook.com>
Date: Thu, 28 Mar 2024 08:03:27 +0100
Subject: [PATCH] Folder 1.02 simplifications

---
 module/folder/changes.md |  4 +++-
 module/folder/folder.php | 23 +++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/module/folder/changes.md b/module/folder/changes.md
index 932955eb..f7f6510a 100644
--- a/module/folder/changes.md
+++ b/module/folder/changes.md
@@ -1,4 +1,6 @@
+1.02
+- Options d'ouverture des fichiers
 1.01
-- Affiche uniqument les images dans Lity, force le téléchargement des autres ressources. Une option est à prévoir dans la configuration.
+- Affiche uniquement les images dans Lity, force le téléchargement des autres ressources. Une option est à prévoir dans la configuration.
 1.0
 - Version initiale publiée
\ No newline at end of file
diff --git a/module/folder/folder.php b/module/folder/folder.php
index 395f9bbf..5265d6c1 100644
--- a/module/folder/folder.php
+++ b/module/folder/folder.php
@@ -39,26 +39,25 @@ class folder extends common
 		'sqo' => 'Carré',
 		'viv' => 'Vivid'
 	];
+	
 	public static $iconSize = [
 		'md' => 'Standard',
 		'lg' => 'Moyenne',
 		'xl' => 'Grande'
 	];
 
+	public static $openingTarget = [
+		'data-lity' => 'Images dans une lightbox (lity), sinon téléchargement',
+		'_blank' => 'Nouvel onglet',
+		'download' => 'Téléchargement forcé',
+	];
+
 
 	public function index()
 	{
 
-		// Configuration de l'affichage
-		$config['showsubfolder'] = $this->getData(['module', $this->getUrl(0), 'subfolder']);
-		$config['sort'] = $this->getData(['module', $this->getUrl(0), 'sort']);
-		$config['showdetails'] = $this->getData(['module', $this->getUrl(0), 'details']);
-		$config['initialfolderstate'] = $this->getData(['module', $this->getUrl(0), 'folderstate']);
-		$config['iconpack'] = $this->getData(['module', $this->getUrl(0), 'iconpack']);
-		$config['iconsize'] = $this->getData(['module', $this->getUrl(0), 'iconsize']);
-
 		// Générer l'affichage
-		self::$folders = $this->getFolderContent($this->getData(['module', $this->getUrl(0), 'path']), $config);
+		self::$folders = $this->getFolderContent($this->getData(['module', $this->getUrl(0), 'path']),  $this->getData(['module', $this->getUrl(0)]));
 
 		// Valeurs en sortie
 		$this->addOutput([
@@ -112,10 +111,10 @@ class folder extends common
 
 	private function getFolderContent($chemin, $config = [])
 	{
-		$showSubFolder = isset($config['showsubfolder']) ? $config['showsubfolder'] : true;
+		$showSubFolder = isset($config['subfolder']) ? $config['subfolder'] : true;
 		$sort = isset($config['sort']) ? $config['sort'] : true;
-		$showDetails = isset($config['showdetails']) ? $config['showdetails'] : false;
-		$initialFolderState = isset($config['initialfolderstate']) ? $config['initialfolderstate'] : 'collapsed';
+		$showDetails = isset($config['details']) ? $config['details'] : false;
+		$initialFolderState = isset($config['folderstate']) ? $config['folderstate'] : 'collapsed';
 		$iconPack = isset($config['iconpack']) || !empty($config['iconpack']) ? $config['iconpack'] : 'classic';
 		$iconSize = isset($config['iconsize']) || !empty($config['iconsize']) ? $config['iconsize'] : 'md';