From b408c9d192de06ac325132d76c9632b37ae395b2 Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Tue, 9 May 2023 08:58:57 +0200
Subject: [PATCH] config RFM WIP

---
 core/module/user/view/edit/edit.php       | 6 +++---
 core/vendor/filemanager/config/config.php | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/module/user/view/edit/edit.php b/core/module/user/view/edit/edit.php
index 7e243e20..7d5a3523 100644
--- a/core/module/user/view/edit/edit.php
+++ b/core/module/user/view/edit/edit.php
@@ -65,7 +65,7 @@
 			]); ?>
 			<?php echo template::select('userEditLanguage', $module::$languagesInstalled, [
 				'label' => 'Langue',
-				'selected' => $this->getData(['user', $this->getUser('id'), 'language'])
+				'selected' => $this->getData(['user', $this->getUrl(2), 'language'])
 			]); ?>
 		</div>
 	</div>
@@ -119,14 +119,14 @@
 						id="userEditGroupProfil<?php echo self::GROUP_MEMBER; ?>">
 						<?php echo template::select('userEditProfil' . self::GROUP_MEMBER, $module::$userProfils[self::GROUP_MEMBER], [
 							'label' => 'Profil',
-							'selected' => $this->getData(['user', $this->getUser('id'), 'profil'])
+							'selected' => $this->getData(['user', $this->getUrl(2), 'profil'])
 						]); ?>
 					</div>
 					<div class="userEditGroupProfil displayNone"
 						id="userEditGroupProfil<?php echo self::GROUP_MODERATOR; ?>">
 						<?php echo template::select('userEditProfil' . self::GROUP_MODERATOR, $module::$userProfils[self::GROUP_MODERATOR], [
 							'label' => 'Profil',
-							'selected' => $this->getData(['user', $this->getUser('id'), 'profil'])
+							'selected' => $this->getData(['user', $this->getUrl(2), 'profil'])
 						]); ?>
 					</div>
 				</div>
diff --git a/core/vendor/filemanager/config/config.php b/core/vendor/filemanager/config/config.php
index 9c6b9206..06339a45 100644
--- a/core/vendor/filemanager/config/config.php
+++ b/core/vendor/filemanager/config/config.php
@@ -20,11 +20,11 @@ setlocale(LC_CTYPE, $lang);
 /* Lecture du groupe de l'utilisateur connecté pour attribuer les droits et les dossiers */
 $userId = $_COOKIE['ZWII_USER_ID'];
 $u = json_decode(file_get_contents('../../../site/data/user.json'), true);
-$g = json_decode(file_get_contents('../../../site/data/group.json'), true);
+$g = json_decode(file_get_contents('../../../site/data/profil.json'), true);
 $group = $u['user'][$userId]['group'];
-$file = $g['group'][$group]['file'];
-$folder = $g['group'][$group]['folder'];
-$uploadDir = $g['group'][$group]['folder']['path'];
+$file = $g['profil'][$group]['file'];
+$folder = $g['profil'][$group]['folder'];
+$uploadDir = $g['profil'][$group]['folder']['path'];
 $currentPath = '../../.' . $uploadDir;
 if (!is_dir($currentPath ))
 	mkdir($currentPath );